kernel: drop everything not on kernel version 4.14
authorDaniel Golle <daniel@makrotopia.org>
Tue, 11 Jun 2019 23:14:25 +0000 (01:14 +0200)
committerDaniel Golle <daniel@makrotopia.org>
Tue, 11 Jun 2019 23:18:52 +0000 (01:18 +0200)
 * Remove testing patches for kernel version 4.19
 * remove targets ar7, ixp4xx, orion
Those targets are still on kernel 4.9, patches for 4.14 were not ready
in time. They may be readded once people prepare and test patches for
kernel 4.14.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
738 files changed:
target/linux/apm821xx/Makefile
target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0003-crypto-drop-mask-CRYPTO_ALG_ASYNC-from-cipher-tfm-al.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0005-cross-tree-phase-out-dma_zalloc_coherent.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch [deleted file]
target/linux/apm821xx/patches-4.19/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch [deleted file]
target/linux/apm821xx/patches-4.19/140-GPIO-add-named-gpio-exports.patch [deleted file]
target/linux/apm821xx/patches-4.19/201-add-amcc-apollo3g-support.patch [deleted file]
target/linux/apm821xx/patches-4.19/202-add-netgear-wndr4700-support.patch [deleted file]
target/linux/apm821xx/patches-4.19/300-fix-atheros-nics-on-apm82181.patch [deleted file]
target/linux/apm821xx/patches-4.19/301-fix-memory-map-wndr4700.patch [deleted file]
target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch [deleted file]
target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch [deleted file]
target/linux/apm821xx/patches-4.19/803-hwmon-tc654-add-detection-routine.patch [deleted file]
target/linux/apm821xx/patches-4.19/804-hwmon-tc654-add-thermal_cooling-device.patch [deleted file]
target/linux/ar7/Makefile [deleted file]
target/linux/ar7/ac49x/config-default [deleted file]
target/linux/ar7/ac49x/profiles/210-None.mk [deleted file]
target/linux/ar7/ac49x/target.mk [deleted file]
target/linux/ar7/base-files.mk [deleted file]
target/linux/ar7/base-files/etc/board.d/02_network [deleted file]
target/linux/ar7/base-files/etc/diag.sh [deleted file]
target/linux/ar7/base-files/etc/init.d/adam2 [deleted file]
target/linux/ar7/config-4.9 [deleted file]
target/linux/ar7/files/drivers/mtd/ac49xpart.c [deleted file]
target/linux/ar7/files/drivers/mtd/titanpart.c [deleted file]
target/linux/ar7/generic/config-default [deleted file]
target/linux/ar7/generic/profiles/100-Annex-A.mk [deleted file]
target/linux/ar7/generic/profiles/110-Annex-B.mk [deleted file]
target/linux/ar7/generic/profiles/200-Texas.mk [deleted file]
target/linux/ar7/generic/profiles/210-None.mk [deleted file]
target/linux/ar7/generic/target.mk [deleted file]
target/linux/ar7/image/Makefile [deleted file]
target/linux/ar7/patches-4.9/100-fix-highmem-offset.patch [deleted file]
target/linux/ar7/patches-4.9/101-MIPS-AR7-allow-NULL-clock-for-clk_get_rate.patch [deleted file]
target/linux/ar7/patches-4.9/110-flash.patch [deleted file]
target/linux/ar7/patches-4.9/160-vlynq_try_remote_first.patch [deleted file]
target/linux/ar7/patches-4.9/200-free-mem-below-kernel-offset.patch [deleted file]
target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch [deleted file]
target/linux/ar7/patches-4.9/310-ac49x-prom-support.patch [deleted file]
target/linux/ar7/patches-4.9/320-ac49x-mtd-partitions.patch [deleted file]
target/linux/ar7/patches-4.9/920-ar7part.patch [deleted file]
target/linux/ar7/patches-4.9/925-actiontec_leds.patch [deleted file]
target/linux/ar7/patches-4.9/950-cpmac_titan.patch [deleted file]
target/linux/ar7/src/adam2patcher.c [deleted file]
target/linux/ath79/Makefile
target/linux/ath79/patches-4.19/0002-watchdog-ath79-fix-maximum-timeout.patch [deleted file]
target/linux/ath79/patches-4.19/0003-leds-add-reset-controller-based-driver.patch [deleted file]
target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch [deleted file]
target/linux/ath79/patches-4.19/0005-usb-add-more-OF-quirk-properties.patch [deleted file]
target/linux/ath79/patches-4.19/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch [deleted file]
target/linux/ath79/patches-4.19/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch [deleted file]
target/linux/ath79/patches-4.19/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch [deleted file]
target/linux/ath79/patches-4.19/0017-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch [deleted file]
target/linux/ath79/patches-4.19/0018-MIPS-pci-ar71xx-convert-to-OF.patch [deleted file]
target/linux/ath79/patches-4.19/0019-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch [deleted file]
target/linux/ath79/patches-4.19/0020-MIPS-pci-ar724x-convert-to-OF.patch [deleted file]
target/linux/ath79/patches-4.19/0021-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch [deleted file]
target/linux/ath79/patches-4.19/0022-MIPS-ath79-move-legacy-wdt-and-uart-clock-aliases-ou.patch [deleted file]
target/linux/ath79/patches-4.19/0023-MIPS-ath79-pass-PLL-base-to-clock-init-functions.patch [deleted file]
target/linux/ath79/patches-4.19/0024-MIPS-ath79-make-specifying-the-reference-clock-in-DT.patch [deleted file]
target/linux/ath79/patches-4.19/0025-MIPS-ath79-support-setting-up-clock-via-DT-on-all-So.patch [deleted file]
target/linux/ath79/patches-4.19/0026-MIPS-ath79-export-switch-MDIO-reference-clock.patch [deleted file]
target/linux/ath79/patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch [deleted file]
target/linux/ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch [deleted file]
target/linux/ath79/patches-4.19/0029-MIPS-ath79-drop-legacy-pci-code.patch [deleted file]
target/linux/ath79/patches-4.19/0030-MIPS-ath79-drop-platform-device-registration-code.patch [deleted file]
target/linux/ath79/patches-4.19/0031-MIPS-ath79-drop-OF-clock-code.patch [deleted file]
target/linux/ath79/patches-4.19/0032-MIPS-ath79-sanitize-symbols.patch [deleted file]
target/linux/ath79/patches-4.19/0033-spi-ath79-drop-pdata-support.patch [deleted file]
target/linux/ath79/patches-4.19/0034-MIPS-ath79-ath9k-exports.patch [deleted file]
target/linux/ath79/patches-4.19/0036-GPIO-add-named-gpio-exports.patch [deleted file]
target/linux/ath79/patches-4.19/0036-MIPS-ath79-remove-irq-code-from-pci.patch [deleted file]
target/linux/ath79/patches-4.19/0037-missing-registers.patch [deleted file]
target/linux/ath79/patches-4.19/004-register_gpio_driver_earlier.patch [deleted file]
target/linux/ath79/patches-4.19/403-mtd_fix_cfi_cmdset_0002_status_check.patch [deleted file]
target/linux/ath79/patches-4.19/404-mtd-cybertan-trx-parser.patch [deleted file]
target/linux/ath79/patches-4.19/405-mtd-tp-link-partition-parser.patch [deleted file]
target/linux/ath79/patches-4.19/420-net-ar71xx_mac_driver.patch [deleted file]
target/linux/ath79/patches-4.19/430-drivers-link-spi-before-mtd.patch [deleted file]
target/linux/ath79/patches-4.19/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch [deleted file]
target/linux/ath79/patches-4.19/490-usb-ehci-add-quirks-for-qca-socs.patch [deleted file]
target/linux/ath79/patches-4.19/900-mdio_bitbang_ignore_ta_value.patch [deleted file]
target/linux/ath79/patches-4.19/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch [deleted file]
target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch [deleted file]
target/linux/bcm53xx/Makefile
target/linux/bcm53xx/patches-4.19/030-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch [deleted file]
target/linux/bcm53xx/patches-4.19/031-v4.21-0001-ARM-dts-BCM5301X-Relicense-BCM47081-BCM4709-files-to.patch [deleted file]
target/linux/bcm53xx/patches-4.19/031-v4.21-0002-ARM-dts-BCM5301X-Relicense-BCM47094-file-to-the-GPL-.patch [deleted file]
target/linux/bcm53xx/patches-4.19/031-v4.21-0003-ARM-dts-BCM53573-Relicense-Tenda-AC9-file-to-the-GPL.patch [deleted file]
target/linux/bcm53xx/patches-4.19/031-v4.21-0004-ARM-dts-BCM53573-Relicense-SoC-file-to-the-GPL-2.0-M.patch [deleted file]
target/linux/bcm53xx/patches-4.19/031-v4.21-0005-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch [deleted file]
target/linux/bcm53xx/patches-4.19/031-v4.21-0006-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch [deleted file]
target/linux/bcm53xx/patches-4.19/032-v5.1-0001-ARM-dts-BCM53573-Relicense-Luxul-files-to-the-GPL-2..patch [deleted file]
target/linux/bcm53xx/patches-4.19/032-v5.1-0002-ARM-dts-BCM5301X-Add-basic-DT-for-Phicomm-K3.patch [deleted file]
target/linux/bcm53xx/patches-4.19/080-v4.20-0001-pinctrl-bcm-add-Northstar-driver.patch [deleted file]
target/linux/bcm53xx/patches-4.19/080-v4.20-0002-pinctrl-bcm-ns-Use-uintptr_t-for-casting-data.patch [deleted file]
target/linux/bcm53xx/patches-4.19/081-v4.21-0001-pinctrl-bcm-ns-support-updated-DT-binding-as-syscon-.patch [deleted file]
target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch [deleted file]
target/linux/bcm53xx/patches-4.19/300-ARM-BCM5301X-Disable-MMU-and-Dcache-during-decompres.patch [deleted file]
target/linux/bcm53xx/patches-4.19/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch [deleted file]
target/linux/bcm53xx/patches-4.19/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch [deleted file]
target/linux/bcm53xx/patches-4.19/311-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch [deleted file]
target/linux/bcm53xx/patches-4.19/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch [deleted file]
target/linux/bcm53xx/patches-4.19/321-ARM-dts-BCM5301X-Describe-partition-formats.patch [deleted file]
target/linux/bcm53xx/patches-4.19/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch [deleted file]
target/linux/bcm53xx/patches-4.19/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch [deleted file]
target/linux/bcm53xx/patches-4.19/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch [deleted file]
target/linux/bcm53xx/patches-4.19/905-BCM53573-minor-hacks.patch [deleted file]
target/linux/brcm47xx/Makefile
target/linux/brcm47xx/patches-4.19/030-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch [deleted file]
target/linux/brcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch [deleted file]
target/linux/brcm47xx/patches-4.19/159-cpu_fixes.patch [deleted file]
target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch [deleted file]
target/linux/brcm47xx/patches-4.19/209-b44-register-adm-switch.patch [deleted file]
target/linux/brcm47xx/patches-4.19/210-b44_phy_fix.patch [deleted file]
target/linux/brcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch [deleted file]
target/linux/brcm47xx/patches-4.19/300-fork_cacheflush.patch [deleted file]
target/linux/brcm47xx/patches-4.19/310-no_highpage.patch [deleted file]
target/linux/brcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch [deleted file]
target/linux/brcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch [deleted file]
target/linux/brcm47xx/patches-4.19/610-pci_ide_fix.patch [deleted file]
target/linux/brcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch [deleted file]
target/linux/brcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch [deleted file]
target/linux/brcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch [deleted file]
target/linux/brcm47xx/patches-4.19/830-huawei_e970_support.patch [deleted file]
target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch [deleted file]
target/linux/brcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch [deleted file]
target/linux/brcm47xx/patches-4.19/940-bcm47xx-yenta.patch [deleted file]
target/linux/brcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch [deleted file]
target/linux/brcm47xx/patches-4.19/999-wl_exports.patch [deleted file]
target/linux/cns3xxx/Makefile
target/linux/cns3xxx/patches-4.19/000-cns3xxx_arch_include.patch [deleted file]
target/linux/cns3xxx/patches-4.19/001-arm_openwrt_machtypes.patch [deleted file]
target/linux/cns3xxx/patches-4.19/010-arm_introduce-dma-fiq-irq-broadcast.patch [deleted file]
target/linux/cns3xxx/patches-4.19/020-watchdog_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/025-smp_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/030-pcie_clock.patch [deleted file]
target/linux/cns3xxx/patches-4.19/040-fiq_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/045-twd_base.patch [deleted file]
target/linux/cns3xxx/patches-4.19/055-pcie_io.patch [deleted file]
target/linux/cns3xxx/patches-4.19/060-pcie_abort.patch [deleted file]
target/linux/cns3xxx/patches-4.19/065-pcie_skip_inactive.patch [deleted file]
target/linux/cns3xxx/patches-4.19/070-i2c_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/075-spi_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/080-sata_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/090-timers.patch [deleted file]
target/linux/cns3xxx/patches-4.19/093-add-virt-pci-io-mapping.patch [deleted file]
target/linux/cns3xxx/patches-4.19/095-gpio_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/097-l2x0_cmdline_disable.patch [deleted file]
target/linux/cns3xxx/patches-4.19/100-laguna_support.patch [deleted file]
target/linux/cns3xxx/patches-4.19/101-laguna_sdhci_card_detect.patch [deleted file]
target/linux/cns3xxx/patches-4.19/110-pci_isolated_interrupts.patch [deleted file]
target/linux/cns3xxx/patches-4.19/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch [deleted file]
target/linux/cns3xxx/patches-4.19/200-broadcom_phy_reinit.patch [deleted file]
target/linux/cns3xxx/patches-4.19/210-dwc2_defaults.patch [deleted file]
target/linux/gemini/Makefile
target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch [deleted file]
target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch [deleted file]
target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch [deleted file]
target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch [deleted file]
target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch [deleted file]
target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch [deleted file]
target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch [deleted file]
target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch [deleted file]
target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch [deleted file]
target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch [deleted file]
target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch [deleted file]
target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch [deleted file]
target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch [deleted file]
target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch [deleted file]
target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch [deleted file]
target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch [deleted file]
target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch [deleted file]
target/linux/gemini/patches-4.19/0019-ARM-dts-gemini-Indent-DIR-685-partition-table.patch [deleted file]
target/linux/gemini/patches-4.19/0020-ARM-dts-Augment-DIR-685-partition-table-for-OpenWrt.patch [deleted file]
target/linux/generic/backport-4.19/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch [deleted file]
target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch [deleted file]
target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch [deleted file]
target/linux/generic/backport-4.19/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch [deleted file]
target/linux/generic/backport-4.19/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch [deleted file]
target/linux/generic/backport-4.19/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch [deleted file]
target/linux/generic/backport-4.19/080-v5.1-0002-bcma-use-dev_-printing-functions.patch [deleted file]
target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch [deleted file]
target/linux/generic/backport-4.19/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch [deleted file]
target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch [deleted file]
target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch [deleted file]
target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch [deleted file]
target/linux/generic/backport-4.19/371-netfilter-nf_flow_table-fix-up-ct-state-of-flows-aft.patch [deleted file]
target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch [deleted file]
target/linux/generic/backport-4.19/450-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch [deleted file]
target/linux/generic/backport-4.19/451-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch [deleted file]
target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch [deleted file]
target/linux/generic/backport-4.9/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch [deleted file]
target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch [deleted file]
target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch [deleted file]
target/linux/generic/backport-4.9/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch [deleted file]
target/linux/generic/backport-4.9/020-backport_netfilter_rtcache.patch [deleted file]
target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch [deleted file]
target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch [deleted file]
target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch [deleted file]
target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch [deleted file]
target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch [deleted file]
target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch [deleted file]
target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch [deleted file]
target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch [deleted file]
target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch [deleted file]
target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch [deleted file]
target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch [deleted file]
target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch [deleted file]
target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch [deleted file]
target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch [deleted file]
target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch [deleted file]
target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch [deleted file]
target/linux/generic/backport-4.9/042-mm-rename-__page_frag-functions-to-__page_frag_cache.patch [deleted file]
target/linux/generic/backport-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch [deleted file]
target/linux/generic/backport-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch [deleted file]
target/linux/generic/backport-4.9/060-0004-mtd-bcm47xxpart-move-TRX-parsing-code-to-separated-f.patch [deleted file]
target/linux/generic/backport-4.9/060-0005-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch [deleted file]
target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch [deleted file]
target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch [deleted file]
target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch [deleted file]
target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch [deleted file]
target/linux/generic/backport-4.9/061-v4.10-0005-mtd-spi-nor-Add-at25df321-spi-nor-flash-support.patch [deleted file]
target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch [deleted file]
target/linux/generic/backport-4.9/061-v4.10-0007-mtd-spi-nor-Add-support-for-mr25h40.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0006-mtd-spi-nor-Add-lock-unlock-support-for-f25l32pa.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch [deleted file]
target/linux/generic/backport-4.9/062-v4.11-0008-mtd-spi-nor-Add-support-for-gd25q16.patch [deleted file]
target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch [deleted file]
target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch [deleted file]
target/linux/generic/backport-4.9/063-v4.11-0003-mtd-Add-partition-device-node-to-mtd-partition-devic.patch [deleted file]
target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0001-mtd-handle-partitioning-on-devices-with-0-erasesize.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch [deleted file]
target/linux/generic/backport-4.9/065-v4.13-0008-mtd-extract-TRX-parser-out-of-bcm47xxpart-into-a-sep.patch [deleted file]
target/linux/generic/backport-4.9/066-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch [deleted file]
target/linux/generic/backport-4.9/066-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch [deleted file]
target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch [deleted file]
target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch [deleted file]
target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch [deleted file]
target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch [deleted file]
target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch [deleted file]
target/linux/generic/backport-4.9/070-bcma-from-4.11.patch [deleted file]
target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch [deleted file]
target/linux/generic/backport-4.9/071-v4.10-0002-net-bgmac-drop-struct-bcma_mdio-we-don-t-need-anymor.patch [deleted file]
target/linux/generic/backport-4.9/071-v4.10-0003-net-bgmac-use-PHY-subsystem-for-initializing-PHY.patch [deleted file]
target/linux/generic/backport-4.9/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch [deleted file]
target/linux/generic/backport-4.9/072-bcma-from-4.12.patch [deleted file]
target/linux/generic/backport-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch [deleted file]
target/linux/generic/backport-4.9/075-v4.10-0002-net-phy-broadcom-Add-support-for-BCM54612E.patch [deleted file]
target/linux/generic/backport-4.9/075-v4.10-0003-net-phy-broadcom-add-bcm54xx_auxctl_read.patch [deleted file]
target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch [deleted file]
target/linux/generic/backport-4.9/075-v4.10-0005-net-phy-broadcom-Move-bcm54xx_auxctl_-read-write-to-.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.11-0002-net-phy-broadcom-Add-support-code-for-reading-PHY-co.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.11-0003-net-phy-bcm7xxx-Add-entry-for-BCM7278.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.11-0004-net-phy-bcm7xxx-Implement-EGPHY-workaround-for-7278.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.11-0005-net-phy-broadcom-use-auxctl-reading-helper-in-BCM546.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.11-0006-net-phy-broadcom-add-support-for-BCM54210E.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.11-0007-net-phy-broadcom-rehook-BCM54612E-specific-init.patch [deleted file]
target/linux/generic/backport-4.9/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch [deleted file]
target/linux/generic/backport-4.9/080-0001-leds-core-add-OF-variants-of-LED-registering-functio.patch [deleted file]
target/linux/generic/backport-4.9/080-0002-leds-gpio-use-OF-variant-of-LED-registering-function.patch [deleted file]
target/linux/generic/backport-4.9/081-0001-thermal-bcm2835-add-thermal-driver-for-bcm2835-SoC.patch [deleted file]
target/linux/generic/backport-4.9/081-0002-thermal-broadcom-add-Northstar-thermal-driver.patch [deleted file]
target/linux/generic/backport-4.9/082-0001-usb-core-read-USB-ports-from-DT-in-the-usbport-LED-t.patch [deleted file]
target/linux/generic/backport-4.9/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch [deleted file]
target/linux/generic/backport-4.9/087-regmap-make-LZO-cache-optional.patch [deleted file]
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch [deleted file]
target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch [deleted file]
target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch [deleted file]
target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch [deleted file]
target/linux/generic/backport-4.9/095-v4.13-0001-rtc-ds1307-add-ds1308-variant.patch [deleted file]
target/linux/generic/backport-4.9/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch [deleted file]
target/linux/generic/backport-4.9/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch [deleted file]
target/linux/generic/backport-4.9/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch [deleted file]
target/linux/generic/backport-4.9/400-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch [deleted file]
target/linux/generic/backport-4.9/401-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch [deleted file]
target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch [deleted file]
target/linux/generic/config-4.19 [deleted file]
target/linux/generic/config-4.9 [deleted file]
target/linux/generic/hack-4.19/204-module_strip.patch [deleted file]
target/linux/generic/hack-4.19/207-disable-modorder.patch [deleted file]
target/linux/generic/hack-4.19/210-darwin_scripts_include.patch [deleted file]
target/linux/generic/hack-4.19/211-host_tools_portability.patch [deleted file]
target/linux/generic/hack-4.19/212-byteshift_portability.patch [deleted file]
target/linux/generic/hack-4.19/214-spidev_h_portability.patch [deleted file]
target/linux/generic/hack-4.19/220-gc_sections.patch [deleted file]
target/linux/generic/hack-4.19/221-module_exports.patch [deleted file]
target/linux/generic/hack-4.19/230-openwrt_lzma_options.patch [deleted file]
target/linux/generic/hack-4.19/250-netfilter_depends.patch [deleted file]
target/linux/generic/hack-4.19/251-sound_kconfig.patch [deleted file]
target/linux/generic/hack-4.19/259-regmap_dynamic.patch [deleted file]
target/linux/generic/hack-4.19/260-crypto_test_dependencies.patch [deleted file]
target/linux/generic/hack-4.19/280-rfkill-stubs.patch [deleted file]
target/linux/generic/hack-4.19/290-nvmem-make-CONFIG_NVMEM-tristate-again.patch [deleted file]
target/linux/generic/hack-4.19/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch [deleted file]
target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch [deleted file]
target/linux/generic/hack-4.19/321-powerpc_crtsavres_prereq.patch [deleted file]
target/linux/generic/hack-4.19/531-debloat_lzma.patch [deleted file]
target/linux/generic/hack-4.19/640-bridge-only-accept-EAP-locally.patch [deleted file]
target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch [deleted file]
target/linux/generic/hack-4.19/650-netfilter-add-xt_OFFLOAD-target.patch [deleted file]
target/linux/generic/hack-4.19/651-wireless_mesh_header.patch [deleted file]
target/linux/generic/hack-4.19/660-fq_codel_defaults.patch [deleted file]
target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch [deleted file]
target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch [deleted file]
target/linux/generic/hack-4.19/700-swconfig_switch_drivers.patch [deleted file]
target/linux/generic/hack-4.19/702-phy_add_aneg_done_function.patch [deleted file]
target/linux/generic/hack-4.19/721-phy_packets.patch [deleted file]
target/linux/generic/hack-4.19/773-bgmac-add-srab-switch.patch [deleted file]
target/linux/generic/hack-4.19/835-misc-owl_loader.patch [deleted file]
target/linux/generic/hack-4.19/901-debloat_sock_diag.patch [deleted file]
target/linux/generic/hack-4.19/902-debloat_proc.patch [deleted file]
target/linux/generic/hack-4.19/904-debloat_dma_buf.patch [deleted file]
target/linux/generic/hack-4.19/910-kobject_uevent.patch [deleted file]
target/linux/generic/hack-4.19/911-kobject_add_broadcast_uevent.patch [deleted file]
target/linux/generic/hack-4.19/921-always-create-console-node-in-initramfs.patch [deleted file]
target/linux/generic/hack-4.19/930-crashlog.patch [deleted file]
target/linux/generic/hack-4.19/940-cleanup-offload-hooks-on-netdev-unregister.patch [deleted file]
target/linux/generic/hack-4.9/204-module_strip.patch [deleted file]
target/linux/generic/hack-4.9/207-disable-modorder.patch [deleted file]
target/linux/generic/hack-4.9/210-darwin_scripts_include.patch [deleted file]
target/linux/generic/hack-4.9/211-host_tools_portability.patch [deleted file]
target/linux/generic/hack-4.9/212-byteshift_portability.patch [deleted file]
target/linux/generic/hack-4.9/214-spidev_h_portability.patch [deleted file]
target/linux/generic/hack-4.9/220-gc_sections.patch [deleted file]
target/linux/generic/hack-4.9/221-module_exports.patch [deleted file]
target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch [deleted file]
target/linux/generic/hack-4.9/250-netfilter_depends.patch [deleted file]
target/linux/generic/hack-4.9/251-sound_kconfig.patch [deleted file]
target/linux/generic/hack-4.9/259-regmap_dynamic.patch [deleted file]
target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch [deleted file]
target/linux/generic/hack-4.9/280-rfkill-stubs.patch [deleted file]
target/linux/generic/hack-4.9/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch [deleted file]
target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch [deleted file]
target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch [deleted file]
target/linux/generic/hack-4.9/531-debloat_lzma.patch [deleted file]
target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch [deleted file]
target/linux/generic/hack-4.9/641-bridge_port_isolate.patch [deleted file]
target/linux/generic/hack-4.9/651-wireless_mesh_header.patch [deleted file]
target/linux/generic/hack-4.9/660-fq_codel_defaults.patch [deleted file]
target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch [deleted file]
target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch [deleted file]
target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch [deleted file]
target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch [deleted file]
target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch [deleted file]
target/linux/generic/hack-4.9/721-phy_packets.patch [deleted file]
target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch [deleted file]
target/linux/generic/hack-4.9/835-misc-owl_loader.patch [deleted file]
target/linux/generic/hack-4.9/901-debloat_sock_diag.patch [deleted file]
target/linux/generic/hack-4.9/902-debloat_proc.patch [deleted file]
target/linux/generic/hack-4.9/904-debloat_dma_buf.patch [deleted file]
target/linux/generic/hack-4.9/910-kobject_uevent.patch [deleted file]
target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch [deleted file]
target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch [deleted file]
target/linux/generic/hack-4.9/930-crashlog.patch [deleted file]
target/linux/generic/pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch [deleted file]
target/linux/generic/pending-4.19/102-MIPS-only-process-negative-stack-offsets-on-stack-tr.patch [deleted file]
target/linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch [deleted file]
target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch [deleted file]
target/linux/generic/pending-4.19/130-add-linux-spidev-compatible-si3210.patch [deleted file]
target/linux/generic/pending-4.19/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch [deleted file]
target/linux/generic/pending-4.19/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch [deleted file]
target/linux/generic/pending-4.19/141-jffs2-add-RENAME_EXCHANGE-support.patch [deleted file]
target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch [deleted file]
target/linux/generic/pending-4.19/180-net-phy-at803x-add-support-for-AT8032.patch [deleted file]
target/linux/generic/pending-4.19/201-extra_optimization.patch [deleted file]
target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch [deleted file]
target/linux/generic/pending-4.19/205-backtrace_module_info.patch [deleted file]
target/linux/generic/pending-4.19/220-optimize_inlining.patch [deleted file]
target/linux/generic/pending-4.19/240-remove-unsane-filenames-from-deps_initramfs-list.patch [deleted file]
target/linux/generic/pending-4.19/261-enable_wilink_platform_without_drivers.patch [deleted file]
target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch [deleted file]
target/linux/generic/pending-4.19/302-mips_no_branch_likely.patch [deleted file]
target/linux/generic/pending-4.19/304-mips_disable_fpu.patch [deleted file]
target/linux/generic/pending-4.19/305-mips_module_reloc.patch [deleted file]
target/linux/generic/pending-4.19/306-mips_mem_functions_performance.patch [deleted file]
target/linux/generic/pending-4.19/307-mips_highmem_offset.patch [deleted file]
target/linux/generic/pending-4.19/308-mips32r2_tune.patch [deleted file]
target/linux/generic/pending-4.19/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch [deleted file]
target/linux/generic/pending-4.19/310-arm_module_unresolved_weak_sym.patch [deleted file]
target/linux/generic/pending-4.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch [deleted file]
target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch [deleted file]
target/linux/generic/pending-4.19/333-arc-enable-unaligned-access-in-kernel-mode.patch [deleted file]
target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch [deleted file]
target/linux/generic/pending-4.19/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch [deleted file]
target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch [deleted file]
target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch [deleted file]
target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch [deleted file]
target/linux/generic/pending-4.19/403-mtd-hook-mtdsplit-to-Kbuild.patch [deleted file]
target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch [deleted file]
target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch [deleted file]
target/linux/generic/pending-4.19/412-mtd-partial_eraseblock_unlock.patch [deleted file]
target/linux/generic/pending-4.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch [deleted file]
target/linux/generic/pending-4.19/420-mtd-redboot_space.patch [deleted file]
target/linux/generic/pending-4.19/430-mtd-add-myloader-partition-parser.patch [deleted file]
target/linux/generic/pending-4.19/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch [deleted file]
target/linux/generic/pending-4.19/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch [deleted file]
target/linux/generic/pending-4.19/440-block2mtd_init.patch [deleted file]
target/linux/generic/pending-4.19/441-block2mtd_probe.patch [deleted file]
target/linux/generic/pending-4.19/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch [deleted file]
target/linux/generic/pending-4.19/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch [deleted file]
target/linux/generic/pending-4.19/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch [deleted file]
target/linux/generic/pending-4.19/465-m25p80-mx-disable-software-protection.patch [deleted file]
target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch [deleted file]
target/linux/generic/pending-4.19/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch [deleted file]
target/linux/generic/pending-4.19/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch [deleted file]
target/linux/generic/pending-4.19/476-mtd-spi-nor-add-eon-en25q128.patch [deleted file]
target/linux/generic/pending-4.19/477-mtd-add-spi-nor-add-mx25u3235f.patch [deleted file]
target/linux/generic/pending-4.19/479-mtd-spi-nor-add-eon-en25qh64.patch [deleted file]
target/linux/generic/pending-4.19/480-mtd-set-rootfs-to-be-root-dev.patch [deleted file]
target/linux/generic/pending-4.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch [deleted file]
target/linux/generic/pending-4.19/491-ubi-auto-create-ubiblock-device-for-rootfs.patch [deleted file]
target/linux/generic/pending-4.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch [deleted file]
target/linux/generic/pending-4.19/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch [deleted file]
target/linux/generic/pending-4.19/494-mtd-ubi-add-EOF-marker-support.patch [deleted file]
target/linux/generic/pending-4.19/495-mtd-core-add-get_mtd_device_by_node.patch [deleted file]
target/linux/generic/pending-4.19/496-dt-bindings-add-bindings-for-mtd-concat-devices.patch [deleted file]
target/linux/generic/pending-4.19/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch [deleted file]
target/linux/generic/pending-4.19/530-jffs2_make_lzma_available.patch [deleted file]
target/linux/generic/pending-4.19/532-jffs2_eofdetect.patch [deleted file]
target/linux/generic/pending-4.19/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch [deleted file]
target/linux/generic/pending-4.19/600-netfilter_conntrack_flush.patch [deleted file]
target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch [deleted file]
target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch [deleted file]
target/linux/generic/pending-4.19/612-netfilter_match_reduce_memory_access.patch [deleted file]
target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch [deleted file]
target/linux/generic/pending-4.19/616-net_optimize_xfrm_calls.patch [deleted file]
target/linux/generic/pending-4.19/620-net_sched-codel-do-not-defer-queue-length-update.patch [deleted file]
target/linux/generic/pending-4.19/630-packet_socket_type.patch [deleted file]
target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch [deleted file]
target/linux/generic/pending-4.19/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch [deleted file]
target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch [deleted file]
target/linux/generic/pending-4.19/643-net-bridge-support-hardware-flow-table-offload.patch [deleted file]
target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch [deleted file]
target/linux/generic/pending-4.19/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch [deleted file]
target/linux/generic/pending-4.19/646-netfilter-nf_flow_table-rework-private-driver-data.patch [deleted file]
target/linux/generic/pending-4.19/655-increase_skb_pad.patch [deleted file]
target/linux/generic/pending-4.19/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch [deleted file]
target/linux/generic/pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch [deleted file]
target/linux/generic/pending-4.19/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch [deleted file]
target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch [deleted file]
target/linux/generic/pending-4.19/681-NET-add-of_get_mac_address_mtd.patch [deleted file]
target/linux/generic/pending-4.19/703-phy-add-detach-callback-to-struct-phy_driver.patch [deleted file]
target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch [deleted file]
target/linux/generic/pending-4.19/735-net-phy-at803x-fix-at8033-sgmii-mode.patch [deleted file]
target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch [deleted file]
target/linux/generic/pending-4.19/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch [deleted file]
target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch [deleted file]
target/linux/generic/pending-4.19/811-pci_disable_usb_common_quirks.patch [deleted file]
target/linux/generic/pending-4.19/834-ledtrig-libata.patch [deleted file]
target/linux/generic/pending-4.19/840-media-i2c-tda1997x-select-V4L2_FWNODE.patch [deleted file]
target/linux/generic/pending-4.19/920-mangle_bootargs.patch [deleted file]
target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch [deleted file]
target/linux/generic/pending-4.9/100-MIPS-fix-cache-flushing-for-highmem-pages.patch [deleted file]
target/linux/generic/pending-4.9/110-ehci_hcd_ignore_oc.patch [deleted file]
target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch [deleted file]
target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch [deleted file]
target/linux/generic/pending-4.9/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch [deleted file]
target/linux/generic/pending-4.9/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch [deleted file]
target/linux/generic/pending-4.9/141-jffs2-add-RENAME_EXCHANGE-support.patch [deleted file]
target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch [deleted file]
target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch [deleted file]
target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch [deleted file]
target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch [deleted file]
target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch [deleted file]
target/linux/generic/pending-4.9/201-extra_optimization.patch [deleted file]
target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch [deleted file]
target/linux/generic/pending-4.9/205-backtrace_module_info.patch [deleted file]
target/linux/generic/pending-4.9/220-optimize_inlining.patch [deleted file]
target/linux/generic/pending-4.9/240-remove-unsane-filenames-from-deps_initramfs-list.patch [deleted file]
target/linux/generic/pending-4.9/261-enable_wilink_platform_without_drivers.patch [deleted file]
target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch [deleted file]
target/linux/generic/pending-4.9/302-mips_no_branch_likely.patch [deleted file]
target/linux/generic/pending-4.9/304-mips_disable_fpu.patch [deleted file]
target/linux/generic/pending-4.9/305-mips_module_reloc.patch [deleted file]
target/linux/generic/pending-4.9/306-mips_mem_functions_performance.patch [deleted file]
target/linux/generic/pending-4.9/307-mips_highmem_offset.patch [deleted file]
target/linux/generic/pending-4.9/308-mips32r2_tune.patch [deleted file]
target/linux/generic/pending-4.9/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch [deleted file]
target/linux/generic/pending-4.9/310-arm_module_unresolved_weak_sym.patch [deleted file]
target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch [deleted file]
target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch [deleted file]
target/linux/generic/pending-4.9/333-arc-enable-unaligned-access-in-kernel-mode.patch [deleted file]
target/linux/generic/pending-4.9/340-MIPS-mm-remove-mips_dma_mapping_error.patch [deleted file]
target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch [deleted file]
target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch [deleted file]
target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch [deleted file]
target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch [deleted file]
target/linux/generic/pending-4.9/403-mtd-hook-mtdsplit-to-Kbuild.patch [deleted file]
target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch [deleted file]
target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch [deleted file]
target/linux/generic/pending-4.9/412-mtd-partial_eraseblock_unlock.patch [deleted file]
target/linux/generic/pending-4.9/419-mtd-redboot-add-of_match_table-with-DT-binding.patch [deleted file]
target/linux/generic/pending-4.9/420-mtd-redboot_space.patch [deleted file]
target/linux/generic/pending-4.9/430-mtd-add-myloader-partition-parser.patch [deleted file]
target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch [deleted file]
target/linux/generic/pending-4.9/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch [deleted file]
target/linux/generic/pending-4.9/440-block2mtd_init.patch [deleted file]
target/linux/generic/pending-4.9/441-block2mtd_probe.patch [deleted file]
target/linux/generic/pending-4.9/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch [deleted file]
target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch [deleted file]
target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch [deleted file]
target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch [deleted file]
target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch [deleted file]
target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch [deleted file]
target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch [deleted file]
target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch [deleted file]
target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch [deleted file]
target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch [deleted file]
target/linux/generic/pending-4.9/479-mtd-spi-nor-add-eon-en25qh32.patch [deleted file]
target/linux/generic/pending-4.9/480-mtd-set-rootfs-to-be-root-dev.patch [deleted file]
target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch [deleted file]
target/linux/generic/pending-4.9/491-ubi-auto-create-ubiblock-device-for-rootfs.patch [deleted file]
target/linux/generic/pending-4.9/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch [deleted file]
target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch [deleted file]
target/linux/generic/pending-4.9/494-mtd-ubi-add-EOF-marker-support.patch [deleted file]
target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch [deleted file]
target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch [deleted file]
target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch [deleted file]
target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch [deleted file]
target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch [deleted file]
target/linux/generic/pending-4.9/611-netfilter_match_bypass_default_table.patch [deleted file]
target/linux/generic/pending-4.9/612-netfilter_match_reduce_memory_access.patch [deleted file]
target/linux/generic/pending-4.9/613-netfilter_optional_tcp_window_check.patch [deleted file]
target/linux/generic/pending-4.9/616-net_optimize_xfrm_calls.patch [deleted file]
target/linux/generic/pending-4.9/620-net_sched-codel-do-not-defer-queue-length-update.patch [deleted file]
target/linux/generic/pending-4.9/630-packet_socket_type.patch [deleted file]
target/linux/generic/pending-4.9/655-increase_skb_pad.patch [deleted file]
target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch [deleted file]
target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch [deleted file]
target/linux/generic/pending-4.9/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch [deleted file]
target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch [deleted file]
target/linux/generic/pending-4.9/681-NET-add-of_get_mac_address_mtd.patch [deleted file]
target/linux/generic/pending-4.9/701-phy_extension.patch [deleted file]
target/linux/generic/pending-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch [deleted file]
target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch [deleted file]
target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch [deleted file]
target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch [deleted file]
target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch [deleted file]
target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch [deleted file]
target/linux/generic/pending-4.9/834-ledtrig-libata.patch [deleted file]
target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch [deleted file]
target/linux/generic/pending-4.9/920-mangle_bootargs.patch [deleted file]
target/linux/imx6/Makefile
target/linux/imx6/patches-4.19/100-bootargs.patch [deleted file]
target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch [deleted file]
target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch [deleted file]
target/linux/ipq40xx/Makefile
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts [deleted file]
target/linux/ipq40xx/patches-4.19/070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch [deleted file]
target/linux/ipq40xx/patches-4.19/071-01-v4.20-ARM-dts-qcom-ipq4019-use-v2-of-the-kpss-bringup-mech.patch [deleted file]
target/linux/ipq40xx/patches-4.19/071-02-ipq40xx-Fix-booting-secondary-cores.patch [deleted file]
target/linux/ipq40xx/patches-4.19/072-v4.20-ARM-dts-qcom-ipq4019-add-cpu-operating-points-for-cp.patch [deleted file]
target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch [deleted file]
target/linux/ipq40xx/patches-4.19/074-ARM-qcom-Add-IPQ4019-SoC-support.patch [deleted file]
target/linux/ipq40xx/patches-4.19/075-dt-bindings-phy-qcom-ipq4019-usb-add-binding-documen.patch [deleted file]
target/linux/ipq40xx/patches-4.19/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch [deleted file]
target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch [deleted file]
target/linux/ipq40xx/patches-4.19/079-v4.20-ARM-dts-qcom-ipq4019-fix-PCI-range.patch [deleted file]
target/linux/ipq40xx/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch [deleted file]
target/linux/ipq40xx/patches-4.19/081-clk-fix-apss-cpu-overclocking.patch [deleted file]
target/linux/ipq40xx/patches-4.19/082-v4.20-mtd-spinand-winbond-Add-support-for-W25N01GV.patch [deleted file]
target/linux/ipq40xx/patches-4.19/083-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.patch [deleted file]
target/linux/ipq40xx/patches-4.19/084-ARM-dts-qcom-ipq4019-Fix-MSI-IRQ-type.patch [deleted file]
target/linux/ipq40xx/patches-4.19/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch [deleted file]
target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio-and-phy.patch [deleted file]
target/linux/ipq40xx/patches-4.19/701-dts-ipq4019-add-mdio-node.patch [deleted file]
target/linux/ipq40xx/patches-4.19/702-dts-ipq4019-add-PHY-switch-nodes.patch [deleted file]
target/linux/ipq40xx/patches-4.19/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch [deleted file]
target/linux/ipq40xx/patches-4.19/710-net-add-qualcomm-essedma-ethernet-driver.patch [deleted file]
target/linux/ipq40xx/patches-4.19/711-dts-ipq4019-add-ethernet-essedma-node.patch [deleted file]
target/linux/ipq40xx/patches-4.19/712-mr33-essedma.patch [deleted file]
target/linux/ipq40xx/patches-4.19/713-essedma-alloc-skb-ip-align.patch [deleted file]
target/linux/ipq40xx/patches-4.19/714-essedma-add-fix-for-memory-allocation.patch [deleted file]
target/linux/ipq40xx/patches-4.19/850-soc-add-qualcomm-syscon.patch [deleted file]
target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch [deleted file]
target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch [deleted file]
target/linux/ipq40xx/patches-4.19/997-device_tree_cmdline.patch [deleted file]
target/linux/ixp4xx/Makefile [deleted file]
target/linux/ixp4xx/base-files/lib/ixp4xx.sh [deleted file]
target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo [deleted file]
target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx [deleted file]
target/linux/ixp4xx/base-files/lib/upgrade/platform.sh [deleted file]
target/linux/ixp4xx/config-4.9 [deleted file]
target/linux/ixp4xx/generic/profiles/100-Default.mk [deleted file]
target/linux/ixp4xx/generic/profiles/105-Atheros-ath5k.mk [deleted file]
target/linux/ixp4xx/generic/profiles/200-NSLU2.mk [deleted file]
target/linux/ixp4xx/generic/profiles/300-NAS100d.mk [deleted file]
target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk [deleted file]
target/linux/ixp4xx/generic/profiles/500-USR8200.mk [deleted file]
target/linux/ixp4xx/generic/target.mk [deleted file]
target/linux/ixp4xx/harddisk/config-default [deleted file]
target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk [deleted file]
target/linux/ixp4xx/harddisk/target.mk [deleted file]
target/linux/ixp4xx/image/Makefile [deleted file]
target/linux/ixp4xx/modules.mk [deleted file]
target/linux/ixp4xx/patches-4.9/001-arm-ixp4xx-set-cohorent_dma_mask-for-ethernet-platfo.patch [deleted file]
target/linux/ixp4xx/patches-4.9/002-ixp4xx_eth-use-parent-device-for-dma-allocations.patch [deleted file]
target/linux/ixp4xx/patches-4.9/020-gateworks_i2c_pld.patch [deleted file]
target/linux/ixp4xx/patches-4.9/030-gpio_line_config.patch [deleted file]
target/linux/ixp4xx/patches-4.9/040-arm_mach_types.patch [deleted file]
target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch [deleted file]
target/linux/ixp4xx/patches-4.9/100-wg302v2_gateway7001_mac_plat_info.patch [deleted file]
target/linux/ixp4xx/patches-4.9/105-wg302v1_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/110-pronghorn_series_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/111-pronghorn_swap_uarts.patch [deleted file]
target/linux/ixp4xx/patches-4.9/115-sidewinder_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/116-sidewinder_fis_location.patch [deleted file]
target/linux/ixp4xx/patches-4.9/120-compex_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/130-wrt300nv2_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/131-wrt300nv2_mac_plat_info.patch [deleted file]
target/linux/ixp4xx/patches-4.9/132-wrt300nv2_mac_fix.patch [deleted file]
target/linux/ixp4xx/patches-4.9/150-lanready_ap1000_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/151-lanready_ap1000_mac_plat_info.patch [deleted file]
target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch [deleted file]
target/linux/ixp4xx/patches-4.9/162-wg302v1_mem_fixup.patch [deleted file]
target/linux/ixp4xx/patches-4.9/170-ixdpg425_mac_plat_info.patch [deleted file]
target/linux/ixp4xx/patches-4.9/175-avila_hss_audio_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/180-tw5334_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/185-mi424wr_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/190-cambria_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/201-npe_driver_print_license_location.patch [deleted file]
target/linux/ixp4xx/patches-4.9/205-npe_driver_separate_phy_functions.patch [deleted file]
target/linux/ixp4xx/patches-4.9/206-npe_driver_add_update_link_function.patch [deleted file]
target/linux/ixp4xx/patches-4.9/207-npe_driver_multiphy_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/295-latch_led_driver.patch [deleted file]
target/linux/ixp4xx/patches-4.9/300-avila_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/304-ixp4xx_eth_jumboframe.patch [deleted file]
target/linux/ixp4xx/patches-4.9/310-gtwx5717_spi_bus.patch [deleted file]
target/linux/ixp4xx/patches-4.9/311-gtwx5717_mac_plat_info.patch [deleted file]
target/linux/ixp4xx/patches-4.9/312-ixp4xx_pata_optimization.patch [deleted file]
target/linux/ixp4xx/patches-4.9/500-usr8200_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/520-tw2662_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/530-ap42x_support.patch [deleted file]
target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch [deleted file]
target/linux/ixp4xx/patches-4.9/900-ixp4xx-crypto-include-module.h.patch [deleted file]
target/linux/ixp4xx/patches-4.9/910-ixp4xx-nr_irq_lines.patch [deleted file]
target/linux/kirkwood/Makefile
target/linux/kirkwood/patches-4.19/100-ib62x0.patch [deleted file]
target/linux/kirkwood/patches-4.19/101-iconnect.patch [deleted file]
target/linux/kirkwood/patches-4.19/102-dockstar.patch [deleted file]
target/linux/kirkwood/patches-4.19/103-iomega-ix2-200.patch [deleted file]
target/linux/kirkwood/patches-4.19/104-ea3500.patch [deleted file]
target/linux/kirkwood/patches-4.19/105-ea4500.patch [deleted file]
target/linux/kirkwood/patches-4.19/105-goflexhome.patch [deleted file]
target/linux/kirkwood/patches-4.19/106-goflexnet.patch [deleted file]
target/linux/kirkwood/patches-4.19/107-01-zyxel-nsa3x0-common-nand-partitions.patch [deleted file]
target/linux/kirkwood/patches-4.19/107-02-nsa310b.patch [deleted file]
target/linux/kirkwood/patches-4.19/108-on100.patch [deleted file]
target/linux/kirkwood/patches-4.19/109-pogoplug_v4.patch [deleted file]
target/linux/kirkwood/patches-4.19/201-enable-sata-port-specific-led-triggers.patch [deleted file]
target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch [deleted file]
target/linux/mpc85xx/Makefile
target/linux/mpc85xx/patches-4.19/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch [deleted file]
target/linux/mpc85xx/patches-4.19/100-powerpc-85xx-tl-wdr4900-v1-support.patch [deleted file]
target/linux/mpc85xx/patches-4.19/101-powerpc-85xx-hiveap-330-support.patch [deleted file]
target/linux/mpc85xx/patches-4.19/102-powerpc-add-cmdline-override.patch [deleted file]
target/linux/mpc85xx/patches-4.19/103-powerpc-85xx-red-15w-rev1.patch [deleted file]
target/linux/mpc85xx/patches-4.19/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch [deleted file]
target/linux/mpc85xx/patches-4.19/105-powerpc-85xx-panda-support.patch [deleted file]
target/linux/octeon/Makefile
target/linux/octeon/patches-4.19/100-ubnt_edgerouter2_support.patch [deleted file]
target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch [deleted file]
target/linux/octeon/patches-4.19/120-cmdline-hack.patch [deleted file]
target/linux/orion/Makefile [deleted file]
target/linux/orion/base-files/etc/board.d/02_network [deleted file]
target/linux/orion/base-files/etc/hotplug.d/usb/10-usb [deleted file]
target/linux/orion/base-files/lib/preinit/01_sysinfo [deleted file]
target/linux/orion/config-4.9 [deleted file]
target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware [deleted file]
target/linux/orion/generic/base-files/lib/upgrade/platform.sh [deleted file]
target/linux/orion/generic/target.mk [deleted file]
target/linux/orion/harddisk/config-default [deleted file]
target/linux/orion/harddisk/target.mk [deleted file]
target/linux/orion/image/Makefile [deleted file]
target/linux/orion/image/generic.mk [deleted file]
target/linux/orion/image/harddisk.mk [deleted file]
target/linux/orion/patches-4.9/000-arm_openwrt_machtypes.patch [deleted file]
target/linux/orion/patches-4.9/100-wrt350nv2_openwrt_partition_map.patch [deleted file]
target/linux/orion/patches-4.9/101-wnr854t_partition_map.patch [deleted file]
target/linux/orion/patches-4.9/200-dt2_board_support.patch [deleted file]
target/linux/orion/patches-4.9/210-wn802t_support.patch [deleted file]
target/linux/sunxi/Makefile
target/linux/sunxi/patches-4.19/101-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch [deleted file]
target/linux/sunxi/patches-4.19/301-orangepi_pc2_usb_otg_to_host_key_power.patch [deleted file]
target/linux/sunxi/patches-4.19/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch [deleted file]
target/linux/sunxi/patches-4.19/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch [deleted file]
target/linux/tegra/Makefile
target/linux/tegra/patches-4.19/100-serial8250-on-tegra-hsuart-recover-from-spurious-interrupts-due-to-tegra2-silicon-bug.patch [deleted file]
target/linux/tegra/patches-4.19/101-ARM-dtc-tegra-enable-front-panel-leds-in-TrimSlice.patch [deleted file]
target/linux/x86/Makefile
target/linux/x86/patches-4.19/011-tune_lzma_options.patch [deleted file]
target/linux/x86/patches-4.19/100-fix_cs5535_clockevt.patch [deleted file]
target/linux/x86/patches-4.19/200-pcengines-apu2-reboot.patch [deleted file]
target/linux/x86/patches-4.19/800-hwmon-w83627ehf-dont-claim-nct677x.patch [deleted file]

index a67aee3b8cb0bfeaddd5d335ea662aa9aa23d9f6..c3253322f2add7bdd407be5dda00f0a9f8fd7d7d 100644 (file)
@@ -14,7 +14,6 @@ MAINTAINER:=Chris Blake <chrisrblake93@gmail.com>, \
 SUBTARGETS:=nand sata
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 define Target/Description
        Build images for AppliedMicro APM821xx based boards.
diff --git a/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch b/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch
deleted file mode 100644 (file)
index 86da6fc..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-From 7b0c03ecc42fb223baf015877fee9d517c2c8af1 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sat, 17 Nov 2018 17:17:21 +0100
-Subject: dmaengine: dw-dmac: implement dma protection control setting
-
-This patch adds a new device-tree property that allows to
-specify the dma protection control bits for the all of the
-DMA controller's channel uniformly.
-
-Setting the "correct" bits can have a huge impact on the
-PPC460EX and APM82181 that use this DMA engine in combination
-with a DesignWare' SATA-II core (sata_dwc_460ex driver).
-
-In the OpenWrt Forum, the user takimata reported that:
-|It seems your patch unleashed the full power of the SATA port.
-|Where I was previously hitting a really hard limit at around
-|82 MB/s for reading and 27 MB/s for writing, I am now getting this:
-|
-|root@OpenWrt:/mnt# time dd if=/dev/zero of=tempfile bs=1M count=1024
-|1024+0 records in
-|1024+0 records out
-|real    0m 13.65s
-|user    0m 0.01s
-|sys     0m 11.89s
-|
-|root@OpenWrt:/mnt# time dd if=tempfile of=/dev/null bs=1M count=1024
-|1024+0 records in
-|1024+0 records out
-|real    0m 8.41s
-|user    0m 0.01s
-|sys     0m 4.70s
-|
-|This means: 121 MB/s reading and 75 MB/s writing!
-|
-|The drive is a WD Green WD10EARX taken from an older MBL Single.
-|I repeated the test a few times with even larger files to rule out
-|any caching, I'm still seeing the same great performance. OpenWrt is
-|now completely on par with the original MBL firmware's performance.
-
-Another user And.short reported:
-|I can report that your fix worked! Boots up fine with two
-|drives even with more partitions, and no more reboot on
-|concurrent disk access!
-
-A closer look into the sata_dwc_460ex code revealed that
-the driver did initally set the correct protection control
-bits. However, this feature was lost when the sata_dwc_460ex
-driver was converted to the generic DMA driver framework.
-
-BugLink: https://forum.openwrt.org/t/wd-mybook-live-duo-two-disks/16195/55
-BugLink: https://forum.openwrt.org/t/wd-mybook-live-duo-two-disks/16195/50
-Fixes: 8b3444852a2b ("sata_dwc_460ex: move to generic DMA driver")
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
----
-
---- a/drivers/dma/dw/core.c
-+++ b/drivers/dma/dw/core.c
-@@ -160,12 +160,14 @@ static void dwc_initialize_chan_idma32(s
- static void dwc_initialize_chan_dw(struct dw_dma_chan *dwc)
- {
-+      struct dw_dma *dw = to_dw_dma(dwc->chan.device);
-       u32 cfghi = DWC_CFGH_FIFO_MODE;
-       u32 cfglo = DWC_CFGL_CH_PRIOR(dwc->priority);
-       bool hs_polarity = dwc->dws.hs_polarity;
-       cfghi |= DWC_CFGH_DST_PER(dwc->dws.dst_id);
-       cfghi |= DWC_CFGH_SRC_PER(dwc->dws.src_id);
-+      cfghi |= DWC_CFGH_PROTCTL(dw->pdata->protctl);
-       /* Set polarity of handshake interface */
-       cfglo |= hs_polarity ? DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL : 0;
---- a/drivers/dma/dw/platform.c
-+++ b/drivers/dma/dw/platform.c
-@@ -162,6 +162,12 @@ dw_dma_parse_dt(struct platform_device *
-                       pdata->multi_block[tmp] = 1;
-       }
-+      if (!of_property_read_u32(np, "snps,dma-protection-control", &tmp)) {
-+              if (tmp > CHAN_PROTCTL_MASK)
-+                      return NULL;
-+              pdata->protctl = tmp;
-+      }
-+
-       return pdata;
- }
- #else
---- a/drivers/dma/dw/regs.h
-+++ b/drivers/dma/dw/regs.h
-@@ -200,6 +200,10 @@ enum dw_dma_msize {
- #define DWC_CFGH_FCMODE               (1 << 0)
- #define DWC_CFGH_FIFO_MODE    (1 << 1)
- #define DWC_CFGH_PROTCTL(x)   ((x) << 2)
-+#define DWC_CFGH_PROTCTL_DATA (0 << 2)        /* data access - always set */
-+#define DWC_CFGH_PROTCTL_PRIV (1 << 2)        /* privileged -> AHB HPROT[1] */
-+#define DWC_CFGH_PROTCTL_BUFFER       (2 << 2)        /* bufferable -> AHB HPROT[2] */
-+#define DWC_CFGH_PROTCTL_CACHE        (4 << 2)        /* cacheable  -> AHB HPROT[3] */
- #define DWC_CFGH_DS_UPD_EN    (1 << 5)
- #define DWC_CFGH_SS_UPD_EN    (1 << 6)
- #define DWC_CFGH_SRC_PER(x)   ((x) << 7)
---- a/include/linux/platform_data/dma-dw.h
-+++ b/include/linux/platform_data/dma-dw.h
-@@ -49,6 +49,7 @@ struct dw_dma_slave {
-  * @data_width: Maximum data width supported by hardware per AHB master
-  *            (in bytes, power of 2)
-  * @multi_block: Multi block transfers supported by hardware per channel.
-+ * @protctl: Protection control signals setting per channel.
-  */
- struct dw_dma_platform_data {
-       unsigned int    nr_channels;
-@@ -65,6 +66,11 @@ struct dw_dma_platform_data {
-       unsigned char   nr_masters;
-       unsigned char   data_width[DW_DMA_MAX_NR_MASTERS];
-       unsigned char   multi_block[DW_DMA_MAX_NR_CHANNELS];
-+#define CHAN_PROTCTL_PRIVILEGED               BIT(0)
-+#define CHAN_PROTCTL_BUFFERABLE               BIT(1)
-+#define CHAN_PROTCTL_CACHEABLE                BIT(2)
-+#define CHAN_PROTCTL_MASK             GENMASK(2, 0)
-+      unsigned char   protctl;
- };
- #endif /* _PLATFORM_DATA_DMA_DW_H */
---- /dev/null
-+++ b/include/dt-bindings/dma/dw-dmac.h
-@@ -0,0 +1,14 @@
-+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
-+
-+#ifndef __DT_BINDINGS_DMA_DW_DMAC_H__
-+#define __DT_BINDINGS_DMA_DW_DMAC_H__
-+
-+/*
-+ * Protection Control bits provide protection against illegal transactions.
-+ * The protection bits[0:2] are one-to-one mapped to AHB HPROT[3:1] signals.
-+ */
-+#define DW_DMAC_HPROT1_PRIVILEGED_MODE        (1 << 0)        /* Privileged Mode */
-+#define DW_DMAC_HPROT2_BUFFERABLE     (1 << 1)        /* DMA is bufferable */
-+#define DW_DMAC_HPROT3_CACHEABLE      (1 << 2)        /* DMA is cacheable */
-+
-+#endif /* __DT_BINDINGS_DMA_DW_DMAC_H__ */
diff --git a/target/linux/apm821xx/patches-4.19/023-0003-crypto-drop-mask-CRYPTO_ALG_ASYNC-from-cipher-tfm-al.patch b/target/linux/apm821xx/patches-4.19/023-0003-crypto-drop-mask-CRYPTO_ALG_ASYNC-from-cipher-tfm-al.patch
deleted file mode 100644 (file)
index bb1f406..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1ad0f1603a6b2afb62a1c065409aaa4e43ca7627 Mon Sep 17 00:00:00 2001
-From: Eric Biggers <ebiggers@google.com>
-Date: Wed, 14 Nov 2018 12:19:39 -0800
-Subject: [PATCH 03/15] crypto: drop mask=CRYPTO_ALG_ASYNC from 'cipher' tfm
- allocations
-
-'cipher' algorithms (single block ciphers) are always synchronous, so
-passing CRYPTO_ALG_ASYNC in the mask to crypto_alloc_cipher() has no
-effect.  Many users therefore already don't pass it, but some still do.
-This inconsistency can cause confusion, especially since the way the
-'mask' argument works is somewhat counterintuitive.
-
-Thus, just remove the unneeded CRYPTO_ALG_ASYNC flags.
-
-This patch shouldn't change any actual behavior.
-
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_alg.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_alg.c
-+++ b/drivers/crypto/amcc/crypto4xx_alg.c
-@@ -526,8 +526,7 @@ static int crypto4xx_compute_gcm_hash_ke
-       uint8_t src[16] = { 0 };
-       int rc = 0;
--      aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC |
--                                    CRYPTO_ALG_NEED_FALLBACK);
-+      aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_NEED_FALLBACK);
-       if (IS_ERR(aes_tfm)) {
-               rc = PTR_ERR(aes_tfm);
-               pr_warn("could not load aes cipher driver: %d\n", rc);
diff --git a/target/linux/apm821xx/patches-4.19/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch b/target/linux/apm821xx/patches-4.19/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch
deleted file mode 100644 (file)
index 635ab00..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 67d8208fba1324fa0198f9fc58a9edbe09596947 Mon Sep 17 00:00:00 2001
-From: Christoph Hellwig <hch@lst.de>
-Date: Sun, 16 Dec 2018 18:19:46 +0100
-Subject: [PATCH 04/15] crypto4xx_core: don't abuse __dma_sync_page
-
-This function is internal to the DMA API implementation. Instead use
-the DMA API to properly unmap. Note that the DMA API usage in this
-driver is a disaster and urgently needs some work - it is missing all
-the unmaps, seems to do a secondary map where it looks like it should
-to a unmap in one place to work around cache coherency and the
-directions passed in seem to be partially wrong.
-
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-Tested-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
----
- drivers/crypto/amcc/crypto4xx_core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -596,7 +596,7 @@ static void crypto4xx_aead_done(struct c
-                                         pd->pd_ctl_len.bf.pkt_len,
-                                         dst);
-       } else {
--              __dma_sync_page(sg_page(dst), dst->offset, dst->length,
-+              dma_unmap_page(dev->core_dev->device, pd->dest, dst->length,
-                               DMA_FROM_DEVICE);
-       }
diff --git a/target/linux/apm821xx/patches-4.19/023-0005-cross-tree-phase-out-dma_zalloc_coherent.patch b/target/linux/apm821xx/patches-4.19/023-0005-cross-tree-phase-out-dma_zalloc_coherent.patch
deleted file mode 100644 (file)
index 857578b..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 750afb08ca71310fcf0c4e2cb1565c63b8235b60 Mon Sep 17 00:00:00 2001
-From: Luis Chamberlain <mcgrof@kernel.org>
-Date: Fri, 4 Jan 2019 09:23:09 +0100
-Subject: [PATCH 05/15] cross-tree: phase out dma_zalloc_coherent()
-
-We already need to zero out memory for dma_alloc_coherent(), as such
-using dma_zalloc_coherent() is superflous. Phase it out.
-
-This change was generated with the following Coccinelle SmPL patch:
-
-@ replace_dma_zalloc_coherent @
-expression dev, size, data, handle, flags;
-@@
-
--dma_zalloc_coherent(dev, size, handle, flags)
-+dma_alloc_coherent(dev, size, handle, flags)
-
-Suggested-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-[hch: re-ran the script on the latest tree]
-Signed-off-by: Christoph Hellwig <hch@lst.de>
----
- drivers/crypto/amcc/crypto4xx_core.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -283,9 +283,9 @@ static u32 crypto4xx_put_pd_to_pdr(struc
-  */
- static u32 crypto4xx_build_gdr(struct crypto4xx_device *dev)
- {
--      dev->gdr = dma_zalloc_coherent(dev->core_dev->device,
--                                     sizeof(struct ce_gd) * PPC4XX_NUM_GD,
--                                     &dev->gdr_pa, GFP_ATOMIC);
-+      dev->gdr = dma_alloc_coherent(dev->core_dev->device,
-+                                    sizeof(struct ce_gd) * PPC4XX_NUM_GD,
-+                                    &dev->gdr_pa, GFP_ATOMIC);
-       if (!dev->gdr)
-               return -ENOMEM;
diff --git a/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch b/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch
deleted file mode 100644 (file)
index ba44197..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-From d072bfa4885354fff86aa1fb1dbc4f1533c9e0bf Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 23 Dec 2018 02:16:13 +0100
-Subject: [PATCH 06/15] crypto: crypto4xx - add prng crypto support
-
-This patch adds support for crypto4xx's ANSI X9.17 Annex C compliant
-pseudo random number generator which provides a pseudo random source
-for the purpose of generating  Initialization Vectors (IV's) for AES
-algorithms to the Packet Engine and other pseudo random number
-requirements.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_core.c    | 87 +++++++++++++++++++++++++
- drivers/crypto/amcc/crypto4xx_core.h    |  4 ++
- drivers/crypto/amcc/crypto4xx_reg_def.h |  1 +
- 3 files changed, 92 insertions(+)
-
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -40,9 +40,11 @@
- #include <crypto/ctr.h>
- #include <crypto/gcm.h>
- #include <crypto/sha.h>
-+#include <crypto/rng.h>
- #include <crypto/scatterwalk.h>
- #include <crypto/skcipher.h>
- #include <crypto/internal/aead.h>
-+#include <crypto/internal/rng.h>
- #include <crypto/internal/skcipher.h>
- #include "crypto4xx_reg_def.h"
- #include "crypto4xx_core.h"
-@@ -1046,6 +1048,10 @@ static int crypto4xx_register_alg(struct
-                       rc = crypto_register_ahash(&alg->alg.u.hash);
-                       break;
-+              case CRYPTO_ALG_TYPE_RNG:
-+                      rc = crypto_register_rng(&alg->alg.u.rng);
-+                      break;
-+
-               default:
-                       rc = crypto_register_skcipher(&alg->alg.u.cipher);
-                       break;
-@@ -1075,6 +1081,10 @@ static void crypto4xx_unregister_alg(str
-                       crypto_unregister_aead(&alg->alg.u.aead);
-                       break;
-+              case CRYPTO_ALG_TYPE_RNG:
-+                      crypto_unregister_rng(&alg->alg.u.rng);
-+                      break;
-+
-               default:
-                       crypto_unregister_skcipher(&alg->alg.u.cipher);
-               }
-@@ -1133,6 +1143,69 @@ static irqreturn_t crypto4xx_ce_interrup
-               PPC4XX_TMO_ERR_INT);
- }
-+static int ppc4xx_prng_data_read(struct crypto4xx_device *dev,
-+                               u8 *data, unsigned int max)
-+{
-+      unsigned int i, curr = 0;
-+      u32 val[2];
-+
-+      do {
-+              /* trigger PRN generation */
-+              writel(PPC4XX_PRNG_CTRL_AUTO_EN,
-+                     dev->ce_base + CRYPTO4XX_PRNG_CTRL);
-+
-+              for (i = 0; i < 1024; i++) {
-+                      /* usually 19 iterations are enough */
-+                      if ((readl(dev->ce_base + CRYPTO4XX_PRNG_STAT) &
-+                           CRYPTO4XX_PRNG_STAT_BUSY))
-+                              continue;
-+
-+                      val[0] = readl_be(dev->ce_base + CRYPTO4XX_PRNG_RES_0);
-+                      val[1] = readl_be(dev->ce_base + CRYPTO4XX_PRNG_RES_1);
-+                      break;
-+              }
-+              if (i == 1024)
-+                      return -ETIMEDOUT;
-+
-+              if ((max - curr) >= 8) {
-+                      memcpy(data, &val, 8);
-+                      data += 8;
-+                      curr += 8;
-+              } else {
-+                      /* copy only remaining bytes */
-+                      memcpy(data, &val, max - curr);
-+                      break;
-+              }
-+      } while (curr < max);
-+
-+      return curr;
-+}
-+
-+static int crypto4xx_prng_generate(struct crypto_rng *tfm,
-+                                 const u8 *src, unsigned int slen,
-+                                 u8 *dstn, unsigned int dlen)
-+{
-+      struct rng_alg *alg = crypto_rng_alg(tfm);
-+      struct crypto4xx_alg *amcc_alg;
-+      struct crypto4xx_device *dev;
-+      int ret;
-+
-+      amcc_alg = container_of(alg, struct crypto4xx_alg, alg.u.rng);
-+      dev = amcc_alg->dev;
-+
-+      mutex_lock(&dev->core_dev->rng_lock);
-+      ret = ppc4xx_prng_data_read(dev, dstn, dlen);
-+      mutex_unlock(&dev->core_dev->rng_lock);
-+      return ret;
-+}
-+
-+
-+static int crypto4xx_prng_seed(struct crypto_rng *tfm, const u8 *seed,
-+                      unsigned int slen)
-+{
-+      return 0;
-+}
-+
- /**
-  * Supported Crypto Algorithms
-  */
-@@ -1302,6 +1375,18 @@ static struct crypto4xx_alg_common crypt
-                       .cra_module     = THIS_MODULE,
-               },
-       } },
-+      { .type = CRYPTO_ALG_TYPE_RNG, .u.rng = {
-+              .base = {
-+                      .cra_name               = "stdrng",
-+                      .cra_driver_name        = "crypto4xx_rng",
-+                      .cra_priority           = 300,
-+                      .cra_ctxsize            = 0,
-+                      .cra_module             = THIS_MODULE,
-+              },
-+              .generate               = crypto4xx_prng_generate,
-+              .seed                   = crypto4xx_prng_seed,
-+              .seedsize               = 0,
-+      } },
- };
- /**
-@@ -1371,6 +1456,7 @@ static int crypto4xx_probe(struct platfo
-       core_dev->dev->core_dev = core_dev;
-       core_dev->dev->is_revb = is_revb;
-       core_dev->device = dev;
-+      mutex_init(&core_dev->rng_lock);
-       spin_lock_init(&core_dev->lock);
-       INIT_LIST_HEAD(&core_dev->dev->alg_list);
-       ratelimit_default_init(&core_dev->dev->aead_ratelimit);
-@@ -1450,6 +1536,7 @@ static int crypto4xx_remove(struct platf
-       tasklet_kill(&core_dev->tasklet);
-       /* Un-register with Linux CryptoAPI */
-       crypto4xx_unregister_alg(core_dev->dev);
-+      mutex_destroy(&core_dev->rng_lock);
-       /* Free all allocated memory */
-       crypto4xx_stop_all(core_dev);
---- a/drivers/crypto/amcc/crypto4xx_core.h
-+++ b/drivers/crypto/amcc/crypto4xx_core.h
-@@ -23,8 +23,10 @@
- #define __CRYPTO4XX_CORE_H__
- #include <linux/ratelimit.h>
-+#include <linux/mutex.h>
- #include <crypto/internal/hash.h>
- #include <crypto/internal/aead.h>
-+#include <crypto/internal/rng.h>
- #include <crypto/internal/skcipher.h>
- #include "crypto4xx_reg_def.h"
- #include "crypto4xx_sa.h"
-@@ -119,6 +121,7 @@ struct crypto4xx_core_device {
-       u32 irq;
-       struct tasklet_struct tasklet;
-       spinlock_t lock;
-+      struct mutex rng_lock;
- };
- struct crypto4xx_ctx {
-@@ -143,6 +146,7 @@ struct crypto4xx_alg_common {
-               struct skcipher_alg cipher;
-               struct ahash_alg hash;
-               struct aead_alg aead;
-+              struct rng_alg rng;
-       } u;
- };
---- a/drivers/crypto/amcc/crypto4xx_reg_def.h
-+++ b/drivers/crypto/amcc/crypto4xx_reg_def.h
-@@ -100,6 +100,7 @@
- #define CRYPTO4XX_ENDIAN_CFG                  0x000600d8
- #define CRYPTO4XX_PRNG_STAT                   0x00070000
-+#define CRYPTO4XX_PRNG_STAT_BUSY              0x1
- #define CRYPTO4XX_PRNG_CTRL                   0x00070004
- #define CRYPTO4XX_PRNG_SEED_L                 0x00070008
- #define CRYPTO4XX_PRNG_SEED_H                 0x0007000c
diff --git a/target/linux/apm821xx/patches-4.19/023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch b/target/linux/apm821xx/patches-4.19/023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch
deleted file mode 100644 (file)
index d2c3848..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6e88098ca43a3d80ae86908f7badba683c8a0d84 Mon Sep 17 00:00:00 2001
-From: Corentin Labbe <clabbe@baylibre.com>
-Date: Wed, 23 Jan 2019 11:24:18 +0000
-Subject: [PATCH 07/15] crypto: crypto4xx - Fix wrong
- ppc4xx_trng_probe()/ppc4xx_trng_remove() arguments
-
-When building without CONFIG_HW_RANDOM_PPC4XX, I hit the following build failure:
-drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_probe':
-drivers/crypto/amcc/crypto4xx_core.c:1407:20: error: passing argument 1 of 'ppc4xx_trng_probe' from incompatible pointer type [-Werror=incompatible-pointer-types]
-In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:
-drivers/crypto/amcc/crypto4xx_trng.h:28:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'
-drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_remove':
-drivers/crypto/amcc/crypto4xx_core.c:1434:21: error: passing argument 1 of 'ppc4xx_trng_remove' from incompatible pointer type [-Werror=incompatible-pointer-types]
-In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:
-drivers/crypto/amcc/crypto4xx_trng.h:30:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'
-
-This patch fix the needed argument of ppc4xx_trng_probe()/ppc4xx_trng_remove() in that case.
-
-Fixes: 5343e674f32f ("crypto4xx: integrate ppc4xx-rng into crypto4xx")
-Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_trng.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_trng.h
-+++ b/drivers/crypto/amcc/crypto4xx_trng.h
-@@ -26,9 +26,9 @@ void ppc4xx_trng_probe(struct crypto4xx_
- void ppc4xx_trng_remove(struct crypto4xx_core_device *core_dev);
- #else
- static inline void ppc4xx_trng_probe(
--      struct crypto4xx_device *dev __maybe_unused) { }
-+      struct crypto4xx_core_device *dev __maybe_unused) { }
- static inline void ppc4xx_trng_remove(
--      struct crypto4xx_device *dev __maybe_unused) { }
-+      struct crypto4xx_core_device *dev __maybe_unused) { }
- #endif
- #endif
diff --git a/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch b/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch
deleted file mode 100644 (file)
index 4b246a7..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From 38cf5533d7a876f75088bacc1277046f30005f28 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Mon, 22 Apr 2019 13:26:01 +0200
-Subject: [PATCH 12/15] crypto: crypto4xx - get rid of redundant using_sd
- variable
-
-using_sd is used as a stand-in for sa_command_0.bf.scatter
-that we need to set anyway, so we might as well just prevent
-double-accounting.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_core.c | 6 ++----
- drivers/crypto/amcc/crypto4xx_core.h | 1 -
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -539,7 +539,7 @@ static void crypto4xx_cipher_done(struct
-       req = skcipher_request_cast(pd_uinfo->async_req);
--      if (pd_uinfo->using_sd) {
-+      if (pd_uinfo->sa_va->sa_command_0.bf.scatter) {
-               crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo,
-                                         req->cryptlen, req->dst);
-       } else {
-@@ -593,7 +593,7 @@ static void crypto4xx_aead_done(struct c
-       u32 icv[AES_BLOCK_SIZE];
-       int err = 0;
--      if (pd_uinfo->using_sd) {
-+      if (pd_uinfo->sa_va->sa_command_0.bf.scatter) {
-               crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo,
-                                         pd->pd_ctl_len.bf.pkt_len,
-                                         dst);
-@@ -887,7 +887,6 @@ int crypto4xx_build_pd(struct crypto_asy
-                * we know application give us dst a whole piece of memory
-                * no need to use scatter ring.
-                */
--              pd_uinfo->using_sd = 0;
-               pd_uinfo->first_sd = 0xffffffff;
-               sa->sa_command_0.bf.scatter = 0;
-               pd->dest = (u32)dma_map_page(dev->core_dev->device,
-@@ -901,7 +900,6 @@ int crypto4xx_build_pd(struct crypto_asy
-               u32 sd_idx = fst_sd;
-               nbytes = datalen;
-               sa->sa_command_0.bf.scatter = 1;
--              pd_uinfo->using_sd = 1;
-               pd_uinfo->first_sd = fst_sd;
-               sd = crypto4xx_get_sdp(dev, &sd_dma, sd_idx);
-               pd->dest = sd_dma;
---- a/drivers/crypto/amcc/crypto4xx_core.h
-+++ b/drivers/crypto/amcc/crypto4xx_core.h
-@@ -64,7 +64,6 @@ union shadow_sa_buf {
- struct pd_uinfo {
-       struct crypto4xx_device *dev;
-       u32   state;
--      u32 using_sd;
-       u32 first_gd;           /* first gather discriptor
-                               used by this packet */
-       u32 num_gd;             /* number of gather discriptor
diff --git a/target/linux/apm821xx/patches-4.19/023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch b/target/linux/apm821xx/patches-4.19/023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch
deleted file mode 100644 (file)
index a6fa84d..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From bfa2ba7d9e6b20aca82b99e6842fe18842ae3a0f Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Fri, 17 May 2019 23:15:57 +0200
-Subject: [PATCH 13/15] crypto: crypto4xx - fix AES CTR blocksize value
-
-This patch fixes a issue with crypto4xx's ctr(aes) that was
-discovered by libcapi's kcapi-enc-test.sh test.
-
-The some of the ctr(aes) encryptions test were failing on the
-non-power-of-two test:
-
-kcapi-enc - Error: encryption failed with error 0
-kcapi-enc - Error: decryption failed with error 0
-[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits):
-original file (1d100e..cc96184c) and generated file (e3b0c442..1b7852b855)
-[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits)
-(openssl generated CT): original file (e3b0..5) and generated file (3..8e)
-[PASSED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits)
-(openssl generated PT)
-[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (password):
-original file (1d1..84c) and generated file (e3b..852b855)
-
-But the 16, 32, 512, 65536 tests always worked.
-
-Thankfully, this isn't a hidden hardware problem like previously,
-instead this turned out to be a copy and paste issue.
-
-With this patch, all the tests are passing with and
-kcapi-enc-test.sh gives crypto4xx's a clean bill of health:
- "Number of failures: 0" :).
-
-Cc: stable@vger.kernel.org
-Fixes: 98e87e3d933b ("crypto: crypto4xx - add aes-ctr support")
-Fixes: f2a13e7cba9e ("crypto: crypto4xx - enable AES RFC3686, ECB, CFB and OFB offloads")
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -1257,7 +1257,7 @@ static struct crypto4xx_alg_common crypt
-                       .cra_flags = CRYPTO_ALG_NEED_FALLBACK |
-                               CRYPTO_ALG_ASYNC |
-                               CRYPTO_ALG_KERN_DRIVER_ONLY,
--                      .cra_blocksize = AES_BLOCK_SIZE,
-+                      .cra_blocksize = 1,
-                       .cra_ctxsize = sizeof(struct crypto4xx_ctx),
-                       .cra_module = THIS_MODULE,
-               },
-@@ -1277,7 +1277,7 @@ static struct crypto4xx_alg_common crypt
-                       .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_ASYNC |
-                               CRYPTO_ALG_KERN_DRIVER_ONLY,
--                      .cra_blocksize = AES_BLOCK_SIZE,
-+                      .cra_blocksize = 1,
-                       .cra_ctxsize = sizeof(struct crypto4xx_ctx),
-                       .cra_module = THIS_MODULE,
-               },
diff --git a/target/linux/apm821xx/patches-4.19/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch b/target/linux/apm821xx/patches-4.19/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch
deleted file mode 100644 (file)
index 16f5af2..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 70c4997f34b6c6888b3ac157adec49e01d0df2d5 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sat, 18 May 2019 23:28:11 +0200
-Subject: [PATCH 14/15] crypto: crypto4xx - fix blocksize for cfb and ofb
-
-While the hardware consider them to be blockciphers, the
-reference implementation defines them as streamciphers.
-
-Do the right thing and set the blocksize to 1. This
-was found by CONFIG_CRYPTO_MANAGER_EXTRA_TESTS.
-
-This fixes the following issues:
-skcipher: blocksize for ofb-aes-ppc4xx (16) doesn't match generic impl (1)
-skcipher: blocksize for cfb-aes-ppc4xx (16) doesn't match generic impl (1)
-
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: stable@vger.kernel.org
-Fixes: f2a13e7cba9e ("crypto: crypto4xx - enable AES RFC3686, ECB, CFB and OFB offloads")
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -1236,7 +1236,7 @@ static struct crypto4xx_alg_common crypt
-                       .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_ASYNC |
-                               CRYPTO_ALG_KERN_DRIVER_ONLY,
--                      .cra_blocksize = AES_BLOCK_SIZE,
-+                      .cra_blocksize = 1,
-                       .cra_ctxsize = sizeof(struct crypto4xx_ctx),
-                       .cra_module = THIS_MODULE,
-               },
-@@ -1316,7 +1316,7 @@ static struct crypto4xx_alg_common crypt
-                       .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_ASYNC |
-                               CRYPTO_ALG_KERN_DRIVER_ONLY,
--                      .cra_blocksize = AES_BLOCK_SIZE,
-+                      .cra_blocksize = 1,
-                       .cra_ctxsize = sizeof(struct crypto4xx_ctx),
-                       .cra_module = THIS_MODULE,
-               },
diff --git a/target/linux/apm821xx/patches-4.19/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch b/target/linux/apm821xx/patches-4.19/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch
deleted file mode 100644 (file)
index 2706042..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-From 0f7a81374060828280fcfdfbaa162cb559017f9f Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sat, 18 May 2019 23:28:12 +0200
-Subject: [PATCH 15/15] crypto: crypto4xx - block ciphers should only accept
- complete blocks
-
-The hardware automatically zero pads incomplete block ciphers
-blocks without raising any errors. This is a screw-up. This
-was noticed by CONFIG_CRYPTO_MANAGER_EXTRA_TESTS tests that
-sent a incomplete blocks and expect them to fail.
-
-This fixes:
-cbc-aes-ppc4xx encryption unexpectedly succeeded on test vector
-"random: len=2409 klen=32"; expected_error=-22, cfg="random:
-may_sleep use_digest src_divs=[96.90%@+2295, 2.34%@+4066,
-0.32%@alignmask+12, 0.34%@+4087, 0.9%@alignmask+1787, 0.1%@+3767]
-iv_offset=6"
-
-ecb-aes-ppc4xx encryption unexpectedly succeeded on test vector
-"random: len=1011 klen=32"; expected_error=-22, cfg="random:
-may_sleep use_digest src_divs=[100.0%@alignmask+20]
-dst_divs=[3.12%@+3001, 96.88%@+4070]"
-
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: stable@vger.kernel.org [4.19, 5.0 and 5.1]
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_alg.c  | 36 +++++++++++++++++++---------
- drivers/crypto/amcc/crypto4xx_core.c | 16 ++++++-------
- drivers/crypto/amcc/crypto4xx_core.h | 10 ++++----
- 3 files changed, 39 insertions(+), 23 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_alg.c
-+++ b/drivers/crypto/amcc/crypto4xx_alg.c
-@@ -76,12 +76,16 @@ static void set_dynamic_sa_command_1(str
- }
- static inline int crypto4xx_crypt(struct skcipher_request *req,
--                                const unsigned int ivlen, bool decrypt)
-+                                const unsigned int ivlen, bool decrypt,
-+                                bool check_blocksize)
- {
-       struct crypto_skcipher *cipher = crypto_skcipher_reqtfm(req);
-       struct crypto4xx_ctx *ctx = crypto_skcipher_ctx(cipher);
-       __le32 iv[AES_IV_SIZE];
-+      if (check_blocksize && !IS_ALIGNED(req->cryptlen, AES_BLOCK_SIZE))
-+              return -EINVAL;
-+
-       if (ivlen)
-               crypto4xx_memcpy_to_le32(iv, req->iv, ivlen);
-@@ -90,24 +94,34 @@ static inline int crypto4xx_crypt(struct
-               ctx->sa_len, 0, NULL);
- }
--int crypto4xx_encrypt_noiv(struct skcipher_request *req)
-+int crypto4xx_encrypt_noiv_block(struct skcipher_request *req)
-+{
-+      return crypto4xx_crypt(req, 0, false, true);
-+}
-+
-+int crypto4xx_encrypt_iv_stream(struct skcipher_request *req)
-+{
-+      return crypto4xx_crypt(req, AES_IV_SIZE, false, false);
-+}
-+
-+int crypto4xx_decrypt_noiv_block(struct skcipher_request *req)
- {
--      return crypto4xx_crypt(req, 0, false);
-+      return crypto4xx_crypt(req, 0, true, true);
- }
--int crypto4xx_encrypt_iv(struct skcipher_request *req)
-+int crypto4xx_decrypt_iv_stream(struct skcipher_request *req)
- {
--      return crypto4xx_crypt(req, AES_IV_SIZE, false);
-+      return crypto4xx_crypt(req, AES_IV_SIZE, true, false);
- }
--int crypto4xx_decrypt_noiv(struct skcipher_request *req)
-+int crypto4xx_encrypt_iv_block(struct skcipher_request *req)
- {
--      return crypto4xx_crypt(req, 0, true);
-+      return crypto4xx_crypt(req, AES_IV_SIZE, false, true);
- }
--int crypto4xx_decrypt_iv(struct skcipher_request *req)
-+int crypto4xx_decrypt_iv_block(struct skcipher_request *req)
- {
--      return crypto4xx_crypt(req, AES_IV_SIZE, true);
-+      return crypto4xx_crypt(req, AES_IV_SIZE, true, true);
- }
- /**
-@@ -278,8 +292,8 @@ crypto4xx_ctr_crypt(struct skcipher_requ
-               return ret;
-       }
--      return encrypt ? crypto4xx_encrypt_iv(req)
--                     : crypto4xx_decrypt_iv(req);
-+      return encrypt ? crypto4xx_encrypt_iv_stream(req)
-+                     : crypto4xx_decrypt_iv_stream(req);
- }
- static int crypto4xx_sk_setup_fallback(struct crypto4xx_ctx *ctx,
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -1224,8 +1224,8 @@ static struct crypto4xx_alg_common crypt
-               .max_keysize = AES_MAX_KEY_SIZE,
-               .ivsize = AES_IV_SIZE,
-               .setkey = crypto4xx_setkey_aes_cbc,
--              .encrypt = crypto4xx_encrypt_iv,
--              .decrypt = crypto4xx_decrypt_iv,
-+              .encrypt = crypto4xx_encrypt_iv_block,
-+              .decrypt = crypto4xx_decrypt_iv_block,
-               .init = crypto4xx_sk_init,
-               .exit = crypto4xx_sk_exit,
-       } },
-@@ -1244,8 +1244,8 @@ static struct crypto4xx_alg_common crypt
-               .max_keysize = AES_MAX_KEY_SIZE,
-               .ivsize = AES_IV_SIZE,
-               .setkey = crypto4xx_setkey_aes_cfb,
--              .encrypt = crypto4xx_encrypt_iv,
--              .decrypt = crypto4xx_decrypt_iv,
-+              .encrypt = crypto4xx_encrypt_iv_stream,
-+              .decrypt = crypto4xx_decrypt_iv_stream,
-               .init = crypto4xx_sk_init,
-               .exit = crypto4xx_sk_exit,
-       } },
-@@ -1304,8 +1304,8 @@ static struct crypto4xx_alg_common crypt
-               .min_keysize = AES_MIN_KEY_SIZE,
-               .max_keysize = AES_MAX_KEY_SIZE,
-               .setkey = crypto4xx_setkey_aes_ecb,
--              .encrypt = crypto4xx_encrypt_noiv,
--              .decrypt = crypto4xx_decrypt_noiv,
-+              .encrypt = crypto4xx_encrypt_noiv_block,
-+              .decrypt = crypto4xx_decrypt_noiv_block,
-               .init = crypto4xx_sk_init,
-               .exit = crypto4xx_sk_exit,
-       } },
-@@ -1324,8 +1324,8 @@ static struct crypto4xx_alg_common crypt
-               .max_keysize = AES_MAX_KEY_SIZE,
-               .ivsize = AES_IV_SIZE,
-               .setkey = crypto4xx_setkey_aes_ofb,
--              .encrypt = crypto4xx_encrypt_iv,
--              .decrypt = crypto4xx_decrypt_iv,
-+              .encrypt = crypto4xx_encrypt_iv_stream,
-+              .decrypt = crypto4xx_decrypt_iv_stream,
-               .init = crypto4xx_sk_init,
-               .exit = crypto4xx_sk_exit,
-       } },
---- a/drivers/crypto/amcc/crypto4xx_core.h
-+++ b/drivers/crypto/amcc/crypto4xx_core.h
-@@ -182,10 +182,12 @@ int crypto4xx_setkey_rfc3686(struct cryp
-                            const u8 *key, unsigned int keylen);
- int crypto4xx_encrypt_ctr(struct skcipher_request *req);
- int crypto4xx_decrypt_ctr(struct skcipher_request *req);
--int crypto4xx_encrypt_iv(struct skcipher_request *req);
--int crypto4xx_decrypt_iv(struct skcipher_request *req);
--int crypto4xx_encrypt_noiv(struct skcipher_request *req);
--int crypto4xx_decrypt_noiv(struct skcipher_request *req);
-+int crypto4xx_encrypt_iv_stream(struct skcipher_request *req);
-+int crypto4xx_decrypt_iv_stream(struct skcipher_request *req);
-+int crypto4xx_encrypt_iv_block(struct skcipher_request *req);
-+int crypto4xx_decrypt_iv_block(struct skcipher_request *req);
-+int crypto4xx_encrypt_noiv_block(struct skcipher_request *req);
-+int crypto4xx_decrypt_noiv_block(struct skcipher_request *req);
- int crypto4xx_rfc3686_encrypt(struct skcipher_request *req);
- int crypto4xx_rfc3686_decrypt(struct skcipher_request *req);
- int crypto4xx_sha1_alg_init(struct crypto_tfm *tfm);
diff --git a/target/linux/apm821xx/patches-4.19/140-GPIO-add-named-gpio-exports.patch b/target/linux/apm821xx/patches-4.19/140-GPIO-add-named-gpio-exports.patch
deleted file mode 100644 (file)
index 8e3060d..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-From cc809a441d8f2924f785eb863dfa6aef47a25b0b Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Tue, 12 Aug 2014 20:49:27 +0200
-Subject: [PATCH 30/36] GPIO: add named gpio exports
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- drivers/gpio/gpiolib-of.c     |   68 +++++++++++++++++++++++++++++++++++++++++
- drivers/gpio/gpiolib.c        |   11 +++++--
- include/asm-generic/gpio.h    |    5 +++
- include/linux/gpio/consumer.h |    8 +++++
- 4 files changed, 90 insertions(+), 2 deletions(-)
-
---- a/drivers/gpio/gpiolib-of.c
-+++ b/drivers/gpio/gpiolib-of.c
-@@ -23,6 +23,8 @@
- #include <linux/pinctrl/pinctrl.h>
- #include <linux/slab.h>
- #include <linux/gpio/machine.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
- #include "gpiolib.h"
-@@ -660,3 +662,72 @@ void of_gpiochip_remove(struct gpio_chip
-       gpiochip_remove_pin_ranges(chip);
-       of_node_put(chip->of_node);
- }
-+
-+#ifdef CONFIG_GPIO_SYSFS
-+
-+static struct of_device_id gpio_export_ids[] = {
-+      { .compatible = "gpio-export" },
-+      { /* sentinel */ }
-+};
-+
-+static int of_gpio_export_probe(struct platform_device *pdev)
-+{
-+      struct device_node *np = pdev->dev.of_node;
-+      struct device_node *cnp;
-+      u32 val;
-+      int nb = 0;
-+
-+      for_each_child_of_node(np, cnp) {
-+              const char *name = NULL;
-+              int gpio;
-+              bool dmc;
-+              int max_gpio = 1;
-+              int i;
-+
-+              of_property_read_string(cnp, "gpio-export,name", &name);
-+
-+              if (!name)
-+                      max_gpio = of_gpio_count(cnp);
-+
-+              for (i = 0; i < max_gpio; i++) {
-+                      unsigned flags = 0;
-+                      enum of_gpio_flags of_flags;
-+
-+                      gpio = of_get_gpio_flags(cnp, i, &of_flags);
-+                      if (!gpio_is_valid(gpio))
-+                              return gpio;
-+
-+                      if (of_flags == OF_GPIO_ACTIVE_LOW)
-+                              flags |= GPIOF_ACTIVE_LOW;
-+
-+                      if (!of_property_read_u32(cnp, "gpio-export,output", &val))
-+                              flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
-+                      else
-+                              flags |= GPIOF_IN;
-+
-+                      if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np)))
-+                              continue;
-+
-+                      dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change");
-+                      gpio_export_with_name(gpio, dmc, name);
-+                      nb++;
-+              }
-+      }
-+
-+      dev_info(&pdev->dev, "%d gpio(s) exported\n", nb);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gpio_export_driver = {
-+      .driver         = {
-+              .name           = "gpio-export",
-+              .owner  = THIS_MODULE,
-+              .of_match_table = of_match_ptr(gpio_export_ids),
-+      },
-+      .probe          = of_gpio_export_probe,
-+};
-+
-+module_platform_driver(gpio_export_driver);
-+
-+#endif
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -127,6 +127,12 @@ static inline int gpio_export(unsigned g
-       return gpiod_export(gpio_to_desc(gpio), direction_may_change);
- }
-+int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
-+static inline int gpio_export_with_name(unsigned gpio, bool direction_may_change, const char *name)
-+{
-+      return __gpiod_export(gpio_to_desc(gpio), direction_may_change, name);
-+}
-+
- static inline int gpio_export_link(struct device *dev, const char *name,
-                                  unsigned gpio)
- {
---- a/include/linux/gpio/consumer.h
-+++ b/include/linux/gpio/consumer.h
-@@ -533,6 +533,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_
- #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
-+int _gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
- int gpiod_export(struct gpio_desc *desc, bool direction_may_change);
- int gpiod_export_link(struct device *dev, const char *name,
-                     struct gpio_desc *desc);
-@@ -540,6 +541,13 @@ void gpiod_unexport(struct gpio_desc *de
- #else  /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */
-+static inline int _gpiod_export(struct gpio_desc *desc,
-+                             bool direction_may_change,
-+                             const char *name)
-+{
-+      return -ENOSYS;
-+}
-+
- static inline int gpiod_export(struct gpio_desc *desc,
-                              bool direction_may_change)
- {
---- a/drivers/gpio/gpiolib-sysfs.c
-+++ b/drivers/gpio/gpiolib-sysfs.c
-@@ -568,7 +568,7 @@ static struct class gpio_class = {
-  *
-  * Returns zero on success, else an error.
-  */
--int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
-+int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name)
- {
-       struct gpio_chip        *chip;
-       struct gpio_device      *gdev;
-@@ -630,6 +630,8 @@ int gpiod_export(struct gpio_desc *desc,
-       offset = gpio_chip_hwgpio(desc);
-       if (chip->names && chip->names[offset])
-               ioname = chip->names[offset];
-+      if (name)
-+              ioname = name;
-       dev = device_create_with_groups(&gpio_class, &gdev->dev,
-                                       MKDEV(0, 0), data, gpio_groups,
-@@ -651,6 +653,12 @@ err_unlock:
-       gpiod_dbg(desc, "%s: status %d\n", __func__, status);
-       return status;
- }
-+EXPORT_SYMBOL_GPL(__gpiod_export);
-+
-+int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
-+{
-+      return __gpiod_export(desc, direction_may_change, NULL);
-+}
- EXPORT_SYMBOL_GPL(gpiod_export);
- static int match_export(struct device *dev, const void *desc)
diff --git a/target/linux/apm821xx/patches-4.19/201-add-amcc-apollo3g-support.patch b/target/linux/apm821xx/patches-4.19/201-add-amcc-apollo3g-support.patch
deleted file mode 100644 (file)
index 18f4c72..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/powerpc/platforms/44x/Kconfig
-+++ b/arch/powerpc/platforms/44x/Kconfig
-@@ -131,6 +131,17 @@ config CANYONLANDS
-       help
-         This option enables support for the AMCC PPC460EX evaluation board.
-+config APOLLO3G
-+      bool "Apollo3G"
-+      depends on 44x
-+      default n
-+      select PPC44x_SIMPLE
-+      select APM821xx
-+      select IBM_EMAC_RGMII
-+      select 460EX
-+      help
-+        This option enables support for the AMCC Apollo 3G board.
-+
- config GLACIER
-       bool "Glacier"
-       depends on 44x
---- a/arch/powerpc/platforms/44x/ppc44x_simple.c
-+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
-@@ -50,6 +50,7 @@ machine_device_initcall(ppc44x_simple, p
-  * board.c file for it rather than adding it to this list.
-  */
- static char *board[] __initdata = {
-+      "amcc,apollo3g",
-       "amcc,arches",
-       "amcc,bamboo",
-       "apm,bluestone",
diff --git a/target/linux/apm821xx/patches-4.19/202-add-netgear-wndr4700-support.patch b/target/linux/apm821xx/patches-4.19/202-add-netgear-wndr4700-support.patch
deleted file mode 100644 (file)
index 536a74e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/powerpc/platforms/44x/Makefile
-+++ b/arch/powerpc/platforms/44x/Makefile
-@@ -4,6 +4,7 @@ ifneq ($(CONFIG_PPC4xx_CPM),y)
- obj-y += idle.o
- endif
- obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
-+obj-$(CONFIG_WNDR4700) += wndr4700.o
- obj-$(CONFIG_EBONY)   += ebony.o
- obj-$(CONFIG_SAM440EP)        += sam440ep.o
- obj-$(CONFIG_WARP)    += warp.o
---- a/arch/powerpc/platforms/44x/Kconfig
-+++ b/arch/powerpc/platforms/44x/Kconfig
-@@ -260,6 +260,19 @@ config ICON
-       help
-         This option enables support for the AMCC PPC440SPe evaluation board.
-+config WNDR4700
-+      bool "WNDR4700"
-+      depends on 44x
-+      default n
-+      select APM821xx
-+      select PCI_MSI
-+      select PPC4xx_MSI
-+      select PPC4xx_PCI_EXPRESS
-+      select IBM_EMAC_RGMII
-+      select 460EX
-+      help
-+        This option enables support for the Netgear WNDR4700/WNDR4720 board.
-+
- config XILINX_VIRTEX440_GENERIC_BOARD
-       bool "Generic Xilinx Virtex 5 FXT board support"
-       depends on 44x
diff --git a/target/linux/apm821xx/patches-4.19/300-fix-atheros-nics-on-apm82181.patch b/target/linux/apm821xx/patches-4.19/300-fix-atheros-nics-on-apm82181.patch
deleted file mode 100644 (file)
index 110726d..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/arch/powerpc/platforms/4xx/pci.c
-+++ b/arch/powerpc/platforms/4xx/pci.c
-@@ -1060,15 +1060,24 @@ static int __init apm821xx_pciex_init_po
-       u32 val;
-       /*
--       * Do a software reset on PCIe ports.
--       * This code is to fix the issue that pci drivers doesn't re-assign
--       * bus number for PCIE devices after Uboot
--       * scanned and configured all the buses (eg. PCIE NIC IntelPro/1000
--       * PT quad port, SAS LSI 1064E)
-+       * Only reset the PHY when no link is currently established.
-+       * This is for the Atheros PCIe board which has problems to establish
-+       * the link (again) after this PHY reset. All other currently tested
-+       * PCIe boards don't show this problem.
-        */
--
--      mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x0);
--      mdelay(10);
-+      val = mfdcri(SDR0, port->sdr_base + PESDRn_LOOP);
-+      if (!(val & 0x00001000)) {
-+              /*
-+               * Do a software reset on PCIe ports.
-+               * This code is to fix the issue that pci drivers doesn't re-assign
-+               * bus number for PCIE devices after Uboot
-+               * scanned and configured all the buses (eg. PCIE NIC IntelPro/1000
-+               * PT quad port, SAS LSI 1064E)
-+               */
-+
-+              mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x0);
-+              mdelay(10);
-+      }
-       if (port->endpoint)
-               val = PTYPE_LEGACY_ENDPOINT << 20;
-@@ -1085,9 +1094,12 @@ static int __init apm821xx_pciex_init_po
-       mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000130);
-       mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
--      mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x10000000);
--      mdelay(50);
--      mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x30000000);
-+      val = mfdcri(SDR0, port->sdr_base + PESDRn_LOOP);
-+      if (!(val & 0x00001000)) {
-+              mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x10000000);
-+              mdelay(50);
-+              mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x30000000);
-+      }
-       mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
-               mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) |
diff --git a/target/linux/apm821xx/patches-4.19/301-fix-memory-map-wndr4700.patch b/target/linux/apm821xx/patches-4.19/301-fix-memory-map-wndr4700.patch
deleted file mode 100644 (file)
index 6eb04b2..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/arch/powerpc/platforms/4xx/pci.c
-+++ b/arch/powerpc/platforms/4xx/pci.c
-@@ -1905,9 +1905,9 @@ static void __init ppc4xx_configure_pcie
-                * if it works
-                */
-               out_le32(mbase + PECFG_PIM0LAL, 0x00000000);
--              out_le32(mbase + PECFG_PIM0LAH, 0x00000000);
-+              out_le32(mbase + PECFG_PIM0LAH, 0x00000008);
-               out_le32(mbase + PECFG_PIM1LAL, 0x00000000);
--              out_le32(mbase + PECFG_PIM1LAH, 0x00000000);
-+              out_le32(mbase + PECFG_PIM1LAH, 0x0000000c);
-               out_le32(mbase + PECFG_PIM01SAH, 0xffff0000);
-               out_le32(mbase + PECFG_PIM01SAL, 0x00000000);
diff --git a/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
deleted file mode 100644 (file)
index 6db2f2e..0000000
+++ /dev/null
@@ -1,545 +0,0 @@
-From 419992bae5aaa4e06402e0b7c79fcf7bcb6b4764 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@googlemail.com>
-Date: Thu, 2 Jun 2016 00:48:46 +0200
-Subject: [PATCH] usb: xhci: add firmware loader for uPD720201 and uPD720202
- w/o ROM
-
-This patch adds a firmware loader for the uPD720201K8-711-BAC-A
-and uPD720202K8-711-BAA-A variant. Both of these chips are listed
-in Renesas' R19UH0078EJ0500 Rev.5.00 "User's Manual: Hardware" as
-devices which need the firmware loader on page 2 in order to
-work as they "do not support the External ROM".
-
-The "Firmware Download Sequence" is describe in chapter
-"7.1 FW Download Interface" R19UH0078EJ0500 Rev.5.00 page 131.
-
-The firmware "K2013080.mem" is available from a USB3.0 Host to
-PCIe Adapter (PP2U-E card) "Firmware download" archive. An
-alternative version can be sourced from Netgear's WNDR4700 GPL
-archives.
-
-The release notes of the PP2U-E's "Firmware Download" ver 2.0.1.3
-(2012-06-15) state that the firmware is for the following devices:
- - uPD720201 ES 2.0 sample whose revision ID is 2.
- - uPD720201 ES 2.1 sample & CS sample & Mass product, ID is 3.
- - uPD720202 ES 2.0 sample & CS sample & Mass product, ID is 2.
-
-If someone from Renesas is listening: It would be great, if these
-firmwares could be added to linux-firmware.git.
-
-Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
-Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
----
- drivers/usb/host/xhci-pci.c | 492 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 492 insertions(+)
-
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -12,6 +12,8 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/acpi.h>
-+#include <linux/firmware.h>
-+#include <asm/unaligned.h>
- #include "xhci.h"
- #include "xhci-trace.h"
-@@ -262,6 +264,458 @@ static void xhci_pme_acpi_rtd3_enable(st
- static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
- #endif /* CONFIG_ACPI */
-+static const struct renesas_fw_entry {
-+      const char *firmware_name;
-+      u16 device;
-+      u8 revision;
-+      u16 expected_version;
-+} renesas_fw_table[] = {
-+      /*
-+       * Only the uPD720201K8-711-BAC-A or uPD720202K8-711-BAA-A
-+       * are listed in R19UH0078EJ0500 Rev.5.00 as devices which
-+       * need the software loader.
-+       *
-+       * PP2U/ReleaseNote_USB3-201-202-FW.txt:
-+       *
-+       * Note: This firmware is for the following devices.
-+       *  - uPD720201 ES 2.0 sample whose revision ID is 2.
-+       *  - uPD720201 ES 2.1 sample & CS sample & Mass product, ID is 3.
-+       *  - uPD720202 ES 2.0 sample & CS sample & Mass product, ID is 2.
-+       */
-+      { "K2013080.mem", 0x0014, 0x02, 0x2013 },
-+      { "K2013080.mem", 0x0014, 0x03, 0x2013 },
-+      { "K2013080.mem", 0x0015, 0x02, 0x2013 },
-+};
-+
-+static const struct renesas_fw_entry *renesas_needs_fw_dl(struct pci_dev *dev)
-+{
-+      const struct renesas_fw_entry *entry;
-+      size_t i;
-+
-+      /* This loader will only work with a RENESAS device. */
-+      if (!(dev->vendor == PCI_VENDOR_ID_RENESAS))
-+              return NULL;
-+
-+      for (i = 0; i < ARRAY_SIZE(renesas_fw_table); i++) {
-+              entry = &renesas_fw_table[i];
-+              if (entry->device == dev->device &&
-+                  entry->revision == dev->revision)
-+                      return entry;
-+      }
-+
-+      return NULL;
-+}
-+
-+static int renesas_fw_download_image(struct pci_dev *dev,
-+                                   const u32 *fw,
-+                                   size_t step)
-+{
-+      size_t i;
-+      int err;
-+      u8 fw_status;
-+      bool data0_or_data1;
-+
-+      /*
-+       * The hardware does alternate between two 32-bit pages.
-+       * (This is because each row of the firmware is 8 bytes).
-+       *
-+       * for even steps we use DATA0, for odd steps DATA1.
-+       */
-+      data0_or_data1 = (step & 1) == 1;
-+
-+      /* step+1. Read "Set DATAX" and confirm it is cleared. */
-+      for (i = 0; i < 10000; i++) {
-+              err = pci_read_config_byte(dev, 0xF5, &fw_status);
-+              if (err)
-+                      return pcibios_err_to_errno(err);
-+              if (!(fw_status & BIT(data0_or_data1)))
-+                      break;
-+
-+              udelay(1);
-+      }
-+      if (i == 10000)
-+              return -ETIMEDOUT;
-+
-+      /*
-+       * step+2. Write FW data to "DATAX".
-+       * "LSB is left" => force little endian
-+       */
-+      err = pci_write_config_dword(dev, data0_or_data1 ? 0xFC : 0xF8,
-+                                   (__force u32) cpu_to_le32(fw[step]));
-+      if (err)
-+              return pcibios_err_to_errno(err);
-+
-+      udelay(100);
-+
-+      /* step+3. Set "Set DATAX". */
-+      err = pci_write_config_byte(dev, 0xF5, BIT(data0_or_data1));
-+      if (err)
-+              return pcibios_err_to_errno(err);
-+
-+      return 0;
-+}
-+
-+static int renesas_fw_verify(struct pci_dev *dev,
-+                           const void *fw_data,
-+                           size_t length)
-+{
-+      const struct renesas_fw_entry *entry = renesas_needs_fw_dl(dev);
-+      u16 fw_version_pointer;
-+      u16 fw_version;
-+
-+      if (!entry)
-+              return -EINVAL;
-+
-+      /*
-+       * The Firmware's Data Format is describe in
-+       * "6.3 Data Format" R19UH0078EJ0500 Rev.5.00 page 124
-+       */
-+
-+      /* "Each row is 8 bytes". => firmware size must be a multiple of 8. */
-+      if (length % 8 != 0) {
-+              dev_err(&dev->dev, "firmware size is not a multipe of 8.");
-+              return -EINVAL;
-+      }
-+
-+      /*
-+       * The bootrom chips of the big brother have sizes up to 64k, let's
-+       * assume that's the biggest the firmware can get.
-+       */
-+      if (length < 0x1000 || length >= 0x10000) {
-+              dev_err(&dev->dev, "firmware is size %zd is not (4k - 64k).",
-+                      length);
-+              return -EINVAL;
-+      }
-+
-+      /* The First 2 bytes are fixed value (55aa). "LSB on Left" */
-+      if (get_unaligned_le16(fw_data) != 0x55aa) {
-+              dev_err(&dev->dev, "no valid firmware header found.");
-+              return -EINVAL;
-+      }
-+
-+      /* verify the firmware version position and print it. */
-+      fw_version_pointer = get_unaligned_le16(fw_data + 4);
-+      if (fw_version_pointer + 2 >= length) {
-+              dev_err(&dev->dev, "firmware version pointer is outside of the firmware image.");
-+              return -EINVAL;
-+      }
-+
-+      fw_version = get_unaligned_le16(fw_data + fw_version_pointer);
-+      dev_dbg(&dev->dev, "got firmware version: %02x.", fw_version);
-+
-+      if (fw_version != entry->expected_version) {
-+              dev_err(&dev->dev, "firmware version mismatch, expected version: %02x.",
-+                       entry->expected_version);
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+
-+static int renesas_fw_check_running(struct pci_dev *pdev)
-+{
-+      int err;
-+      u8 fw_state;
-+
-+      /*
-+       * Test if the device is actually needing the firmware. As most
-+       * BIOSes will initialize the device for us. If the device is
-+       * initialized.
-+       */
-+      err = pci_read_config_byte(pdev, 0xF4, &fw_state);
-+      if (err)
-+              return pcibios_err_to_errno(err);
-+
-+      /*
-+       * Check if "FW Download Lock" is locked. If it is and the FW is
-+       * ready we can simply continue. If the FW is not ready, we have
-+       * to give up.
-+       */
-+      if (fw_state & BIT(1)) {
-+              dev_dbg(&pdev->dev, "FW Download Lock is engaged.");
-+
-+              if (fw_state & BIT(4))
-+                      return 0;
-+
-+              dev_err(&pdev->dev, "FW Download Lock is set and FW is not ready. Giving Up.");
-+              return -EIO;
-+      }
-+
-+      /*
-+       * Check if "FW Download Enable" is set. If someone (us?) tampered
-+       * with it and it can't be resetted, we have to give up too... and
-+       * ask for a forgiveness and a reboot.
-+       */
-+      if (fw_state & BIT(0)) {
-+              dev_err(&pdev->dev, "FW Download Enable is stale. Giving Up (poweroff/reboot needed).");
-+              return -EIO;
-+      }
-+
-+      /* Otherwise, Check the "Result Code" Bits (6:4) and act accordingly */
-+      switch ((fw_state & 0x70)) {
-+      case 0: /* No result yet */
-+              dev_dbg(&pdev->dev, "FW is not ready/loaded yet.");
-+
-+              /* tell the caller, that this device needs the firmware. */
-+              return 1;
-+
-+      case BIT(4): /* Success, device should be working. */
-+              dev_dbg(&pdev->dev, "FW is ready.");
-+              return 0;
-+
-+      case BIT(5): /* Error State */
-+              dev_err(&pdev->dev, "hardware is in an error state. Giving up (poweroff/reboot needed).");
-+              return -ENODEV;
-+
-+      default: /* All other states are marked as "Reserved states" */
-+              dev_err(&pdev->dev, "hardware is in an invalid state %x. Giving up (poweroff/reboot needed).",
-+                      (fw_state & 0x70) >> 4);
-+              return -EINVAL;
-+      }
-+}
-+
-+static int renesas_hw_check_run_stop_busy(struct pci_dev *pdev)
-+{
-+#if 0
-+      u32 val;
-+
-+      /*
-+       * 7.1.3 Note 3: "... must not set 'FW Download Enable' when
-+       * 'RUN/STOP' of USBCMD Register is set"
-+       */
-+      val = readl(hcd->regs + 0x20);
-+      if (val & BIT(0)) {
-+              dev_err(&pdev->dev, "hardware is busy and can't receive a FW.");
-+              return -EBUSY;
-+      }
-+#endif
-+      return 0;
-+}
-+
-+static int renesas_fw_download(struct pci_dev *pdev,
-+      const struct firmware *fw, unsigned int retry_counter)
-+{
-+      const u32 *fw_data = (const u32 *) fw->data;
-+      size_t i;
-+      int err;
-+      u8 fw_status;
-+
-+      /*
-+       * For more information and the big picture: please look at the
-+       * "Firmware Download Sequence" in "7.1 FW Download Interface"
-+       * of R19UH0078EJ0500 Rev.5.00 page 131
-+       */
-+      err = renesas_hw_check_run_stop_busy(pdev);
-+      if (err)
-+              return err;
-+
-+      /*
-+       * 0. Set "FW Download Enable" bit in the
-+       * "FW Download Control & Status Register" at 0xF4
-+       */
-+      err = pci_write_config_byte(pdev, 0xF4, BIT(0));
-+      if (err)
-+              return pcibios_err_to_errno(err);
-+
-+      /* 1 - 10 follow one step after the other. */
-+      for (i = 0; i < fw->size / 4; i++) {
-+              err = renesas_fw_download_image(pdev, fw_data, i);
-+              if (err) {
-+                      dev_err(&pdev->dev, "Firmware Download Step %zd failed at position %zd bytes with (%d).",
-+                               i, i * 4, err);
-+                      return err;
-+              }
-+      }
-+
-+      /*
-+       * This sequence continues until the last data is written to
-+       * "DATA0" or "DATA1". Naturally, we wait until "SET DATA0/1"
-+       * is cleared by the hardware beforehand.
-+       */
-+      for (i = 0; i < 10000; i++) {
-+              err = pci_read_config_byte(pdev, 0xF5, &fw_status);
-+              if (err)
-+                      return pcibios_err_to_errno(err);
-+              if (!(fw_status & (BIT(0) | BIT(1))))
-+                      break;
-+
-+              udelay(1);
-+      }
-+      if (i == 10000)
-+              dev_warn(&pdev->dev, "Final Firmware Download step timed out.");
-+
-+      /*
-+       * 11. After finishing writing the last data of FW, the
-+       * System Software must clear "FW Download Enable"
-+       */
-+      err = pci_write_config_byte(pdev, 0xF4, 0);
-+      if (err)
-+              return pcibios_err_to_errno(err);
-+
-+      /* 12. Read "Result Code" and confirm it is good. */
-+      for (i = 0; i < 10000; i++) {
-+              err = pci_read_config_byte(pdev, 0xF4, &fw_status);
-+              if (err)
-+                      return pcibios_err_to_errno(err);
-+              if (fw_status & BIT(4))
-+                      break;
-+
-+              udelay(1);
-+      }
-+      if (i == 10000) {
-+              /* Timed out / Error - let's see if we can fix this */
-+              err = renesas_fw_check_running(pdev);
-+              switch (err) {
-+              case 0: /*
-+                       * we shouldn't end up here.
-+                       * maybe it took a little bit longer.
-+                       * But all should be well?
-+                       */
-+                      break;
-+
-+              case 1: /* (No result yet? - we can try to retry) */
-+                      if (retry_counter < 10) {
-+                              retry_counter++;
-+                              dev_warn(&pdev->dev, "Retry Firmware download: %d try.",
-+                                        retry_counter);
-+                              return renesas_fw_download(pdev, fw,
-+                                                         retry_counter);
-+                      }
-+                      return -ETIMEDOUT;
-+
-+              default:
-+                      return err;
-+              }
-+      }
-+      /*
-+       * Optional last step: Engage Firmware Lock
-+       *
-+       * err = pci_write_config_byte(pdev, 0xF4, BIT(2));
-+       * if (err)
-+       *      return pcibios_err_to_errno(err);
-+       */
-+
-+      return 0;
-+}
-+
-+struct renesas_fw_ctx {
-+      struct pci_dev *pdev;
-+      const struct pci_device_id *id;
-+      bool resume;
-+};
-+
-+static int xhci_pci_probe(struct pci_dev *pdev,
-+                        const struct pci_device_id *id);
-+
-+static void renesas_fw_callback(const struct firmware *fw,
-+                              void *context)
-+{
-+      struct renesas_fw_ctx *ctx = context;
-+      struct pci_dev *pdev = ctx->pdev;
-+      struct device *parent = pdev->dev.parent;
-+      int err = -ENOENT;
-+
-+      if (fw) {
-+              err = renesas_fw_verify(pdev, fw->data, fw->size);
-+              if (!err) {
-+                      err = renesas_fw_download(pdev, fw, 0);
-+                      release_firmware(fw);
-+                      if (!err) {
-+                              if (ctx->resume)
-+                                      return;
-+
-+                              err = xhci_pci_probe(pdev, ctx->id);
-+                              if (!err) {
-+                                      /* everything worked */
-+                                      devm_kfree(&pdev->dev, ctx);
-+                                      return;
-+                              }
-+
-+                              /* in case of an error - fall through */
-+                      } else {
-+                              dev_err(&pdev->dev, "firmware failed to download (%d).",
-+                                      err);
-+                      }
-+              }
-+      } else {
-+              dev_err(&pdev->dev, "firmware failed to load (%d).", err);
-+      }
-+
-+      dev_info(&pdev->dev, "Unloading driver");
-+
-+      if (parent)
-+              device_lock(parent);
-+
-+      device_release_driver(&pdev->dev);
-+
-+      if (parent)
-+              device_unlock(parent);
-+
-+      pci_dev_put(pdev);
-+}
-+
-+static int renesas_fw_alive_check(struct pci_dev *pdev)
-+{
-+      const struct renesas_fw_entry *entry;
-+      int err;
-+
-+      /* check if we have a eligible RENESAS' uPD720201/2 w/o FW. */
-+      entry = renesas_needs_fw_dl(pdev);
-+      if (!entry)
-+              return 0;
-+
-+      err = renesas_fw_check_running(pdev);
-+      /* Also go ahead, if the firmware is running */
-+      if (err == 0)
-+              return 0;
-+
-+      /* At this point, we can be sure that the FW isn't ready. */
-+      return err;
-+}
-+
-+static int renesas_fw_download_to_hw(struct pci_dev *pdev,
-+                                   const struct pci_device_id *id,
-+                                   bool do_resume)
-+{
-+      const struct renesas_fw_entry *entry;
-+      struct renesas_fw_ctx *ctx;
-+      int err;
-+
-+      /* check if we have a eligible RENESAS' uPD720201/2 w/o FW. */
-+      entry = renesas_needs_fw_dl(pdev);
-+      if (!entry)
-+              return 0;
-+
-+      err = renesas_fw_check_running(pdev);
-+      /* Continue ahead, if the firmware is already running. */
-+      if (err == 0)
-+              return 0;
-+
-+      if (err != 1)
-+              return err;
-+
-+      ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
-+      if (!ctx)
-+              return -ENOMEM;
-+      ctx->pdev = pdev;
-+      ctx->resume = do_resume;
-+      ctx->id = id;
-+
-+      pci_dev_get(pdev);
-+      err = request_firmware_nowait(THIS_MODULE, 1, entry->firmware_name,
-+              &pdev->dev, GFP_KERNEL, ctx, renesas_fw_callback);
-+      if (err) {
-+              pci_dev_put(pdev);
-+              return err;
-+      }
-+
-+      /*
-+       * The renesas_fw_callback() callback will continue the probe
-+       * process, once it aquires the firmware.
-+       */
-+      return 1;
-+}
-+
- /* called during probe() after chip reset completes */
- static int xhci_pci_setup(struct usb_hcd *hcd)
- {
-@@ -300,6 +754,22 @@ static int xhci_pci_probe(struct pci_dev
-       struct hc_driver *driver;
-       struct usb_hcd *hcd;
-+      /*
-+       * Check if this device is a RENESAS uPD720201/2 device.
-+       * Otherwise, we can continue with xhci_pci_probe as usual.
-+       */
-+      retval = renesas_fw_download_to_hw(dev, id, false);
-+      switch (retval) {
-+      case 0:
-+              break;
-+
-+      case 1: /* let it load the firmware and recontinue the probe. */
-+              return 0;
-+
-+      default:
-+              return retval;
-+      }
-+
-       driver = (struct hc_driver *)id->driver_data;
-       /* Prevent runtime suspending between USB-2 and USB-3 initialization */
-@@ -361,6 +831,16 @@ static void xhci_pci_remove(struct pci_d
- {
-       struct xhci_hcd *xhci;
-+      if (renesas_fw_alive_check(dev)) {
-+              /*
-+               * bail out early, if this was a renesas device w/o FW.
-+               * Else we might hit the NMI watchdog in xhci_handsake
-+               * during xhci_reset as part of the driver's unloading.
-+               * which we forced in the renesas_fw_callback().
-+               */
-+              return;
-+      }
-+
-       xhci = hcd_to_xhci(pci_get_drvdata(dev));
-       xhci->xhc_state |= XHCI_STATE_REMOVING;
-       if (xhci->shared_hcd) {
diff --git a/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch
deleted file mode 100644 (file)
index fc4553d..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From a0dc613140bab907a3d5787a7ae7b0638bf674d0 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Thu, 23 Jun 2016 20:28:20 +0200
-Subject: [PATCH] usb: xhci: force MSI for uPD720201 and
- uPD720202
-
-The APM82181 does not support MSI-X. When probed, it will
-produce a noisy warning.
-
----
- drivers/usb/host/pci-quirks.c | 362 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 362 insertions(+)
-
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -215,6 +215,7 @@ static void xhci_pci_quirks(struct devic
-           pdev->device == 0x0015) {
-               xhci->quirks |= XHCI_RESET_ON_RESUME;
-               xhci->quirks |= XHCI_ZERO_64B_REGS;
-+              xhci->quirks |= XHCI_FORCE_MSI;
-       }
-       if (pdev->vendor == PCI_VENDOR_ID_VIA)
-               xhci->quirks |= XHCI_RESET_ON_RESUME;
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -424,10 +424,14 @@ static int xhci_try_enable_msi(struct us
-               free_irq(hcd->irq, hcd);
-       hcd->irq = 0;
--      ret = xhci_setup_msix(xhci);
--      if (ret)
--              /* fall back to msi*/
-+      if (xhci->quirks & XHCI_FORCE_MSI) {
-               ret = xhci_setup_msi(xhci);
-+      } else {
-+              ret = xhci_setup_msix(xhci);
-+              if (ret)
-+                      /* fall back to msi*/
-+                      ret = xhci_setup_msi(xhci);
-+      }
-       if (!ret) {
-               hcd->msi_enabled = 1;
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1867,6 +1867,7 @@ struct xhci_hcd {
-       /* support xHCI 0.96 spec USB2 software LPM */
-       unsigned                sw_lpm_support:1;
-       /* support xHCI 1.0 spec USB2 hardware LPM */
-+#define XHCI_FORCE_MSI                (1 << 24)
-       unsigned                hw_lpm_support:1;
-       /* Broken Suspend flag for SNPS Suspend resume issue */
-       unsigned                broken_suspend:1;
diff --git a/target/linux/apm821xx/patches-4.19/803-hwmon-tc654-add-detection-routine.patch b/target/linux/apm821xx/patches-4.19/803-hwmon-tc654-add-detection-routine.patch
deleted file mode 100644 (file)
index f8b30ae..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 694f9bfb8efaef8a33e8992015ff9d0866faf4a2 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 17 Dec 2017 17:27:15 +0100
-Subject: [PATCH 1/2] hwmon: tc654 add detection routine
-
-This patch adds a detection routine for the TC654/TC655
-chips.  Both IDs are listed in the Datasheet.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
----
- drivers/hwmon/tc654.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
---- a/drivers/hwmon/tc654.c
-+++ b/drivers/hwmon/tc654.c
-@@ -64,6 +64,11 @@ enum tc654_regs {
- /* Register data is read (and cached) at most once per second. */
- #define TC654_UPDATE_INTERVAL         HZ
-+/* Manufacturer and Version Identification Register Values */
-+#define TC654_MFR_ID_MICROCHIP                0x84
-+#define TC654_VER_ID                  0x00
-+#define TC655_VER_ID                  0x01
-+
- struct tc654_data {
-       struct i2c_client *client;
-@@ -497,6 +502,29 @@ static const struct i2c_device_id tc654_
-       {}
- };
-+static int
-+tc654_detect(struct i2c_client *new_client, struct i2c_board_info *info)
-+{
-+      struct i2c_adapter *adapter = new_client->adapter;
-+      int manufacturer, product;
-+
-+      if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-+              return -ENODEV;
-+
-+      manufacturer = i2c_smbus_read_byte_data(new_client, TC654_REG_MFR_ID);
-+      if (manufacturer != TC654_MFR_ID_MICROCHIP)
-+              return -ENODEV;
-+
-+      product = i2c_smbus_read_byte_data(new_client, TC654_REG_VER_ID);
-+      if (!((product == TC654_VER_ID) || (product == TC655_VER_ID)))
-+              return -ENODEV;
-+
-+      strlcpy(info->type, product == TC654_VER_ID ? "tc654" : "tc655",
-+              I2C_NAME_SIZE);
-+      return 0;
-+}
-+
-+
- MODULE_DEVICE_TABLE(i2c, tc654_id);
- static struct i2c_driver tc654_driver = {
-@@ -505,6 +533,7 @@ static struct i2c_driver tc654_driver =
-                  },
-       .probe = tc654_probe,
-       .id_table = tc654_id,
-+      .detect = tc654_detect,
- };
- module_i2c_driver(tc654_driver);
diff --git a/target/linux/apm821xx/patches-4.19/804-hwmon-tc654-add-thermal_cooling-device.patch b/target/linux/apm821xx/patches-4.19/804-hwmon-tc654-add-thermal_cooling-device.patch
deleted file mode 100644 (file)
index 18ed8ae..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-From 15ae701189744d321d3a1264ff46f8871e8765ee Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 17 Dec 2017 17:29:13 +0100
-Subject: [PATCH] hwmon: tc654: add thermal_cooling device
-
-This patch adds a thermaL_cooling device to the tc654 driver.
-This allows the chip to be used for DT-based cooling.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
----
- drivers/hwmon/tc654.c | 103 +++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 86 insertions(+), 17 deletions(-)
-
---- a/drivers/hwmon/tc654.c
-+++ b/drivers/hwmon/tc654.c
-@@ -24,6 +24,7 @@
- #include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/slab.h>
-+#include <linux/thermal.h>
- #include <linux/util_macros.h>
- enum tc654_regs {
-@@ -141,6 +142,9 @@ struct tc654_data {
-                        * writable register used to control the duty
-                        * cycle of the V OUT output.
-                        */
-+
-+      /* optional cooling device */
-+      struct thermal_cooling_device *cdev;
- };
- /* helper to grab and cache data, at most one time per second */
-@@ -376,36 +380,30 @@ static ssize_t set_pwm_mode(struct devic
- static const int tc654_pwm_map[16] = { 77,  88, 102, 112, 124, 136, 148, 160,
-                                     172, 184, 196, 207, 219, 231, 243, 255};
-+static int get_pwm(struct tc654_data *data)
-+{
-+      if (data->config & TC654_REG_CONFIG_SDM)
-+              return 0;
-+      else
-+              return tc654_pwm_map[data->duty_cycle];
-+}
-+
- static ssize_t show_pwm(struct device *dev, struct device_attribute *da,
-                       char *buf)
- {
-       struct tc654_data *data = tc654_update_client(dev);
--      int pwm;
-       if (IS_ERR(data))
-               return PTR_ERR(data);
--      if (data->config & TC654_REG_CONFIG_SDM)
--              pwm = 0;
--      else
--              pwm = tc654_pwm_map[data->duty_cycle];
--
--      return sprintf(buf, "%d\n", pwm);
-+      return sprintf(buf, "%d\n", get_pwm(data));
- }
--static ssize_t set_pwm(struct device *dev, struct device_attribute *da,
--                     const char *buf, size_t count)
-+static int _set_pwm(struct tc654_data *data, unsigned long val)
- {
--      struct tc654_data *data = dev_get_drvdata(dev);
-       struct i2c_client *client = data->client;
--      unsigned long val;
-       int ret;
--      if (kstrtoul(buf, 10, &val))
--              return -EINVAL;
--      if (val > 255)
--              return -EINVAL;
--
-       mutex_lock(&data->update_lock);
-       if (val == 0)
-@@ -425,6 +423,22 @@ static ssize_t set_pwm(struct device *de
- out:
-       mutex_unlock(&data->update_lock);
-+      return ret;
-+}
-+
-+static ssize_t set_pwm(struct device *dev, struct device_attribute *da,
-+                     const char *buf, size_t count)
-+{
-+      struct tc654_data *data = dev_get_drvdata(dev);
-+      unsigned long val;
-+      int ret;
-+
-+      if (kstrtoul(buf, 10, &val))
-+              return -EINVAL;
-+      if (val > 255)
-+              return -EINVAL;
-+
-+      ret = _set_pwm(data, val);
-       return ret < 0 ? ret : count;
- }
-@@ -462,6 +476,47 @@ static struct attribute *tc654_attrs[] =
- ATTRIBUTE_GROUPS(tc654);
-+/* cooling device */
-+
-+static int tc654_get_max_state(struct thermal_cooling_device *cdev,
-+                             unsigned long *state)
-+{
-+      *state = 255;
-+      return 0;
-+}
-+
-+static int tc654_get_cur_state(struct thermal_cooling_device *cdev,
-+                              unsigned long *state)
-+{
-+      struct tc654_data *data = tc654_update_client(cdev->devdata);
-+
-+      if (IS_ERR(data))
-+              return PTR_ERR(data);
-+
-+      *state = get_pwm(data);
-+      return 0;
-+}
-+
-+static int tc654_set_cur_state(struct thermal_cooling_device *cdev,
-+                             unsigned long state)
-+{
-+      struct tc654_data *data = tc654_update_client(cdev->devdata);
-+
-+      if (IS_ERR(data))
-+              return PTR_ERR(data);
-+
-+      if (state > 255)
-+              return -EINVAL;
-+
-+      return _set_pwm(data, state);
-+}
-+
-+static const struct thermal_cooling_device_ops tc654_fan_cool_ops = {
-+      .get_max_state = tc654_get_max_state,
-+      .get_cur_state = tc654_get_cur_state,
-+      .set_cur_state = tc654_set_cur_state,
-+};
-+
- /*
-  * device probe and removal
-  */
-@@ -493,7 +548,21 @@ static int tc654_probe(struct i2c_client
-       hwmon_dev =
-           devm_hwmon_device_register_with_groups(dev, client->name, data,
-                                                  tc654_groups);
--      return PTR_ERR_OR_ZERO(hwmon_dev);
-+      if (IS_ERR(hwmon_dev))
-+              return PTR_ERR(hwmon_dev);
-+
-+#if IS_ENABLED(CONFIG_OF)
-+      /* Optional cooling device register for Device tree platforms */
-+      data->cdev = thermal_of_cooling_device_register(client->dev.of_node,
-+                                                      "tc654", hwmon_dev,
-+                                                      &tc654_fan_cool_ops);
-+#else /* CONFIG_OF */
-+      /* Optional cooling device register for non Device tree platforms */
-+      data->cdev = thermal_cooling_device_register("tc654", hwmon_dev,
-+                                                   &tc654_fan_cool_ops);
-+#endif /* CONFIG_OF */
-+
-+      return PTR_ERR_OR_ZERO(data->cdev);
- }
- static const struct i2c_device_id tc654_id[] = {
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
deleted file mode 100644 (file)
index 1f789ca..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=mipsel
-BOARD:=ar7
-BOARDNAME:=TI AR7
-FEATURES:=squashfs atm low_mem
-MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-SUBTARGETS:=generic ac49x
-
-KERNEL_PATCHVER:=4.9
-
-define Target/Description
-       Build firmware images for TI AR7 based routers.
-endef
-
-include $(INCLUDE_DIR)/target.mk
-
-DEFAULT_PACKAGES+= swconfig
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/ar7/ac49x/config-default b/target/linux/ar7/ac49x/config-default
deleted file mode 100644 (file)
index d56df86..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_AR7_AC49X=y
-CONFIG_AR7_TYPE_AC49X=y
-# CONFIG_AR7_TYPE_TI is not set
-CONFIG_MTD_AC49X_PARTS=y
diff --git a/target/linux/ar7/ac49x/profiles/210-None.mk b/target/linux/ar7/ac49x/profiles/210-None.mk
deleted file mode 100644 (file)
index 2fcfacd..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/None
-  NAME:=No WiFi
-  PACKAGES:=
-endef
-
-define Profile/None/Description
-       Package set without WiFi support
-endef
-$(eval $(call Profile,None))
-
diff --git a/target/linux/ar7/ac49x/target.mk b/target/linux/ar7/ac49x/target.mk
deleted file mode 100644 (file)
index 47f3ab2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-
-SUBTARGET:=ac49x
-BOARDNAME:=AudioCodes AC49x
-
-define Target/Description
-       Build firmware images for AudioCodes AC49x based routers.
-endef
diff --git a/target/linux/ar7/base-files.mk b/target/linux/ar7/base-files.mk
deleted file mode 100644 (file)
index f21a604..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-define Build/Compile
-       $(call Build/Compile/Default)
-       $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher $(PLATFORM_DIR)/src/adam2patcher.c
-endef
-
-define Package/base-files/install-target
-       mkdir -p $(1)/sbin
-       $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
-endef
-
-
diff --git a/target/linux/ar7/base-files/etc/board.d/02_network b/target/linux/ar7/base-files/etc/board.d/02_network
deleted file mode 100755 (executable)
index c1c2dc4..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-. /lib/functions/uci-defaults.sh
-
-board_config_update
-
-if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175A/1:00" -o \
-     -e "/sys/bus/mdio_bus/drivers/IC+ IP17xx/1:00" ] && \
-   [ -x /sbin/swconfig ];
-then
-       ucidef_add_switch "eth0" \
-               "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0"
-
-elif [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/1:00" -o \
-       -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/1:10" ];
-then
-       ucidef_set_interface_lan "eth0.1"
-
-elif [ -d "/sys/class/net/eth1" ]; then
-       ucidef_set_interface_lan "eth0 eth1"
-
-else
-       ucidef_set_interface_lan "eth0"
-fi
-
-board_config_flush
-
-exit 0
diff --git a/target/linux/ar7/base-files/etc/diag.sh b/target/linux/ar7/base-files/etc/diag.sh
deleted file mode 100644 (file)
index f9aa809..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2007-2013 OpenWrt.org
-
-. /lib/functions/leds.sh
-
-get_status_led() {
-       [ -d "/sys/class/leds/status" ] && status_led="status"
-       [ -d "/sys/class/leds/power:green" ] && status_led="power:green"
-}
-
-set_state() {
-       get_status_led
-
-       case "$1" in
-       preinit)
-               status_led_blink_preinit
-               ;;
-       failsafe)
-               status_led_blink_failsafe
-               ;;
-       preinit_regular)
-               status_led_blink_preinit_regular
-               ;;
-       done)
-               status_led_on
-
-               [ "$status_led" = "power:green" ] && {
-                       led_off "power:red"
-               }
-               ;;
-       esac
-}
diff --git a/target/linux/ar7/base-files/etc/init.d/adam2 b/target/linux/ar7/base-files/etc/init.d/adam2
deleted file mode 100755 (executable)
index 6b78627..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# ADAM2 patcher for Netgear DG834 and compatible
-# Copyright (C) 2006 OpenWrt.org
-
-START=00
-start() {
-       MD5="$(md5sum /dev/mtdblock0  | awk '{print $1}')"
-       [ "$MD5" = "0530bfdf00ec155f4182afd70da028c1" ] && {
-               mtd unlock adam2
-               /sbin/adam2patcher /dev/mtdblock0
-       }
-       rm -f /etc/rc.d/S${START}adam2 /etc/init.d/adam2 /sbin/adam2patcher >&- 2>&-
-}
diff --git a/target/linux/ar7/config-4.9 b/target/linux/ar7/config-4.9
deleted file mode 100644 (file)
index 95a5375..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-CONFIG_ADM6996_PHY=y
-CONFIG_AR7=y
-CONFIG_AR7_TI=y
-# CONFIG_AR7_TYPE_AC49X is not set
-CONFIG_AR7_TYPE_TI=y
-CONFIG_AR7_WDT=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=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_SUPPORTS_UPROBES=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_BOOT_ELF32=y
-CONFIG_CEVT_R4K=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-CONFIG_CPMAC=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_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_ETHERNET_PACKET_MANGLE=y
-CONFIG_FIXED_PHY=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_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_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_CBPF_JIT=y
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_HAVE_CLK=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_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_EXIT_ON_IRQ_STACK=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_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ_PERIODIC=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IP17XX_PHY=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_MIPS_CPU=y
-CONFIG_IRQ_WORK=y
-CONFIG_KALLSYMS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_MDIO_BOARDINFO=y
-CONFIG_MIPS=y
-CONFIG_MIPS_ASID_BITS=8
-CONFIG_MIPS_ASID_SHIFT=0
-CONFIG_MIPS_CLOCK_VSYSCALL=y
-# CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND is not set
-CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-CONFIG_MODULES_USE_ELF_REL=y
-# CONFIG_MTD_AC49X_PARTS is not set
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MVSWITCH_PHY=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_NO_EXCEPT_FILL=y
-CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
-# CONFIG_NO_IOPORT_MAP is not set
-# CONFIG_OF is not set
-CONFIG_PCI_DRIVERS_LEGACY=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PHYLIB=y
-# CONFIG_RCU_STALL_COMMON is not set
-# CONFIG_SCHED_INFO is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SRCU=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SWCONFIG=y
-CONFIG_SWPHY=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_MIPS16=y
-CONFIG_SYS_SUPPORTS_ZBOOT=y
-CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_VLYNQ=y
-# CONFIG_VLYNQ_DEBUG is not set
diff --git a/target/linux/ar7/files/drivers/mtd/ac49xpart.c b/target/linux/ar7/files/drivers/mtd/ac49xpart.c
deleted file mode 100644 (file)
index 4f8a9c1..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * AudioCodes AC49x PSPBoot-based flash partition table
- * Copyright 2012 Daniel Golle <daniel.golle@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 St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/bootmem.h>
-#include <linux/magic.h>
-#include <linux/module.h>
-
-#include <asm/mach-ar7/prom.h>
-
-#define AC49X_MAXENVPARTS      8
-
-#define AC49X_PARTTYPE_LOADER  0
-#define AC49X_PARTTYPE_BOOTENV 1
-#define AC49X_PARTTYPE_LINUX   2
-#define AC49X_PARTTYPE_ROOTFS  3
-#define AC49X_PARTTYPE_UNKNOWN 4
-#define AC49X_NUM_PARTTYPES    5
-
-#define AC49X_FLASH_ADDRMASK   0x00FFFFFF
-
-#define AC49X_LOADER_MAGIC     0x40809000
-#define AC49X_LINUX_MAGIC      0x464c457f /*  ELF */
-#define AC49X_BOOTENV_MAGIC    0x4578614d /* MaxE */
-
-#define ROOTFS_MIN_OFFSET      0xC0000
-
-int parse_partvar(const unsigned char *partvar, struct mtd_partition *part)
-{
-       unsigned int partstart, partend;
-       unsigned int pnum;
-
-       pnum = sscanf(partvar, "0x%x,0x%x", &partstart, &partend);
-       if (pnum != 2)
-               return 1;
-
-       part->offset = partstart & AC49X_FLASH_ADDRMASK;
-       part->size = partend - partstart;
-
-       return 0;
-}
-
-int detect_parttype(struct mtd_info *master, struct mtd_partition part)
-{
-       unsigned int magic;
-       size_t len;
-
-       if (part.size < 4)
-               return -1;
-
-       mtd_read(master, part.offset, sizeof(magic), &len,
-                (uint8_t *)&magic);
-
-       if (len != sizeof(magic))
-               return -1;
-
-       switch (magic) {
-       case AC49X_LOADER_MAGIC:
-               return AC49X_PARTTYPE_LOADER;
-       case AC49X_LINUX_MAGIC:
-               return AC49X_PARTTYPE_LINUX;
-       case SQUASHFS_MAGIC:
-       case CRAMFS_MAGIC:
-       case CRAMFS_MAGIC_WEND:
-               return AC49X_PARTTYPE_ROOTFS;
-       case AC49X_BOOTENV_MAGIC:
-               return AC49X_PARTTYPE_BOOTENV;
-       default:
-               switch (magic & 0xFF) {
-               case JFFS2_SUPER_MAGIC:
-                       return AC49X_PARTTYPE_ROOTFS;
-               }
-               switch (magic >> 8) {
-               case JFFS2_SUPER_MAGIC:
-                       return AC49X_PARTTYPE_ROOTFS;
-               }
-               return AC49X_PARTTYPE_UNKNOWN;
-       }
-}
-
-const char *partnames[] = {
-       "loader",
-       "config",
-       "linux",
-       "rootfs",
-       "data"
-};
-
-void gen_partname(unsigned int type,
-                 unsigned int *typenumeration,
-                 struct mtd_partition *part)
-{
-       char *s  = kzalloc(sizeof(char) * 8, GFP_KERNEL);
-
-       (typenumeration[type])++;
-       if (typenumeration[type] == 1)
-               sprintf(s, "%s", partnames[type]);
-       else
-               sprintf(s, "%s%d", partnames[type], typenumeration[type]);
-
-       part->name = s;
-}
-
-static int create_mtd_partitions(struct mtd_info *master,
-                                const struct mtd_partition **pparts,
-                                struct mtd_part_parser_data *data)
-{
-       unsigned int envpartnum = 0, linuxpartnum = 0;
-       unsigned int typenumeration[5] = { 0, 0, 0, 0, 0 };
-       unsigned char evn[5];
-       const unsigned char *partvar = NULL;
-
-       struct mtd_partition *ac49x_parts;
-
-       ac49x_parts = kzalloc(sizeof(*ac49x_parts) * AC49X_MAXENVPARTS,
-                               GFP_KERNEL);
-
-       if (!ac49x_parts)
-               return -ENOMEM;
-
-       linuxpartnum = 0;
-       for (envpartnum = 0; envpartnum < AC49X_MAXENVPARTS; envpartnum++) {
-               struct mtd_partition parsepart;
-               unsigned int offset, size, type;
-               int err;
-               sprintf(evn, "mtd%d", envpartnum);
-               partvar = prom_getenv(evn);
-               if (!partvar)
-                       continue;
-               err = parse_partvar(partvar, &parsepart);
-               if (err)
-                       continue;
-               offset = parsepart.offset;
-               size = parsepart.size;
-               type = detect_parttype(master, parsepart);
-               gen_partname(type, typenumeration, &parsepart);
-               /* protect loader */
-               if (type == AC49X_PARTTYPE_LOADER)
-                       parsepart.mask_flags = MTD_WRITEABLE;
-               else
-                       parsepart.mask_flags = 0;
-
-               memcpy(&(ac49x_parts[linuxpartnum]), &parsepart,
-                       sizeof(struct mtd_partition));
-
-               /* scan for contained rootfs */
-               if (type == AC49X_PARTTYPE_LINUX) {
-                       parsepart.offset += ROOTFS_MIN_OFFSET &
-                                               ~(master->erasesize - 1);
-                       parsepart.size -= ROOTFS_MIN_OFFSET &
-                                               ~(master->erasesize - 1);
-                       do {
-                               unsigned int size, offset;
-                               size = parsepart.size;
-                               offset = parsepart.offset;
-
-                               type = detect_parttype(master, parsepart);
-                               if (type == AC49X_PARTTYPE_ROOTFS) {
-                                       gen_partname(type, typenumeration,
-                                                       &parsepart);
-                                       printk(KERN_INFO
-                                               "%s %s: 0x%08x@0x%08x\n",
-                                               "detected sub-partition",
-                                               parsepart.name,
-                                               (unsigned int)parsepart.size,
-                                               (unsigned int)parsepart.offset);
-                                       linuxpartnum++;
-                                       memcpy(&(ac49x_parts[linuxpartnum]),
-                                               &parsepart,
-                                               sizeof(struct mtd_partition));
-                                       break;
-                               }
-                               parsepart.offset += master->erasesize;
-                               parsepart.size -= master->erasesize;
-                       } while (parsepart.size >= master->erasesize);
-               }
-               linuxpartnum++;
-       }
-
-       *pparts = ac49x_parts;
-       return linuxpartnum;
-}
-
-static struct mtd_part_parser ac49x_parser = {
-       .owner = THIS_MODULE,
-       .parse_fn = create_mtd_partitions,
-       .name = "ac49xpart",
-};
-
-static int __init ac49x_parser_init(void)
-{
-       register_mtd_parser(&ac49x_parser);
-       return 0;
-}
-
-module_init(ac49x_parser_init);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Daniel Golle <daniel.golle@gmail.com>");
-MODULE_DESCRIPTION("MTD partitioning for AudioCodes AC49x");
diff --git a/target/linux/ar7/files/drivers/mtd/titanpart.c b/target/linux/ar7/files/drivers/mtd/titanpart.c
deleted file mode 100644 (file)
index a6403f6..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/bootmem.h>
-#include <linux/magic.h>
-#include <asm/mach-ar7/prom.h>
-
-#define IMAGE_A_SIZE 0X3c0000
-#define WRTP_PARTS     14
-#define NSP_IMG_MAGIC_NUMBER           le32_to_cpu(0x4D544443)
-#define NSP_IMG_SECTION_TYPE_KERNEL            (0x01)
-#define NSP_IMG_SECTION_TYPE_FILESYSTEM_ROOT   (0x02)
-#define NSP_IMG_SECTION_TYPE_FILESYSTEM                (0x03)
-#define MAX_NUM_PARTITIONS 14
-
-static int part_count=0;
-static struct mtd_partition titan_parts[WRTP_PARTS];
-
-
-struct nsp_img_hdr_head
-{
-       unsigned int    magic;          /* Magic number to identify this image header */
-       unsigned int    boot_offset;    /* Offset from start of header to kernel code. */
-       unsigned int    flags;          /* Image flags. */
-       unsigned int    hdr_version;    /* Version of this header. */
-       unsigned int    hdr_size;       /* The complete size of all portions of the header */
-       unsigned int    prod_id;        /* This product id */
-       unsigned int    rel_id;         /* Which release this is */
-       unsigned int    version;        /* name-MMM.nnn.ooo-rxx => 0xMMnnooxx. See comment
-                                          below */
-       unsigned int    image_size;     /* Image size (including header) */
-       unsigned int    info_offset;    /* Offset from start of header to info block */
-       unsigned int    sect_info_offset;       /* Offset from start of header to section desc */
-       unsigned int    chksum_offset;  /* Offset from start of header to chksum block */
-       unsigned int    pad1;
-};
-
-struct nsp_img_hdr_section_info
-{
-       unsigned int    num_sects;      /* Number of section (and section desc blocks) in this image */
-       unsigned int    sect_size;      /* Size of a SINGLE section_desc block */
-       unsigned int    sections_offset;        /* Offset to from start of header to the start of the section blocks */
-};
-
-/* There will be one of more of the following stuctures in the image header. Each
-   section will have one of these blocks. */
-struct nsp_img_hdr_sections
-{
-       unsigned int    offset;         /* Offset of section from start of NSP_IMG_HDR_HEAD */
-       unsigned int    total_size;     /* Size of section (including pad size.) */
-       unsigned int    raw_size;       /* Size of section only */
-       unsigned int    flags;          /* Section flags */
-       unsigned int    chksum;         /* Section checksum */
-       unsigned int    type;           /* Section type. What kind of info does this section describe */
-       char            name[16];       /* Reference name for this section. */
-};
-
-
-
-
-
-static int     titan_parse_env_address(char *env_name, unsigned int *flash_base,
-                               unsigned int *flash_end)
-{
-       char    image_name[30];
-       char    *env_ptr;
-       char    *base_ptr;
-       char    *end_ptr;
-       char * string_ptr;
-       /* Get the image variable */
-       env_ptr = prom_getenv(env_name);
-       if(!env_ptr){
-               printk("titan: invalid env name, %s.\n", env_name);
-               return -1;      /* Error, no image variable */
-       }
-       strncpy(image_name, env_ptr, 30);
-       image_name[29]=0;
-       string_ptr = image_name;
-       /* Extract the start and stop addresses of the partition */
-       base_ptr = strsep(&string_ptr, ",");
-       end_ptr = strsep(&string_ptr, ",");
-       if ((base_ptr == NULL) || (end_ptr == NULL)) {  
-               printk("titan: Couldn't tokenize %s start,end.\n", image_name);
-               return -1;
-       }
-
-       *flash_base = (unsigned int) simple_strtol(base_ptr, NULL, 0);
-       *flash_end = (unsigned int) simple_strtol(end_ptr, NULL, 0);
-       if((!*flash_base) || (!*flash_end)) {
-               printk("titan: Unable to convert :%s: :%s: into start,end values.\n",
-                               env_name, image_name);
-               return -1;
-       }
-       *flash_base &= 0x0fffffff;
-       *flash_end &= 0x0fffffff;
-       return 0;
-}
-
-
-
-static int     titan_get_single_image(char *bootcfg_name, unsigned int *flash_base,
-                               unsigned int *flash_end)
-{
-       char    *env_ptr;
-       char    *base_ptr;
-       char    *end_ptr;
-       char    image_name[30];
-       char * string_ptr;
-
-       if(!bootcfg_name || !flash_base || !flash_end)
-               return -1;
-
-       env_ptr = prom_getenv(bootcfg_name);
-       if(!env_ptr){
-               printk("titan: %s variable not found.\n", bootcfg_name);
-               return -1;      /* Error, no bootcfg variable */
-       }
-
-       string_ptr = image_name;
-       /* Save off the image name */
-       strncpy(image_name, env_ptr, 30);
-       image_name[29]=0;
-
-       end_ptr=strsep(&string_ptr, "\"");
-       base_ptr=strsep(&string_ptr, "\"");             /* Loose the last " */
-       if(!end_ptr || !base_ptr){
-               printk("titan: invalid bootcfg format, %s.\n", image_name);
-               return -1;      /* Error, invalid bootcfg variable */
-       }
-
-       /* Now, parse the addresses */
-       return titan_parse_env_address(base_ptr, flash_base, flash_end);
-}
-
-
-
-static void titan_add_partition(char * env_name, unsigned int flash_base, unsigned int flash_end)
-{
-               titan_parts[part_count].name = env_name;
-               titan_parts[part_count].offset = flash_base;
-               titan_parts[part_count].size = flash_end-flash_base;
-               titan_parts[part_count].mask_flags = (strcmp(env_name, "bootloader")==0|| 
-                       strcmp(env_name, "boot_env")==0 ||
-                       strcmp(env_name, "full_image")==0 )?MTD_WRITEABLE:0;
-               part_count++;
-
-}
-int create_titan_partitions(struct mtd_info *master,
-       struct mtd_partition **pparts,
-       unsigned long origin)
-{
-       struct nsp_img_hdr_head         hdr;
-       struct nsp_img_hdr_section_info sect_info;
-       struct nsp_img_hdr_sections     section;
-       unsigned int                    flash_base, flash_end;
-       unsigned int                    start, end;
-       char                            *name;
-       int     i;
-       int     total_sects=0;
-       size_t len;
-
-       /* Get the bootcfg env variable first */
-       if(titan_get_single_image("BOOTCFG", &flash_base, &flash_end)) {
-               /* Error, fallback */
-               return -1;
-       }
-
-       /* Get access to the header, and do some validation checks */
-       //hdr=(struct nsp_img_hdr_head*)flash_base;
-       mtd_read(master, flash_base, sizeof(struct nsp_img_hdr_head), &len, (uint8_t *)&hdr);
-       if(hdr.magic != NSP_IMG_MAGIC_NUMBER)
-               return -1;      /* Not a single image */
-
-       mtd_read(master, flash_base + hdr.sect_info_offset, sizeof(struct nsp_img_hdr_section_info), &len, (uint8_t *)&sect_info);
-
-       /* Look for the root fs, and add it first. This way we KNOW where the rootfs is */
-       for(i=0; i< sect_info.num_sects && i<MAX_NUM_PARTITIONS; i++){
-               mtd_read(master, flash_base + sect_info.sections_offset + (i * sect_info.sect_size) , sizeof(struct nsp_img_hdr_sections), &len, (uint8_t *)&section);
-               /* Add only the root partition */
-               if(section.type != NSP_IMG_SECTION_TYPE_FILESYSTEM_ROOT){
-                       continue;
-               }
-               start=flash_base + section.offset;
-               end=start + section.total_size;
-               titan_add_partition("root", start, end);
-               total_sects++;
-               
-       }
-
-       for(i=0; i< sect_info.num_sects && i<MAX_NUM_PARTITIONS; i++){
-
-               mtd_read(master, flash_base + sect_info.sections_offset + (i * sect_info.sect_size) , sizeof(struct nsp_img_hdr_sections), &len, (uint8_t *)&section);
-
-               name=section.name;
-               if(section.type == NSP_IMG_SECTION_TYPE_FILESYSTEM_ROOT)
-               {
-                       name = "rootfs";
-                       start=flash_base + section.offset;
-                       end=flash_end;
-                       titan_add_partition(name, start, end);
-                       total_sects++;
-               }
-               else if(section.type == NSP_IMG_SECTION_TYPE_KERNEL)
-               {
-                       name = "kernel";
-                       start=flash_base + section.offset;
-                       end=start + section.total_size;
-                       titan_add_partition(name, start, end);
-                       total_sects++;
-               }
-
-       }
-
-       /* Next, lets add the single image */
-       titan_add_partition("primary_image", flash_base, flash_end);
-       total_sects++;
-
-
-       titan_add_partition("full_image", 0,  master->size);
-       total_sects++;
-
-       if (!titan_parse_env_address("BOOTLOADER", &start, &end)){
-               titan_add_partition("bootloader", start, end);
-               total_sects++;
-       }
-       if (!titan_parse_env_address("boot_env", &start, &end)){
-               titan_add_partition("boot_env", start, end);
-               total_sects++;
-       }
-       *pparts = titan_parts;
-       return total_sects;
-}
diff --git a/target/linux/ar7/generic/config-default b/target/linux/ar7/generic/config-default
deleted file mode 100644 (file)
index 10d46e9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_AR7_TI=y
-# CONFIG_AR7_TYPE_AC49X is not set
-CONFIG_AR7_TYPE_TI=y
-# CONFIG_MTD_AC49X_PARTS is not set
-CONFIG_MTD_AR7_PARTS=y
diff --git a/target/linux/ar7/generic/profiles/100-Annex-A.mk b/target/linux/ar7/generic/profiles/100-Annex-A.mk
deleted file mode 100644 (file)
index d8e549e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Annex-A
-  NAME:=Annex-A DSL firmware (default)
-  PACKAGES:=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl \
-           kmod-sangam-atm-annex-a
-endef
-
-define Profile/Annex-A/Description
-       Package set compatible with Annex-A DSL lines (most countries).
-endef
-$(eval $(call Profile,Annex-A))
-
diff --git a/target/linux/ar7/generic/profiles/110-Annex-B.mk b/target/linux/ar7/generic/profiles/110-Annex-B.mk
deleted file mode 100644 (file)
index 55de1fc..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Annex-B
-  NAME:=Annex-B DSL firmware
-  PACKAGES:=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl \
-           kmod-sangam-atm-annex-b
-endef
-
-define Profile/Annex-B/Description
-       Package set compatible with Annex-B DSL lines (Germany).
-endef
-$(eval $(call Profile,Annex-B))
-
diff --git a/target/linux/ar7/generic/profiles/200-Texas.mk b/target/linux/ar7/generic/profiles/200-Texas.mk
deleted file mode 100644 (file)
index 7d868bd..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Texas
-  NAME:=Texas Instruments WiFi (mac80211)
-  PACKAGES:=kmod-acx-mac80211
-endef
-
-define Profile/Texas/Description
-       Package set compatible with hardware using Texas Instruments WiFi cards
-       using the mac80211 driver.
-endef
-$(eval $(call Profile,Texas))
-
diff --git a/target/linux/ar7/generic/profiles/210-None.mk b/target/linux/ar7/generic/profiles/210-None.mk
deleted file mode 100644 (file)
index 2fcfacd..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/None
-  NAME:=No WiFi
-  PACKAGES:=
-endef
-
-define Profile/None/Description
-       Package set without WiFi support
-endef
-$(eval $(call Profile,None))
-
diff --git a/target/linux/ar7/generic/target.mk b/target/linux/ar7/generic/target.mk
deleted file mode 100644 (file)
index b40d2a4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-
-SUBTARGET:=generic
-BOARDNAME:=Texas Instruments AR7 boards
-
-DEFAULT_PACKAGES+= kmod-mac80211 kmod-acx-mac80211 wpad-basic
-
-define Target/Description
-       Build firmware images for TI AR7 based routers.
-endef
diff --git a/target/linux/ar7/image/Makefile b/target/linux/ar7/image/Makefile
deleted file mode 100644 (file)
index d20de27..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-DROP_SECTIONS:=.reginfo .mdebug .comment .note .pdr .options .MIPS.options
-OBJCOPY_SREC:=$(TARGET_CROSS)objcopy -S -O srec $(addprefix --remove-section=,$(DROP_SECTIONS))
-
-LOADADDR:=0x94600000
-KERNEL_ENTRY:=0x94100000
-RAMSTART:=0x94000000
-RAMSIZE:=0x00100000
-
-EVA_LOADADDR := 0x94100000
-
-LOADER_MAKEOPTS= \
-       KDIR=$(KDIR) \
-       LOADADDR=$(LOADADDR) \
-       KERNEL_ENTRY=$(KERNEL_ENTRY) \
-       RAMSTART=$(RAMSTART) \
-       RAMSIZE=$(RAMSIZE)
-
-CFLAGS := -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
-       -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 -mno-abicalls -fno-pic \
-       -pipe -mlong-calls -fno-common \
-       -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap \
-       -DLOADADDR=$(LOADADDR)
-
-define Build/Clean
-       $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean
-endef
-
-define Image/Prepare
-       cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
-       $(STAGING_DIR_HOST)/bin/lzma2eva $(EVA_LOADADDR) 0x$${shell $(TARGET_CROSS)nm $(KDIR)/vmlinux | grep -w kernel_entry | cut -d' ' -f1} $(KDIR)/vmlinux.lzma $(KDIR)/loader.eva
-
-       $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader \
-               $(LOADER_MAKEOPTS) \
-               clean compile
-       $(OBJCOPY_SREC) $(KDIR)/loader.elf $(KDIR)/loader.srec
-       $(OBJCOPY_SREC) $(KDIR)/vmlinux.elf $(KDIR)/vmlinux.srec
-       srec2bin $(KDIR)/loader.srec $(KDIR)/loader.bin
-       srec2bin $(KDIR)/vmlinux.srec $(KDIR)/vmlinux.bin
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-       $(OBJCOPY_SREC) $(KDIR)/vmlinux-initramfs.elf \
-               $(KDIR)/vmlinux-initramfs.srec
-       srec2bin $(KDIR)/vmlinux-initramfs.srec $(KDIR)/vmlinux-initramfs.bin
-endif
-endef
-
-define align/jffs2-64k
-bs=65536 conv=sync
-endef
-
-define align/jffs2-128k
-bs=131072 conv=sync
-endef
-
-define align/squashfs
-endef
-
-define Image/Build/CyberTAN
-       (dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin) | \
-               $(STAGING_DIR_HOST)/bin/addpattern -p $(3) -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(4)-code.bin
-endef
-
-define Image/Build/Titan
-       $(STAGING_DIR_HOST)/bin/mktitanimg -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(4)-code.bin -i $(KDIR)/loader.bin $(KDIR)/root.$(1) -a 0x10000 0x10000 -h 2  -p 0x4C575943 -s 0x0b010000
-       $(STAGING_DIR_HOST)/bin/mktitanimg -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-na-$(4)-code.bin -i $(KDIR)/loader.bin $(KDIR)/root.$(1) -a 0x10000 0x10000 -h 2  -p 0x4D575943 -s 0x0b010000
-endef
-
-define Image/Build/AudioCodes
-       ( dd if=$(KDIR)/vmlinux.elf bs=64k conv=sync ; dd if=$(KDIR)/root.$(1) ) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).bin
-endef
-
-#define Image/Build/sErCoMm
-#      cat sercomm/adam2.bin "$(BIN_DIR)/$(IMG_PREFIX)-$(1).bin" > "$(KDIR)/dgfw.tmp"
-#      dd if=sercomm/$(2) of="$(KDIR)/dgfw.tmp" bs=$$$$((0x3e0000 - 80)) seek=1 conv=notrunc
-#      $(STAGING_DIR_HOST)/bin/dgfirmware -f -w "$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3).img" "$(KDIR)/dgfw.tmp"
-#      rm -f "$(KDIR)/dgfw.tmp"
-#endef
-
-define Image/Build/EVA
-       dd if=$(KDIR)/loader.eva $(call align/$(1)) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(KERNEL)-$(1).bin
-       cat $(KDIR)/root.$(1) >> $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(KERNEL)-$(1).bin
-       $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(KERNEL)-$(1).bin)
-endef
-
-define Image/Build/Initramfs
-       $(CP) $(KDIR)/vmlinux-initramfs.bin $(BIN_DIR)/$(IMG_PREFIX)-initramfs.bin
-endef
-
-ifeq ($(CONFIG_AR7_TI),y)
-define Image/Build
-       dd if=$(KDIR)/loader.bin $(call align/$(1)) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
-       cat $(KDIR)/root.$(1) >> $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
-       $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(1).bin)
-       $(call Image/Build/CyberTAN,$(1),AG1B,AG1B,$(1))
-       $(call Image/Build/CyberTAN,$(1),AG1A,AG1A,$(1))
-       $(call Image/Build/CyberTAN,$(1),WA21,WA21,$(1))
-       $(call Image/Build/CyberTAN,$(1),WA22,WA22,$(1))
-       $(call Image/Build/CyberTAN,$(1),WAG2,WAG2,$(1))
-       $(call Image/Build/CyberTAN,$(1),AG310,AV2A -b -r 1.0,$(1))
-       $(call Image/Build/CyberTAN,$(1),AG241v2,AG3A -b -r 2.0,$(1))
-       $(call Image/Build/CyberTAN,$(1),AG241v2b,AG3B -b -r 2.0,$(1))
-       $(call Image/Build/CyberTAN,$(1),AG241v1,AG3A -b,$(1))
-       $(call Image/Build/CyberTAN,$(1),WAG54GP2v1,ATWL -b,$(1))
-       $(call Image/Build/CyberTAN,$(1),WAG54GP2v2,CTWL -b,$(1))
-       $(call Image/Build/CyberTAN,$(1),WA31,WA31 -b,$(1))
-       $(call Image/Build/CyberTAN,$(1),WA32,WA32 -b,$(1))
-       $(call Image/Build/CyberTAN,$(1),WA7A,WA7A -b,$(1))
-       $(call Image/Build/CyberTAN,$(1),WA7B,WA7B -b,$(1))
-#      $(call Image/Build/sErCoMm,$(1),dg834,$(1))
-#      $(call Image/Build/sErCoMm,$(1),jdr454wb,$(1))
-       $(call Image/Build/EVA,$(1),EVA)
-       $(call Image/Build/Titan,$(1),Titan,Titan,$(1))
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-       $(call Image/Build/Initramfs)
-endif
-endef
-endif
-
-ifeq ($(CONFIG_AR7_AC49X),y)
-define Image/Build
-#      $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(1).bin)
-       $(call Image/Build/AudioCodes,$(1),mp202,$(1))
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-       $(call Image/Build/Initramfs)
-endif
-endef
-endif
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ar7/patches-4.9/100-fix-highmem-offset.patch b/target/linux/ar7/patches-4.9/100-fix-highmem-offset.patch
deleted file mode 100644 (file)
index f1a7549..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/mach-ar7/spaces.h
-+++ b/arch/mips/include/asm/mach-ar7/spaces.h
-@@ -20,6 +20,8 @@
- #define UNCAC_BASE    _AC(0xb4000000, UL)     /* 0xa0000000 + PHYS_OFFSET */
- #define IO_BASE               UNCAC_BASE
-+#define HIGHMEM_START _AC(0x20000000, UL)
-+
- #include <asm/mach-generic/spaces.h>
- #endif /* __ASM_AR7_SPACES_H */
diff --git a/target/linux/ar7/patches-4.9/101-MIPS-AR7-allow-NULL-clock-for-clk_get_rate.patch b/target/linux/ar7/patches-4.9/101-MIPS-AR7-allow-NULL-clock-for-clk_get_rate.patch
deleted file mode 100644 (file)
index 74ac0d1..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From patchwork Tue Jul 18 10:17:26 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [5/9] MIPS: AR7: allow NULL clock for clk_get_rate
-X-Patchwork-Submitter: Jonas Gorski <jonas.gorski@gmail.com>
-X-Patchwork-Id: 16775
-Message-Id: <20170718101730.2541-6-jonas.gorski@gmail.com>
-To: unlisted-recipients:; (no To-header on input)
-Cc: Ralf Baechle <ralf@linux-mips.org>,
- Paul Gortmaker <paul.gortmaker@windriver.com>,
- James Hogan <james.hogan@imgtec.com>,
- linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
-Date: Tue, 18 Jul 2017 12:17:26 +0200
-From: Jonas Gorski <jonas.gorski@gmail.com>
-List-Id: linux-mips <linux-mips.eddie.linux-mips.org>
-
-Make the behaviour of clk_get_rate consistent with common clk's
-clk_get_rate by accepting NULL clocks as parameter. Some device
-drivers rely on this, and will cause an OOPS otherwise.
-
-Fixes: 780019ddf02f ("MIPS: AR7: Implement clock API")
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
-Cc: James Hogan <james.hogan@imgtec.com>
-Cc: linux-mips@linux-mips.org
-Cc: linux-kernel@vger.kernel.org
-Reported-by: Mathias Kresin <dev@kresin.me>
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- arch/mips/ar7/clock.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/mips/ar7/clock.c
-+++ b/arch/mips/ar7/clock.c
-@@ -430,6 +430,9 @@ EXPORT_SYMBOL(clk_disable);
- unsigned long clk_get_rate(struct clk *clk)
- {
-+      if (!clk)
-+              return 0;
-+
-       return clk->rate;
- }
- EXPORT_SYMBOL(clk_get_rate);
diff --git a/target/linux/ar7/patches-4.9/110-flash.patch b/target/linux/ar7/patches-4.9/110-flash.patch
deleted file mode 100644 (file)
index f5713bd..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -12,7 +12,7 @@ obj-$(CONFIG_MTD_OF_PARTS)   += ofpart.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
--obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
-+obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o titanpart.o
- obj-$(CONFIG_MTD_BCM63XX_PARTS)       += bcm63xxpart.o
- obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
- obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -198,7 +198,7 @@ static struct resource physmap_flash_res
-       .name   = "mem",
-       .flags  = IORESOURCE_MEM,
-       .start  = 0x10000000,
--      .end    = 0x107fffff,
-+      .end    = 0x11ffffff,
- };
- static const char *ar7_probe_types[] = { "ar7part", NULL };
diff --git a/target/linux/ar7/patches-4.9/160-vlynq_try_remote_first.patch b/target/linux/ar7/patches-4.9/160-vlynq_try_remote_first.patch
deleted file mode 100644 (file)
index 1d1310d..0000000
+++ /dev/null
@@ -1,300 +0,0 @@
---- a/drivers/vlynq/vlynq.c
-+++ b/drivers/vlynq/vlynq.c
-@@ -119,20 +119,40 @@ static int vlynq_linked(struct vlynq_dev
-       return 0;
- }
-+static volatile int vlynq_delay_value_new = 0;
-+
-+static void vlynq_delay_wait(u32 count)
-+{
-+      /* Code adopted from original vlynq driver */
-+      int i = 0;
-+      volatile int *ptr = &vlynq_delay_value_new;
-+      *ptr = 0;
-+
-+      /* We are assuming that the each cycle takes about
-+       * 23 assembly instructions. */
-+      for(i = 0; i < (count + 23)/23; i++)
-+              *ptr = *ptr + 1;
-+}
-+
- static void vlynq_reset(struct vlynq_device *dev)
- {
-+      u32 rtm = readl(&dev->local->revision);
-+
-+      rtm = rtm < 0x00010205 || readl(&dev->local->status) & 0x800 == 0 ?
-+                      0 : 0x600000;
-+
-       writel(readl(&dev->local->control) | VLYNQ_CTRL_RESET,
-                       &dev->local->control);
-       /* Wait for the devices to finish resetting */
--      msleep(5);
-+      vlynq_delay_wait(0xffffff);
-       /* Remove reset bit */
--      writel(readl(&dev->local->control) & ~VLYNQ_CTRL_RESET,
-+      writel(readl(&dev->local->control) & ~VLYNQ_CTRL_RESET | rtm,
-                       &dev->local->control);
-       /* Give some time for the devices to settle */
--      msleep(5);
-+      vlynq_delay_wait(0xffffff);
- }
- static void vlynq_irq_unmask(struct irq_data *d)
-@@ -379,6 +399,61 @@ void vlynq_unregister_driver(struct vlyn
- }
- EXPORT_SYMBOL(vlynq_unregister_driver);
-+enum vlynq_clk_src {
-+      vlynq_clk_external,
-+      vlynq_clk_local,
-+      vlynq_clk_remote,
-+      vlynq_clk_invalid,
-+};
-+
-+static int __vlynq_set_clocks(struct vlynq_device *dev,
-+                              enum vlynq_clk_src clk_dir,
-+                              int lclk_div, int rclk_div)
-+{
-+      u32 reg;
-+
-+      if (clk_dir == vlynq_clk_invalid) {
-+              printk(KERN_ERR "%s: attempt to set invalid clocking\n",
-+                              dev_name(&dev->dev));
-+              return -EINVAL;
-+      }
-+
-+      reg = readl(&dev->local->control);
-+      if (readl(&dev->local->revision) < 0x00010205) {
-+              if (clk_dir & vlynq_clk_local)
-+                      reg |= VLYNQ_CTRL_CLOCK_INT;
-+              else
-+                      reg &= ~VLYNQ_CTRL_CLOCK_INT;
-+      }
-+      reg &= ~VLYNQ_CTRL_CLOCK_MASK;
-+      reg |= VLYNQ_CTRL_CLOCK_DIV(lclk_div);
-+      writel(reg, &dev->local->control);
-+
-+      if (!vlynq_linked(dev))
-+              return -ENODEV;
-+
-+      printk(KERN_INFO "%s: local VLYNQ protocol rev. is 0x%08x\n",
-+                      dev_name(&dev->dev), readl(&dev->local->revision));
-+      printk(KERN_INFO "%s: remote VLYNQ protocol rev. is 0x%08x\n",
-+                      dev_name(&dev->dev), readl(&dev->remote->revision));
-+
-+      reg = readl(&dev->remote->control);
-+      if (readl(&dev->remote->revision) < 0x00010205) {
-+              if (clk_dir & vlynq_clk_remote)
-+                      reg |= VLYNQ_CTRL_CLOCK_INT;
-+              else
-+                      reg &= ~VLYNQ_CTRL_CLOCK_INT;
-+      }
-+      reg &= ~VLYNQ_CTRL_CLOCK_MASK;
-+      reg |= VLYNQ_CTRL_CLOCK_DIV(rclk_div);
-+      writel(reg, &dev->remote->control);
-+
-+      if (!vlynq_linked(dev))
-+              return -ENODEV;
-+
-+      return 0;
-+}
-+
- /*
-  * A VLYNQ remote device can clock the VLYNQ bus master
-  * using a dedicated clock line. In that case, both the
-@@ -392,29 +467,16 @@ static int __vlynq_try_remote(struct vly
-       int i;
-       vlynq_reset(dev);
--      for (i = dev->dev_id ? vlynq_rdiv2 : vlynq_rdiv8; dev->dev_id ?
--                      i <= vlynq_rdiv8 : i >= vlynq_rdiv2;
--              dev->dev_id ? i++ : i--) {
-+      for (i = 0; i <= 7; i++) {
-               if (!vlynq_linked(dev))
-                       break;
--              writel((readl(&dev->remote->control) &
--                              ~VLYNQ_CTRL_CLOCK_MASK) |
--                              VLYNQ_CTRL_CLOCK_INT |
--                              VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1),
--                              &dev->remote->control);
--              writel((readl(&dev->local->control)
--                              & ~(VLYNQ_CTRL_CLOCK_INT |
--                              VLYNQ_CTRL_CLOCK_MASK)) |
--                              VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1),
--                              &dev->local->control);
--
--              if (vlynq_linked(dev)) {
--                      printk(KERN_DEBUG
--                              "%s: using remote clock divisor %d\n",
--                              dev_name(&dev->dev), i - vlynq_rdiv1 + 1);
--                      dev->divisor = i;
-+              if (!__vlynq_set_clocks(dev, vlynq_clk_remote, i, i)) {
-+                      printk(KERN_INFO
-+                                      "%s: using remote clock divisor %d\n",
-+                                      dev_name(&dev->dev), i + 1);
-+                      dev->divisor = i + vlynq_rdiv1;
-                       return 0;
-               } else {
-                       vlynq_reset(dev);
-@@ -433,25 +495,17 @@ static int __vlynq_try_remote(struct vly
-  */
- static int __vlynq_try_local(struct vlynq_device *dev)
- {
--      int i;
-+      int i, dir = !dev->dev_id;
-       vlynq_reset(dev);
--      for (i = dev->dev_id ? vlynq_ldiv2 : vlynq_ldiv8; dev->dev_id ?
--                      i <= vlynq_ldiv8 : i >= vlynq_ldiv2;
--              dev->dev_id ? i++ : i--) {
--
--              writel((readl(&dev->local->control) &
--                              ~VLYNQ_CTRL_CLOCK_MASK) |
--                              VLYNQ_CTRL_CLOCK_INT |
--                              VLYNQ_CTRL_CLOCK_DIV(i - vlynq_ldiv1),
--                              &dev->local->control);
--
--              if (vlynq_linked(dev)) {
--                      printk(KERN_DEBUG
--                              "%s: using local clock divisor %d\n",
--                              dev_name(&dev->dev), i - vlynq_ldiv1 + 1);
--                      dev->divisor = i;
-+      for (i = dir ? 7 : 0; dir ? i >= 0 : i <= 7; dir ? i-- : i++) {
-+
-+              if (!__vlynq_set_clocks(dev, vlynq_clk_local, i, 0)) {
-+                      printk(KERN_INFO
-+                                      "%s: using local clock divisor %d\n",
-+                                      dev_name(&dev->dev), i + 1);
-+                      dev->divisor = i + vlynq_ldiv1;
-                       return 0;
-               } else {
-                       vlynq_reset(dev);
-@@ -473,18 +527,10 @@ static int __vlynq_try_external(struct v
-       if (!vlynq_linked(dev))
-               return -ENODEV;
--      writel((readl(&dev->remote->control) &
--                      ~VLYNQ_CTRL_CLOCK_INT),
--                      &dev->remote->control);
--
--      writel((readl(&dev->local->control) &
--                      ~VLYNQ_CTRL_CLOCK_INT),
--                      &dev->local->control);
--
--      if (vlynq_linked(dev)) {
--              printk(KERN_DEBUG "%s: using external clock\n",
--                      dev_name(&dev->dev));
--                      dev->divisor = vlynq_div_external;
-+      if (!__vlynq_set_clocks(dev, vlynq_clk_external, 0, 0)) {
-+              printk(KERN_INFO "%s: using external clock\n",
-+                              dev_name(&dev->dev));
-+                              dev->divisor = vlynq_div_external;
-               return 0;
-       }
-@@ -501,24 +547,16 @@ static int __vlynq_enable_device(struct
-               return result;
-       switch (dev->divisor) {
--      case vlynq_div_external:
-       case vlynq_div_auto:
-               /* When the device is brought from reset it should have clock
-                * generation negotiated by hardware.
-                * Check which device is generating clocks and perform setup
-                * accordingly */
--              if (vlynq_linked(dev) && readl(&dev->remote->control) &
--                 VLYNQ_CTRL_CLOCK_INT) {
--                      if (!__vlynq_try_remote(dev) ||
--                              !__vlynq_try_local(dev)  ||
--                              !__vlynq_try_external(dev))
--                              return 0;
--              } else {
--                      if (!__vlynq_try_external(dev) ||
--                              !__vlynq_try_local(dev)    ||
--                              !__vlynq_try_remote(dev))
--                              return 0;
--              }
-+              if (!__vlynq_try_remote(dev) || !__vlynq_try_local(dev))
-+                      return 0;
-+      case vlynq_div_external:
-+              if (!__vlynq_try_external(dev))
-+                      return 0;
-               break;
-       case vlynq_ldiv1:
-       case vlynq_ldiv2:
-@@ -528,15 +566,12 @@ static int __vlynq_enable_device(struct
-       case vlynq_ldiv6:
-       case vlynq_ldiv7:
-       case vlynq_ldiv8:
--              writel(VLYNQ_CTRL_CLOCK_INT |
--                      VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
--                      vlynq_ldiv1), &dev->local->control);
--              writel(0, &dev->remote->control);
--              if (vlynq_linked(dev)) {
--                      printk(KERN_DEBUG
--                              "%s: using local clock divisor %d\n",
--                              dev_name(&dev->dev),
--                              dev->divisor - vlynq_ldiv1 + 1);
-+              if (!__vlynq_set_clocks(dev, vlynq_clk_local, dev->divisor -
-+                              vlynq_ldiv1, 0)) {
-+                      printk(KERN_INFO
-+                                      "%s: using local clock divisor %d\n",
-+                                      dev_name(&dev->dev),
-+                                      dev->divisor - vlynq_ldiv1 + 1);
-                       return 0;
-               }
-               break;
-@@ -548,20 +583,17 @@ static int __vlynq_enable_device(struct
-       case vlynq_rdiv6:
-       case vlynq_rdiv7:
-       case vlynq_rdiv8:
--              writel(0, &dev->local->control);
--              writel(VLYNQ_CTRL_CLOCK_INT |
--                      VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
--                      vlynq_rdiv1), &dev->remote->control);
--              if (vlynq_linked(dev)) {
--                      printk(KERN_DEBUG
--                              "%s: using remote clock divisor %d\n",
--                              dev_name(&dev->dev),
--                              dev->divisor - vlynq_rdiv1 + 1);
-+              if (!__vlynq_set_clocks(dev, vlynq_clk_remote, 0,
-+                              dev->divisor - vlynq_rdiv1)) {
-+                      printk(KERN_INFO
-+                                      "%s: using remote clock divisor %d\n",
-+                                      dev_name(&dev->dev),
-+                                      dev->divisor - vlynq_rdiv1 + 1);
-                       return 0;
-               }
-               break;
-       }
--
-+      vlynq_reset(dev);
-       ops->off(dev);
-       return -ENODEV;
- }
-@@ -732,14 +764,14 @@ static int vlynq_probe(struct platform_d
-       platform_set_drvdata(pdev, dev);
-       printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n",
--             dev_name(&dev->dev), (void *)dev->regs_start, dev->irq,
--             (void *)dev->mem_start);
-+                      dev_name(&dev->dev), (void *)dev->regs_start,
-+                      dev->irq, (void *)dev->mem_start);
-       dev->dev_id = 0;
-       dev->divisor = vlynq_div_auto;
--      result = __vlynq_enable_device(dev);
--      if (result == 0) {
-+      if (!__vlynq_enable_device(dev)) {
-               dev->dev_id = readl(&dev->remote->chip);
-+              vlynq_reset(dev);
-               ((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev);
-       }
-       if (dev->dev_id)
diff --git a/target/linux/ar7/patches-4.9/200-free-mem-below-kernel-offset.patch b/target/linux/ar7/patches-4.9/200-free-mem-below-kernel-offset.patch
deleted file mode 100644 (file)
index 4011942..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/arch/mips/ar7/memory.c
-+++ b/arch/mips/ar7/memory.c
-@@ -66,5 +66,11 @@ void __init prom_meminit(void)
- void __init prom_free_prom_memory(void)
- {
--      /* Nothing to free */
-+      /* adapted from arch/mips/txx9/generic/setup.c */
-+      unsigned long saddr = PHYS_OFFSET + PAGE_SIZE;
-+      unsigned long eaddr = __pa_symbol(&_text);
-+
-+      /* free memory between prom-record and kernel _text base */
-+      if (saddr < eaddr)
-+              free_init_pages("prom memory", saddr, eaddr);
- }
diff --git a/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch b/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch
deleted file mode 100644 (file)
index 583f6bc..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/arch/mips/ar7/Platform
-+++ b/arch/mips/ar7/Platform
-@@ -3,4 +3,9 @@
- #
- platform-$(CONFIG_AR7)                += ar7/
- cflags-$(CONFIG_AR7)          += -I$(srctree)/arch/mips/include/asm/mach-ar7
--load-$(CONFIG_AR7)            += 0xffffffff94100000
-+load-$(CONFIG_AR7_TI)         += 0xffffffff94100000
-+
-+#
-+# AudioCodes AC49x
-+#
-+load-$(CONFIG_AR7_AC49X)      += 0xffffffff945ca000
---- a/arch/mips/ar7/setup.c
-+++ b/arch/mips/ar7/setup.c
-@@ -68,6 +68,10 @@ const char *get_system_type(void)
-                       return "TI AR7 (TNETV1056)";
-               case TITAN_CHIP_1060:
-                       return "TI AR7 (TNETV1060)";
-+              case TITAN_CHIP_AC495:
-+                      return "AudioCodes AC495";
-+              case TITAN_CHIP_AC496:
-+                      return "AudioCodes AC496";
-               }
-       default:
-               return "TI AR7 (unknown)";
---- a/arch/mips/include/asm/mach-ar7/ar7.h
-+++ b/arch/mips/include/asm/mach-ar7/ar7.h
-@@ -92,6 +92,8 @@
- #define TITAN_CHIP_1055 0x0e
- #define TITAN_CHIP_1056 0x0d
- #define TITAN_CHIP_1060 0x07
-+#define TITAN_CHIP_AC495      0x00
-+#define TITAN_CHIP_AC496      0x02
- /* Interrupts */
- #define AR7_IRQ_UART0 15
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -161,7 +161,7 @@ config AR7
-       select HAVE_CLK
-       help
-         Support for the Texas Instruments AR7 System-on-a-Chip
--        family: TNETD7100, 7200 and 7300.
-+        family: TI TNETD7100, 7200, 7300 and AudioCodes AC49x.
- config ATH25
-       bool "Atheros AR231x/AR531x SoC support"
-@@ -1008,6 +1008,7 @@ config MIPS_PARAVIRT
- endchoice
- source "arch/mips/alchemy/Kconfig"
-+source "arch/mips/ar7/Kconfig"
- source "arch/mips/ath25/Kconfig"
- source "arch/mips/ath79/Kconfig"
- source "arch/mips/bcm47xx/Kconfig"
---- /dev/null
-+++ b/arch/mips/ar7/Kconfig
-@@ -0,0 +1,26 @@
-+if AR7
-+
-+config AR7_TI
-+      bool
-+
-+config AR7_AC49X
-+      bool
-+
-+choice
-+      prompt "AR7 SoC family selection"
-+      default AR7_TYPE_TI
-+      depends on AR7
-+      help
-+        Select AR7 MIPS SoC implementation.
-+
-+      config AR7_TYPE_TI
-+              bool "Texas Instruments AR7"
-+              select AR7_TI
-+
-+      config AR7_TYPE_AC49X
-+              bool "AudioCodes AC49X"
-+              select AR7_AC49X
-+
-+endchoice
-+
-+endif
diff --git a/target/linux/ar7/patches-4.9/310-ac49x-prom-support.patch b/target/linux/ar7/patches-4.9/310-ac49x-prom-support.patch
deleted file mode 100644 (file)
index dddf221..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/ar7/prom.c
-+++ b/arch/mips/ar7/prom.c
-@@ -70,6 +70,7 @@ struct psbl_rec {
- };
- static const char psp_env_version[] __initconst = "TIENV0.8";
-+static const char psp_env_version_ac49x[] __initconst = "MaxENV0.2";
- struct psp_env_chunk {
-       u8      num;
-@@ -186,7 +187,8 @@ static void __init ar7_init_env(struct e
-       struct psbl_rec *psbl = (struct psbl_rec *)(KSEG1ADDR(0x14000300));
-       void *psp_env = (void *)KSEG1ADDR(psbl->env_base);
--      if (strcmp(psp_env, psp_env_version) == 0) {
-+      if (strcmp(psp_env, psp_env_version) == 0 ||
-+          strcmp(psp_env, psp_env_version_ac49x) == 0) {
-               parse_psp_env(psp_env);
-       } else {
-               for (i = 0; i < MAX_ENTRY; i++, env++)
diff --git a/target/linux/ar7/patches-4.9/320-ac49x-mtd-partitions.patch b/target/linux/ar7/patches-4.9/320-ac49x-mtd-partitions.patch
deleted file mode 100644 (file)
index fafa8c7..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -154,6 +154,11 @@ config MTD_OF_PARTS
-         the partition map from the children of the flash node,
-         as described in Documentation/devicetree/bindings/mtd/partition.txt.
-+config MTD_AC49X_PARTS
-+      tristate "AudioCodes AC49X partitioning support"
-+      ---help---
-+        AudioCodes AC49X partitioning support
-+
- config MTD_AR7_PARTS
-       tristate "TI AR7 partitioning support"
-       ---help---
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_SPLIT)              += mtdsplit/
- obj-$(CONFIG_MTD_OF_PARTS)    += ofpart.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
-+obj-$(CONFIG_MTD_AC49X_PARTS) += ac49xpart.o
- obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o titanpart.o
- obj-$(CONFIG_MTD_BCM63XX_PARTS)       += bcm63xxpart.o
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -201,7 +201,7 @@ static struct resource physmap_flash_res
-       .end    = 0x11ffffff,
- };
--static const char *ar7_probe_types[] = { "ar7part", NULL };
-+static const char *ar7_probe_types[] = { "ac49xpart", "ar7part", NULL };
- static struct physmap_flash_data physmap_flash_data = {
-       .width  = 2,
diff --git a/target/linux/ar7/patches-4.9/920-ar7part.patch b/target/linux/ar7/patches-4.9/920-ar7part.patch
deleted file mode 100644 (file)
index e520af2..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/drivers/mtd/ar7part.c
-+++ b/drivers/mtd/ar7part.c
-@@ -30,11 +30,14 @@
- #include <uapi/linux/magic.h>
-+#include <asm/mach-ar7/prom.h>
-+
- #define AR7_PARTS     4
- #define ROOT_OFFSET   0xe0000
- #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42)
- #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281)
-+#define LOADER_MAGIC3 le32_to_cpu(0x434d4d4c)
- struct ar7_bin_rec {
-       unsigned int checksum;
-@@ -42,12 +45,16 @@ struct ar7_bin_rec {
-       unsigned int address;
- };
-+int create_titan_partitions(struct mtd_info *master,
-+        const struct mtd_partition **pparts,
-+        struct mtd_part_parser_data *data);
-+
- static int create_mtd_partitions(struct mtd_info *master,
-                                const struct mtd_partition **pparts,
-                                struct mtd_part_parser_data *data)
- {
-       struct ar7_bin_rec header;
--      unsigned int offset;
-+      unsigned int offset, mtd_start, mtd_end;
-       size_t len;
-       unsigned int pre_size = master->erasesize, post_size = 0;
-       unsigned int root_offset = ROOT_OFFSET;
-@@ -55,6 +62,16 @@ static int create_mtd_partitions(struct
-       int retries = 10;
-       struct mtd_partition *ar7_parts;
-+      const char *prom_str = prom_getenv("ProductID");
-+      char mtd_name[] = "mtd1";
-+      if(prom_str &&
-+              (strcmp(prom_str, "CYWL")==0 ||
-+              strcmp(prom_str, "CYWM")==0 ||
-+              strcmp(prom_str, "CYLM")==0 ||
-+              strcmp(prom_str, "CYLL")==0)){
-+              return create_titan_partitions(master, pparts, data);
-+      }
-+
-       ar7_parts = kzalloc(sizeof(*ar7_parts) * AR7_PARTS, GFP_KERNEL);
-       if (!ar7_parts)
-               return -ENOMEM;
-@@ -83,34 +100,39 @@ static int create_mtd_partitions(struct
-       pre_size = offset;
--      if (!ar7_parts[1].offset) {
--              ar7_parts[1].offset = master->size - master->erasesize;
--              post_size = master->erasesize;
--      }
--
-       switch (header.checksum) {
--      case LOADER_MAGIC1:
--              while (header.length) {
--                      offset += sizeof(header) + header.length;
--                      mtd_read(master, offset, sizeof(header), &len,
--                               (uint8_t *)&header);
--              }
--              root_offset = offset + sizeof(header) + 4;
--              break;
-       case LOADER_MAGIC2:
-+              for (retries = 0; retries <= 9; retries++) {
-+                      mtd_name[3] = '0' + retries;
-+                      prom_str = prom_getenv(mtd_name);
-+                      if (prom_str == NULL)
-+                              continue;
-+                      sscanf(prom_str, "%i,%i", &mtd_start, &mtd_end);
-+                      if (pre_size == (mtd_start & 0x1ffffff)) {
-+                              ar7_parts[1].offset = mtd_end &= 0x1ffffff;
-+                              ar7_parts[1].size = post_size = master->size - mtd_end;
-+                              break;
-+                      }
-+              }
-+      case LOADER_MAGIC1:
-+              root_offset = (header.checksum == LOADER_MAGIC1) ? 4 : 0;
-               while (header.length) {
-                       offset += sizeof(header) + header.length;
-                       mtd_read(master, offset, sizeof(header), &len,
-                                (uint8_t *)&header);
-               }
--              root_offset = offset + sizeof(header) + 4 + 0xff;
--              root_offset &= ~(uint32_t)0xff;
-+              root_offset += offset + sizeof(header);
-               break;
-       default:
-               printk(KERN_WARNING "Unknown magic: %08x\n", header.checksum);
-               break;
-       }
-+      if (!ar7_parts[1].offset) {
-+              post_size = master->erasesize;
-+              ar7_parts[1].offset = master->size - post_size;
-+      }
-+
-       mtd_read(master, root_offset, sizeof(header), &len, (u8 *)&header);
-       if (header.checksum != SQUASHFS_MAGIC) {
-               root_offset += master->erasesize - 1;
---- a/drivers/mtd/titanpart.c
-+++ b/drivers/mtd/titanpart.c
-@@ -148,8 +148,8 @@ static void titan_add_partition(char * e
- }
- int create_titan_partitions(struct mtd_info *master,
--      struct mtd_partition **pparts,
--      unsigned long origin)
-+      const struct mtd_partition **pparts,
-+      struct mtd_part_parser_data *data)
- {
-       struct nsp_img_hdr_head         hdr;
-       struct nsp_img_hdr_section_info sect_info;
diff --git a/target/linux/ar7/patches-4.9/925-actiontec_leds.patch b/target/linux/ar7/patches-4.9/925-actiontec_leds.patch
deleted file mode 100644 (file)
index 804dbf5..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -460,31 +460,22 @@ static struct gpio_led fb_fon_leds[] = {
-       },
- };
--static struct gpio_led gt701_leds[] = {
-+static struct gpio_led actiontec_leds[] = {
-       {
-               .name                   = "inet:green",
-               .gpio                   = 13,
--              .active_low             = 1,
--      },
--      {
--              .name                   = "usb",
--              .gpio                   = 12,
--              .active_low             = 1,
-       },
-       {
-               .name                   = "inet:red",
-               .gpio                   = 9,
--              .active_low             = 1,
-       },
-       {
--              .name                   = "power:red",
-+              .name                   = "power:green",
-               .gpio                   = 7,
--              .active_low             = 1,
-       },
-       {
--              .name                   = "power:green",
-+              .name                   = "power:red",
-               .gpio                   = 8,
--              .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-@@ -492,6 +483,44 @@ static struct gpio_led gt701_leds[] = {
-               .gpio                   = 10,
-               .active_low             = 1,
-       },
-+      {
-+              .name                   = "wifi",
-+              .gpio                   = 6,
-+              .active_low             = 1,
-+      },
-+      {
-+              .name                   = "wifi:red",
-+              .gpio                   = 3,
-+      },
-+      {
-+              .name                   = "standby",
-+              .gpio                   = 4,
-+      },
-+      {
-+              .name                   = "wps",
-+              .gpio                   = 16,
-+              .active_low             = 1,
-+      },
-+      {
-+              .name                   = "usb",
-+              .gpio                   = 12,
-+              .active_low             = 1,
-+      },
-+      {
-+              .name                   = "voip",
-+              .gpio                   = 15,
-+              .active_low             = 1,
-+        },
-+        {
-+                .name                 = "line1",
-+                .gpio                 = 23,
-+                .active_low           = 1,
-+      },
-+      {
-+              .name                   = "line2",
-+              .gpio                   = 25,
-+              .active_low             = 1,
-+      },
- };
- static struct gpio_led_platform_data ar7_led_data;
-@@ -535,9 +564,9 @@ static void __init detect_leds(void)
-       } else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) {
-               ar7_led_data.num_leds = ARRAY_SIZE(titan_leds);
-               ar7_led_data.leds = titan_leds;
--      } else if (strstr(prid, "GT701")) {
--              ar7_led_data.num_leds = ARRAY_SIZE(gt701_leds);
--              ar7_led_data.leds = gt701_leds;
-+      } else if (strstr(prid, "GT7") || strstr(prid, "PK5000")) {
-+              ar7_led_data.num_leds = ARRAY_SIZE(actiontec_leds);
-+              ar7_led_data.leds = actiontec_leds;
-       }
- }
diff --git a/target/linux/ar7/patches-4.9/950-cpmac_titan.patch b/target/linux/ar7/patches-4.9/950-cpmac_titan.patch
deleted file mode 100644 (file)
index 158b689..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/drivers/net/ethernet/ti/cpmac.c
-+++ b/drivers/net/ethernet/ti/cpmac.c
-@@ -1124,6 +1124,8 @@ static int cpmac_probe(struct platform_d
-               goto fail;
-       }
-+      ar7_device_reset(pdata->reset_bit);
-+
-       dev->irq = platform_get_irq_byname(pdev, "irq");
-       dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1203,7 +1205,7 @@ int cpmac_init(void)
-       cpmac_mii->write = cpmac_mdio_write;
-       cpmac_mii->reset = cpmac_mdio_reset;
--      cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256);
-+      cpmac_mii->priv = ioremap(ar7_is_titan() ? TITAN_REGS_MDIO : AR7_REGS_MDIO, 256);
-       if (!cpmac_mii->priv) {
-               pr_err("Can't ioremap mdio registers\n");
-@@ -1214,10 +1216,16 @@ int cpmac_init(void)
-       /* FIXME: unhardcode gpio&reset bits */
-       ar7_gpio_disable(26);
-       ar7_gpio_disable(27);
--      ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
--      ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
-+
-+      if (!ar7_is_titan()) {
-+              ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
-+              ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
-+      }
-       ar7_device_reset(AR7_RESET_BIT_EPHY);
-+      if (ar7_is_titan())
-+              ar7_device_reset(TITAN_RESET_BIT_EPHY1);
-+
-       cpmac_mii->reset(cpmac_mii);
-       for (i = 0; i < 300; i++) {
-@@ -1234,7 +1242,11 @@ int cpmac_init(void)
-               mask = 0;
-       }
--      cpmac_mii->phy_mask = ~(mask | 0x80000000);
-+      if (ar7_is_titan())
-+              cpmac_mii->phy_mask = ~(mask | 0x80000000 | 0x40000000);
-+      else
-+              cpmac_mii->phy_mask = ~(mask | 0x80000000);
-+
-       snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "cpmac-1");
-       res = mdiobus_register(cpmac_mii);
diff --git a/target/linux/ar7/src/adam2patcher.c b/target/linux/ar7/src/adam2patcher.c
deleted file mode 100644 (file)
index 25a7807..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * patcher.c - ADAM2 patcher for Netgear DG834 (and compatible)
- *
- * Copyright (C) 2006 Felix Fietkau
- *
- * 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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <string.h>
-
-#include <sys/ioctl.h>
-
-int main(int argc, char **argv)
-{
-       int fd;
-       char *ptr;
-       uint32_t *i;
-
-       if (argc != 2) {
-               fprintf(stderr, "Usage: %s <filename>\n", argv[0]);
-               exit(1);
-       }
-
-       if (((fd = open(argv[1], O_RDWR)) < 0)
-                       || ((ptr = mmap(0, 128 * 1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1))) {
-               fprintf(stderr, "Can't open file\n");
-               exit(1);
-       }
-
-       i = (uint32_t *) &ptr[0x3944];
-       if (*i == 0x0c000944) {
-               fprintf(stderr, "Unpatched ADAM2 detected. Patching... ");
-               *i = 0x00000000;
-               msync(i, sizeof(*i), MS_SYNC|MS_INVALIDATE);
-               fprintf(stderr, "done!\n");
-       } else if (*i == 0x00000000) {
-               fprintf(stderr, "Patched ADAM2 detected.\n");
-       } else {
-               fprintf(stderr, "Unknown ADAM2 detected. Can't patch!\n");
-       }
-
-       close(fd);              
-}
index 0ccc0bed1ce05f7c5a71c8251850742f4216bbcc..82f6317ac669e742054bb2b8ad276533a5fdbedf 100644 (file)
@@ -9,7 +9,6 @@ SUBTARGETS:=generic nand tiny
 FEATURES:=ramdisk
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ath79/patches-4.19/0002-watchdog-ath79-fix-maximum-timeout.patch b/target/linux/ath79/patches-4.19/0002-watchdog-ath79-fix-maximum-timeout.patch
deleted file mode 100644 (file)
index 36234d8..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5f5c9858af167f842ee8df053920b98387a71af1 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 5 Mar 2018 11:41:25 +0100
-Subject: [PATCH 02/27] watchdog: ath79: fix maximum timeout
-
-If the userland tries to set a timeout higher than the max_timeout,
-then we should fallback to max_timeout.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/watchdog/ath79_wdt.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/watchdog/ath79_wdt.c
-+++ b/drivers/watchdog/ath79_wdt.c
-@@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(voi
- static int ath79_wdt_set_timeout(int val)
- {
--      if (val < 1 || val > max_timeout)
-+      if (val < 1)
-               return -EINVAL;
--      timeout = val;
-+      if (val > max_timeout)
-+              timeout = max_timeout;
-+      else
-+              timeout = val;
-+
-       ath79_wdt_keepalive();
-       return 0;
diff --git a/target/linux/ath79/patches-4.19/0003-leds-add-reset-controller-based-driver.patch b/target/linux/ath79/patches-4.19/0003-leds-add-reset-controller-based-driver.patch
deleted file mode 100644 (file)
index b909d57..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-From ecbd9c87f073f097d9fe56390353e64e963e866a Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 6 Mar 2018 10:03:03 +0100
-Subject: [PATCH 03/27] leds: add reset-controller based driver
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/leds/Kconfig      |  11 ++++
- drivers/leds/Makefile     |   1 +
- drivers/leds/leds-reset.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 149 insertions(+)
- create mode 100644 drivers/leds/leds-reset.c
-
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -756,6 +756,17 @@ config LEDS_NIC78BX
-         To compile this driver as a module, choose M here: the module
-         will be called leds-nic78bx.
-+config LEDS_RESET
-+      tristate "LED support for reset-controller API"
-+      depends on LEDS_CLASS
-+      depends on RESET_CONTROLLER
-+      help
-+        This option enables support for LEDs connected to pins driven by reset
-+        controllers. Yes, DNI actual built HW like that.
-+
-+        To compile this driver as a module, choose M here: the module
-+        will be called leds-reset.
-+
- comment "LED Triggers"
- source "drivers/leds/trigger/Kconfig"
---- /dev/null
-+++ b/drivers/leds/leds-reset.c
-@@ -0,0 +1,140 @@
-+/*
-+ * Copyright (C) 2018 John Crispin <john@phrozen.org>
-+ *
-+ * 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/err.h>
-+#include <linux/reset.h>
-+#include <linux/kernel.h>
-+#include <linux/leds.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/reset.h>
-+
-+struct reset_led_data {
-+      struct led_classdev cdev;
-+      struct reset_control *rst;
-+};
-+
-+static inline struct reset_led_data *
-+                      cdev_to_reset_led_data(struct led_classdev *led_cdev)
-+{
-+      return container_of(led_cdev, struct reset_led_data, cdev);
-+}
-+
-+static void reset_led_set(struct led_classdev *led_cdev,
-+      enum led_brightness value)
-+{
-+      struct reset_led_data *led_dat = cdev_to_reset_led_data(led_cdev);
-+
-+      if (value == LED_OFF)
-+              reset_control_assert(led_dat->rst);
-+      else
-+              reset_control_deassert(led_dat->rst);
-+}
-+
-+struct reset_leds_priv {
-+      int num_leds;
-+      struct reset_led_data leds[];
-+};
-+
-+static inline int sizeof_reset_leds_priv(int num_leds)
-+{
-+      return sizeof(struct reset_leds_priv) +
-+              (sizeof(struct reset_led_data) * num_leds);
-+}
-+
-+static struct reset_leds_priv *reset_leds_create(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      struct fwnode_handle *child;
-+      struct reset_leds_priv *priv;
-+      int count, ret;
-+
-+      count = device_get_child_node_count(dev);
-+      if (!count)
-+              return ERR_PTR(-ENODEV);
-+
-+      priv = devm_kzalloc(dev, sizeof_reset_leds_priv(count), GFP_KERNEL);
-+      if (!priv)
-+              return ERR_PTR(-ENOMEM);
-+
-+      device_for_each_child_node(dev, child) {
-+              struct reset_led_data *led = &priv->leds[priv->num_leds];
-+              struct device_node *np = to_of_node(child);
-+
-+              ret = fwnode_property_read_string(child, "label", &led->cdev.name);
-+              if (!led->cdev.name) {
-+                      fwnode_handle_put(child);
-+                      return ERR_PTR(-EINVAL);
-+              }
-+              led->rst = __of_reset_control_get(np, NULL, 0, 0, 0);
-+              if (IS_ERR(led->rst))
-+                      return ERR_PTR(-EINVAL);
-+
-+              fwnode_property_read_string(child, "linux,default-trigger",
-+                                              &led->cdev.default_trigger);
-+
-+              led->cdev.brightness_set = reset_led_set;
-+              ret = devm_of_led_classdev_register(&pdev->dev, np, &led->cdev);
-+              if (ret < 0)
-+                      return ERR_PTR(ret);
-+              led->cdev.dev->of_node = np;
-+              priv->num_leds++;
-+      }
-+
-+      return priv;
-+}
-+
-+static const struct of_device_id of_reset_leds_match[] = {
-+      { .compatible = "reset-leds", },
-+      {},
-+};
-+
-+MODULE_DEVICE_TABLE(of, of_reset_leds_match);
-+
-+static int reset_led_probe(struct platform_device *pdev)
-+{
-+      struct reset_leds_priv *priv;
-+
-+      priv = reset_leds_create(pdev);
-+      if (IS_ERR(priv))
-+              return PTR_ERR(priv);
-+
-+      platform_set_drvdata(pdev, priv);
-+
-+      return 0;
-+}
-+
-+static void reset_led_shutdown(struct platform_device *pdev)
-+{
-+      struct reset_leds_priv *priv = platform_get_drvdata(pdev);
-+      int i;
-+
-+      for (i = 0; i < priv->num_leds; i++) {
-+              struct reset_led_data *led = &priv->leds[i];
-+
-+              if (!(led->cdev.flags & LED_RETAIN_AT_SHUTDOWN))
-+                      reset_led_set(&led->cdev, LED_OFF);
-+      }
-+}
-+
-+static struct platform_driver reset_led_driver = {
-+      .probe          = reset_led_probe,
-+      .shutdown       = reset_led_shutdown,
-+      .driver         = {
-+              .name   = "leds-reset",
-+              .of_match_table = of_reset_leds_match,
-+      },
-+};
-+
-+module_platform_driver(reset_led_driver);
-+
-+MODULE_AUTHOR("John Crispin <john@phrozen.org>");
-+MODULE_DESCRIPTION("reset controller LED driver");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:leds-reset");
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -78,6 +78,7 @@ obj-$(CONFIG_LEDS_MT6323)            += leds-mt632
- obj-$(CONFIG_LEDS_LM3692X)            += leds-lm3692x.o
- obj-$(CONFIG_LEDS_SC27XX_BLTC)                += leds-sc27xx-bltc.o
- obj-$(CONFIG_LEDS_LM3601X)            += leds-lm3601x.o
-+obj-$(CONFIG_LEDS_RESET)              += leds-reset.o
- # LED SPI Drivers
- obj-$(CONFIG_LEDS_CR0014114)          += leds-cr0014114.o
diff --git a/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch
deleted file mode 100644 (file)
index 6280baf..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-From 08c9d6ceef01893678a5d2e8a15517c745417f21 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 6 Mar 2018 10:04:05 +0100
-Subject: [PATCH 04/27] phy: add ath79 usb phys
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/phy/Kconfig          |  16 ++++++
- drivers/phy/Makefile         |   2 +
- drivers/phy/phy-ar7100-usb.c | 124 +++++++++++++++++++++++++++++++++++++++++++
- drivers/phy/phy-ar7200-usb.c | 108 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 250 insertions(+)
- create mode 100644 drivers/phy/phy-ar7100-usb.c
- create mode 100644 drivers/phy/phy-ar7200-usb.c
-
---- a/drivers/phy/Kconfig
-+++ b/drivers/phy/Kconfig
-@@ -15,6 +15,22 @@ config GENERIC_PHY
-         phy users can obtain reference to the PHY. All the users of this
-         framework should select this config.
-+config PHY_AR7100_USB
-+      tristate "Atheros AR7100 USB PHY driver"
-+      depends on ATH79 || COMPILE_TEST
-+      default y if USB_EHCI_HCD_PLATFORM
-+      select PHY_SIMPLE
-+      help
-+        Enable this to support the USB PHY on Atheros AR7100 SoCs.
-+
-+config PHY_AR7200_USB
-+      tristate "Atheros AR7200 USB PHY driver"
-+      depends on ATH79 || COMPILE_TEST
-+      default y if USB_EHCI_HCD_PLATFORM
-+      select PHY_SIMPLE
-+      help
-+        Enable this to support the USB PHY on Atheros AR7200 SoCs.
-+
- config PHY_LPC18XX_USB_OTG
-       tristate "NXP LPC18xx/43xx SoC USB OTG PHY driver"
-       depends on OF && (ARCH_LPC18XX || COMPILE_TEST)
---- a/drivers/phy/Makefile
-+++ b/drivers/phy/Makefile
-@@ -4,6 +4,8 @@
- #
- obj-$(CONFIG_GENERIC_PHY)             += phy-core.o
-+obj-$(CONFIG_PHY_AR7100_USB)          += phy-ar7100-usb.o
-+obj-$(CONFIG_PHY_AR7200_USB)          += phy-ar7200-usb.o
- obj-$(CONFIG_PHY_LPC18XX_USB_OTG)     += phy-lpc18xx-usb-otg.o
- obj-$(CONFIG_PHY_XGENE)                       += phy-xgene.o
- obj-$(CONFIG_PHY_PISTACHIO_USB)               += phy-pistachio-usb.o
---- /dev/null
-+++ b/drivers/phy/phy-ar7100-usb.c
-@@ -0,0 +1,140 @@
-+/*
-+ * Copyright (C) 2018 John Crispin <john@phrozen.org>
-+ *
-+ * 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/platform_device.h>
-+#include <linux/phy/phy.h>
-+#include <linux/delay.h>
-+#include <linux/reset.h>
-+#include <linux/of_gpio.h>
-+
-+#include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+struct ar7100_usb_phy {
-+      struct reset_control    *rst_phy;
-+      struct reset_control    *rst_host;
-+      struct reset_control    *rst_ohci_dll;
-+      void __iomem            *io_base;
-+      struct phy              *phy;
-+      int                     gpio;
-+};
-+
-+static int ar7100_usb_phy_power_off(struct phy *phy)
-+{
-+      struct ar7100_usb_phy *priv = phy_get_drvdata(phy);
-+      int err = 0;
-+
-+      err |= reset_control_assert(priv->rst_host);
-+      err |= reset_control_assert(priv->rst_phy);
-+      err |= reset_control_assert(priv->rst_ohci_dll);
-+
-+      return err;
-+}
-+
-+static int ar7100_usb_phy_power_on(struct phy *phy)
-+{
-+      struct ar7100_usb_phy *priv = phy_get_drvdata(phy);
-+      int err = 0;
-+
-+      err |= ar7100_usb_phy_power_off(phy);
-+      mdelay(100);
-+      err |= reset_control_deassert(priv->rst_ohci_dll);
-+      err |= reset_control_deassert(priv->rst_phy);
-+      err |= reset_control_deassert(priv->rst_host);
-+      mdelay(500);
-+      iowrite32(0xf0000, priv->io_base + AR71XX_USB_CTRL_REG_CONFIG);
-+      iowrite32(0x20c00, priv->io_base + AR71XX_USB_CTRL_REG_FLADJ);
-+
-+      return err;
-+}
-+
-+static const struct phy_ops ar7100_usb_phy_ops = {
-+      .power_on       = ar7100_usb_phy_power_on,
-+      .power_off      = ar7100_usb_phy_power_off,
-+      .owner          = THIS_MODULE,
-+};
-+
-+static int ar7100_usb_phy_probe(struct platform_device *pdev)
-+{
-+      struct phy_provider *phy_provider;
-+      struct resource *res;
-+      struct ar7100_usb_phy *priv;
-+
-+      priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-+      if (!priv)
-+              return -ENOMEM;
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      priv->io_base = devm_ioremap_resource(&pdev->dev, res);
-+      if (IS_ERR(priv->io_base))
-+              return PTR_ERR(priv->io_base);
-+
-+      priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy");
-+      if (IS_ERR(priv->rst_phy)) {
-+              dev_err(&pdev->dev, "phy reset is missing\n");
-+              return PTR_ERR(priv->rst_phy);
-+      }
-+
-+      priv->rst_host = devm_reset_control_get(&pdev->dev, "usb-host");
-+      if (IS_ERR(priv->rst_host)) {
-+              dev_err(&pdev->dev, "host reset is missing\n");
-+              return PTR_ERR(priv->rst_host);
-+      }
-+
-+      priv->rst_ohci_dll = devm_reset_control_get(&pdev->dev, "usb-ohci-dll");
-+      if (IS_ERR(priv->rst_ohci_dll)) {
-+              dev_err(&pdev->dev, "ohci-dll reset is missing\n");
-+              return PTR_ERR(priv->rst_host);
-+      }
-+
-+      priv->phy = devm_phy_create(&pdev->dev, NULL, &ar7100_usb_phy_ops);
-+      if (IS_ERR(priv->phy)) {
-+              dev_err(&pdev->dev, "failed to create PHY\n");
-+              return PTR_ERR(priv->phy);
-+      }
-+
-+      priv->gpio = of_get_gpio(pdev->dev.of_node, 0);
-+      if (priv->gpio >= 0) {
-+              int ret = devm_gpio_request(&pdev->dev, priv->gpio, dev_name(&pdev->dev));
-+
-+              if (ret) {
-+                      dev_err(&pdev->dev, "failed to request gpio\n");
-+                      return ret;
-+              }
-+              gpio_export_with_name(priv->gpio, 0, dev_name(&pdev->dev));
-+              gpio_set_value(priv->gpio, 1);
-+      }
-+
-+      phy_set_drvdata(priv->phy, priv);
-+
-+      phy_provider = devm_of_phy_provider_register(&pdev->dev, of_phy_simple_xlate);
-+
-+
-+      return PTR_ERR_OR_ZERO(phy_provider);
-+}
-+
-+static const struct of_device_id ar7100_usb_phy_of_match[] = {
-+      { .compatible = "qca,ar7100-usb-phy" },
-+      {}
-+};
-+MODULE_DEVICE_TABLE(of, ar7100_usb_phy_of_match);
-+
-+static struct platform_driver ar7100_usb_phy_driver = {
-+      .probe  = ar7100_usb_phy_probe,
-+      .driver = {
-+              .of_match_table = ar7100_usb_phy_of_match,
-+              .name           = "ar7100-usb-phy",
-+      }
-+};
-+module_platform_driver(ar7100_usb_phy_driver);
-+
-+MODULE_DESCRIPTION("ATH79 USB PHY driver");
-+MODULE_AUTHOR("Alban Bedel <albeu@free.fr>");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/phy/phy-ar7200-usb.c
-@@ -0,0 +1,123 @@
-+/*
-+ * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
-+ *
-+ * 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/platform_device.h>
-+#include <linux/phy/phy.h>
-+#include <linux/reset.h>
-+#include <linux/of_gpio.h>
-+
-+struct ar7200_usb_phy {
-+      struct reset_control    *rst_phy;
-+      struct reset_control    *suspend_override;
-+      struct phy              *phy;
-+      int                     gpio;
-+};
-+
-+static int ar7200_usb_phy_power_on(struct phy *phy)
-+{
-+      struct ar7200_usb_phy *priv = phy_get_drvdata(phy);
-+      int err = 0;
-+
-+      if (priv->rst_phy)
-+              err = reset_control_deassert(priv->rst_phy);
-+      if (!err && priv->suspend_override)
-+              err = reset_control_assert(priv->suspend_override);
-+      if (err && priv->rst_phy)
-+              err = reset_control_assert(priv->rst_phy);
-+
-+      return err;
-+}
-+
-+static int ar7200_usb_phy_power_off(struct phy *phy)
-+{
-+      struct ar7200_usb_phy *priv = phy_get_drvdata(phy);
-+      int err = 0;
-+
-+      if (priv->suspend_override)
-+              err = reset_control_deassert(priv->suspend_override);
-+      if (priv->rst_phy)
-+              err |= reset_control_assert(priv->rst_phy);
-+
-+      return err;
-+}
-+
-+static const struct phy_ops ar7200_usb_phy_ops = {
-+      .power_on       = ar7200_usb_phy_power_on,
-+      .power_off      = ar7200_usb_phy_power_off,
-+      .owner          = THIS_MODULE,
-+};
-+
-+static int ar7200_usb_phy_probe(struct platform_device *pdev)
-+{
-+      struct phy_provider *phy_provider;
-+      struct ar7200_usb_phy *priv;
-+
-+      priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-+      if (!priv)
-+              return -ENOMEM;
-+
-+      priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy");
-+      if (IS_ERR(priv->rst_phy)) {
-+              dev_err(&pdev->dev, "phy reset is missing\n");
-+              return PTR_ERR(priv->rst_phy);
-+      }
-+
-+      priv->suspend_override = devm_reset_control_get_optional(
-+              &pdev->dev, "usb-suspend-override");
-+      if (IS_ERR(priv->suspend_override)) {
-+              if (PTR_ERR(priv->suspend_override) == -ENOENT)
-+                      priv->suspend_override = NULL;
-+              else
-+                      return PTR_ERR(priv->suspend_override);
-+      }
-+
-+      priv->phy = devm_phy_create(&pdev->dev, NULL, &ar7200_usb_phy_ops);
-+      if (IS_ERR(priv->phy)) {
-+              dev_err(&pdev->dev, "failed to create PHY\n");
-+              return PTR_ERR(priv->phy);
-+      }
-+
-+      priv->gpio = of_get_gpio(pdev->dev.of_node, 0);
-+      if (priv->gpio >= 0) {
-+              int ret = devm_gpio_request(&pdev->dev, priv->gpio, dev_name(&pdev->dev));
-+
-+              if (ret) {
-+                      dev_err(&pdev->dev, "failed to request gpio\n");
-+                      return ret;
-+              }
-+              gpio_export_with_name(priv->gpio, 0, dev_name(&pdev->dev));
-+              gpio_set_value(priv->gpio, 1);
-+      }
-+
-+      phy_set_drvdata(priv->phy, priv);
-+
-+      phy_provider = devm_of_phy_provider_register(&pdev->dev, of_phy_simple_xlate);
-+
-+      return PTR_ERR_OR_ZERO(phy_provider);
-+}
-+
-+static const struct of_device_id ar7200_usb_phy_of_match[] = {
-+      { .compatible = "qca,ar7200-usb-phy" },
-+      {}
-+};
-+MODULE_DEVICE_TABLE(of, ar7200_usb_phy_of_match);
-+
-+static struct platform_driver ar7200_usb_phy_driver = {
-+      .probe  = ar7200_usb_phy_probe,
-+      .driver = {
-+              .of_match_table = ar7200_usb_phy_of_match,
-+              .name           = "ar7200-usb-phy",
-+      }
-+};
-+module_platform_driver(ar7200_usb_phy_driver);
-+
-+MODULE_DESCRIPTION("ATH79 USB PHY driver");
-+MODULE_AUTHOR("Alban Bedel <albeu@free.fr>");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/ath79/patches-4.19/0005-usb-add-more-OF-quirk-properties.patch b/target/linux/ath79/patches-4.19/0005-usb-add-more-OF-quirk-properties.patch
deleted file mode 100644 (file)
index 52d77c8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2201818e5bd33f389beceb3943fdfcf5a698fc5b Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 6 Mar 2018 10:01:43 +0100
-Subject: [PATCH 05/27] usb: add more OF/quirk properties
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/usb/host/ehci-platform.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/usb/host/ehci-platform.c
-+++ b/drivers/usb/host/ehci-platform.c
-@@ -161,6 +161,11 @@ static int ehci_platform_probe(struct pl
-       ehci = hcd_to_ehci(hcd);
-       if (pdata == &ehci_platform_defaults && dev->dev.of_node) {
-+              of_property_read_u32(dev->dev.of_node, "caps-offset", &pdata->caps_offset);
-+
-+              if (of_property_read_bool(dev->dev.of_node, "has-synopsys-hc-bug"))
-+                      pdata->has_synopsys_hc_bug = 1;
-+
-               if (of_property_read_bool(dev->dev.of_node, "big-endian-regs"))
-                       ehci->big_endian_mmio = 1;
diff --git a/target/linux/ath79/patches-4.19/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch b/target/linux/ath79/patches-4.19/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch
deleted file mode 100644 (file)
index bd26107..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-From f3eacff2310a60348a755c50a8da6fc251fc8587 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 6 Mar 2018 09:55:13 +0100
-Subject: [PATCH 07/33] irqchip/irq-ath79-intc: add irq cascade driver for
- QCA9556 SoCs
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/irqchip/Makefile         |   1 +
- drivers/irqchip/irq-ath79-intc.c | 142 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 143 insertions(+)
- create mode 100644 drivers/irqchip/irq-ath79-intc.c
-
---- a/drivers/irqchip/Makefile
-+++ b/drivers/irqchip/Makefile
-@@ -3,6 +3,7 @@ obj-$(CONFIG_IRQCHIP)                  += irqchip.o
- obj-$(CONFIG_ALPINE_MSI)              += irq-alpine-msi.o
- obj-$(CONFIG_ATH79)                   += irq-ath79-cpu.o
-+obj-$(CONFIG_ATH79)                   += irq-ath79-intc.o
- obj-$(CONFIG_ATH79)                   += irq-ath79-misc.o
- obj-$(CONFIG_ARCH_BCM2835)            += irq-bcm2835.o
- obj-$(CONFIG_ARCH_BCM2835)            += irq-bcm2836.o
---- /dev/null
-+++ b/drivers/irqchip/irq-ath79-intc.c
-@@ -0,0 +1,142 @@
-+/*
-+ *  Atheros AR71xx/AR724x/AR913x specific interrupt handling
-+ *
-+ *  Copyright (C) 2018 John Crispin <john@phrozen.org>
-+ *
-+ *  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/interrupt.h>
-+#include <linux/irqchip.h>
-+#include <linux/of.h>
-+#include <linux/of_irq.h>
-+#include <linux/irqdomain.h>
-+
-+#include <asm/irq_cpu.h>
-+#include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+#define ATH79_MAX_INTC_CASCADE        3
-+
-+struct ath79_intc {
-+      struct irq_chip chip;
-+      u32 irq;
-+      u32 pending_mask;
-+      u32 int_status;
-+      u32 irq_mask[ATH79_MAX_INTC_CASCADE];
-+      u32 irq_wb_chan[ATH79_MAX_INTC_CASCADE];
-+};
-+
-+static void ath79_intc_irq_handler(struct irq_desc *desc)
-+{
-+      struct irq_domain *domain = irq_desc_get_handler_data(desc);
-+      struct ath79_intc *intc = domain->host_data;
-+      u32 pending;
-+
-+      pending = ath79_reset_rr(intc->int_status);
-+      pending &= intc->pending_mask;
-+
-+      if (pending) {
-+              int i;
-+
-+              for (i = 0; i < domain->hwirq_max; i++)
-+                      if (pending & intc->irq_mask[i]) {
-+                              if (intc->irq_wb_chan[i] != 0xffffffff)
-+                                      ath79_ddr_wb_flush(intc->irq_wb_chan[i]);
-+                              generic_handle_irq(irq_find_mapping(domain, i));
-+                      }
-+      } else {
-+              spurious_interrupt();
-+      }
-+}
-+
-+static void ath79_intc_irq_enable(struct irq_data *d)
-+{
-+      struct ath79_intc *intc = d->domain->host_data;
-+      enable_irq(intc->irq);
-+}
-+
-+static void ath79_intc_irq_disable(struct irq_data *d)
-+{
-+      struct ath79_intc *intc = d->domain->host_data;
-+      disable_irq(intc->irq);
-+}
-+
-+static int ath79_intc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
-+{
-+      struct ath79_intc *intc = d->host_data;
-+
-+      irq_set_chip_and_handler(irq, &intc->chip, handle_level_irq);
-+
-+      return 0;
-+}
-+
-+static const struct irq_domain_ops ath79_irq_domain_ops = {
-+      .xlate = irq_domain_xlate_onecell,
-+      .map = ath79_intc_map,
-+};
-+
-+static int __init ath79_intc_of_init(
-+      struct device_node *node, struct device_node *parent)
-+{
-+      struct irq_domain *domain;
-+      struct ath79_intc *intc;
-+      int cnt, cntwb, i, err;
-+
-+      cnt = of_property_count_u32_elems(node, "qca,pending-bits");
-+      if (cnt > ATH79_MAX_INTC_CASCADE)
-+              panic("Too many INTC pending bits\n");
-+
-+      intc = kzalloc(sizeof(*intc), GFP_KERNEL);
-+      if (!intc)
-+              panic("Failed to allocate INTC memory\n");
-+      intc->chip = dummy_irq_chip;
-+      intc->chip.name = "INTC";
-+      intc->chip.irq_disable = ath79_intc_irq_disable;
-+      intc->chip.irq_enable = ath79_intc_irq_enable;
-+
-+      if (of_property_read_u32(node, "qca,int-status-addr", &intc->int_status) < 0) {
-+              panic("Missing address of interrupt status register\n");
-+      }
-+
-+      of_property_read_u32_array(node, "qca,pending-bits", intc->irq_mask, cnt);
-+      for (i = 0; i < cnt; i++) {
-+              intc->pending_mask |= intc->irq_mask[i];
-+              intc->irq_wb_chan[i] = 0xffffffff;
-+      }
-+
-+      cntwb = of_count_phandle_with_args(
-+              node, "qca,ddr-wb-channels", "#qca,ddr-wb-channel-cells");
-+
-+      for (i = 0; i < cntwb; i++) {
-+              struct of_phandle_args args;
-+              u32 irq = i;
-+
-+              of_property_read_u32_index(
-+                      node, "qca,ddr-wb-channel-interrupts", i, &irq);
-+              if (irq >= ATH79_MAX_INTC_CASCADE)
-+                      continue;
-+
-+              err = of_parse_phandle_with_args(
-+                      node, "qca,ddr-wb-channels",
-+                      "#qca,ddr-wb-channel-cells",
-+                      i, &args);
-+              if (err)
-+                      return err;
-+
-+              intc->irq_wb_chan[irq] = args.args[0];
-+      }
-+
-+      intc->irq = irq_of_parse_and_map(node, 0);
-+      if (!intc->irq)
-+              panic("Failed to get INTC IRQ");
-+
-+      domain = irq_domain_add_linear(node, cnt, &ath79_irq_domain_ops, intc);
-+      irq_set_chained_handler_and_data(intc->irq, ath79_intc_irq_handler, domain);
-+
-+      return 0;
-+}
-+IRQCHIP_DECLARE(ath79_intc, "qca,ar9340-intc",
-+              ath79_intc_of_init);
diff --git a/target/linux/ath79/patches-4.19/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch b/target/linux/ath79/patches-4.19/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch
deleted file mode 100644 (file)
index b5ad731..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From e029f998594f151008ecbfa024e2957edd2a5189 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 6 Mar 2018 09:58:19 +0100
-Subject: [PATCH 08/33] irqchip/irq-ath79-cpu: drop !OF init helper
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/irqchip/irq-ath79-cpu.c | 7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/irqchip/irq-ath79-cpu.c
-+++ b/drivers/irqchip/irq-ath79-cpu.c
-@@ -88,10 +88,3 @@ static int __init ar79_cpu_intc_of_init(
- }
- IRQCHIP_DECLARE(ar79_cpu_intc, "qca,ar7100-cpu-intc",
-               ar79_cpu_intc_of_init);
--
--void __init ath79_cpu_irq_init(unsigned irq_wb_chan2, unsigned irq_wb_chan3)
--{
--      irq_wb_chan[2] = irq_wb_chan2;
--      irq_wb_chan[3] = irq_wb_chan3;
--      mips_cpu_irq_init();
--}
diff --git a/target/linux/ath79/patches-4.19/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch b/target/linux/ath79/patches-4.19/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch
deleted file mode 100644 (file)
index 05db506..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0c8856211d26f84277f7fcb0b9595e5c646bc464 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 6 Mar 2018 10:00:55 +0100
-Subject: [PATCH 11/33] MIPS: ath79: select the PINCTRL subsystem
-
-The pinmux on QCA SoCs is controlled by a single register. The
-"pinctrl-single" driver can be used but requires the target
-to select PINCTRL.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -288,6 +288,7 @@ config BCM63XX
-       select SYS_HAS_EARLY_PRINTK
-       select SWAP_IO_SPACE
-       select GPIOLIB
-+      select PINCTRL
-       select HAVE_CLK
-       select MIPS_L1_CACHE_SHIFT_4
-       select CLKDEV_LOOKUP
diff --git a/target/linux/ath79/patches-4.19/0017-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch b/target/linux/ath79/patches-4.19/0017-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch
deleted file mode 100644 (file)
index bf7eb69..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-From 4a4f869ec58ed8910b9b2e68d0eee50957e9bb20 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 25 Jun 2018 15:52:10 +0200
-Subject: [PATCH 17/33] dt-bindings: PCI: qcom,ar7100: adds binding doc
-
-With the driver being converted from platform_data to pure OF, we need to
-also add some docs.
-
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: devicetree@vger.kernel.org
-Signed-off-by: John Crispin <john@phrozen.org>
----
- .../devicetree/bindings/pci/qcom,ar7100-pci.txt    | 38 ++++++++++++++++++++++
- 1 file changed, 38 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pci/qcom,ar7100-pci.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pci/qcom,ar7100-pci.txt
-@@ -0,0 +1,38 @@
-+* Qualcomm Atheros AR7100 PCI express root complex
-+
-+Required properties:
-+- compatible: should contain "qcom,ar7100-pci" to identify the core.
-+- reg: Should contain the register ranges as listed in the reg-names property.
-+- reg-names: Definition: Must include the following entries
-+      - "cfg_base"    IO Memory
-+- #address-cells: set to <3>
-+- #size-cells: set to <2>
-+- ranges: ranges for the PCI memory and I/O regions
-+- interrupt-map-mask and interrupt-map: standard PCI
-+      properties to define the mapping of the PCIe interface to interrupt
-+      numbers.
-+- #interrupt-cells: set to <1>
-+- interrupt-controller: define to enable the builtin IRQ cascade.
-+
-+Optional properties:
-+- interrupt-parent: phandle to the MIPS IRQ controller
-+
-+* Example for ar7100
-+      pcie-controller@180c0000 {
-+              compatible = "qca,ar7100-pci";
-+              #address-cells = <3>;
-+              #size-cells = <2>;
-+              bus-range = <0x0 0x0>;
-+              reg = <0x17010000 0x100>;
-+              reg-names = "cfg_base";
-+              ranges = <0x2000000 0 0x10000000 0x10000000 0 0x07000000
-+                        0x1000000 0 0x00000000 0x00000000 0 0x00000001>;
-+              interrupt-parent = <&cpuintc>;
-+              interrupts = <2>;
-+
-+              interrupt-controller;
-+              #interrupt-cells = <1>;
-+
-+              interrupt-map-mask = <0 0 0 1>;
-+              interrupt-map = <0 0 0 0 &pcie0 0>;
-+      };
diff --git a/target/linux/ath79/patches-4.19/0018-MIPS-pci-ar71xx-convert-to-OF.patch b/target/linux/ath79/patches-4.19/0018-MIPS-pci-ar71xx-convert-to-OF.patch
deleted file mode 100644 (file)
index 91796a1..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-From 1855ab6b1d27f5b38a648baf57ff6a534afec26d Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 23 Jun 2018 15:07:23 +0200
-Subject: [PATCH 18/33] MIPS: pci-ar71xx: convert to OF
-
-With the ath79 target getting converted to pure OF, we can drop all the
-platform data code and add the missing OF bits to the driver. We also add
-a irq domain for the PCI/e controllers cascade, thus making it usable from
-dts files.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/pci/pci-ar71xx.c | 82 +++++++++++++++++++++++-----------------------
- 1 file changed, 41 insertions(+), 41 deletions(-)
-
---- a/arch/mips/pci/pci-ar71xx.c
-+++ b/arch/mips/pci/pci-ar71xx.c
-@@ -18,8 +18,11 @@
- #include <linux/pci.h>
- #include <linux/pci_regs.h>
- #include <linux/interrupt.h>
-+#include <linux/irqchip/chained_irq.h>
- #include <linux/init.h>
- #include <linux/platform_device.h>
-+#include <linux/of_irq.h>
-+#include <linux/of_pci.h>
- #include <asm/mach-ath79/ar71xx_regs.h>
- #include <asm/mach-ath79/ath79.h>
-@@ -49,12 +52,13 @@
- #define AR71XX_PCI_IRQ_COUNT          5
- struct ar71xx_pci_controller {
-+      struct device_node *np;
-       void __iomem *cfg_base;
-       int irq;
--      int irq_base;
-       struct pci_controller pci_ctrl;
-       struct resource io_res;
-       struct resource mem_res;
-+      struct irq_domain *domain;
- };
- /* Byte lane enable bits */
-@@ -228,29 +232,30 @@ static struct pci_ops ar71xx_pci_ops = {
- static void ar71xx_pci_irq_handler(struct irq_desc *desc)
- {
--      struct ar71xx_pci_controller *apc;
-       void __iomem *base = ath79_reset_base;
-+      struct irq_chip *chip = irq_desc_get_chip(desc);
-+      struct ar71xx_pci_controller *apc = irq_desc_get_handler_data(desc);
-       u32 pending;
--      apc = irq_desc_get_handler_data(desc);
--
-+      chained_irq_enter(chip, desc);
-       pending = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_STATUS) &
-                 __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-       if (pending & AR71XX_PCI_INT_DEV0)
--              generic_handle_irq(apc->irq_base + 0);
-+              generic_handle_irq(irq_linear_revmap(apc->domain, 1));
-       else if (pending & AR71XX_PCI_INT_DEV1)
--              generic_handle_irq(apc->irq_base + 1);
-+              generic_handle_irq(irq_linear_revmap(apc->domain, 2));
-       else if (pending & AR71XX_PCI_INT_DEV2)
--              generic_handle_irq(apc->irq_base + 2);
-+              generic_handle_irq(irq_linear_revmap(apc->domain, 3));
-       else if (pending & AR71XX_PCI_INT_CORE)
--              generic_handle_irq(apc->irq_base + 4);
-+              generic_handle_irq(irq_linear_revmap(apc->domain, 4));
-       else
-               spurious_interrupt();
-+      chained_irq_exit(chip, desc);
- }
- static void ar71xx_pci_irq_unmask(struct irq_data *d)
-@@ -261,7 +266,7 @@ static void ar71xx_pci_irq_unmask(struct
-       u32 t;
-       apc = irq_data_get_irq_chip_data(d);
--      irq = d->irq - apc->irq_base;
-+      irq = irq_linear_revmap(apc->domain, d->irq);
-       t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-       __raw_writel(t | (1 << irq), base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-@@ -278,7 +283,7 @@ static void ar71xx_pci_irq_mask(struct i
-       u32 t;
-       apc = irq_data_get_irq_chip_data(d);
--      irq = d->irq - apc->irq_base;
-+      irq = irq_linear_revmap(apc->domain, d->irq);
-       t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-       __raw_writel(t & ~(1 << irq), base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-@@ -294,24 +299,31 @@ static struct irq_chip ar71xx_pci_irq_ch
-       .irq_mask_ack   = ar71xx_pci_irq_mask,
- };
-+static int ar71xx_pci_irq_map(struct irq_domain *d,
-+                            unsigned int irq, irq_hw_number_t hw)
-+{
-+      struct ar71xx_pci_controller *apc = d->host_data;
-+
-+      irq_set_chip_and_handler(irq, &ar71xx_pci_irq_chip, handle_level_irq);
-+      irq_set_chip_data(irq, apc);
-+
-+      return 0;
-+}
-+
-+static const struct irq_domain_ops ar71xx_pci_domain_ops = {
-+      .xlate = irq_domain_xlate_onecell,
-+      .map = ar71xx_pci_irq_map,
-+};
-+
- static void ar71xx_pci_irq_init(struct ar71xx_pci_controller *apc)
- {
-       void __iomem *base = ath79_reset_base;
--      int i;
-       __raw_writel(0, base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-       __raw_writel(0, base + AR71XX_RESET_REG_PCI_INT_STATUS);
--      BUILD_BUG_ON(ATH79_PCI_IRQ_COUNT < AR71XX_PCI_IRQ_COUNT);
--
--      apc->irq_base = ATH79_PCI_IRQ_BASE;
--      for (i = apc->irq_base;
--           i < apc->irq_base + AR71XX_PCI_IRQ_COUNT; i++) {
--              irq_set_chip_and_handler(i, &ar71xx_pci_irq_chip,
--                                       handle_level_irq);
--              irq_set_chip_data(i, apc);
--      }
--
-+      apc->domain = irq_domain_add_linear(apc->np, AR71XX_PCI_IRQ_COUNT,
-+                                          &ar71xx_pci_domain_ops, apc);
-       irq_set_chained_handler_and_data(apc->irq, ar71xx_pci_irq_handler,
-                                        apc);
- }
-@@ -328,6 +340,11 @@ static void ar71xx_pci_reset(void)
-       mdelay(100);
- }
-+static const struct of_device_id ar71xx_pci_ids[] = {
-+      { .compatible = "qca,ar7100-pci" },
-+      {},
-+};
-+
- static int ar71xx_pci_probe(struct platform_device *pdev)
- {
-       struct ar71xx_pci_controller *apc;
-@@ -348,26 +365,6 @@ static int ar71xx_pci_probe(struct platf
-       if (apc->irq < 0)
-               return -EINVAL;
--      res = platform_get_resource_byname(pdev, IORESOURCE_IO, "io_base");
--      if (!res)
--              return -EINVAL;
--
--      apc->io_res.parent = res;
--      apc->io_res.name = "PCI IO space";
--      apc->io_res.start = res->start;
--      apc->io_res.end = res->end;
--      apc->io_res.flags = IORESOURCE_IO;
--
--      res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mem_base");
--      if (!res)
--              return -EINVAL;
--
--      apc->mem_res.parent = res;
--      apc->mem_res.name = "PCI memory space";
--      apc->mem_res.start = res->start;
--      apc->mem_res.end = res->end;
--      apc->mem_res.flags = IORESOURCE_MEM;
--
-       ar71xx_pci_reset();
-       /* setup COMMAND register */
-@@ -380,9 +377,11 @@ static int ar71xx_pci_probe(struct platf
-       ar71xx_pci_irq_init(apc);
-+      apc->np = pdev->dev.of_node;
-       apc->pci_ctrl.pci_ops = &ar71xx_pci_ops;
-       apc->pci_ctrl.mem_resource = &apc->mem_res;
-       apc->pci_ctrl.io_resource = &apc->io_res;
-+      pci_load_of_ranges(&apc->pci_ctrl, pdev->dev.of_node);
-       register_pci_controller(&apc->pci_ctrl);
-@@ -393,6 +392,7 @@ static struct platform_driver ar71xx_pci
-       .probe = ar71xx_pci_probe,
-       .driver = {
-               .name = "ar71xx-pci",
-+              .of_match_table = of_match_ptr(ar71xx_pci_ids),
-       },
- };
diff --git a/target/linux/ath79/patches-4.19/0019-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch b/target/linux/ath79/patches-4.19/0019-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch
deleted file mode 100644 (file)
index a0af79c..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From ea27764bc3ef2a05decf3ae05edffc289cd0d93c Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 25 Jun 2018 15:52:02 +0200
-Subject: [PATCH 19/33] dt-bindings: PCI: qcom,ar7240: adds binding doc
-
-With the driver being converted from platform_data to pure OF, we need to
-also add some docs.
-
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: devicetree@vger.kernel.org
-Signed-off-by: John Crispin <john@phrozen.org>
----
- .../devicetree/bindings/pci/qcom,ar7240-pci.txt    | 42 ++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pci/qcom,ar7240-pci.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pci/qcom,ar7240-pci.txt
-@@ -0,0 +1,42 @@
-+* Qualcomm Atheros AR724X PCI express root complex
-+
-+Required properties:
-+- compatible: should contain "qcom,ar7240-pci" to identify the core.
-+- reg: Should contain the register ranges as listed in the reg-names property.
-+- reg-names: Definition: Must include the following entries
-+      - "crp_base"    Configuration registers
-+      - "ctrl_base"   Control registers
-+      - "cfg_base"    IO Memory
-+- #address-cells: set to <3>
-+- #size-cells: set to <2>
-+- ranges: ranges for the PCI memory and I/O regions
-+- interrupt-map-mask and interrupt-map: standard PCI
-+      properties to define the mapping of the PCIe interface to interrupt
-+      numbers.
-+- #interrupt-cells: set to <1>
-+- interrupt-parent: phandle to the MIPS IRQ controller
-+
-+Optional properties:
-+- interrupt-controller: define to enable the builtin IRQ cascade.
-+
-+* Example for qca9557
-+      pcie-controller@180c0000 {
-+              compatible = "qcom,ar7240-pci";
-+              #address-cells = <3>;
-+              #size-cells = <2>;
-+              bus-range = <0x0 0x0>;
-+              reg = <0x180c0000 0x1000>,
-+                    <0x180f0000 0x100>,
-+                    <0x14000000 0x1000>;
-+              reg-names = "crp_base", "ctrl_base", "cfg_base";
-+              ranges = <0x2000000 0 0x10000000 0x10000000 0 0x04000000
-+                        0x1000000 0 0x00000000 0x00000000 0 0x00000001>;
-+              interrupt-parent = <&intc2>;
-+              interrupts = <1>;
-+
-+              interrupt-controller;
-+              #interrupt-cells = <1>;
-+
-+              interrupt-map-mask = <0 0 0 1>;
-+              interrupt-map = <0 0 0 0 &pcie0 0>;
-+      };
diff --git a/target/linux/ath79/patches-4.19/0020-MIPS-pci-ar724x-convert-to-OF.patch b/target/linux/ath79/patches-4.19/0020-MIPS-pci-ar724x-convert-to-OF.patch
deleted file mode 100644 (file)
index 936bfd4..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-From a522ee0199d5d3ea114ca2e211f6ac398d3e8e0b Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 23 Jun 2018 15:07:37 +0200
-Subject: [PATCH 20/33] MIPS: pci-ar724x: convert to OF
-
-With the ath79 target getting converted to pure OF, we can drop all the
-platform data code and add the missing OF bits to the driver. We also add
-a irq domain for the PCI/e controllers cascade, thus making it usable from
-dts files.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/pci/pci-ar724x.c | 88 ++++++++++++++++++++++------------------------
- 1 file changed, 42 insertions(+), 46 deletions(-)
-
---- a/arch/mips/pci/pci-ar724x.c
-+++ b/arch/mips/pci/pci-ar724x.c
-@@ -14,8 +14,11 @@
- #include <linux/init.h>
- #include <linux/delay.h>
- #include <linux/platform_device.h>
-+#include <linux/irqchip/chained_irq.h>
- #include <asm/mach-ath79/ath79.h>
- #include <asm/mach-ath79/ar71xx_regs.h>
-+#include <linux/of_irq.h>
-+#include <linux/of_pci.h>
- #define AR724X_PCI_REG_APP            0x00
- #define AR724X_PCI_REG_RESET          0x18
-@@ -45,17 +48,20 @@ struct ar724x_pci_controller {
-       void __iomem *crp_base;
-       int irq;
--      int irq_base;
-       bool link_up;
-       bool bar0_is_cached;
-       u32  bar0_value;
-+      struct device_node *np;
-       struct pci_controller pci_controller;
-+      struct irq_domain *domain;
-       struct resource io_res;
-       struct resource mem_res;
- };
-+static struct irq_chip ar724x_pci_irq_chip;
-+
- static inline bool ar724x_pci_check_link(struct ar724x_pci_controller *apc)
- {
-       u32 reset;
-@@ -231,35 +237,31 @@ static struct pci_ops ar724x_pci_ops = {
- static void ar724x_pci_irq_handler(struct irq_desc *desc)
- {
--      struct ar724x_pci_controller *apc;
--      void __iomem *base;
-+      struct irq_chip *chip = irq_desc_get_chip(desc);
-+      struct ar724x_pci_controller *apc = irq_desc_get_handler_data(desc);
-       u32 pending;
--      apc = irq_desc_get_handler_data(desc);
--      base = apc->ctrl_base;
--
--      pending = __raw_readl(base + AR724X_PCI_REG_INT_STATUS) &
--                __raw_readl(base + AR724X_PCI_REG_INT_MASK);
-+      chained_irq_enter(chip, desc);
-+      pending = __raw_readl(apc->ctrl_base + AR724X_PCI_REG_INT_STATUS) &
-+                __raw_readl(apc->ctrl_base + AR724X_PCI_REG_INT_MASK);
-       if (pending & AR724X_PCI_INT_DEV0)
--              generic_handle_irq(apc->irq_base + 0);
--
-+              generic_handle_irq(irq_linear_revmap(apc->domain, 1));
-       else
-               spurious_interrupt();
-+      chained_irq_exit(chip, desc);
- }
- static void ar724x_pci_irq_unmask(struct irq_data *d)
- {
-       struct ar724x_pci_controller *apc;
-       void __iomem *base;
--      int offset;
-       u32 t;
-       apc = irq_data_get_irq_chip_data(d);
-       base = apc->ctrl_base;
--      offset = apc->irq_base - d->irq;
--      switch (offset) {
-+      switch (irq_linear_revmap(apc->domain, d->irq)) {
-       case 0:
-               t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
-               __raw_writel(t | AR724X_PCI_INT_DEV0,
-@@ -273,14 +275,12 @@ static void ar724x_pci_irq_mask(struct i
- {
-       struct ar724x_pci_controller *apc;
-       void __iomem *base;
--      int offset;
-       u32 t;
-       apc = irq_data_get_irq_chip_data(d);
-       base = apc->ctrl_base;
--      offset = apc->irq_base - d->irq;
--      switch (offset) {
-+      switch (irq_linear_revmap(apc->domain, d->irq)) {
-       case 0:
-               t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
-               __raw_writel(t & ~AR724X_PCI_INT_DEV0,
-@@ -305,26 +305,34 @@ static struct irq_chip ar724x_pci_irq_ch
-       .irq_mask_ack   = ar724x_pci_irq_mask,
- };
-+static int ar724x_pci_irq_map(struct irq_domain *d,
-+                            unsigned int irq, irq_hw_number_t hw)
-+{
-+      struct ar724x_pci_controller *apc = d->host_data;
-+
-+      irq_set_chip_and_handler(irq, &ar724x_pci_irq_chip, handle_level_irq);
-+      irq_set_chip_data(irq, apc);
-+
-+      return 0;
-+}
-+
-+static const struct irq_domain_ops ar724x_pci_domain_ops = {
-+      .xlate = irq_domain_xlate_onecell,
-+      .map = ar724x_pci_irq_map,
-+};
-+
- static void ar724x_pci_irq_init(struct ar724x_pci_controller *apc,
-                               int id)
- {
-       void __iomem *base;
--      int i;
-       base = apc->ctrl_base;
-       __raw_writel(0, base + AR724X_PCI_REG_INT_MASK);
-       __raw_writel(0, base + AR724X_PCI_REG_INT_STATUS);
--      apc->irq_base = ATH79_PCI_IRQ_BASE + (id * AR724X_PCI_IRQ_COUNT);
--
--      for (i = apc->irq_base;
--           i < apc->irq_base + AR724X_PCI_IRQ_COUNT; i++) {
--              irq_set_chip_and_handler(i, &ar724x_pci_irq_chip,
--                                       handle_level_irq);
--              irq_set_chip_data(i, apc);
--      }
--
-+      apc->domain = irq_domain_add_linear(apc->np, 2,
-+                                          &ar724x_pci_domain_ops, apc);
-       irq_set_chained_handler_and_data(apc->irq, ar724x_pci_irq_handler,
-                                        apc);
- }
-@@ -394,29 +402,11 @@ static int ar724x_pci_probe(struct platf
-       if (apc->irq < 0)
-               return -EINVAL;
--      res = platform_get_resource_byname(pdev, IORESOURCE_IO, "io_base");
--      if (!res)
--              return -EINVAL;
--
--      apc->io_res.parent = res;
--      apc->io_res.name = "PCI IO space";
--      apc->io_res.start = res->start;
--      apc->io_res.end = res->end;
--      apc->io_res.flags = IORESOURCE_IO;
--
--      res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mem_base");
--      if (!res)
--              return -EINVAL;
--
--      apc->mem_res.parent = res;
--      apc->mem_res.name = "PCI memory space";
--      apc->mem_res.start = res->start;
--      apc->mem_res.end = res->end;
--      apc->mem_res.flags = IORESOURCE_MEM;
--
-+      apc->np = pdev->dev.of_node;
-       apc->pci_controller.pci_ops = &ar724x_pci_ops;
-       apc->pci_controller.io_resource = &apc->io_res;
-       apc->pci_controller.mem_resource = &apc->mem_res;
-+      pci_load_of_ranges(&apc->pci_controller, pdev->dev.of_node);
-       /*
-        * Do the full PCIE Root Complex Initialization Sequence if the PCIe
-@@ -438,10 +428,16 @@ static int ar724x_pci_probe(struct platf
-       return 0;
- }
-+static const struct of_device_id ar724x_pci_ids[] = {
-+      { .compatible = "qcom,ar7240-pci" },
-+      {},
-+};
-+
- static struct platform_driver ar724x_pci_driver = {
-       .probe = ar724x_pci_probe,
-       .driver = {
-               .name = "ar724x-pci",
-+              .of_match_table = of_match_ptr(ar724x_pci_ids),
-       },
- };
diff --git a/target/linux/ath79/patches-4.19/0021-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch b/target/linux/ath79/patches-4.19/0021-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch
deleted file mode 100644 (file)
index c273140..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-From 288a8eb0d41f09fda242e05f8a7bd1f5b3489477 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 6 Mar 2018 13:19:26 +0100
-Subject: [PATCH 21/33] MIPS: ath79: add helpers for setting clocks and expose
- the ref clock
-
-Preparation for transitioning the legacy clock setup code over
-to OF.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/clock.c               | 128 ++++++++++++++++++----------------
- include/dt-bindings/clock/ath79-clk.h |   3 +-
- 2 files changed, 68 insertions(+), 63 deletions(-)
-
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -37,20 +37,46 @@ static struct clk_onecell_data clk_data
-       .clk_num = ARRAY_SIZE(clks),
- };
--static struct clk *__init ath79_add_sys_clkdev(
--      const char *id, unsigned long rate)
-+static const char * const clk_names[ATH79_CLK_END] = {
-+      [ATH79_CLK_CPU] = "cpu",
-+      [ATH79_CLK_DDR] = "ddr",
-+      [ATH79_CLK_AHB] = "ahb",
-+      [ATH79_CLK_REF] = "ref",
-+};
-+
-+static const char * __init ath79_clk_name(int type)
- {
--      struct clk *clk;
--      int err;
-+      BUG_ON(type >= ARRAY_SIZE(clk_names) || !clk_names[type]);
-+      return clk_names[type];
-+}
--      clk = clk_register_fixed_rate(NULL, id, NULL, 0, rate);
-+static void __init __ath79_set_clk(int type, const char *name, struct clk *clk)
-+{
-       if (IS_ERR(clk))
--              panic("failed to allocate %s clock structure", id);
-+              panic("failed to allocate %s clock structure", clk_names[type]);
--      err = clk_register_clkdev(clk, id, NULL);
--      if (err)
--              panic("unable to register %s clock device", id);
-+      clks[type] = clk;
-+      clk_register_clkdev(clk, name, NULL);
-+}
-+static struct clk * __init ath79_set_clk(int type, unsigned long rate)
-+{
-+      const char *name = ath79_clk_name(type);
-+      struct clk *clk;
-+
-+      clk = clk_register_fixed_rate(NULL, name, NULL, 0, rate);
-+      __ath79_set_clk(type, name, clk);
-+      return clk;
-+}
-+
-+static struct clk * __init ath79_set_ff_clk(int type, const char *parent,
-+                                          unsigned int mult, unsigned int div)
-+{
-+      const char *name = ath79_clk_name(type);
-+      struct clk *clk;
-+
-+      clk = clk_register_fixed_factor(NULL, name, parent, 0, mult, div);
-+      __ath79_set_clk(type, name, clk);
-       return clk;
- }
-@@ -80,27 +106,15 @@ static void __init ar71xx_clocks_init(vo
-       div = (((pll >> AR71XX_AHB_DIV_SHIFT) & AR71XX_AHB_DIV_MASK) + 1) * 2;
-       ahb_rate = cpu_rate / div;
--      ath79_add_sys_clkdev("ref", ref_rate);
--      clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
--      clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
--      clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
-+      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-+      ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-+      ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-+      ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-       clk_add_alias("wdt", NULL, "ahb", NULL);
-       clk_add_alias("uart", NULL, "ahb", NULL);
- }
--static struct clk * __init ath79_reg_ffclk(const char *name,
--              const char *parent_name, unsigned int mult, unsigned int div)
--{
--      struct clk *clk;
--
--      clk = clk_register_fixed_factor(NULL, name, parent_name, 0, mult, div);
--      if (IS_ERR(clk))
--              panic("failed to allocate %s clock structure", name);
--
--      return clk;
--}
--
- static void __init ar724x_clk_init(struct clk *ref_clk, void __iomem *pll_base)
- {
-       u32 pll;
-@@ -114,24 +128,19 @@ static void __init ar724x_clk_init(struc
-       ddr_div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
-       ahb_div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
--      clks[ATH79_CLK_CPU] = ath79_reg_ffclk("cpu", "ref", mult, div);
--      clks[ATH79_CLK_DDR] = ath79_reg_ffclk("ddr", "ref", mult, div * ddr_div);
--      clks[ATH79_CLK_AHB] = ath79_reg_ffclk("ahb", "ref", mult, div * ahb_div);
-+      ath79_set_ff_clk(ATH79_CLK_CPU, "ref", mult, div);
-+      ath79_set_ff_clk(ATH79_CLK_DDR, "ref", mult, div * ddr_div);
-+      ath79_set_ff_clk(ATH79_CLK_AHB, "ref", mult, div * ahb_div);
- }
- static void __init ar724x_clocks_init(void)
- {
-       struct clk *ref_clk;
--      ref_clk = ath79_add_sys_clkdev("ref", AR724X_BASE_FREQ);
-+      ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ);
-       ar724x_clk_init(ref_clk, ath79_pll_base);
--      /* just make happy plat_time_init() from arch/mips/ath79/setup.c */
--      clk_register_clkdev(clks[ATH79_CLK_CPU], "cpu", NULL);
--      clk_register_clkdev(clks[ATH79_CLK_DDR], "ddr", NULL);
--      clk_register_clkdev(clks[ATH79_CLK_AHB], "ahb", NULL);
--
-       clk_add_alias("wdt", NULL, "ahb", NULL);
-       clk_add_alias("uart", NULL, "ahb", NULL);
- }
-@@ -186,12 +195,12 @@ static void __init ar9330_clk_init(struc
-                    AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
-       }
--      clks[ATH79_CLK_CPU] = ath79_reg_ffclk("cpu", "ref",
--                                      ninit_mul, ref_div * out_div * cpu_div);
--      clks[ATH79_CLK_DDR] = ath79_reg_ffclk("ddr", "ref",
--                                      ninit_mul, ref_div * out_div * ddr_div);
--      clks[ATH79_CLK_AHB] = ath79_reg_ffclk("ahb", "ref",
--                                      ninit_mul, ref_div * out_div * ahb_div);
-+      ath79_set_ff_clk(ATH79_CLK_CPU, "ref", ninit_mul,
-+                       ref_div * out_div * cpu_div);
-+      ath79_set_ff_clk(ATH79_CLK_DDR, "ref", ninit_mul,
-+                       ref_div * out_div * ddr_div);
-+      ath79_set_ff_clk(ATH79_CLK_AHB, "ref", ninit_mul,
-+                       ref_div * out_div * ahb_div);
- }
- static void __init ar933x_clocks_init(void)
-@@ -206,15 +215,10 @@ static void __init ar933x_clocks_init(vo
-       else
-               ref_rate = (25 * 1000 * 1000);
--      ref_clk = ath79_add_sys_clkdev("ref", ref_rate);
-+      ref_clk = ath79_set_clk(ATH79_CLK_REF, ref_rate);
-       ar9330_clk_init(ref_clk, ath79_pll_base);
--      /* just make happy plat_time_init() from arch/mips/ath79/setup.c */
--      clk_register_clkdev(clks[ATH79_CLK_CPU], "cpu", NULL);
--      clk_register_clkdev(clks[ATH79_CLK_DDR], "ddr", NULL);
--      clk_register_clkdev(clks[ATH79_CLK_AHB], "ahb", NULL);
--
-       clk_add_alias("wdt", NULL, "ahb", NULL);
-       clk_add_alias("uart", NULL, "ref", NULL);
- }
-@@ -344,10 +348,10 @@ static void __init ar934x_clocks_init(vo
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_add_sys_clkdev("ref", ref_rate);
--      clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
--      clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
--      clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
-+      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-+      ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-+      ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-+      ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-       clk_add_alias("wdt", NULL, "ref", NULL);
-       clk_add_alias("uart", NULL, "ref", NULL);
-@@ -431,10 +435,10 @@ static void __init qca953x_clocks_init(v
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_add_sys_clkdev("ref", ref_rate);
--      ath79_add_sys_clkdev("cpu", cpu_rate);
--      ath79_add_sys_clkdev("ddr", ddr_rate);
--      ath79_add_sys_clkdev("ahb", ahb_rate);
-+      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-+      ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-+      ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-+      ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-       clk_add_alias("wdt", NULL, "ref", NULL);
-       clk_add_alias("uart", NULL, "ref", NULL);
-@@ -516,10 +520,10 @@ static void __init qca955x_clocks_init(v
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_add_sys_clkdev("ref", ref_rate);
--      clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
--      clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
--      clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
-+      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-+      ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-+      ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-+      ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-       clk_add_alias("wdt", NULL, "ref", NULL);
-       clk_add_alias("uart", NULL, "ref", NULL);
-@@ -620,10 +624,10 @@ static void __init qca956x_clocks_init(v
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_add_sys_clkdev("ref", ref_rate);
--      ath79_add_sys_clkdev("cpu", cpu_rate);
--      ath79_add_sys_clkdev("ddr", ddr_rate);
--      ath79_add_sys_clkdev("ahb", ahb_rate);
-+      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-+      ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-+      ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-+      ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-       clk_add_alias("wdt", NULL, "ref", NULL);
-       clk_add_alias("uart", NULL, "ref", NULL);
---- a/include/dt-bindings/clock/ath79-clk.h
-+++ b/include/dt-bindings/clock/ath79-clk.h
-@@ -13,7 +13,8 @@
- #define ATH79_CLK_CPU         0
- #define ATH79_CLK_DDR         1
- #define ATH79_CLK_AHB         2
-+#define ATH79_CLK_REF         3
--#define ATH79_CLK_END         3
-+#define ATH79_CLK_END         4
- #endif /* __DT_BINDINGS_ATH79_CLK_H */
diff --git a/target/linux/ath79/patches-4.19/0022-MIPS-ath79-move-legacy-wdt-and-uart-clock-aliases-ou.patch b/target/linux/ath79/patches-4.19/0022-MIPS-ath79-move-legacy-wdt-and-uart-clock-aliases-ou.patch
deleted file mode 100644 (file)
index 389edc4..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-From 339c191a95e978353c9ba3aafab0261e14de109b Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 6 Mar 2018 13:22:43 +0100
-Subject: [PATCH 22/33] MIPS: ath79: move legacy "wdt" and "uart" clock aliases
- out of soc init
-
-Preparation for reusing functions for DT
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/clock.c | 38 +++++++++++++++++---------------------
- 1 file changed, 17 insertions(+), 21 deletions(-)
-
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -110,9 +110,6 @@ static void __init ar71xx_clocks_init(vo
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
--
--      clk_add_alias("wdt", NULL, "ahb", NULL);
--      clk_add_alias("uart", NULL, "ahb", NULL);
- }
- static void __init ar724x_clk_init(struct clk *ref_clk, void __iomem *pll_base)
-@@ -140,9 +137,6 @@ static void __init ar724x_clocks_init(vo
-       ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ);
-       ar724x_clk_init(ref_clk, ath79_pll_base);
--
--      clk_add_alias("wdt", NULL, "ahb", NULL);
--      clk_add_alias("uart", NULL, "ahb", NULL);
- }
- static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base)
-@@ -218,9 +212,6 @@ static void __init ar933x_clocks_init(vo
-       ref_clk = ath79_set_clk(ATH79_CLK_REF, ref_rate);
-       ar9330_clk_init(ref_clk, ath79_pll_base);
--
--      clk_add_alias("wdt", NULL, "ahb", NULL);
--      clk_add_alias("uart", NULL, "ref", NULL);
- }
- static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac,
-@@ -353,9 +344,6 @@ static void __init ar934x_clocks_init(vo
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
--      clk_add_alias("wdt", NULL, "ref", NULL);
--      clk_add_alias("uart", NULL, "ref", NULL);
--
-       iounmap(dpll_base);
- }
-@@ -439,9 +427,6 @@ static void __init qca953x_clocks_init(v
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
--
--      clk_add_alias("wdt", NULL, "ref", NULL);
--      clk_add_alias("uart", NULL, "ref", NULL);
- }
- static void __init qca955x_clocks_init(void)
-@@ -524,9 +509,6 @@ static void __init qca955x_clocks_init(v
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
--
--      clk_add_alias("wdt", NULL, "ref", NULL);
--      clk_add_alias("uart", NULL, "ref", NULL);
- }
- static void __init qca956x_clocks_init(void)
-@@ -628,13 +610,13 @@ static void __init qca956x_clocks_init(v
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
--
--      clk_add_alias("wdt", NULL, "ref", NULL);
--      clk_add_alias("uart", NULL, "ref", NULL);
- }
- void __init ath79_clocks_init(void)
- {
-+      const char *wdt;
-+      const char *uart;
-+
-       if (soc_is_ar71xx())
-               ar71xx_clocks_init();
-       else if (soc_is_ar724x() || soc_is_ar913x())
-@@ -651,6 +633,20 @@ void __init ath79_clocks_init(void)
-               qca956x_clocks_init();
-       else
-               BUG();
-+
-+      if (soc_is_ar71xx() || soc_is_ar724x() || soc_is_ar913x()) {
-+              wdt = "ahb";
-+              uart = "ahb";
-+      } else if (soc_is_ar933x()) {
-+              wdt = "ahb";
-+              uart = "ref";
-+      } else {
-+              wdt = "ref";
-+              uart = "ref";
-+      }
-+
-+      clk_add_alias("wdt", NULL, wdt, NULL);
-+      clk_add_alias("uart", NULL, uart, NULL);
- }
- unsigned long __init
diff --git a/target/linux/ath79/patches-4.19/0023-MIPS-ath79-pass-PLL-base-to-clock-init-functions.patch b/target/linux/ath79/patches-4.19/0023-MIPS-ath79-pass-PLL-base-to-clock-init-functions.patch
deleted file mode 100644 (file)
index 6c0f2ad..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-From 6350b2c36c522fecbc91a80b63f49319dafd2a72 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 6 Mar 2018 13:23:20 +0100
-Subject: [PATCH 23/33] MIPS: ath79: pass PLL base to clock init functions
-
-Preparation for passing the mapped base via DT
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/clock.c | 60 ++++++++++++++++++++++++-------------------------
- 1 file changed, 30 insertions(+), 30 deletions(-)
-
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -80,7 +80,7 @@ static struct clk * __init ath79_set_ff_
-       return clk;
- }
--static void __init ar71xx_clocks_init(void)
-+static void __init ar71xx_clocks_init(void __iomem *pll_base)
- {
-       unsigned long ref_rate;
-       unsigned long cpu_rate;
-@@ -92,7 +92,7 @@ static void __init ar71xx_clocks_init(vo
-       ref_rate = AR71XX_BASE_FREQ;
--      pll = ath79_pll_rr(AR71XX_PLL_REG_CPU_CONFIG);
-+      pll = __raw_readl(pll_base + AR71XX_PLL_REG_CPU_CONFIG);
-       div = ((pll >> AR71XX_PLL_FB_SHIFT) & AR71XX_PLL_FB_MASK) + 1;
-       freq = div * ref_rate;
-@@ -130,13 +130,13 @@ static void __init ar724x_clk_init(struc
-       ath79_set_ff_clk(ATH79_CLK_AHB, "ref", mult, div * ahb_div);
- }
--static void __init ar724x_clocks_init(void)
-+static void __init ar724x_clocks_init(void __iomem *pll_base)
- {
-       struct clk *ref_clk;
-       ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ);
--      ar724x_clk_init(ref_clk, ath79_pll_base);
-+      ar724x_clk_init(ref_clk, pll_base);
- }
- static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base)
-@@ -197,7 +197,7 @@ static void __init ar9330_clk_init(struc
-                        ref_div * out_div * ahb_div);
- }
--static void __init ar933x_clocks_init(void)
-+static void __init ar933x_clocks_init(void __iomem *pll_base)
- {
-       struct clk *ref_clk;
-       unsigned long ref_rate;
-@@ -234,7 +234,7 @@ static u32 __init ar934x_get_pll_freq(u3
-       return ret;
- }
--static void __init ar934x_clocks_init(void)
-+static void __init ar934x_clocks_init(void __iomem *pll_base)
- {
-       unsigned long ref_rate;
-       unsigned long cpu_rate;
-@@ -265,7 +265,7 @@ static void __init ar934x_clocks_init(vo
-                         AR934X_SRIF_DPLL1_REFDIV_MASK;
-               frac = 1 << 18;
-       } else {
--              pll = ath79_pll_rr(AR934X_PLL_CPU_CONFIG_REG);
-+              pll = __raw_readl(pll_base + AR934X_PLL_CPU_CONFIG_REG);
-               out_div = (pll >> AR934X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
-                       AR934X_PLL_CPU_CONFIG_OUTDIV_MASK;
-               ref_div = (pll >> AR934X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
-@@ -292,7 +292,7 @@ static void __init ar934x_clocks_init(vo
-                         AR934X_SRIF_DPLL1_REFDIV_MASK;
-               frac = 1 << 18;
-       } else {
--              pll = ath79_pll_rr(AR934X_PLL_DDR_CONFIG_REG);
-+              pll = __raw_readl(pll_base + AR934X_PLL_DDR_CONFIG_REG);
-               out_div = (pll >> AR934X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
-                         AR934X_PLL_DDR_CONFIG_OUTDIV_MASK;
-               ref_div = (pll >> AR934X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
-@@ -307,7 +307,7 @@ static void __init ar934x_clocks_init(vo
-       ddr_pll = ar934x_get_pll_freq(ref_rate, ref_div, nint,
-                                     nfrac, frac, out_div);
--      clk_ctrl = ath79_pll_rr(AR934X_PLL_CPU_DDR_CLK_CTRL_REG);
-+      clk_ctrl = __raw_readl(pll_base + AR934X_PLL_CPU_DDR_CLK_CTRL_REG);
-       postdiv = (clk_ctrl >> AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_SHIFT) &
-                 AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_MASK;
-@@ -347,7 +347,7 @@ static void __init ar934x_clocks_init(vo
-       iounmap(dpll_base);
- }
--static void __init qca953x_clocks_init(void)
-+static void __init qca953x_clocks_init(void __iomem *pll_base)
- {
-       unsigned long ref_rate;
-       unsigned long cpu_rate;
-@@ -363,7 +363,7 @@ static void __init qca953x_clocks_init(v
-       else
-               ref_rate = 25 * 1000 * 1000;
--      pll = ath79_pll_rr(QCA953X_PLL_CPU_CONFIG_REG);
-+      pll = __raw_readl(pll_base + QCA953X_PLL_CPU_CONFIG_REG);
-       out_div = (pll >> QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
-                 QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK;
-       ref_div = (pll >> QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
-@@ -377,7 +377,7 @@ static void __init qca953x_clocks_init(v
-       cpu_pll += frac * (ref_rate >> 6) / ref_div;
-       cpu_pll /= (1 << out_div);
--      pll = ath79_pll_rr(QCA953X_PLL_DDR_CONFIG_REG);
-+      pll = __raw_readl(pll_base + QCA953X_PLL_DDR_CONFIG_REG);
-       out_div = (pll >> QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
-                 QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK;
-       ref_div = (pll >> QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
-@@ -391,7 +391,7 @@ static void __init qca953x_clocks_init(v
-       ddr_pll += frac * (ref_rate >> 6) / (ref_div << 4);
-       ddr_pll /= (1 << out_div);
--      clk_ctrl = ath79_pll_rr(QCA953X_PLL_CLK_CTRL_REG);
-+      clk_ctrl = __raw_readl(pll_base + QCA953X_PLL_CLK_CTRL_REG);
-       postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
-                 QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
-@@ -429,7 +429,7 @@ static void __init qca953x_clocks_init(v
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
- }
--static void __init qca955x_clocks_init(void)
-+static void __init qca955x_clocks_init(void __iomem *pll_base)
- {
-       unsigned long ref_rate;
-       unsigned long cpu_rate;
-@@ -445,7 +445,7 @@ static void __init qca955x_clocks_init(v
-       else
-               ref_rate = 25 * 1000 * 1000;
--      pll = ath79_pll_rr(QCA955X_PLL_CPU_CONFIG_REG);
-+      pll = __raw_readl(pll_base + QCA955X_PLL_CPU_CONFIG_REG);
-       out_div = (pll >> QCA955X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
-                 QCA955X_PLL_CPU_CONFIG_OUTDIV_MASK;
-       ref_div = (pll >> QCA955X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
-@@ -459,7 +459,7 @@ static void __init qca955x_clocks_init(v
-       cpu_pll += frac * ref_rate / (ref_div * (1 << 6));
-       cpu_pll /= (1 << out_div);
--      pll = ath79_pll_rr(QCA955X_PLL_DDR_CONFIG_REG);
-+      pll = __raw_readl(pll_base + QCA955X_PLL_DDR_CONFIG_REG);
-       out_div = (pll >> QCA955X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
-                 QCA955X_PLL_DDR_CONFIG_OUTDIV_MASK;
-       ref_div = (pll >> QCA955X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
-@@ -473,7 +473,7 @@ static void __init qca955x_clocks_init(v
-       ddr_pll += frac * ref_rate / (ref_div * (1 << 10));
-       ddr_pll /= (1 << out_div);
--      clk_ctrl = ath79_pll_rr(QCA955X_PLL_CLK_CTRL_REG);
-+      clk_ctrl = __raw_readl(pll_base + QCA955X_PLL_CLK_CTRL_REG);
-       postdiv = (clk_ctrl >> QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
-                 QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
-@@ -511,7 +511,7 @@ static void __init qca955x_clocks_init(v
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
- }
--static void __init qca956x_clocks_init(void)
-+static void __init qca956x_clocks_init(void __iomem *pll_base)
- {
-       unsigned long ref_rate;
-       unsigned long cpu_rate;
-@@ -537,13 +537,13 @@ static void __init qca956x_clocks_init(v
-       else
-               ref_rate = 25 * 1000 * 1000;
--      pll = ath79_pll_rr(QCA956X_PLL_CPU_CONFIG_REG);
-+      pll = __raw_readl(pll_base + QCA956X_PLL_CPU_CONFIG_REG);
-       out_div = (pll >> QCA956X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
-                 QCA956X_PLL_CPU_CONFIG_OUTDIV_MASK;
-       ref_div = (pll >> QCA956X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
-                 QCA956X_PLL_CPU_CONFIG_REFDIV_MASK;
--      pll = ath79_pll_rr(QCA956X_PLL_CPU_CONFIG1_REG);
-+      pll = __raw_readl(pll_base + QCA956X_PLL_CPU_CONFIG1_REG);
-       nint = (pll >> QCA956X_PLL_CPU_CONFIG1_NINT_SHIFT) &
-              QCA956X_PLL_CPU_CONFIG1_NINT_MASK;
-       hfrac = (pll >> QCA956X_PLL_CPU_CONFIG1_NFRAC_H_SHIFT) &
-@@ -556,12 +556,12 @@ static void __init qca956x_clocks_init(v
-       cpu_pll += (hfrac >> 13) * ref_rate / ref_div;
-       cpu_pll /= (1 << out_div);
--      pll = ath79_pll_rr(QCA956X_PLL_DDR_CONFIG_REG);
-+      pll = __raw_readl(pll_base + QCA956X_PLL_DDR_CONFIG_REG);
-       out_div = (pll >> QCA956X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
-                 QCA956X_PLL_DDR_CONFIG_OUTDIV_MASK;
-       ref_div = (pll >> QCA956X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
-                 QCA956X_PLL_DDR_CONFIG_REFDIV_MASK;
--      pll = ath79_pll_rr(QCA956X_PLL_DDR_CONFIG1_REG);
-+      pll = __raw_readl(pll_base + QCA956X_PLL_DDR_CONFIG1_REG);
-       nint = (pll >> QCA956X_PLL_DDR_CONFIG1_NINT_SHIFT) &
-              QCA956X_PLL_DDR_CONFIG1_NINT_MASK;
-       hfrac = (pll >> QCA956X_PLL_DDR_CONFIG1_NFRAC_H_SHIFT) &
-@@ -574,7 +574,7 @@ static void __init qca956x_clocks_init(v
-       ddr_pll += (hfrac >> 13) * ref_rate / ref_div;
-       ddr_pll /= (1 << out_div);
--      clk_ctrl = ath79_pll_rr(QCA956X_PLL_CLK_CTRL_REG);
-+      clk_ctrl = __raw_readl(pll_base + QCA956X_PLL_CLK_CTRL_REG);
-       postdiv = (clk_ctrl >> QCA956X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
-                 QCA956X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
-@@ -618,19 +618,19 @@ void __init ath79_clocks_init(void)
-       const char *uart;
-       if (soc_is_ar71xx())
--              ar71xx_clocks_init();
-+              ar71xx_clocks_init(ath79_pll_base);
-       else if (soc_is_ar724x() || soc_is_ar913x())
--              ar724x_clocks_init();
-+              ar724x_clocks_init(ath79_pll_base);
-       else if (soc_is_ar933x())
--              ar933x_clocks_init();
-+              ar933x_clocks_init(ath79_pll_base);
-       else if (soc_is_ar934x())
--              ar934x_clocks_init();
-+              ar934x_clocks_init(ath79_pll_base);
-       else if (soc_is_qca953x())
--              qca953x_clocks_init();
-+              qca953x_clocks_init(ath79_pll_base);
-       else if (soc_is_qca955x())
--              qca955x_clocks_init();
-+              qca955x_clocks_init(ath79_pll_base);
-       else if (soc_is_qca956x() || soc_is_tp9343())
--              qca956x_clocks_init();
-+              qca956x_clocks_init(ath79_pll_base);
-       else
-               BUG();
diff --git a/target/linux/ath79/patches-4.19/0024-MIPS-ath79-make-specifying-the-reference-clock-in-DT.patch b/target/linux/ath79/patches-4.19/0024-MIPS-ath79-make-specifying-the-reference-clock-in-DT.patch
deleted file mode 100644 (file)
index 9ceb643..0000000
+++ /dev/null
@@ -1,229 +0,0 @@
-From 5fadb2544ed0bb72ddddd846aa303bb9ed2d211c Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 6 Mar 2018 13:24:07 +0100
-Subject: [PATCH 24/33] MIPS: ath79: make specifying the reference clock in DT
- optional
-
-It can be autodetected for many SoCs using the strapping options.
-If the clock is specified in DT, the autodetected value is ignored
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/clock.c | 84 +++++++++++++++++++++++--------------------------
- 1 file changed, 40 insertions(+), 44 deletions(-)
-
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -80,6 +80,18 @@ static struct clk * __init ath79_set_ff_
-       return clk;
- }
-+static unsigned long __init ath79_setup_ref_clk(unsigned long rate)
-+{
-+      struct clk *clk = clks[ATH79_CLK_REF];
-+
-+      if (clk)
-+              rate = clk_get_rate(clk);
-+      else
-+              clk = ath79_set_clk(ATH79_CLK_REF, rate);
-+
-+      return rate;
-+}
-+
- static void __init ar71xx_clocks_init(void __iomem *pll_base)
- {
-       unsigned long ref_rate;
-@@ -90,7 +102,7 @@ static void __init ar71xx_clocks_init(vo
-       u32 freq;
-       u32 div;
--      ref_rate = AR71XX_BASE_FREQ;
-+      ref_rate = ath79_setup_ref_clk(AR71XX_BASE_FREQ);
-       pll = __raw_readl(pll_base + AR71XX_PLL_REG_CPU_CONFIG);
-@@ -106,16 +118,17 @@ static void __init ar71xx_clocks_init(vo
-       div = (((pll >> AR71XX_AHB_DIV_SHIFT) & AR71XX_AHB_DIV_MASK) + 1) * 2;
-       ahb_rate = cpu_rate / div;
--      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
- }
--static void __init ar724x_clk_init(struct clk *ref_clk, void __iomem *pll_base)
-+static void __init ar724x_clocks_init(void __iomem *pll_base)
- {
--      u32 pll;
-       u32 mult, div, ddr_div, ahb_div;
-+      u32 pll;
-+
-+      ath79_setup_ref_clk(AR71XX_BASE_FREQ);
-       pll = __raw_readl(pll_base + AR724X_PLL_REG_CPU_CONFIG);
-@@ -130,17 +143,9 @@ static void __init ar724x_clk_init(struc
-       ath79_set_ff_clk(ATH79_CLK_AHB, "ref", mult, div * ahb_div);
- }
--static void __init ar724x_clocks_init(void __iomem *pll_base)
--{
--      struct clk *ref_clk;
--
--      ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ);
--
--      ar724x_clk_init(ref_clk, pll_base);
--}
--
--static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base)
-+static void __init ar933x_clocks_init(void __iomem *pll_base)
- {
-+      unsigned long ref_rate;
-       u32 clock_ctrl;
-       u32 ref_div;
-       u32 ninit_mul;
-@@ -149,6 +154,15 @@ static void __init ar9330_clk_init(struc
-       u32 cpu_div;
-       u32 ddr_div;
-       u32 ahb_div;
-+      u32 t;
-+
-+      t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
-+      if (t & AR933X_BOOTSTRAP_REF_CLK_40)
-+              ref_rate = (40 * 1000 * 1000);
-+      else
-+              ref_rate = (25 * 1000 * 1000);
-+
-+      ath79_setup_ref_clk(ref_rate);
-       clock_ctrl = __raw_readl(pll_base + AR933X_PLL_CLOCK_CTRL_REG);
-       if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
-@@ -197,23 +211,6 @@ static void __init ar9330_clk_init(struc
-                        ref_div * out_div * ahb_div);
- }
--static void __init ar933x_clocks_init(void __iomem *pll_base)
--{
--      struct clk *ref_clk;
--      unsigned long ref_rate;
--      u32 t;
--
--      t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
--      if (t & AR933X_BOOTSTRAP_REF_CLK_40)
--              ref_rate = (40 * 1000 * 1000);
--      else
--              ref_rate = (25 * 1000 * 1000);
--
--      ref_clk = ath79_set_clk(ATH79_CLK_REF, ref_rate);
--
--      ar9330_clk_init(ref_clk, ath79_pll_base);
--}
--
- static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac,
-                                     u32 frac, u32 out_div)
- {
-@@ -253,6 +250,8 @@ static void __init ar934x_clocks_init(vo
-       else
-               ref_rate = 25 * 1000 * 1000;
-+      ref_rate = ath79_setup_ref_clk(ref_rate);
-+
-       pll = __raw_readl(dpll_base + AR934X_SRIF_CPU_DPLL2_REG);
-       if (pll & AR934X_SRIF_DPLL2_LOCAL_PLL) {
-               out_div = (pll >> AR934X_SRIF_DPLL2_OUTDIV_SHIFT) &
-@@ -339,7 +338,6 @@ static void __init ar934x_clocks_init(vo
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-@@ -363,6 +361,8 @@ static void __init qca953x_clocks_init(v
-       else
-               ref_rate = 25 * 1000 * 1000;
-+      ref_rate = ath79_setup_ref_clk(ref_rate);
-+
-       pll = __raw_readl(pll_base + QCA953X_PLL_CPU_CONFIG_REG);
-       out_div = (pll >> QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
-                 QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK;
-@@ -423,7 +423,6 @@ static void __init qca953x_clocks_init(v
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-@@ -445,6 +444,8 @@ static void __init qca955x_clocks_init(v
-       else
-               ref_rate = 25 * 1000 * 1000;
-+      ref_rate = ath79_setup_ref_clk(ref_rate);
-+
-       pll = __raw_readl(pll_base + QCA955X_PLL_CPU_CONFIG_REG);
-       out_div = (pll >> QCA955X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
-                 QCA955X_PLL_CPU_CONFIG_OUTDIV_MASK;
-@@ -505,7 +506,6 @@ static void __init qca955x_clocks_init(v
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-@@ -537,6 +537,8 @@ static void __init qca956x_clocks_init(v
-       else
-               ref_rate = 25 * 1000 * 1000;
-+      ref_rate = ath79_setup_ref_clk(ref_rate);
-+
-       pll = __raw_readl(pll_base + QCA956X_PLL_CPU_CONFIG_REG);
-       out_div = (pll >> QCA956X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
-                 QCA956X_PLL_CPU_CONFIG_OUTDIV_MASK;
-@@ -606,7 +608,6 @@ static void __init qca956x_clocks_init(v
-       else
-               ahb_rate = cpu_pll / (postdiv + 1);
--      ath79_set_clk(ATH79_CLK_REF, ref_rate);
-       ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-@@ -682,10 +683,8 @@ static void __init ath79_clocks_init_dt_
-       void __iomem *pll_base;
-       ref_clk = of_clk_get(np, 0);
--      if (IS_ERR(ref_clk)) {
--              pr_err("%pOF: of_clk_get failed\n", np);
--              goto err;
--      }
-+      if (!IS_ERR(ref_clk))
-+              clks[ATH79_CLK_REF] = ref_clk;
-       pll_base = of_iomap(np, 0);
-       if (!pll_base) {
-@@ -694,9 +693,9 @@ static void __init ath79_clocks_init_dt_
-       }
-       if (of_device_is_compatible(np, "qca,ar9130-pll"))
--              ar724x_clk_init(ref_clk, pll_base);
-+              ar724x_clocks_init(pll_base);
-       else if (of_device_is_compatible(np, "qca,ar9330-pll"))
--              ar9330_clk_init(ref_clk, pll_base);
-+              ar933x_clocks_init(pll_base);
-       else {
-               pr_err("%pOF: could not find any appropriate clk_init()\n", np);
-               goto err_iounmap;
-@@ -714,9 +713,6 @@ err_iounmap:
- err_clk:
-       clk_put(ref_clk);
--
--err:
--      return;
- }
- CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ath79_clocks_init_dt_ng);
- CLK_OF_DECLARE(ar9330_clk, "qca,ar9330-pll", ath79_clocks_init_dt_ng);
diff --git a/target/linux/ath79/patches-4.19/0025-MIPS-ath79-support-setting-up-clock-via-DT-on-all-So.patch b/target/linux/ath79/patches-4.19/0025-MIPS-ath79-support-setting-up-clock-via-DT-on-all-So.patch
deleted file mode 100644 (file)
index 13f46a9..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From 6325626de001df98aebe51f3008b1aca05798d19 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 6 Mar 2018 13:26:27 +0100
-Subject: [PATCH 25/33] MIPS: ath79: support setting up clock via DT on all SoC
- types
-
-Use the same functions as the legacy code
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/clock.c | 39 ++++++++++++++++++++++-----------------
- 1 file changed, 22 insertions(+), 17 deletions(-)
-
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -669,16 +669,6 @@ ath79_get_sys_clk_rate(const char *id)
- #ifdef CONFIG_OF
- static void __init ath79_clocks_init_dt(struct device_node *np)
- {
--      of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
--}
--
--CLK_OF_DECLARE(ar7100, "qca,ar7100-pll", ath79_clocks_init_dt);
--CLK_OF_DECLARE(ar7240, "qca,ar7240-pll", ath79_clocks_init_dt);
--CLK_OF_DECLARE(ar9340, "qca,ar9340-pll", ath79_clocks_init_dt);
--CLK_OF_DECLARE(ar9550, "qca,qca9550-pll", ath79_clocks_init_dt);
--
--static void __init ath79_clocks_init_dt_ng(struct device_node *np)
--{
-       struct clk *ref_clk;
-       void __iomem *pll_base;
-@@ -692,14 +682,21 @@ static void __init ath79_clocks_init_dt_
-               goto err_clk;
-       }
--      if (of_device_is_compatible(np, "qca,ar9130-pll"))
-+      if (of_device_is_compatible(np, "qca,ar7100-pll"))
-+              ar71xx_clocks_init(pll_base);
-+      else if (of_device_is_compatible(np, "qca,ar7240-pll") ||
-+               of_device_is_compatible(np, "qca,ar9130-pll"))
-               ar724x_clocks_init(pll_base);
-       else if (of_device_is_compatible(np, "qca,ar9330-pll"))
-               ar933x_clocks_init(pll_base);
--      else {
--              pr_err("%pOF: could not find any appropriate clk_init()\n", np);
--              goto err_iounmap;
--      }
-+      else if (of_device_is_compatible(np, "qca,ar9340-pll"))
-+              ar934x_clocks_init(pll_base);
-+      else if (of_device_is_compatible(np, "qca,qca9530-pll"))
-+              qca953x_clocks_init(pll_base);
-+      else if (of_device_is_compatible(np, "qca,qca9550-pll"))
-+              qca955x_clocks_init(pll_base);
-+      else if (of_device_is_compatible(np, "qca,qca9560-pll"))
-+              qca956x_clocks_init(pll_base);
-       if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
-               pr_err("%pOF: could not register clk provider\n", np);
-@@ -714,6 +711,14 @@ err_iounmap:
- err_clk:
-       clk_put(ref_clk);
- }
--CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ath79_clocks_init_dt_ng);
--CLK_OF_DECLARE(ar9330_clk, "qca,ar9330-pll", ath79_clocks_init_dt_ng);
-+
-+CLK_OF_DECLARE(ar7100_clk, "qca,ar7100-pll", ath79_clocks_init_dt);
-+CLK_OF_DECLARE(ar7240_clk, "qca,ar7240-pll", ath79_clocks_init_dt);
-+CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ath79_clocks_init_dt);
-+CLK_OF_DECLARE(ar9330_clk, "qca,ar9330-pll", ath79_clocks_init_dt);
-+CLK_OF_DECLARE(ar9340_clk, "qca,ar9340-pll", ath79_clocks_init_dt);
-+CLK_OF_DECLARE(ar9530_clk, "qca,qca9530-pll", ath79_clocks_init_dt);
-+CLK_OF_DECLARE(ar9550_clk, "qca,qca9550-pll", ath79_clocks_init_dt);
-+CLK_OF_DECLARE(ar9560_clk, "qca,qca9560-pll", ath79_clocks_init_dt);
-+
- #endif
diff --git a/target/linux/ath79/patches-4.19/0026-MIPS-ath79-export-switch-MDIO-reference-clock.patch b/target/linux/ath79/patches-4.19/0026-MIPS-ath79-export-switch-MDIO-reference-clock.patch
deleted file mode 100644 (file)
index 27adb56..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-From 78538d673801902108797f2c813e70cfbce280c9 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 6 Mar 2018 13:27:28 +0100
-Subject: [PATCH 26/33] MIPS: ath79: export switch MDIO reference clock
-
-On AR934x, the MDIO reference clock can be configured to a fixed 100 MHz
-clock. If that feature is not used, it defaults to the main reference
-clock, like on all other SoC.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/clock.c               | 8 ++++++++
- include/dt-bindings/clock/ath79-clk.h | 3 ++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -42,6 +42,7 @@ static const char * const clk_names[ATH7
-       [ATH79_CLK_DDR] = "ddr",
-       [ATH79_CLK_AHB] = "ahb",
-       [ATH79_CLK_REF] = "ref",
-+      [ATH79_CLK_MDIO] = "mdio",
- };
- static const char * __init ath79_clk_name(int type)
-@@ -342,6 +343,10 @@ static void __init ar934x_clocks_init(vo
-       ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-+      clk_ctrl = __raw_readl(pll_base + AR934X_PLL_SWITCH_CLOCK_CONTROL_REG);
-+      if (clk_ctrl & AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL)
-+              ath79_set_clk(ATH79_CLK_MDIO, 100 * 1000 * 1000);
-+
-       iounmap(dpll_base);
- }
-@@ -698,6 +703,9 @@ static void __init ath79_clocks_init_dt(
-       else if (of_device_is_compatible(np, "qca,qca9560-pll"))
-               qca956x_clocks_init(pll_base);
-+      if (!clks[ATH79_CLK_MDIO])
-+              clks[ATH79_CLK_MDIO] = clks[ATH79_CLK_REF];
-+
-       if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
-               pr_err("%pOF: could not register clk provider\n", np);
-               goto err_iounmap;
---- a/include/dt-bindings/clock/ath79-clk.h
-+++ b/include/dt-bindings/clock/ath79-clk.h
-@@ -14,7 +14,8 @@
- #define ATH79_CLK_DDR         1
- #define ATH79_CLK_AHB         2
- #define ATH79_CLK_REF         3
-+#define ATH79_CLK_MDIO                4
--#define ATH79_CLK_END         4
-+#define ATH79_CLK_END         5
- #endif /* __DT_BINDINGS_ATH79_CLK_H */
diff --git a/target/linux/ath79/patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch b/target/linux/ath79/patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch
deleted file mode 100644 (file)
index 6586f08..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-From 3765b1f79593a0a9098ed15e48074c95403a53ee Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 23 Jun 2018 15:05:08 +0200
-Subject: [PATCH 27/33] MIPS: ath79: drop legacy IRQ code
-
-With the target now being fully OF based, we can drop the legacy IRQ code.
-All IRQs are now handled via the new irqchip drivers.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/Makefile                 |   2 +-
- arch/mips/ath79/irq.c                    | 169 -------------------------------
- arch/mips/ath79/setup.c                  |   6 ++
- arch/mips/include/asm/mach-ath79/ath79.h |   4 -
- 4 files changed, 7 insertions(+), 174 deletions(-)
- delete mode 100644 arch/mips/ath79/irq.c
-
---- a/arch/mips/ath79/Makefile
-+++ b/arch/mips/ath79/Makefile
-@@ -8,7 +8,7 @@
- # under the terms of the GNU General Public License version 2 as published
- # by the Free Software Foundation.
--obj-y := prom.o setup.o irq.o common.o clock.o
-+obj-y := prom.o setup.o common.o clock.o
- obj-$(CONFIG_EARLY_PRINTK)            += early_printk.o
- obj-$(CONFIG_PCI)                     += pci.o
---- a/arch/mips/ath79/irq.c
-+++ /dev/null
-@@ -1,169 +0,0 @@
--/*
-- *  Atheros AR71xx/AR724x/AR913x specific interrupt handling
-- *
-- *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
-- *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
-- *
-- *  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/interrupt.h>
--#include <linux/irqchip.h>
--#include <linux/of_irq.h>
--
--#include <asm/irq_cpu.h>
--#include <asm/mipsregs.h>
--
--#include <asm/mach-ath79/ath79.h>
--#include <asm/mach-ath79/ar71xx_regs.h>
--#include "common.h"
--#include "machtypes.h"
--
--
--static void ar934x_ip2_irq_dispatch(struct irq_desc *desc)
--{
--      u32 status;
--
--      status = ath79_reset_rr(AR934X_RESET_REG_PCIE_WMAC_INT_STATUS);
--
--      if (status & AR934X_PCIE_WMAC_INT_PCIE_ALL) {
--              ath79_ddr_wb_flush(3);
--              generic_handle_irq(ATH79_IP2_IRQ(0));
--      } else if (status & AR934X_PCIE_WMAC_INT_WMAC_ALL) {
--              ath79_ddr_wb_flush(4);
--              generic_handle_irq(ATH79_IP2_IRQ(1));
--      } else {
--              spurious_interrupt();
--      }
--}
--
--static void ar934x_ip2_irq_init(void)
--{
--      int i;
--
--      for (i = ATH79_IP2_IRQ_BASE;
--           i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
--              irq_set_chip_and_handler(i, &dummy_irq_chip,
--                                       handle_level_irq);
--
--      irq_set_chained_handler(ATH79_CPU_IRQ(2), ar934x_ip2_irq_dispatch);
--}
--
--static void qca955x_ip2_irq_dispatch(struct irq_desc *desc)
--{
--      u32 status;
--
--      status = ath79_reset_rr(QCA955X_RESET_REG_EXT_INT_STATUS);
--      status &= QCA955X_EXT_INT_PCIE_RC1_ALL | QCA955X_EXT_INT_WMAC_ALL;
--
--      if (status == 0) {
--              spurious_interrupt();
--              return;
--      }
--
--      if (status & QCA955X_EXT_INT_PCIE_RC1_ALL) {
--              /* TODO: flush DDR? */
--              generic_handle_irq(ATH79_IP2_IRQ(0));
--      }
--
--      if (status & QCA955X_EXT_INT_WMAC_ALL) {
--              /* TODO: flush DDR? */
--              generic_handle_irq(ATH79_IP2_IRQ(1));
--      }
--}
--
--static void qca955x_ip3_irq_dispatch(struct irq_desc *desc)
--{
--      u32 status;
--
--      status = ath79_reset_rr(QCA955X_RESET_REG_EXT_INT_STATUS);
--      status &= QCA955X_EXT_INT_PCIE_RC2_ALL |
--                QCA955X_EXT_INT_USB1 |
--                QCA955X_EXT_INT_USB2;
--
--      if (status == 0) {
--              spurious_interrupt();
--              return;
--      }
--
--      if (status & QCA955X_EXT_INT_USB1) {
--              /* TODO: flush DDR? */
--              generic_handle_irq(ATH79_IP3_IRQ(0));
--      }
--
--      if (status & QCA955X_EXT_INT_USB2) {
--              /* TODO: flush DDR? */
--              generic_handle_irq(ATH79_IP3_IRQ(1));
--      }
--
--      if (status & QCA955X_EXT_INT_PCIE_RC2_ALL) {
--              /* TODO: flush DDR? */
--              generic_handle_irq(ATH79_IP3_IRQ(2));
--      }
--}
--
--static void qca955x_irq_init(void)
--{
--      int i;
--
--      for (i = ATH79_IP2_IRQ_BASE;
--           i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
--              irq_set_chip_and_handler(i, &dummy_irq_chip,
--                                       handle_level_irq);
--
--      irq_set_chained_handler(ATH79_CPU_IRQ(2), qca955x_ip2_irq_dispatch);
--
--      for (i = ATH79_IP3_IRQ_BASE;
--           i < ATH79_IP3_IRQ_BASE + ATH79_IP3_IRQ_COUNT; i++)
--              irq_set_chip_and_handler(i, &dummy_irq_chip,
--                                       handle_level_irq);
--
--      irq_set_chained_handler(ATH79_CPU_IRQ(3), qca955x_ip3_irq_dispatch);
--}
--
--void __init arch_init_irq(void)
--{
--      unsigned irq_wb_chan2 = -1;
--      unsigned irq_wb_chan3 = -1;
--      bool misc_is_ar71xx;
--
--      if (mips_machtype == ATH79_MACH_GENERIC_OF) {
--              irqchip_init();
--              return;
--      }
--
--      if (soc_is_ar71xx() || soc_is_ar724x() ||
--          soc_is_ar913x() || soc_is_ar933x()) {
--              irq_wb_chan2 = 3;
--              irq_wb_chan3 = 2;
--      } else if (soc_is_ar934x()) {
--              irq_wb_chan3 = 2;
--      }
--
--      ath79_cpu_irq_init(irq_wb_chan2, irq_wb_chan3);
--
--      if (soc_is_ar71xx() || soc_is_ar913x())
--              misc_is_ar71xx = true;
--      else if (soc_is_ar724x() ||
--               soc_is_ar933x() ||
--               soc_is_ar934x() ||
--               soc_is_qca955x())
--              misc_is_ar71xx = false;
--      else
--              BUG();
--      ath79_misc_irq_init(
--              ath79_reset_base + AR71XX_RESET_REG_MISC_INT_STATUS,
--              ATH79_CPU_IRQ(6), ATH79_MISC_IRQ_BASE, misc_is_ar71xx);
--
--      if (soc_is_ar934x())
--              ar934x_ip2_irq_init();
--      else if (soc_is_qca955x())
--              qca955x_irq_init();
--}
---- a/arch/mips/ath79/setup.c
-+++ b/arch/mips/ath79/setup.c
-@@ -19,6 +19,7 @@
- #include <linux/clk.h>
- #include <linux/clk-provider.h>
- #include <linux/of_fdt.h>
-+#include <linux/irqchip.h>
- #include <asm/bootinfo.h>
- #include <asm/idle.h>
-@@ -305,6 +306,11 @@ void __init plat_time_init(void)
-       mips_hpt_frequency = cpu_clk_rate / 2;
- }
-+void __init arch_init_irq(void)
-+{
-+      irqchip_init();
-+}
-+
- static int __init ath79_setup(void)
- {
-       if  (mips_machtype == ATH79_MACH_GENERIC_OF)
---- a/arch/mips/include/asm/mach-ath79/ath79.h
-+++ b/arch/mips/include/asm/mach-ath79/ath79.h
-@@ -178,8 +178,4 @@ static inline u32 ath79_reset_rr(unsigne
- void ath79_device_reset_set(u32 mask);
- void ath79_device_reset_clear(u32 mask);
--void ath79_cpu_irq_init(unsigned irq_wb_chan2, unsigned irq_wb_chan3);
--void ath79_misc_irq_init(void __iomem *regs, int irq,
--                      int irq_base, bool is_ar71xx);
--
- #endif /* __ASM_MACH_ATH79_H */
diff --git a/target/linux/ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch b/target/linux/ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch
deleted file mode 100644 (file)
index 1901e6e..0000000
+++ /dev/null
@@ -1,1048 +0,0 @@
-From badf28957b6dc400dff27bd23ba2ae75d9514be5 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 23 Jun 2018 15:04:09 +0200
-Subject: [PATCH 28/33] MIPS: ath79: drop machfiles
-
-With the target now being fully OF based, we can drop the legacy mach
-files. Boards can now boot fully of devicetree files.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/Kconfig              |   1 -
- arch/mips/ath79/Kconfig        |  73 -------------------
- arch/mips/ath79/Makefile       |  10 ---
- arch/mips/ath79/clock.c        |   1 -
- arch/mips/ath79/mach-ap121.c   |  92 ------------------------
- arch/mips/ath79/mach-ap136.c   | 156 -----------------------------------------
- arch/mips/ath79/mach-ap81.c    | 100 --------------------------
- arch/mips/ath79/mach-db120.c   | 136 -----------------------------------
- arch/mips/ath79/mach-pb44.c    | 128 ---------------------------------
- arch/mips/ath79/mach-ubnt-xm.c | 126 ---------------------------------
- arch/mips/ath79/machtypes.h    |  28 --------
- arch/mips/ath79/setup.c        |  77 +++-----------------
- 12 files changed, 9 insertions(+), 919 deletions(-)
- delete mode 100644 arch/mips/ath79/mach-ap121.c
- delete mode 100644 arch/mips/ath79/mach-ap136.c
- delete mode 100644 arch/mips/ath79/mach-ap81.c
- delete mode 100644 arch/mips/ath79/mach-db120.c
- delete mode 100644 arch/mips/ath79/mach-pb44.c
- delete mode 100644 arch/mips/ath79/mach-ubnt-xm.c
- delete mode 100644 arch/mips/ath79/machtypes.h
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -202,7 +202,6 @@ config ATH79
-       select COMMON_CLK
-       select CLKDEV_LOOKUP
-       select IRQ_MIPS_CPU
--      select MIPS_MACHINE
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_HAS_EARLY_PRINTK
-       select SYS_SUPPORTS_32BIT_KERNEL
---- a/arch/mips/ath79/Kconfig
-+++ b/arch/mips/ath79/Kconfig
-@@ -1,79 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- if ATH79
--menu "Atheros AR71XX/AR724X/AR913X machine selection"
--
--config ATH79_MACH_AP121
--      bool "Atheros AP121 reference board"
--      select SOC_AR933X
--      select ATH79_DEV_GPIO_BUTTONS
--      select ATH79_DEV_LEDS_GPIO
--      select ATH79_DEV_SPI
--      select ATH79_DEV_USB
--      select ATH79_DEV_WMAC
--      help
--        Say 'Y' here if you want your kernel to support the
--        Atheros AP121 reference board.
--
--config ATH79_MACH_AP136
--      bool "Atheros AP136 reference board"
--      select SOC_QCA955X
--      select ATH79_DEV_GPIO_BUTTONS
--      select ATH79_DEV_LEDS_GPIO
--      select ATH79_DEV_SPI
--      select ATH79_DEV_USB
--      select ATH79_DEV_WMAC
--      help
--        Say 'Y' here if you want your kernel to support the
--        Atheros AP136 reference board.
--
--config ATH79_MACH_AP81
--      bool "Atheros AP81 reference board"
--      select SOC_AR913X
--      select ATH79_DEV_GPIO_BUTTONS
--      select ATH79_DEV_LEDS_GPIO
--      select ATH79_DEV_SPI
--      select ATH79_DEV_USB
--      select ATH79_DEV_WMAC
--      help
--        Say 'Y' here if you want your kernel to support the
--        Atheros AP81 reference board.
--
--config ATH79_MACH_DB120
--      bool "Atheros DB120 reference board"
--      select SOC_AR934X
--      select ATH79_DEV_GPIO_BUTTONS
--      select ATH79_DEV_LEDS_GPIO
--      select ATH79_DEV_SPI
--      select ATH79_DEV_USB
--      select ATH79_DEV_WMAC
--      help
--        Say 'Y' here if you want your kernel to support the
--        Atheros DB120 reference board.
--
--config ATH79_MACH_PB44
--      bool "Atheros PB44 reference board"
--      select SOC_AR71XX
--      select ATH79_DEV_GPIO_BUTTONS
--      select ATH79_DEV_LEDS_GPIO
--      select ATH79_DEV_SPI
--      select ATH79_DEV_USB
--      help
--        Say 'Y' here if you want your kernel to support the
--        Atheros PB44 reference board.
--
--config ATH79_MACH_UBNT_XM
--      bool "Ubiquiti Networks XM (rev 1.0) board"
--      select SOC_AR724X
--      select ATH79_DEV_GPIO_BUTTONS
--      select ATH79_DEV_LEDS_GPIO
--      select ATH79_DEV_SPI
--      help
--        Say 'Y' here if you want your kernel to support the
--        Ubiquiti Networks XM (rev 1.0) board.
--
--endmenu
--
- config SOC_AR71XX
-       select HW_HAS_PCI
-       def_bool n
---- a/arch/mips/ath79/Makefile
-+++ b/arch/mips/ath79/Makefile
-@@ -22,13 +22,3 @@ obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)   += dev
- obj-$(CONFIG_ATH79_DEV_SPI)           += dev-spi.o
- obj-$(CONFIG_ATH79_DEV_USB)           += dev-usb.o
- obj-$(CONFIG_ATH79_DEV_WMAC)          += dev-wmac.o
--
--#
--# Machines
--#
--obj-$(CONFIG_ATH79_MACH_AP121)                += mach-ap121.o
--obj-$(CONFIG_ATH79_MACH_AP136)                += mach-ap136.o
--obj-$(CONFIG_ATH79_MACH_AP81)         += mach-ap81.o
--obj-$(CONFIG_ATH79_MACH_DB120)                += mach-db120.o
--obj-$(CONFIG_ATH79_MACH_PB44)         += mach-pb44.o
--obj-$(CONFIG_ATH79_MACH_UBNT_XM)      += mach-ubnt-xm.o
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -26,7 +26,6 @@
- #include <asm/mach-ath79/ath79.h>
- #include <asm/mach-ath79/ar71xx_regs.h>
- #include "common.h"
--#include "machtypes.h"
- #define AR71XX_BASE_FREQ      40000000
- #define AR724X_BASE_FREQ      40000000
---- a/arch/mips/ath79/mach-ap121.c
-+++ /dev/null
-@@ -1,92 +0,0 @@
--/*
-- *  Atheros AP121 board support
-- *
-- *  Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
-- *
-- *  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 "machtypes.h"
--#include "dev-gpio-buttons.h"
--#include "dev-leds-gpio.h"
--#include "dev-spi.h"
--#include "dev-usb.h"
--#include "dev-wmac.h"
--
--#define AP121_GPIO_LED_WLAN           0
--#define AP121_GPIO_LED_USB            1
--
--#define AP121_GPIO_BTN_JUMPSTART      11
--#define AP121_GPIO_BTN_RESET          12
--
--#define AP121_KEYS_POLL_INTERVAL      20      /* msecs */
--#define AP121_KEYS_DEBOUNCE_INTERVAL  (3 * AP121_KEYS_POLL_INTERVAL)
--
--#define AP121_CAL_DATA_ADDR   0x1fff1000
--
--static struct gpio_led ap121_leds_gpio[] __initdata = {
--      {
--              .name           = "ap121:green:usb",
--              .gpio           = AP121_GPIO_LED_USB,
--              .active_low     = 0,
--      },
--      {
--              .name           = "ap121:green:wlan",
--              .gpio           = AP121_GPIO_LED_WLAN,
--              .active_low     = 0,
--      },
--};
--
--static struct gpio_keys_button ap121_gpio_keys[] __initdata = {
--      {
--              .desc           = "jumpstart button",
--              .type           = EV_KEY,
--              .code           = KEY_WPS_BUTTON,
--              .debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = AP121_GPIO_BTN_JUMPSTART,
--              .active_low     = 1,
--      },
--      {
--              .desc           = "reset button",
--              .type           = EV_KEY,
--              .code           = KEY_RESTART,
--              .debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = AP121_GPIO_BTN_RESET,
--              .active_low     = 1,
--      }
--};
--
--static struct spi_board_info ap121_spi_info[] = {
--      {
--              .bus_num        = 0,
--              .chip_select    = 0,
--              .max_speed_hz   = 25000000,
--              .modalias       = "mx25l1606e",
--      }
--};
--
--static struct ath79_spi_platform_data ap121_spi_data = {
--      .bus_num        = 0,
--      .num_chipselect = 1,
--};
--
--static void __init ap121_setup(void)
--{
--      u8 *cal_data = (u8 *) KSEG1ADDR(AP121_CAL_DATA_ADDR);
--
--      ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_leds_gpio),
--                               ap121_leds_gpio);
--      ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,
--                                      ARRAY_SIZE(ap121_gpio_keys),
--                                      ap121_gpio_keys);
--
--      ath79_register_spi(&ap121_spi_data, ap121_spi_info,
--                         ARRAY_SIZE(ap121_spi_info));
--      ath79_register_usb();
--      ath79_register_wmac(cal_data);
--}
--
--MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",
--           ap121_setup);
---- a/arch/mips/ath79/mach-ap136.c
-+++ /dev/null
-@@ -1,156 +0,0 @@
--/*
-- * Qualcomm Atheros AP136 reference board support
-- *
-- * Copyright (c) 2012 Qualcomm Atheros
-- * Copyright (c) 2012-2013 Gabor Juhos <juhosg@openwrt.org>
-- *
-- * Permission to use, copy, modify, and/or distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- *
-- */
--
--#include <linux/pci.h>
--#include <linux/ath9k_platform.h>
--
--#include "machtypes.h"
--#include "dev-gpio-buttons.h"
--#include "dev-leds-gpio.h"
--#include "dev-spi.h"
--#include "dev-usb.h"
--#include "dev-wmac.h"
--#include "pci.h"
--
--#define AP136_GPIO_LED_STATUS_RED     14
--#define AP136_GPIO_LED_STATUS_GREEN   19
--#define AP136_GPIO_LED_USB            4
--#define AP136_GPIO_LED_WLAN_2G                13
--#define AP136_GPIO_LED_WLAN_5G                12
--#define AP136_GPIO_LED_WPS_RED                15
--#define AP136_GPIO_LED_WPS_GREEN      20
--
--#define AP136_GPIO_BTN_WPS            16
--#define AP136_GPIO_BTN_RFKILL         21
--
--#define AP136_KEYS_POLL_INTERVAL      20      /* msecs */
--#define AP136_KEYS_DEBOUNCE_INTERVAL  (3 * AP136_KEYS_POLL_INTERVAL)
--
--#define AP136_WMAC_CALDATA_OFFSET 0x1000
--#define AP136_PCIE_CALDATA_OFFSET 0x5000
--
--static struct gpio_led ap136_leds_gpio[] __initdata = {
--      {
--              .name           = "qca:green:status",
--              .gpio           = AP136_GPIO_LED_STATUS_GREEN,
--              .active_low     = 1,
--      },
--      {
--              .name           = "qca:red:status",
--              .gpio           = AP136_GPIO_LED_STATUS_RED,
--              .active_low     = 1,
--      },
--      {
--              .name           = "qca:green:wps",
--              .gpio           = AP136_GPIO_LED_WPS_GREEN,
--              .active_low     = 1,
--      },
--      {
--              .name           = "qca:red:wps",
--              .gpio           = AP136_GPIO_LED_WPS_RED,
--              .active_low     = 1,
--      },
--      {
--              .name           = "qca:red:wlan-2g",
--              .gpio           = AP136_GPIO_LED_WLAN_2G,
--              .active_low     = 1,
--      },
--      {
--              .name           = "qca:red:usb",
--              .gpio           = AP136_GPIO_LED_USB,
--              .active_low     = 1,
--      }
--};
--
--static struct gpio_keys_button ap136_gpio_keys[] __initdata = {
--      {
--              .desc           = "WPS button",
--              .type           = EV_KEY,
--              .code           = KEY_WPS_BUTTON,
--              .debounce_interval = AP136_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = AP136_GPIO_BTN_WPS,
--              .active_low     = 1,
--      },
--      {
--              .desc           = "RFKILL button",
--              .type           = EV_KEY,
--              .code           = KEY_RFKILL,
--              .debounce_interval = AP136_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = AP136_GPIO_BTN_RFKILL,
--              .active_low     = 1,
--      },
--};
--
--static struct spi_board_info ap136_spi_info[] = {
--      {
--              .bus_num        = 0,
--              .chip_select    = 0,
--              .max_speed_hz   = 25000000,
--              .modalias       = "mx25l6405d",
--      }
--};
--
--static struct ath79_spi_platform_data ap136_spi_data = {
--      .bus_num        = 0,
--      .num_chipselect = 1,
--};
--
--#ifdef CONFIG_PCI
--static struct ath9k_platform_data ap136_ath9k_data;
--
--static int ap136_pci_plat_dev_init(struct pci_dev *dev)
--{
--      if (dev->bus->number == 1 && (PCI_SLOT(dev->devfn)) == 0)
--              dev->dev.platform_data = &ap136_ath9k_data;
--
--      return 0;
--}
--
--static void __init ap136_pci_init(u8 *eeprom)
--{
--      memcpy(ap136_ath9k_data.eeprom_data, eeprom,
--             sizeof(ap136_ath9k_data.eeprom_data));
--
--      ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init);
--      ath79_register_pci();
--}
--#else
--static inline void ap136_pci_init(u8 *eeprom) {}
--#endif /* CONFIG_PCI */
--
--static void __init ap136_setup(void)
--{
--      u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
--
--      ath79_register_leds_gpio(-1, ARRAY_SIZE(ap136_leds_gpio),
--                               ap136_leds_gpio);
--      ath79_register_gpio_keys_polled(-1, AP136_KEYS_POLL_INTERVAL,
--                                      ARRAY_SIZE(ap136_gpio_keys),
--                                      ap136_gpio_keys);
--      ath79_register_spi(&ap136_spi_data, ap136_spi_info,
--                         ARRAY_SIZE(ap136_spi_info));
--      ath79_register_usb();
--      ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET);
--      ap136_pci_init(art + AP136_PCIE_CALDATA_OFFSET);
--}
--
--MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
--           "Atheros AP136-010 reference board",
--           ap136_setup);
---- a/arch/mips/ath79/mach-ap81.c
-+++ /dev/null
-@@ -1,100 +0,0 @@
--/*
-- *  Atheros AP81 board support
-- *
-- *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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 "machtypes.h"
--#include "dev-wmac.h"
--#include "dev-gpio-buttons.h"
--#include "dev-leds-gpio.h"
--#include "dev-spi.h"
--#include "dev-usb.h"
--
--#define AP81_GPIO_LED_STATUS  1
--#define AP81_GPIO_LED_AOSS    3
--#define AP81_GPIO_LED_WLAN    6
--#define AP81_GPIO_LED_POWER   14
--
--#define AP81_GPIO_BTN_SW4     12
--#define AP81_GPIO_BTN_SW1     21
--
--#define AP81_KEYS_POLL_INTERVAL               20      /* msecs */
--#define AP81_KEYS_DEBOUNCE_INTERVAL   (3 * AP81_KEYS_POLL_INTERVAL)
--
--#define AP81_CAL_DATA_ADDR    0x1fff1000
--
--static struct gpio_led ap81_leds_gpio[] __initdata = {
--      {
--              .name           = "ap81:green:status",
--              .gpio           = AP81_GPIO_LED_STATUS,
--              .active_low     = 1,
--      }, {
--              .name           = "ap81:amber:aoss",
--              .gpio           = AP81_GPIO_LED_AOSS,
--              .active_low     = 1,
--      }, {
--              .name           = "ap81:green:wlan",
--              .gpio           = AP81_GPIO_LED_WLAN,
--              .active_low     = 1,
--      }, {
--              .name           = "ap81:green:power",
--              .gpio           = AP81_GPIO_LED_POWER,
--              .active_low     = 1,
--      }
--};
--
--static struct gpio_keys_button ap81_gpio_keys[] __initdata = {
--      {
--              .desc           = "sw1",
--              .type           = EV_KEY,
--              .code           = BTN_0,
--              .debounce_interval = AP81_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = AP81_GPIO_BTN_SW1,
--              .active_low     = 1,
--      } , {
--              .desc           = "sw4",
--              .type           = EV_KEY,
--              .code           = BTN_1,
--              .debounce_interval = AP81_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = AP81_GPIO_BTN_SW4,
--              .active_low     = 1,
--      }
--};
--
--static struct spi_board_info ap81_spi_info[] = {
--      {
--              .bus_num        = 0,
--              .chip_select    = 0,
--              .max_speed_hz   = 25000000,
--              .modalias       = "m25p64",
--      }
--};
--
--static struct ath79_spi_platform_data ap81_spi_data = {
--      .bus_num        = 0,
--      .num_chipselect = 1,
--};
--
--static void __init ap81_setup(void)
--{
--      u8 *cal_data = (u8 *) KSEG1ADDR(AP81_CAL_DATA_ADDR);
--
--      ath79_register_leds_gpio(-1, ARRAY_SIZE(ap81_leds_gpio),
--                               ap81_leds_gpio);
--      ath79_register_gpio_keys_polled(-1, AP81_KEYS_POLL_INTERVAL,
--                                      ARRAY_SIZE(ap81_gpio_keys),
--                                      ap81_gpio_keys);
--      ath79_register_spi(&ap81_spi_data, ap81_spi_info,
--                         ARRAY_SIZE(ap81_spi_info));
--      ath79_register_wmac(cal_data);
--      ath79_register_usb();
--}
--
--MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board",
--           ap81_setup);
---- a/arch/mips/ath79/mach-db120.c
-+++ /dev/null
-@@ -1,136 +0,0 @@
--/*
-- * Atheros DB120 reference board support
-- *
-- * Copyright (c) 2011 Qualcomm Atheros
-- * Copyright (c) 2011 Gabor Juhos <juhosg@openwrt.org>
-- *
-- * Permission to use, copy, modify, and/or distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- *
-- */
--
--#include <linux/pci.h>
--#include <linux/ath9k_platform.h>
--
--#include "machtypes.h"
--#include "dev-gpio-buttons.h"
--#include "dev-leds-gpio.h"
--#include "dev-spi.h"
--#include "dev-usb.h"
--#include "dev-wmac.h"
--#include "pci.h"
--
--#define DB120_GPIO_LED_WLAN_5G                12
--#define DB120_GPIO_LED_WLAN_2G                13
--#define DB120_GPIO_LED_STATUS         14
--#define DB120_GPIO_LED_WPS            15
--
--#define DB120_GPIO_BTN_WPS            16
--
--#define DB120_KEYS_POLL_INTERVAL      20      /* msecs */
--#define DB120_KEYS_DEBOUNCE_INTERVAL  (3 * DB120_KEYS_POLL_INTERVAL)
--
--#define DB120_WMAC_CALDATA_OFFSET 0x1000
--#define DB120_PCIE_CALDATA_OFFSET 0x5000
--
--static struct gpio_led db120_leds_gpio[] __initdata = {
--      {
--              .name           = "db120:green:status",
--              .gpio           = DB120_GPIO_LED_STATUS,
--              .active_low     = 1,
--      },
--      {
--              .name           = "db120:green:wps",
--              .gpio           = DB120_GPIO_LED_WPS,
--              .active_low     = 1,
--      },
--      {
--              .name           = "db120:green:wlan-5g",
--              .gpio           = DB120_GPIO_LED_WLAN_5G,
--              .active_low     = 1,
--      },
--      {
--              .name           = "db120:green:wlan-2g",
--              .gpio           = DB120_GPIO_LED_WLAN_2G,
--              .active_low     = 1,
--      },
--};
--
--static struct gpio_keys_button db120_gpio_keys[] __initdata = {
--      {
--              .desc           = "WPS button",
--              .type           = EV_KEY,
--              .code           = KEY_WPS_BUTTON,
--              .debounce_interval = DB120_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = DB120_GPIO_BTN_WPS,
--              .active_low     = 1,
--      },
--};
--
--static struct spi_board_info db120_spi_info[] = {
--      {
--              .bus_num        = 0,
--              .chip_select    = 0,
--              .max_speed_hz   = 25000000,
--              .modalias       = "s25sl064a",
--      }
--};
--
--static struct ath79_spi_platform_data db120_spi_data = {
--      .bus_num        = 0,
--      .num_chipselect = 1,
--};
--
--#ifdef CONFIG_PCI
--static struct ath9k_platform_data db120_ath9k_data;
--
--static int db120_pci_plat_dev_init(struct pci_dev *dev)
--{
--      switch (PCI_SLOT(dev->devfn)) {
--      case 0:
--              dev->dev.platform_data = &db120_ath9k_data;
--              break;
--      }
--
--      return 0;
--}
--
--static void __init db120_pci_init(u8 *eeprom)
--{
--      memcpy(db120_ath9k_data.eeprom_data, eeprom,
--             sizeof(db120_ath9k_data.eeprom_data));
--
--      ath79_pci_set_plat_dev_init(db120_pci_plat_dev_init);
--      ath79_register_pci();
--}
--#else
--static inline void db120_pci_init(u8 *eeprom) {}
--#endif /* CONFIG_PCI */
--
--static void __init db120_setup(void)
--{
--      u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
--
--      ath79_register_leds_gpio(-1, ARRAY_SIZE(db120_leds_gpio),
--                               db120_leds_gpio);
--      ath79_register_gpio_keys_polled(-1, DB120_KEYS_POLL_INTERVAL,
--                                      ARRAY_SIZE(db120_gpio_keys),
--                                      db120_gpio_keys);
--      ath79_register_spi(&db120_spi_data, db120_spi_info,
--                         ARRAY_SIZE(db120_spi_info));
--      ath79_register_usb();
--      ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET);
--      db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET);
--}
--
--MIPS_MACHINE(ATH79_MACH_DB120, "DB120", "Atheros DB120 reference board",
--           db120_setup);
---- a/arch/mips/ath79/mach-pb44.c
-+++ /dev/null
-@@ -1,128 +0,0 @@
--/*
-- *  Atheros PB44 reference board support
-- *
-- *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
-- *
-- *  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/init.h>
--#include <linux/platform_device.h>
--#include <linux/i2c.h>
--#include <linux/gpio/machine.h>
--#include <linux/platform_data/pcf857x.h>
--
--#include "machtypes.h"
--#include "dev-gpio-buttons.h"
--#include "dev-leds-gpio.h"
--#include "dev-spi.h"
--#include "dev-usb.h"
--#include "pci.h"
--
--#define PB44_GPIO_I2C_SCL     0
--#define PB44_GPIO_I2C_SDA     1
--
--#define PB44_GPIO_EXP_BASE    16
--#define PB44_GPIO_SW_RESET    (PB44_GPIO_EXP_BASE + 6)
--#define PB44_GPIO_SW_JUMP     (PB44_GPIO_EXP_BASE + 8)
--#define PB44_GPIO_LED_JUMP1   (PB44_GPIO_EXP_BASE + 9)
--#define PB44_GPIO_LED_JUMP2   (PB44_GPIO_EXP_BASE + 10)
--
--#define PB44_KEYS_POLL_INTERVAL               20      /* msecs */
--#define PB44_KEYS_DEBOUNCE_INTERVAL   (3 * PB44_KEYS_POLL_INTERVAL)
--
--static struct gpiod_lookup_table pb44_i2c_gpiod_table = {
--      .dev_id = "i2c-gpio.0",
--      .table = {
--              GPIO_LOOKUP_IDX("ath79-gpio", PB44_GPIO_I2C_SDA,
--                              NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
--              GPIO_LOOKUP_IDX("ath79-gpio", PB44_GPIO_I2C_SCL,
--                              NULL, 1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
--      },
--};
--
--static struct platform_device pb44_i2c_gpio_device = {
--      .name           = "i2c-gpio",
--      .id             = 0,
--      .dev = {
--              .platform_data  = NULL,
--      }
--};
--
--static struct pcf857x_platform_data pb44_pcf857x_data = {
--      .gpio_base      = PB44_GPIO_EXP_BASE,
--};
--
--static struct i2c_board_info pb44_i2c_board_info[] __initdata = {
--      {
--              I2C_BOARD_INFO("pcf8575", 0x20),
--              .platform_data  = &pb44_pcf857x_data,
--      },
--};
--
--static struct gpio_led pb44_leds_gpio[] __initdata = {
--      {
--              .name           = "pb44:amber:jump1",
--              .gpio           = PB44_GPIO_LED_JUMP1,
--              .active_low     = 1,
--      }, {
--              .name           = "pb44:green:jump2",
--              .gpio           = PB44_GPIO_LED_JUMP2,
--              .active_low     = 1,
--      },
--};
--
--static struct gpio_keys_button pb44_gpio_keys[] __initdata = {
--      {
--              .desc           = "soft_reset",
--              .type           = EV_KEY,
--              .code           = KEY_RESTART,
--              .debounce_interval = PB44_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = PB44_GPIO_SW_RESET,
--              .active_low     = 1,
--      } , {
--              .desc           = "jumpstart",
--              .type           = EV_KEY,
--              .code           = KEY_WPS_BUTTON,
--              .debounce_interval = PB44_KEYS_DEBOUNCE_INTERVAL,
--              .gpio           = PB44_GPIO_SW_JUMP,
--              .active_low     = 1,
--      }
--};
--
--static struct spi_board_info pb44_spi_info[] = {
--      {
--              .bus_num        = 0,
--              .chip_select    = 0,
--              .max_speed_hz   = 25000000,
--              .modalias       = "m25p64",
--      },
--};
--
--static struct ath79_spi_platform_data pb44_spi_data = {
--      .bus_num                = 0,
--      .num_chipselect         = 1,
--};
--
--static void __init pb44_init(void)
--{
--      gpiod_add_lookup_table(&pb44_i2c_gpiod_table);
--      i2c_register_board_info(0, pb44_i2c_board_info,
--                              ARRAY_SIZE(pb44_i2c_board_info));
--      platform_device_register(&pb44_i2c_gpio_device);
--
--      ath79_register_leds_gpio(-1, ARRAY_SIZE(pb44_leds_gpio),
--                               pb44_leds_gpio);
--      ath79_register_gpio_keys_polled(-1, PB44_KEYS_POLL_INTERVAL,
--                                      ARRAY_SIZE(pb44_gpio_keys),
--                                      pb44_gpio_keys);
--      ath79_register_spi(&pb44_spi_data, pb44_spi_info,
--                         ARRAY_SIZE(pb44_spi_info));
--      ath79_register_usb();
--      ath79_register_pci();
--}
--
--MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
--           pb44_init);
---- a/arch/mips/ath79/mach-ubnt-xm.c
-+++ /dev/null
-@@ -1,126 +0,0 @@
--/*
-- *  Ubiquiti Networks XM (rev 1.0) board support
-- *
-- *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
-- *
-- *  Derived from: mach-pb44.c
-- *
-- *  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/init.h>
--#include <linux/pci.h>
--#include <linux/ath9k_platform.h>
--
--#include <asm/mach-ath79/irq.h>
--
--#include "machtypes.h"
--#include "dev-gpio-buttons.h"
--#include "dev-leds-gpio.h"
--#include "dev-spi.h"
--#include "pci.h"
--
--#define UBNT_XM_GPIO_LED_L1           0
--#define UBNT_XM_GPIO_LED_L2           1
--#define UBNT_XM_GPIO_LED_L3           11
--#define UBNT_XM_GPIO_LED_L4           7
--
--#define UBNT_XM_GPIO_BTN_RESET                12
--
--#define UBNT_XM_KEYS_POLL_INTERVAL    20
--#define UBNT_XM_KEYS_DEBOUNCE_INTERVAL        (3 * UBNT_XM_KEYS_POLL_INTERVAL)
--
--#define UBNT_XM_EEPROM_ADDR           (u8 *) KSEG1ADDR(0x1fff1000)
--
--static struct gpio_led ubnt_xm_leds_gpio[] __initdata = {
--      {
--              .name           = "ubnt-xm:red:link1",
--              .gpio           = UBNT_XM_GPIO_LED_L1,
--              .active_low     = 0,
--      }, {
--              .name           = "ubnt-xm:orange:link2",
--              .gpio           = UBNT_XM_GPIO_LED_L2,
--              .active_low     = 0,
--      }, {
--              .name           = "ubnt-xm:green:link3",
--              .gpio           = UBNT_XM_GPIO_LED_L3,
--              .active_low     = 0,
--      }, {
--              .name           = "ubnt-xm:green:link4",
--              .gpio           = UBNT_XM_GPIO_LED_L4,
--              .active_low     = 0,
--      },
--};
--
--static struct gpio_keys_button ubnt_xm_gpio_keys[] __initdata = {
--      {
--              .desc                   = "reset",
--              .type                   = EV_KEY,
--              .code                   = KEY_RESTART,
--              .debounce_interval      = UBNT_XM_KEYS_DEBOUNCE_INTERVAL,
--              .gpio                   = UBNT_XM_GPIO_BTN_RESET,
--              .active_low             = 1,
--      }
--};
--
--static struct spi_board_info ubnt_xm_spi_info[] = {
--      {
--              .bus_num        = 0,
--              .chip_select    = 0,
--              .max_speed_hz   = 25000000,
--              .modalias       = "mx25l6405d",
--      }
--};
--
--static struct ath79_spi_platform_data ubnt_xm_spi_data = {
--      .bus_num                = 0,
--      .num_chipselect         = 1,
--};
--
--#ifdef CONFIG_PCI
--static struct ath9k_platform_data ubnt_xm_eeprom_data;
--
--static int ubnt_xm_pci_plat_dev_init(struct pci_dev *dev)
--{
--      switch (PCI_SLOT(dev->devfn)) {
--      case 0:
--              dev->dev.platform_data = &ubnt_xm_eeprom_data;
--              break;
--      }
--
--      return 0;
--}
--
--static void __init ubnt_xm_pci_init(void)
--{
--      memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,
--             sizeof(ubnt_xm_eeprom_data.eeprom_data));
--
--      ath79_pci_set_plat_dev_init(ubnt_xm_pci_plat_dev_init);
--      ath79_register_pci();
--}
--#else
--static inline void ubnt_xm_pci_init(void) {}
--#endif /* CONFIG_PCI */
--
--static void __init ubnt_xm_init(void)
--{
--      ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xm_leds_gpio),
--                               ubnt_xm_leds_gpio);
--
--      ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
--                                      ARRAY_SIZE(ubnt_xm_gpio_keys),
--                                      ubnt_xm_gpio_keys);
--
--      ath79_register_spi(&ubnt_xm_spi_data, ubnt_xm_spi_info,
--                         ARRAY_SIZE(ubnt_xm_spi_info));
--
--      ubnt_xm_pci_init();
--}
--
--MIPS_MACHINE(ATH79_MACH_UBNT_XM,
--           "UBNT-XM",
--           "Ubiquiti Networks XM (rev 1.0) board",
--           ubnt_xm_init);
---- a/arch/mips/ath79/machtypes.h
-+++ /dev/null
-@@ -1,28 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X machine type definitions
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_MACHTYPE_H
--#define _ATH79_MACHTYPE_H
--
--#include <asm/mips_machine.h>
--
--enum ath79_mach_type {
--      ATH79_MACH_GENERIC_OF = -1,     /* Device tree board */
--      ATH79_MACH_GENERIC = 0,
--      ATH79_MACH_AP121,               /* Atheros AP121 reference board */
--      ATH79_MACH_AP136_010,           /* Atheros AP136-010 reference board */
--      ATH79_MACH_AP81,                /* Atheros AP81 reference board */
--      ATH79_MACH_DB120,               /* Atheros DB120 reference board */
--      ATH79_MACH_PB44,                /* Atheros PB44 reference board */
--      ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
--};
--
--#endif /* _ATH79_MACHTYPE_H */
---- a/arch/mips/ath79/setup.c
-+++ b/arch/mips/ath79/setup.c
-@@ -33,7 +33,6 @@
- #include <asm/mach-ath79/ar71xx_regs.h>
- #include "common.h"
- #include "dev-common.h"
--#include "machtypes.h"
- #define ATH79_SYS_TYPE_LEN    64
-@@ -230,25 +229,21 @@ void __init plat_mem_setup(void)
-       else if (fw_passed_dtb)
-               __dt_setup_arch((void *)KSEG0ADDR(fw_passed_dtb));
--      if (mips_machtype != ATH79_MACH_GENERIC_OF) {
--              ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
--                                                 AR71XX_RESET_SIZE);
--              ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
--                                               AR71XX_PLL_SIZE);
--              ath79_detect_sys_type();
--              ath79_ddr_ctrl_init();
-+      ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
-+                                         AR71XX_RESET_SIZE);
-+      ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
-+                                       AR71XX_PLL_SIZE);
-+      ath79_detect_sys_type();
-+      ath79_ddr_ctrl_init();
--              detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
--
--              /* OF machines should use the reset driver */
--              _machine_restart = ath79_restart;
--      }
-+      detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
-+      _machine_restart = ath79_restart;
-       _machine_halt = ath79_halt;
-       pm_power_off = ath79_halt;
- }
--static void __init ath79_of_plat_time_init(void)
-+void __init plat_time_init(void)
- {
-       struct device_node *np;
-       struct clk *clk;
-@@ -278,66 +273,12 @@ static void __init ath79_of_plat_time_in
-       clk_put(clk);
- }
--void __init plat_time_init(void)
--{
--      unsigned long cpu_clk_rate;
--      unsigned long ahb_clk_rate;
--      unsigned long ddr_clk_rate;
--      unsigned long ref_clk_rate;
--
--      if (IS_ENABLED(CONFIG_OF) && mips_machtype == ATH79_MACH_GENERIC_OF) {
--              ath79_of_plat_time_init();
--              return;
--      }
--
--      ath79_clocks_init();
--
--      cpu_clk_rate = ath79_get_sys_clk_rate("cpu");
--      ahb_clk_rate = ath79_get_sys_clk_rate("ahb");
--      ddr_clk_rate = ath79_get_sys_clk_rate("ddr");
--      ref_clk_rate = ath79_get_sys_clk_rate("ref");
--
--      pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz\n",
--              cpu_clk_rate / 1000000, (cpu_clk_rate / 1000) % 1000,
--              ddr_clk_rate / 1000000, (ddr_clk_rate / 1000) % 1000,
--              ahb_clk_rate / 1000000, (ahb_clk_rate / 1000) % 1000,
--              ref_clk_rate / 1000000, (ref_clk_rate / 1000) % 1000);
--
--      mips_hpt_frequency = cpu_clk_rate / 2;
--}
--
- void __init arch_init_irq(void)
- {
-       irqchip_init();
- }
--static int __init ath79_setup(void)
--{
--      if  (mips_machtype == ATH79_MACH_GENERIC_OF)
--              return 0;
--
--      ath79_gpio_init();
--      ath79_register_uart();
--      ath79_register_wdt();
--
--      mips_machine_setup();
--
--      return 0;
--}
--
--arch_initcall(ath79_setup);
--
- void __init device_tree_init(void)
- {
-       unflatten_and_copy_device_tree();
- }
--
--MIPS_MACHINE(ATH79_MACH_GENERIC,
--           "Generic",
--           "Generic AR71XX/AR724X/AR913X based board",
--           NULL);
--
--MIPS_MACHINE(ATH79_MACH_GENERIC_OF,
--           "DTB",
--           "Generic AR71XX/AR724X/AR913X based board (DT)",
--           NULL);
diff --git a/target/linux/ath79/patches-4.19/0029-MIPS-ath79-drop-legacy-pci-code.patch b/target/linux/ath79/patches-4.19/0029-MIPS-ath79-drop-legacy-pci-code.patch
deleted file mode 100644 (file)
index 254f2f9..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-From d0f1420702ed47a82572aaf39e7407055518d14e Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 23 Jun 2018 15:05:19 +0200
-Subject: [PATCH 29/33] MIPS: ath79: drop legacy pci code
-
-With the target now being fully OF based, we can drop the legacy pci
-platform code. The only bits that we need to keep is the fixup code
-which we move to its own code file.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/Makefile    |   1 -
- arch/mips/ath79/pci.c       | 273 --------------------------------------------
- arch/mips/ath79/pci.h       |  35 ------
- arch/mips/pci/Makefile      |   1 +
- arch/mips/pci/fixup-ath79.c |  21 ++++
- 5 files changed, 22 insertions(+), 309 deletions(-)
- delete mode 100644 arch/mips/ath79/pci.c
- delete mode 100644 arch/mips/ath79/pci.h
- create mode 100644 arch/mips/pci/fixup-ath79.c
-
---- a/arch/mips/ath79/Makefile
-+++ b/arch/mips/ath79/Makefile
-@@ -11,7 +11,6 @@
- obj-y := prom.o setup.o common.o clock.o
- obj-$(CONFIG_EARLY_PRINTK)            += early_printk.o
--obj-$(CONFIG_PCI)                     += pci.o
- #
- # Devices
---- a/arch/mips/ath79/pci.c
-+++ /dev/null
-@@ -1,273 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X specific PCI setup code
-- *
-- *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
-- *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  Parts of this file are based on Atheros' 2.6.15 BSP
-- *
-- *  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/init.h>
--#include <linux/pci.h>
--#include <linux/resource.h>
--#include <linux/platform_device.h>
--#include <asm/mach-ath79/ar71xx_regs.h>
--#include <asm/mach-ath79/ath79.h>
--#include <asm/mach-ath79/irq.h>
--#include "pci.h"
--
--static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);
--static const struct ath79_pci_irq *ath79_pci_irq_map;
--static unsigned ath79_pci_nr_irqs;
--
--static const struct ath79_pci_irq ar71xx_pci_irq_map[] = {
--      {
--              .slot   = 17,
--              .pin    = 1,
--              .irq    = ATH79_PCI_IRQ(0),
--      }, {
--              .slot   = 18,
--              .pin    = 1,
--              .irq    = ATH79_PCI_IRQ(1),
--      }, {
--              .slot   = 19,
--              .pin    = 1,
--              .irq    = ATH79_PCI_IRQ(2),
--      }
--};
--
--static const struct ath79_pci_irq ar724x_pci_irq_map[] = {
--      {
--              .slot   = 0,
--              .pin    = 1,
--              .irq    = ATH79_PCI_IRQ(0),
--      }
--};
--
--static const struct ath79_pci_irq qca955x_pci_irq_map[] = {
--      {
--              .bus    = 0,
--              .slot   = 0,
--              .pin    = 1,
--              .irq    = ATH79_PCI_IRQ(0),
--      },
--      {
--              .bus    = 1,
--              .slot   = 0,
--              .pin    = 1,
--              .irq    = ATH79_PCI_IRQ(1),
--      },
--};
--
--int pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
--{
--      int irq = -1;
--      int i;
--
--      if (ath79_pci_nr_irqs == 0 ||
--          ath79_pci_irq_map == NULL) {
--              if (soc_is_ar71xx()) {
--                      ath79_pci_irq_map = ar71xx_pci_irq_map;
--                      ath79_pci_nr_irqs = ARRAY_SIZE(ar71xx_pci_irq_map);
--              } else if (soc_is_ar724x() ||
--                         soc_is_ar9342() ||
--                         soc_is_ar9344()) {
--                      ath79_pci_irq_map = ar724x_pci_irq_map;
--                      ath79_pci_nr_irqs = ARRAY_SIZE(ar724x_pci_irq_map);
--              } else if (soc_is_qca955x()) {
--                      ath79_pci_irq_map = qca955x_pci_irq_map;
--                      ath79_pci_nr_irqs = ARRAY_SIZE(qca955x_pci_irq_map);
--              } else {
--                      pr_crit("pci %s: invalid irq map\n",
--                              pci_name((struct pci_dev *) dev));
--                      return irq;
--              }
--      }
--
--      for (i = 0; i < ath79_pci_nr_irqs; i++) {
--              const struct ath79_pci_irq *entry;
--
--              entry = &ath79_pci_irq_map[i];
--              if (entry->bus == dev->bus->number &&
--                  entry->slot == slot &&
--                  entry->pin == pin) {
--                      irq = entry->irq;
--                      break;
--              }
--      }
--
--      if (irq < 0)
--              pr_crit("pci %s: no irq found for pin %u\n",
--                      pci_name((struct pci_dev *) dev), pin);
--      else
--              pr_info("pci %s: using irq %d for pin %u\n",
--                      pci_name((struct pci_dev *) dev), irq, pin);
--
--      return irq;
--}
--
--int pcibios_plat_dev_init(struct pci_dev *dev)
--{
--      if (ath79_pci_plat_dev_init)
--              return ath79_pci_plat_dev_init(dev);
--
--      return 0;
--}
--
--void __init ath79_pci_set_irq_map(unsigned nr_irqs,
--                                const struct ath79_pci_irq *map)
--{
--      ath79_pci_nr_irqs = nr_irqs;
--      ath79_pci_irq_map = map;
--}
--
--void __init ath79_pci_set_plat_dev_init(int (*func)(struct pci_dev *dev))
--{
--      ath79_pci_plat_dev_init = func;
--}
--
--static struct platform_device *
--ath79_register_pci_ar71xx(void)
--{
--      struct platform_device *pdev;
--      struct resource res[4];
--
--      memset(res, 0, sizeof(res));
--
--      res[0].name = "cfg_base";
--      res[0].flags = IORESOURCE_MEM;
--      res[0].start = AR71XX_PCI_CFG_BASE;
--      res[0].end = AR71XX_PCI_CFG_BASE + AR71XX_PCI_CFG_SIZE - 1;
--
--      res[1].flags = IORESOURCE_IRQ;
--      res[1].start = ATH79_CPU_IRQ(2);
--      res[1].end = ATH79_CPU_IRQ(2);
--
--      res[2].name = "io_base";
--      res[2].flags = IORESOURCE_IO;
--      res[2].start = 0;
--      res[2].end = 0;
--
--      res[3].name = "mem_base";
--      res[3].flags = IORESOURCE_MEM;
--      res[3].start = AR71XX_PCI_MEM_BASE;
--      res[3].end = AR71XX_PCI_MEM_BASE + AR71XX_PCI_MEM_SIZE - 1;
--
--      pdev = platform_device_register_simple("ar71xx-pci", -1,
--                                             res, ARRAY_SIZE(res));
--      return pdev;
--}
--
--static struct platform_device *
--ath79_register_pci_ar724x(int id,
--                        unsigned long cfg_base,
--                        unsigned long ctrl_base,
--                        unsigned long crp_base,
--                        unsigned long mem_base,
--                        unsigned long mem_size,
--                        unsigned long io_base,
--                        int irq)
--{
--      struct platform_device *pdev;
--      struct resource res[6];
--
--      memset(res, 0, sizeof(res));
--
--      res[0].name = "cfg_base";
--      res[0].flags = IORESOURCE_MEM;
--      res[0].start = cfg_base;
--      res[0].end = cfg_base + AR724X_PCI_CFG_SIZE - 1;
--
--      res[1].name = "ctrl_base";
--      res[1].flags = IORESOURCE_MEM;
--      res[1].start = ctrl_base;
--      res[1].end = ctrl_base + AR724X_PCI_CTRL_SIZE - 1;
--
--      res[2].flags = IORESOURCE_IRQ;
--      res[2].start = irq;
--      res[2].end = irq;
--
--      res[3].name = "mem_base";
--      res[3].flags = IORESOURCE_MEM;
--      res[3].start = mem_base;
--      res[3].end = mem_base + mem_size - 1;
--
--      res[4].name = "io_base";
--      res[4].flags = IORESOURCE_IO;
--      res[4].start = io_base;
--      res[4].end = io_base;
--
--      res[5].name = "crp_base";
--      res[5].flags = IORESOURCE_MEM;
--      res[5].start = crp_base;
--      res[5].end = crp_base + AR724X_PCI_CRP_SIZE - 1;
--
--      pdev = platform_device_register_simple("ar724x-pci", id,
--                                             res, ARRAY_SIZE(res));
--      return pdev;
--}
--
--int __init ath79_register_pci(void)
--{
--      struct platform_device *pdev = NULL;
--
--      if (soc_is_ar71xx()) {
--              pdev = ath79_register_pci_ar71xx();
--      } else if (soc_is_ar724x()) {
--              pdev = ath79_register_pci_ar724x(-1,
--                                               AR724X_PCI_CFG_BASE,
--                                               AR724X_PCI_CTRL_BASE,
--                                               AR724X_PCI_CRP_BASE,
--                                               AR724X_PCI_MEM_BASE,
--                                               AR724X_PCI_MEM_SIZE,
--                                               0,
--                                               ATH79_CPU_IRQ(2));
--      } else if (soc_is_ar9342() ||
--                 soc_is_ar9344()) {
--              u32 bootstrap;
--
--              bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
--              if ((bootstrap & AR934X_BOOTSTRAP_PCIE_RC) == 0)
--                      return -ENODEV;
--
--              pdev = ath79_register_pci_ar724x(-1,
--                                               AR724X_PCI_CFG_BASE,
--                                               AR724X_PCI_CTRL_BASE,
--                                               AR724X_PCI_CRP_BASE,
--                                               AR724X_PCI_MEM_BASE,
--                                               AR724X_PCI_MEM_SIZE,
--                                               0,
--                                               ATH79_IP2_IRQ(0));
--      } else if (soc_is_qca9558()) {
--              pdev = ath79_register_pci_ar724x(0,
--                                               QCA955X_PCI_CFG_BASE0,
--                                               QCA955X_PCI_CTRL_BASE0,
--                                               QCA955X_PCI_CRP_BASE0,
--                                               QCA955X_PCI_MEM_BASE0,
--                                               QCA955X_PCI_MEM_SIZE,
--                                               0,
--                                               ATH79_IP2_IRQ(0));
--
--              pdev = ath79_register_pci_ar724x(1,
--                                               QCA955X_PCI_CFG_BASE1,
--                                               QCA955X_PCI_CTRL_BASE1,
--                                               QCA955X_PCI_CRP_BASE1,
--                                               QCA955X_PCI_MEM_BASE1,
--                                               QCA955X_PCI_MEM_SIZE,
--                                               1,
--                                               ATH79_IP3_IRQ(2));
--      } else {
--              /* No PCI support */
--              return -ENODEV;
--      }
--
--      if (!pdev)
--              pr_err("unable to register PCI controller device\n");
--
--      return pdev ? 0 : -ENODEV;
--}
---- a/arch/mips/ath79/pci.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X PCI support
-- *
-- *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
-- *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_PCI_H
--#define _ATH79_PCI_H
--
--struct ath79_pci_irq {
--      int     bus;
--      u8      slot;
--      u8      pin;
--      int     irq;
--};
--
--#ifdef CONFIG_PCI
--void ath79_pci_set_irq_map(unsigned nr_irqs, const struct ath79_pci_irq *map);
--void ath79_pci_set_plat_dev_init(int (*func)(struct pci_dev *dev));
--int ath79_register_pci(void);
--#else
--static inline void
--ath79_pci_set_irq_map(unsigned nr_irqs, const struct ath79_pci_irq *map) {}
--static inline void
--ath79_pci_set_plat_dev_init(int (*func)(struct pci_dev *)) {}
--static inline int ath79_register_pci(void) { return 0; }
--#endif
--
--#endif /* _ATH79_PCI_H */
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_MIPS_PCI_VIRTIO)        += pci-vir
- #
- # These are still pretty much in the old state, watch, go blind.
- #
-+obj-$(CONFIG_ATH79)           += fixup-ath79.o
- obj-$(CONFIG_LASAT)           += pci-lasat.o
- obj-$(CONFIG_MIPS_COBALT)     += fixup-cobalt.o
- obj-$(CONFIG_LEMOTE_FULOONG2E)        += fixup-fuloong2e.o ops-loongson2.o
---- /dev/null
-+++ b/arch/mips/pci/fixup-ath79.c
-@@ -0,0 +1,21 @@
-+/*
-+ *  Copyright (C) 2018 John Crispin <john@phrozen.org>
-+ *
-+ *  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/pci.h>
-+//#include <linux/of_irq.h>
-+#include <linux/of_pci.h>
-+
-+int pcibios_plat_dev_init(struct pci_dev *dev)
-+{
-+      return PCIBIOS_SUCCESSFUL;
-+}
-+
-+int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      return of_irq_parse_and_map_pci(dev, slot, pin);
-+}
diff --git a/target/linux/ath79/patches-4.19/0030-MIPS-ath79-drop-platform-device-registration-code.patch b/target/linux/ath79/patches-4.19/0030-MIPS-ath79-drop-platform-device-registration-code.patch
deleted file mode 100644 (file)
index 93a133c..0000000
+++ /dev/null
@@ -1,933 +0,0 @@
-From dce930fba8ad3a90ccd164f199e57c2d61937ccd Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 23 Jun 2018 15:12:38 +0200
-Subject: [PATCH 30/33] MIPS: ath79: drop platform device registration code
-
-With the target now being fully OF based, we can drop the legacy platform
-device registration code. All devices and their drivers are now probed
-via OF.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/Makefile           |  10 --
- arch/mips/ath79/common.h           |   2 -
- arch/mips/ath79/dev-common.c       | 159 ------------------------
- arch/mips/ath79/dev-common.h       |  18 ---
- arch/mips/ath79/dev-gpio-buttons.c |  56 ---------
- arch/mips/ath79/dev-gpio-buttons.h |  23 ----
- arch/mips/ath79/dev-leds-gpio.c    |  54 ---------
- arch/mips/ath79/dev-leds-gpio.h    |  21 ----
- arch/mips/ath79/dev-spi.c          |  38 ------
- arch/mips/ath79/dev-spi.h          |  22 ----
- arch/mips/ath79/dev-usb.c          | 242 -------------------------------------
- arch/mips/ath79/dev-usb.h          |  17 ---
- arch/mips/ath79/dev-wmac.c         | 155 ------------------------
- arch/mips/ath79/dev-wmac.h         |  17 ---
- arch/mips/ath79/setup.c            |   1 -
- 15 files changed, 835 deletions(-)
- delete mode 100644 arch/mips/ath79/dev-common.c
- delete mode 100644 arch/mips/ath79/dev-common.h
- delete mode 100644 arch/mips/ath79/dev-gpio-buttons.c
- delete mode 100644 arch/mips/ath79/dev-gpio-buttons.h
- delete mode 100644 arch/mips/ath79/dev-leds-gpio.c
- delete mode 100644 arch/mips/ath79/dev-leds-gpio.h
- delete mode 100644 arch/mips/ath79/dev-spi.c
- delete mode 100644 arch/mips/ath79/dev-spi.h
- delete mode 100644 arch/mips/ath79/dev-usb.c
- delete mode 100644 arch/mips/ath79/dev-usb.h
- delete mode 100644 arch/mips/ath79/dev-wmac.c
- delete mode 100644 arch/mips/ath79/dev-wmac.h
-
---- a/arch/mips/ath79/Makefile
-+++ b/arch/mips/ath79/Makefile
-@@ -11,13 +11,3 @@
- obj-y := prom.o setup.o common.o clock.o
- obj-$(CONFIG_EARLY_PRINTK)            += early_printk.o
--
--#
--# Devices
--#
--obj-y                                 += dev-common.o
--obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)  += dev-gpio-buttons.o
--obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)     += dev-leds-gpio.o
--obj-$(CONFIG_ATH79_DEV_SPI)           += dev-spi.o
--obj-$(CONFIG_ATH79_DEV_USB)           += dev-usb.o
--obj-$(CONFIG_ATH79_DEV_WMAC)          += dev-wmac.o
---- a/arch/mips/ath79/common.h
-+++ b/arch/mips/ath79/common.h
-@@ -24,6 +24,4 @@ unsigned long ath79_get_sys_clk_rate(con
- void ath79_ddr_ctrl_init(void);
--void ath79_gpio_init(void);
--
- #endif /* __ATH79_COMMON_H */
---- a/arch/mips/ath79/dev-common.c
-+++ /dev/null
-@@ -1,159 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X common devices
-- *
-- *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  Parts of this file are based on Atheros' 2.6.15 BSP
-- *
-- *  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/platform_device.h>
--#include <linux/platform_data/gpio-ath79.h>
--#include <linux/serial_8250.h>
--#include <linux/clk.h>
--#include <linux/err.h>
--
--#include <asm/mach-ath79/ath79.h>
--#include <asm/mach-ath79/ar71xx_regs.h>
--#include "common.h"
--#include "dev-common.h"
--
--static struct resource ath79_uart_resources[] = {
--      {
--              .start  = AR71XX_UART_BASE,
--              .end    = AR71XX_UART_BASE + AR71XX_UART_SIZE - 1,
--              .flags  = IORESOURCE_MEM,
--      },
--};
--
--#define AR71XX_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
--static struct plat_serial8250_port ath79_uart_data[] = {
--      {
--              .mapbase        = AR71XX_UART_BASE,
--              .irq            = ATH79_MISC_IRQ(3),
--              .flags          = AR71XX_UART_FLAGS,
--              .iotype         = UPIO_MEM32,
--              .regshift       = 2,
--      }, {
--              /* terminating entry */
--      }
--};
--
--static struct platform_device ath79_uart_device = {
--      .name           = "serial8250",
--      .id             = PLAT8250_DEV_PLATFORM,
--      .resource       = ath79_uart_resources,
--      .num_resources  = ARRAY_SIZE(ath79_uart_resources),
--      .dev = {
--              .platform_data  = ath79_uart_data
--      },
--};
--
--static struct resource ar933x_uart_resources[] = {
--      {
--              .start  = AR933X_UART_BASE,
--              .end    = AR933X_UART_BASE + AR71XX_UART_SIZE - 1,
--              .flags  = IORESOURCE_MEM,
--      },
--      {
--              .start  = ATH79_MISC_IRQ(3),
--              .end    = ATH79_MISC_IRQ(3),
--              .flags  = IORESOURCE_IRQ,
--      },
--};
--
--static struct platform_device ar933x_uart_device = {
--      .name           = "ar933x-uart",
--      .id             = -1,
--      .resource       = ar933x_uart_resources,
--      .num_resources  = ARRAY_SIZE(ar933x_uart_resources),
--};
--
--void __init ath79_register_uart(void)
--{
--      unsigned long uart_clk_rate;
--
--      uart_clk_rate = ath79_get_sys_clk_rate("uart");
--
--      if (soc_is_ar71xx() ||
--          soc_is_ar724x() ||
--          soc_is_ar913x() ||
--          soc_is_ar934x() ||
--          soc_is_qca955x()) {
--              ath79_uart_data[0].uartclk = uart_clk_rate;
--              platform_device_register(&ath79_uart_device);
--      } else if (soc_is_ar933x()) {
--              platform_device_register(&ar933x_uart_device);
--      } else {
--              BUG();
--      }
--}
--
--void __init ath79_register_wdt(void)
--{
--      struct resource res;
--
--      memset(&res, 0, sizeof(res));
--
--      res.flags = IORESOURCE_MEM;
--      res.start = AR71XX_RESET_BASE + AR71XX_RESET_REG_WDOG_CTRL;
--      res.end = res.start + 0x8 - 1;
--
--      platform_device_register_simple("ath79-wdt", -1, &res, 1);
--}
--
--static struct ath79_gpio_platform_data ath79_gpio_pdata;
--
--static struct resource ath79_gpio_resources[] = {
--      {
--              .flags = IORESOURCE_MEM,
--              .start = AR71XX_GPIO_BASE,
--              .end = AR71XX_GPIO_BASE + AR71XX_GPIO_SIZE - 1,
--      },
--      {
--              .start  = ATH79_MISC_IRQ(2),
--              .end    = ATH79_MISC_IRQ(2),
--              .flags  = IORESOURCE_IRQ,
--      },
--};
--
--static struct platform_device ath79_gpio_device = {
--      .name           = "ath79-gpio",
--      .id             = -1,
--      .resource       = ath79_gpio_resources,
--      .num_resources  = ARRAY_SIZE(ath79_gpio_resources),
--      .dev = {
--              .platform_data  = &ath79_gpio_pdata
--      },
--};
--
--void __init ath79_gpio_init(void)
--{
--      if (soc_is_ar71xx()) {
--              ath79_gpio_pdata.ngpios = AR71XX_GPIO_COUNT;
--      } else if (soc_is_ar7240()) {
--              ath79_gpio_pdata.ngpios = AR7240_GPIO_COUNT;
--      } else if (soc_is_ar7241() || soc_is_ar7242()) {
--              ath79_gpio_pdata.ngpios = AR7241_GPIO_COUNT;
--      } else if (soc_is_ar913x()) {
--              ath79_gpio_pdata.ngpios = AR913X_GPIO_COUNT;
--      } else if (soc_is_ar933x()) {
--              ath79_gpio_pdata.ngpios = AR933X_GPIO_COUNT;
--      } else if (soc_is_ar934x()) {
--              ath79_gpio_pdata.ngpios = AR934X_GPIO_COUNT;
--              ath79_gpio_pdata.oe_inverted = 1;
--      } else if (soc_is_qca955x()) {
--              ath79_gpio_pdata.ngpios = QCA955X_GPIO_COUNT;
--              ath79_gpio_pdata.oe_inverted = 1;
--      } else {
--              BUG();
--      }
--
--      platform_device_register(&ath79_gpio_device);
--}
---- a/arch/mips/ath79/dev-common.h
-+++ /dev/null
-@@ -1,18 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X common devices
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_DEV_COMMON_H
--#define _ATH79_DEV_COMMON_H
--
--void ath79_register_uart(void);
--void ath79_register_wdt(void);
--
--#endif /* _ATH79_DEV_COMMON_H */
---- a/arch/mips/ath79/dev-gpio-buttons.c
-+++ /dev/null
-@@ -1,56 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X GPIO button support
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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/init.h"
--#include "linux/slab.h"
--#include <linux/platform_device.h>
--
--#include "dev-gpio-buttons.h"
--
--void __init ath79_register_gpio_keys_polled(int id,
--                                          unsigned poll_interval,
--                                          unsigned nbuttons,
--                                          struct gpio_keys_button *buttons)
--{
--      struct platform_device *pdev;
--      struct gpio_keys_platform_data pdata;
--      struct gpio_keys_button *p;
--      int err;
--
--      p = kmemdup(buttons, nbuttons * sizeof(*p), GFP_KERNEL);
--      if (!p)
--              return;
--
--      pdev = platform_device_alloc("gpio-keys-polled", id);
--      if (!pdev)
--              goto err_free_buttons;
--
--      memset(&pdata, 0, sizeof(pdata));
--      pdata.poll_interval = poll_interval;
--      pdata.nbuttons = nbuttons;
--      pdata.buttons = p;
--
--      err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
--      if (err)
--              goto err_put_pdev;
--
--      err = platform_device_add(pdev);
--      if (err)
--              goto err_put_pdev;
--
--      return;
--
--err_put_pdev:
--      platform_device_put(pdev);
--
--err_free_buttons:
--      kfree(p);
--}
---- a/arch/mips/ath79/dev-gpio-buttons.h
-+++ /dev/null
-@@ -1,23 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X GPIO button support
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_DEV_GPIO_BUTTONS_H
--#define _ATH79_DEV_GPIO_BUTTONS_H
--
--#include <linux/input.h>
--#include <linux/gpio_keys.h>
--
--void ath79_register_gpio_keys_polled(int id,
--                                   unsigned poll_interval,
--                                   unsigned nbuttons,
--                                   struct gpio_keys_button *buttons);
--
--#endif /* _ATH79_DEV_GPIO_BUTTONS_H */
---- a/arch/mips/ath79/dev-leds-gpio.c
-+++ /dev/null
-@@ -1,54 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X common GPIO LEDs support
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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/init.h>
--#include <linux/slab.h>
--#include <linux/platform_device.h>
--
--#include "dev-leds-gpio.h"
--
--void __init ath79_register_leds_gpio(int id,
--                                   unsigned num_leds,
--                                   struct gpio_led *leds)
--{
--      struct platform_device *pdev;
--      struct gpio_led_platform_data pdata;
--      struct gpio_led *p;
--      int err;
--
--      p = kmemdup(leds, num_leds * sizeof(*p), GFP_KERNEL);
--      if (!p)
--              return;
--
--      pdev = platform_device_alloc("leds-gpio", id);
--      if (!pdev)
--              goto err_free_leds;
--
--      memset(&pdata, 0, sizeof(pdata));
--      pdata.num_leds = num_leds;
--      pdata.leds = p;
--
--      err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
--      if (err)
--              goto err_put_pdev;
--
--      err = platform_device_add(pdev);
--      if (err)
--              goto err_put_pdev;
--
--      return;
--
--err_put_pdev:
--      platform_device_put(pdev);
--
--err_free_leds:
--      kfree(p);
--}
---- a/arch/mips/ath79/dev-leds-gpio.h
-+++ /dev/null
-@@ -1,21 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X common GPIO LEDs support
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_DEV_LEDS_GPIO_H
--#define _ATH79_DEV_LEDS_GPIO_H
--
--#include <linux/leds.h>
--
--void ath79_register_leds_gpio(int id,
--                            unsigned num_leds,
--                            struct gpio_led *leds);
--
--#endif /* _ATH79_DEV_LEDS_GPIO_H */
---- a/arch/mips/ath79/dev-spi.c
-+++ /dev/null
-@@ -1,38 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X SPI controller device
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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/platform_device.h>
--#include <asm/mach-ath79/ar71xx_regs.h>
--#include "dev-spi.h"
--
--static struct resource ath79_spi_resources[] = {
--      {
--              .start  = AR71XX_SPI_BASE,
--              .end    = AR71XX_SPI_BASE + AR71XX_SPI_SIZE - 1,
--              .flags  = IORESOURCE_MEM,
--      },
--};
--
--static struct platform_device ath79_spi_device = {
--      .name           = "ath79-spi",
--      .id             = -1,
--      .resource       = ath79_spi_resources,
--      .num_resources  = ARRAY_SIZE(ath79_spi_resources),
--};
--
--void __init ath79_register_spi(struct ath79_spi_platform_data *pdata,
--                             struct spi_board_info const *info,
--                             unsigned n)
--{
--      spi_register_board_info(info, n);
--      ath79_spi_device.dev.platform_data = pdata;
--      platform_device_register(&ath79_spi_device);
--}
---- a/arch/mips/ath79/dev-spi.h
-+++ /dev/null
-@@ -1,22 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X SPI controller device
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_DEV_SPI_H
--#define _ATH79_DEV_SPI_H
--
--#include <linux/spi/spi.h>
--#include <asm/mach-ath79/ath79_spi_platform.h>
--
--void ath79_register_spi(struct ath79_spi_platform_data *pdata,
--                       struct spi_board_info const *info,
--                       unsigned n);
--
--#endif /* _ATH79_DEV_SPI_H */
---- a/arch/mips/ath79/dev-usb.c
-+++ /dev/null
-@@ -1,242 +0,0 @@
--/*
-- *  Atheros AR7XXX/AR9XXX USB Host Controller device
-- *
-- *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  Parts of this file are based on Atheros' 2.6.15 BSP
-- *
-- *  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/delay.h>
--#include <linux/irq.h>
--#include <linux/dma-mapping.h>
--#include <linux/platform_device.h>
--#include <linux/usb/ehci_pdriver.h>
--#include <linux/usb/ohci_pdriver.h>
--
--#include <asm/mach-ath79/ath79.h>
--#include <asm/mach-ath79/ar71xx_regs.h>
--#include "common.h"
--#include "dev-usb.h"
--
--static u64 ath79_usb_dmamask = DMA_BIT_MASK(32);
--
--static struct usb_ohci_pdata ath79_ohci_pdata = {
--};
--
--static struct usb_ehci_pdata ath79_ehci_pdata_v1 = {
--      .has_synopsys_hc_bug    = 1,
--};
--
--static struct usb_ehci_pdata ath79_ehci_pdata_v2 = {
--      .caps_offset            = 0x100,
--      .has_tt                 = 1,
--};
--
--static void __init ath79_usb_register(const char *name, int id,
--                                    unsigned long base, unsigned long size,
--                                    int irq, const void *data,
--                                    size_t data_size)
--{
--      struct resource res[2];
--      struct platform_device *pdev;
--
--      memset(res, 0, sizeof(res));
--
--      res[0].flags = IORESOURCE_MEM;
--      res[0].start = base;
--      res[0].end = base + size - 1;
--
--      res[1].flags = IORESOURCE_IRQ;
--      res[1].start = irq;
--      res[1].end = irq;
--
--      pdev = platform_device_register_resndata(NULL, name, id,
--                                               res, ARRAY_SIZE(res),
--                                               data, data_size);
--
--      if (IS_ERR(pdev)) {
--              pr_err("ath79: unable to register USB at %08lx, err=%d\n",
--                     base, (int) PTR_ERR(pdev));
--              return;
--      }
--
--      pdev->dev.dma_mask = &ath79_usb_dmamask;
--      pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
--}
--
--#define AR71XX_USB_RESET_MASK (AR71XX_RESET_USB_HOST | \
--                               AR71XX_RESET_USB_PHY | \
--                               AR71XX_RESET_USB_OHCI_DLL)
--
--static void __init ath79_usb_setup(void)
--{
--      void __iomem *usb_ctrl_base;
--
--      ath79_device_reset_set(AR71XX_USB_RESET_MASK);
--      mdelay(1000);
--      ath79_device_reset_clear(AR71XX_USB_RESET_MASK);
--
--      usb_ctrl_base = ioremap(AR71XX_USB_CTRL_BASE, AR71XX_USB_CTRL_SIZE);
--
--      /* Turning on the Buff and Desc swap bits */
--      __raw_writel(0xf0000, usb_ctrl_base + AR71XX_USB_CTRL_REG_CONFIG);
--
--      /* WAR for HW bug. Here it adjusts the duration between two SOFS */
--      __raw_writel(0x20c00, usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);
--
--      iounmap(usb_ctrl_base);
--
--      mdelay(900);
--
--      ath79_usb_register("ohci-platform", -1,
--                         AR71XX_OHCI_BASE, AR71XX_OHCI_SIZE,
--                         ATH79_MISC_IRQ(6),
--                         &ath79_ohci_pdata, sizeof(ath79_ohci_pdata));
--
--      ath79_usb_register("ehci-platform", -1,
--                         AR71XX_EHCI_BASE, AR71XX_EHCI_SIZE,
--                         ATH79_CPU_IRQ(3),
--                         &ath79_ehci_pdata_v1, sizeof(ath79_ehci_pdata_v1));
--}
--
--static void __init ar7240_usb_setup(void)
--{
--      void __iomem *usb_ctrl_base;
--
--      ath79_device_reset_clear(AR7240_RESET_OHCI_DLL);
--      ath79_device_reset_set(AR7240_RESET_USB_HOST);
--
--      mdelay(1000);
--
--      ath79_device_reset_set(AR7240_RESET_OHCI_DLL);
--      ath79_device_reset_clear(AR7240_RESET_USB_HOST);
--
--      usb_ctrl_base = ioremap(AR7240_USB_CTRL_BASE, AR7240_USB_CTRL_SIZE);
--
--      /* WAR for HW bug. Here it adjusts the duration between two SOFS */
--      __raw_writel(0x3, usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);
--
--      iounmap(usb_ctrl_base);
--
--      ath79_usb_register("ohci-platform", -1,
--                         AR7240_OHCI_BASE, AR7240_OHCI_SIZE,
--                         ATH79_CPU_IRQ(3),
--                         &ath79_ohci_pdata, sizeof(ath79_ohci_pdata));
--}
--
--static void __init ar724x_usb_setup(void)
--{
--      ath79_device_reset_set(AR724X_RESET_USBSUS_OVERRIDE);
--      mdelay(10);
--
--      ath79_device_reset_clear(AR724X_RESET_USB_HOST);
--      mdelay(10);
--
--      ath79_device_reset_clear(AR724X_RESET_USB_PHY);
--      mdelay(10);
--
--      ath79_usb_register("ehci-platform", -1,
--                         AR724X_EHCI_BASE, AR724X_EHCI_SIZE,
--                         ATH79_CPU_IRQ(3),
--                         &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
--}
--
--static void __init ar913x_usb_setup(void)
--{
--      ath79_device_reset_set(AR913X_RESET_USBSUS_OVERRIDE);
--      mdelay(10);
--
--      ath79_device_reset_clear(AR913X_RESET_USB_HOST);
--      mdelay(10);
--
--      ath79_device_reset_clear(AR913X_RESET_USB_PHY);
--      mdelay(10);
--
--      ath79_usb_register("ehci-platform", -1,
--                         AR913X_EHCI_BASE, AR913X_EHCI_SIZE,
--                         ATH79_CPU_IRQ(3),
--                         &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
--}
--
--static void __init ar933x_usb_setup(void)
--{
--      ath79_device_reset_set(AR933X_RESET_USBSUS_OVERRIDE);
--      mdelay(10);
--
--      ath79_device_reset_clear(AR933X_RESET_USB_HOST);
--      mdelay(10);
--
--      ath79_device_reset_clear(AR933X_RESET_USB_PHY);
--      mdelay(10);
--
--      ath79_usb_register("ehci-platform", -1,
--                         AR933X_EHCI_BASE, AR933X_EHCI_SIZE,
--                         ATH79_CPU_IRQ(3),
--                         &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
--}
--
--static void __init ar934x_usb_setup(void)
--{
--      u32 bootstrap;
--
--      bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
--      if (bootstrap & AR934X_BOOTSTRAP_USB_MODE_DEVICE)
--              return;
--
--      ath79_device_reset_set(AR934X_RESET_USBSUS_OVERRIDE);
--      udelay(1000);
--
--      ath79_device_reset_clear(AR934X_RESET_USB_PHY);
--      udelay(1000);
--
--      ath79_device_reset_clear(AR934X_RESET_USB_PHY_ANALOG);
--      udelay(1000);
--
--      ath79_device_reset_clear(AR934X_RESET_USB_HOST);
--      udelay(1000);
--
--      ath79_usb_register("ehci-platform", -1,
--                         AR934X_EHCI_BASE, AR934X_EHCI_SIZE,
--                         ATH79_CPU_IRQ(3),
--                         &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
--}
--
--static void __init qca955x_usb_setup(void)
--{
--      ath79_usb_register("ehci-platform", 0,
--                         QCA955X_EHCI0_BASE, QCA955X_EHCI_SIZE,
--                         ATH79_IP3_IRQ(0),
--                         &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
--
--      ath79_usb_register("ehci-platform", 1,
--                         QCA955X_EHCI1_BASE, QCA955X_EHCI_SIZE,
--                         ATH79_IP3_IRQ(1),
--                         &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
--}
--
--void __init ath79_register_usb(void)
--{
--      if (soc_is_ar71xx())
--              ath79_usb_setup();
--      else if (soc_is_ar7240())
--              ar7240_usb_setup();
--      else if (soc_is_ar7241() || soc_is_ar7242())
--              ar724x_usb_setup();
--      else if (soc_is_ar913x())
--              ar913x_usb_setup();
--      else if (soc_is_ar933x())
--              ar933x_usb_setup();
--      else if (soc_is_ar934x())
--              ar934x_usb_setup();
--      else if (soc_is_qca955x())
--              qca955x_usb_setup();
--      else
--              BUG();
--}
---- a/arch/mips/ath79/dev-usb.h
-+++ /dev/null
-@@ -1,17 +0,0 @@
--/*
-- *  Atheros AR71XX/AR724X/AR913X USB Host Controller support
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_DEV_USB_H
--#define _ATH79_DEV_USB_H
--
--void ath79_register_usb(void);
--
--#endif /* _ATH79_DEV_USB_H */
---- a/arch/mips/ath79/dev-wmac.c
-+++ /dev/null
-@@ -1,155 +0,0 @@
--/*
-- *  Atheros AR913X/AR933X SoC built-in WMAC device support
-- *
-- *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
-- *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  Parts of this file are based on Atheros 2.6.15/2.6.31 BSP
-- *
-- *  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/init.h>
--#include <linux/delay.h>
--#include <linux/irq.h>
--#include <linux/platform_device.h>
--#include <linux/ath9k_platform.h>
--
--#include <asm/mach-ath79/ath79.h>
--#include <asm/mach-ath79/ar71xx_regs.h>
--#include "dev-wmac.h"
--
--static struct ath9k_platform_data ath79_wmac_data;
--
--static struct resource ath79_wmac_resources[] = {
--      {
--              /* .start and .end fields are filled dynamically */
--              .flags  = IORESOURCE_MEM,
--      }, {
--              /* .start and .end fields are filled dynamically */
--              .flags  = IORESOURCE_IRQ,
--      },
--};
--
--static struct platform_device ath79_wmac_device = {
--      .name           = "ath9k",
--      .id             = -1,
--      .resource       = ath79_wmac_resources,
--      .num_resources  = ARRAY_SIZE(ath79_wmac_resources),
--      .dev = {
--              .platform_data = &ath79_wmac_data,
--      },
--};
--
--static void __init ar913x_wmac_setup(void)
--{
--      /* reset the WMAC */
--      ath79_device_reset_set(AR913X_RESET_AMBA2WMAC);
--      mdelay(10);
--
--      ath79_device_reset_clear(AR913X_RESET_AMBA2WMAC);
--      mdelay(10);
--
--      ath79_wmac_resources[0].start = AR913X_WMAC_BASE;
--      ath79_wmac_resources[0].end = AR913X_WMAC_BASE + AR913X_WMAC_SIZE - 1;
--      ath79_wmac_resources[1].start = ATH79_CPU_IRQ(2);
--      ath79_wmac_resources[1].end = ATH79_CPU_IRQ(2);
--}
--
--
--static int ar933x_wmac_reset(void)
--{
--      ath79_device_reset_set(AR933X_RESET_WMAC);
--      ath79_device_reset_clear(AR933X_RESET_WMAC);
--
--      return 0;
--}
--
--static int ar933x_r1_get_wmac_revision(void)
--{
--      return ath79_soc_rev;
--}
--
--static void __init ar933x_wmac_setup(void)
--{
--      u32 t;
--
--      ar933x_wmac_reset();
--
--      ath79_wmac_device.name = "ar933x_wmac";
--
--      ath79_wmac_resources[0].start = AR933X_WMAC_BASE;
--      ath79_wmac_resources[0].end = AR933X_WMAC_BASE + AR933X_WMAC_SIZE - 1;
--      ath79_wmac_resources[1].start = ATH79_CPU_IRQ(2);
--      ath79_wmac_resources[1].end = ATH79_CPU_IRQ(2);
--
--      t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
--      if (t & AR933X_BOOTSTRAP_REF_CLK_40)
--              ath79_wmac_data.is_clk_25mhz = false;
--      else
--              ath79_wmac_data.is_clk_25mhz = true;
--
--      if (ath79_soc_rev == 1)
--              ath79_wmac_data.get_mac_revision = ar933x_r1_get_wmac_revision;
--
--      ath79_wmac_data.external_reset = ar933x_wmac_reset;
--}
--
--static void ar934x_wmac_setup(void)
--{
--      u32 t;
--
--      ath79_wmac_device.name = "ar934x_wmac";
--
--      ath79_wmac_resources[0].start = AR934X_WMAC_BASE;
--      ath79_wmac_resources[0].end = AR934X_WMAC_BASE + AR934X_WMAC_SIZE - 1;
--      ath79_wmac_resources[1].start = ATH79_IP2_IRQ(1);
--      ath79_wmac_resources[1].end = ATH79_IP2_IRQ(1);
--
--      t = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
--      if (t & AR934X_BOOTSTRAP_REF_CLK_40)
--              ath79_wmac_data.is_clk_25mhz = false;
--      else
--              ath79_wmac_data.is_clk_25mhz = true;
--}
--
--static void qca955x_wmac_setup(void)
--{
--      u32 t;
--
--      ath79_wmac_device.name = "qca955x_wmac";
--
--      ath79_wmac_resources[0].start = QCA955X_WMAC_BASE;
--      ath79_wmac_resources[0].end = QCA955X_WMAC_BASE + QCA955X_WMAC_SIZE - 1;
--      ath79_wmac_resources[1].start = ATH79_IP2_IRQ(1);
--      ath79_wmac_resources[1].end = ATH79_IP2_IRQ(1);
--
--      t = ath79_reset_rr(QCA955X_RESET_REG_BOOTSTRAP);
--      if (t & QCA955X_BOOTSTRAP_REF_CLK_40)
--              ath79_wmac_data.is_clk_25mhz = false;
--      else
--              ath79_wmac_data.is_clk_25mhz = true;
--}
--
--void __init ath79_register_wmac(u8 *cal_data)
--{
--      if (soc_is_ar913x())
--              ar913x_wmac_setup();
--      else if (soc_is_ar933x())
--              ar933x_wmac_setup();
--      else if (soc_is_ar934x())
--              ar934x_wmac_setup();
--      else if (soc_is_qca955x())
--              qca955x_wmac_setup();
--      else
--              BUG();
--
--      if (cal_data)
--              memcpy(ath79_wmac_data.eeprom_data, cal_data,
--                     sizeof(ath79_wmac_data.eeprom_data));
--
--      platform_device_register(&ath79_wmac_device);
--}
---- a/arch/mips/ath79/dev-wmac.h
-+++ /dev/null
-@@ -1,17 +0,0 @@
--/*
-- *  Atheros AR913X/AR933X SoC built-in WMAC device support
-- *
-- *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
-- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_DEV_WMAC_H
--#define _ATH79_DEV_WMAC_H
--
--void ath79_register_wmac(u8 *cal_data);
--
--#endif /* _ATH79_DEV_WMAC_H */
---- a/arch/mips/ath79/setup.c
-+++ b/arch/mips/ath79/setup.c
-@@ -32,7 +32,6 @@
- #include <asm/mach-ath79/ath79.h>
- #include <asm/mach-ath79/ar71xx_regs.h>
- #include "common.h"
--#include "dev-common.h"
- #define ATH79_SYS_TYPE_LEN    64
diff --git a/target/linux/ath79/patches-4.19/0031-MIPS-ath79-drop-OF-clock-code.patch b/target/linux/ath79/patches-4.19/0031-MIPS-ath79-drop-OF-clock-code.patch
deleted file mode 100644 (file)
index a11be73..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From 00e4313da4609074fff134e61dd9ffe3fd37474d Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sun, 24 Jun 2018 09:39:41 +0200
-Subject: [PATCH 31/33] MIPS: ath79: drop !OF clock code
-
-With the target now being fully OF based, we can drop the legacy clock
-registration code. All clocks are now probed via devicetree.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/ath79/clock.c  | 56 ------------------------------------------------
- arch/mips/ath79/common.h |  3 ---
- 2 files changed, 59 deletions(-)
-
---- a/arch/mips/ath79/clock.c
-+++ b/arch/mips/ath79/clock.c
-@@ -617,60 +617,6 @@ static void __init qca956x_clocks_init(v
-       ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
- }
--void __init ath79_clocks_init(void)
--{
--      const char *wdt;
--      const char *uart;
--
--      if (soc_is_ar71xx())
--              ar71xx_clocks_init(ath79_pll_base);
--      else if (soc_is_ar724x() || soc_is_ar913x())
--              ar724x_clocks_init(ath79_pll_base);
--      else if (soc_is_ar933x())
--              ar933x_clocks_init(ath79_pll_base);
--      else if (soc_is_ar934x())
--              ar934x_clocks_init(ath79_pll_base);
--      else if (soc_is_qca953x())
--              qca953x_clocks_init(ath79_pll_base);
--      else if (soc_is_qca955x())
--              qca955x_clocks_init(ath79_pll_base);
--      else if (soc_is_qca956x() || soc_is_tp9343())
--              qca956x_clocks_init(ath79_pll_base);
--      else
--              BUG();
--
--      if (soc_is_ar71xx() || soc_is_ar724x() || soc_is_ar913x()) {
--              wdt = "ahb";
--              uart = "ahb";
--      } else if (soc_is_ar933x()) {
--              wdt = "ahb";
--              uart = "ref";
--      } else {
--              wdt = "ref";
--              uart = "ref";
--      }
--
--      clk_add_alias("wdt", NULL, wdt, NULL);
--      clk_add_alias("uart", NULL, uart, NULL);
--}
--
--unsigned long __init
--ath79_get_sys_clk_rate(const char *id)
--{
--      struct clk *clk;
--      unsigned long rate;
--
--      clk = clk_get(NULL, id);
--      if (IS_ERR(clk))
--              panic("unable to get %s clock, err=%d", id, (int) PTR_ERR(clk));
--
--      rate = clk_get_rate(clk);
--      clk_put(clk);
--
--      return rate;
--}
--
--#ifdef CONFIG_OF
- static void __init ath79_clocks_init_dt(struct device_node *np)
- {
-       struct clk *ref_clk;
-@@ -727,5 +673,3 @@ CLK_OF_DECLARE(ar9340_clk, "qca,ar9340-p
- CLK_OF_DECLARE(ar9530_clk, "qca,qca9530-pll", ath79_clocks_init_dt);
- CLK_OF_DECLARE(ar9550_clk, "qca,qca9550-pll", ath79_clocks_init_dt);
- CLK_OF_DECLARE(ar9560_clk, "qca,qca9560-pll", ath79_clocks_init_dt);
--
--#endif
---- a/arch/mips/ath79/common.h
-+++ b/arch/mips/ath79/common.h
-@@ -19,9 +19,6 @@
- #define ATH79_MEM_SIZE_MIN    (2 * 1024 * 1024)
- #define ATH79_MEM_SIZE_MAX    (256 * 1024 * 1024)
--void ath79_clocks_init(void);
--unsigned long ath79_get_sys_clk_rate(const char *id);
--
- void ath79_ddr_ctrl_init(void);
- #endif /* __ATH79_COMMON_H */
diff --git a/target/linux/ath79/patches-4.19/0032-MIPS-ath79-sanitize-symbols.patch b/target/linux/ath79/patches-4.19/0032-MIPS-ath79-sanitize-symbols.patch
deleted file mode 100644 (file)
index 1c38139..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-From 3fc8585cf76022dba7496627074d42af88c30718 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 23 Jun 2018 15:16:55 +0200
-Subject: [PATCH 32/33] MIPS: ath79: sanitize symbols
-
-We no longer need to select which SoCs are supported as the whole arch
-code is always built. So lets drop all the SoC symbols
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/Kconfig       |  2 ++
- arch/mips/ath79/Kconfig | 44 +++++---------------------------------------
- arch/mips/pci/Makefile  |  2 +-
- 3 files changed, 8 insertions(+), 40 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -208,6 +208,8 @@ config ATH79
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_MIPS16
-       select SYS_SUPPORTS_ZBOOT_UART_PROM
-+      select HW_HAS_PCI
-+      select USB_ARCH_HAS_EHCI
-       select USE_OF
-       select USB_EHCI_ROOT_HUB_TT if USB_EHCI_HCD_PLATFORM
-       help
---- a/arch/mips/ath79/Kconfig
-+++ b/arch/mips/ath79/Kconfig
-@@ -1,48 +1,14 @@
- # SPDX-License-Identifier: GPL-2.0
- if ATH79
--config SOC_AR71XX
--      select HW_HAS_PCI
--      def_bool n
--
--config SOC_AR724X
--      select HW_HAS_PCI
--      select PCI_AR724X if PCI
--      def_bool n
--
--config SOC_AR913X
--      def_bool n
--
--config SOC_AR933X
--      def_bool n
--
--config SOC_AR934X
--      select HW_HAS_PCI
--      select PCI_AR724X if PCI
--      def_bool n
--
--config SOC_QCA955X
--      select HW_HAS_PCI
--      select PCI_AR724X if PCI
-+config PCI_AR71XX
-+      bool "PCI support for AR7100 type SoCs"
-+      depends on PCI
-       def_bool n
- config PCI_AR724X
--      def_bool n
--
--config ATH79_DEV_GPIO_BUTTONS
--      def_bool n
--
--config ATH79_DEV_LEDS_GPIO
--      def_bool n
--
--config ATH79_DEV_SPI
--      def_bool n
--
--config ATH79_DEV_USB
--      def_bool n
--
--config ATH79_DEV_WMAC
--      depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA955X)
-+      bool "PCI support for AR724x type SoCs"
-+      depends on PCI
-       def_bool n
- endif
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -23,7 +23,7 @@ obj-$(CONFIG_BCM63XX)                += pci-bcm63xx.o
-                                       ops-bcm63xx.o
- obj-$(CONFIG_MIPS_ALCHEMY)    += pci-alchemy.o
- obj-$(CONFIG_PCI_AR2315)      += pci-ar2315.o
--obj-$(CONFIG_SOC_AR71XX)      += pci-ar71xx.o
-+obj-$(CONFIG_PCI_AR71XX)      += pci-ar71xx.o
- obj-$(CONFIG_PCI_AR724X)      += pci-ar724x.o
- obj-$(CONFIG_MIPS_PCI_VIRTIO) += pci-virtio-guest.o
- #
diff --git a/target/linux/ath79/patches-4.19/0033-spi-ath79-drop-pdata-support.patch b/target/linux/ath79/patches-4.19/0033-spi-ath79-drop-pdata-support.patch
deleted file mode 100644 (file)
index aeb50c9..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From c4e197bbcecc7233aa9e553e7047fa50e4e1fe77 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 25 Jun 2018 15:52:34 +0200
-Subject: [PATCH 33/33] spi: ath79: drop pdata support
-
-The target is being converted to pure OF. We can therefore drop all of the
-platform data code from the driver.
-
-Cc: linux-spi@vger.kernel.org
-Acked-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/mips/include/asm/mach-ath79/ath79_spi_platform.h | 19 -------------------
- drivers/spi/spi-ath79.c                               |  8 --------
- 2 files changed, 27 deletions(-)
- delete mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
-
---- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
-+++ /dev/null
-@@ -1,19 +0,0 @@
--/*
-- *  Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller
-- *
-- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-- *
-- *  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.
-- */
--
--#ifndef _ATH79_SPI_PLATFORM_H
--#define _ATH79_SPI_PLATFORM_H
--
--struct ath79_spi_platform_data {
--      unsigned        bus_num;
--      unsigned        num_chipselect;
--};
--
--#endif /* _ATH79_SPI_PLATFORM_H */
---- a/drivers/spi/spi-ath79.c
-+++ b/drivers/spi/spi-ath79.c
-@@ -26,7 +26,6 @@
- #include <linux/err.h>
- #include <asm/mach-ath79/ar71xx_regs.h>
--#include <asm/mach-ath79/ath79_spi_platform.h>
- #define DRV_NAME      "ath79-spi"
-@@ -208,7 +207,6 @@ static int ath79_spi_probe(struct platfo
- {
-       struct spi_master *master;
-       struct ath79_spi *sp;
--      struct ath79_spi_platform_data *pdata;
-       struct resource *r;
-       unsigned long rate;
-       int ret;
-@@ -223,15 +221,9 @@ static int ath79_spi_probe(struct platfo
-       master->dev.of_node = pdev->dev.of_node;
-       platform_set_drvdata(pdev, sp);
--      pdata = dev_get_platdata(&pdev->dev);
--
-       master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
-       master->setup = ath79_spi_setup;
-       master->cleanup = ath79_spi_cleanup;
--      if (pdata) {
--              master->bus_num = pdata->bus_num;
--              master->num_chipselect = pdata->num_chipselect;
--      }
-       sp->bitbang.master = master;
-       sp->bitbang.chipselect = ath79_spi_chipselect;
diff --git a/target/linux/ath79/patches-4.19/0034-MIPS-ath79-ath9k-exports.patch b/target/linux/ath79/patches-4.19/0034-MIPS-ath79-ath9k-exports.patch
deleted file mode 100644 (file)
index 6eec142..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/mips/ath79/common.c
-+++ b/arch/mips/ath79/common.c
-@@ -34,11 +34,13 @@ EXPORT_SYMBOL_GPL(ath79_ddr_freq);
- enum ath79_soc_type ath79_soc;
- unsigned int ath79_soc_rev;
-+EXPORT_SYMBOL_GPL(ath79_soc_rev);
- void __iomem *ath79_pll_base;
- void __iomem *ath79_reset_base;
- EXPORT_SYMBOL_GPL(ath79_reset_base);
--static void __iomem *ath79_ddr_base;
-+void __iomem *ath79_ddr_base;
-+EXPORT_SYMBOL_GPL(ath79_ddr_base);
- static void __iomem *ath79_ddr_wb_flush_base;
- static void __iomem *ath79_ddr_pci_win_base;
---- a/arch/mips/include/asm/mach-ath79/ath79.h
-+++ b/arch/mips/include/asm/mach-ath79/ath79.h
-@@ -152,6 +152,7 @@ void ath79_ddr_wb_flush(unsigned int reg
- void ath79_ddr_set_pci_windows(void);
- extern void __iomem *ath79_pll_base;
-+extern void __iomem *ath79_ddr_base;
- extern void __iomem *ath79_reset_base;
- static inline void ath79_pll_wr(unsigned reg, u32 val)
diff --git a/target/linux/ath79/patches-4.19/0036-GPIO-add-named-gpio-exports.patch b/target/linux/ath79/patches-4.19/0036-GPIO-add-named-gpio-exports.patch
deleted file mode 100644 (file)
index b3aa9fc..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-From 4267880319bc1a2270d352e0ded6d6386242a7ef Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Tue, 12 Aug 2014 20:49:27 +0200
-Subject: [PATCH 24/53] GPIO: add named gpio exports
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- drivers/gpio/gpiolib-of.c     |   68 +++++++++++++++++++++++++++++++++++++++++
- drivers/gpio/gpiolib-sysfs.c  |   10 +++++-
- include/asm-generic/gpio.h    |    6 ++++
- include/linux/gpio/consumer.h |    8 +++++
- 4 files changed, 91 insertions(+), 1 deletion(-)
-
---- a/drivers/gpio/gpiolib-of.c
-+++ b/drivers/gpio/gpiolib-of.c
-@@ -23,6 +23,8 @@
- #include <linux/pinctrl/pinctrl.h>
- #include <linux/slab.h>
- #include <linux/gpio/machine.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
- #include "gpiolib.h"
-@@ -660,3 +662,68 @@ void of_gpiochip_remove(struct gpio_chip
-       gpiochip_remove_pin_ranges(chip);
-       of_node_put(chip->of_node);
- }
-+
-+static struct of_device_id gpio_export_ids[] = {
-+      { .compatible = "gpio-export" },
-+      { /* sentinel */ }
-+};
-+
-+static int of_gpio_export_probe(struct platform_device *pdev)
-+{
-+      struct device_node *np = pdev->dev.of_node;
-+      struct device_node *cnp;
-+      u32 val;
-+      int nb = 0;
-+
-+      for_each_child_of_node(np, cnp) {
-+              const char *name = NULL;
-+              int gpio;
-+              bool dmc;
-+              int max_gpio = 1;
-+              int i;
-+
-+              of_property_read_string(cnp, "gpio-export,name", &name);
-+
-+              if (!name)
-+                      max_gpio = of_gpio_count(cnp);
-+
-+              for (i = 0; i < max_gpio; i++) {
-+                      unsigned flags = 0;
-+                      enum of_gpio_flags of_flags;
-+
-+                      gpio = of_get_gpio_flags(cnp, i, &of_flags);
-+                      if (!gpio_is_valid(gpio))
-+                              return gpio;
-+
-+                      if (of_flags == OF_GPIO_ACTIVE_LOW)
-+                              flags |= GPIOF_ACTIVE_LOW;
-+
-+                      if (!of_property_read_u32(cnp, "gpio-export,output", &val))
-+                              flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
-+                      else
-+                              flags |= GPIOF_IN;
-+
-+                      if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np)))
-+                              continue;
-+
-+                      dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change");
-+                      gpio_export_with_name(gpio, dmc, name);
-+                      nb++;
-+              }
-+      }
-+
-+      dev_info(&pdev->dev, "%d gpio(s) exported\n", nb);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gpio_export_driver = {
-+      .driver         = {
-+              .name           = "gpio-export",
-+              .owner  = THIS_MODULE,
-+              .of_match_table = of_match_ptr(gpio_export_ids),
-+      },
-+      .probe          = of_gpio_export_probe,
-+};
-+
-+module_platform_driver(gpio_export_driver);
---- a/drivers/gpio/gpiolib-sysfs.c
-+++ b/drivers/gpio/gpiolib-sysfs.c
-@@ -568,7 +568,7 @@ static struct class gpio_class = {
-  *
-  * Returns zero on success, else an error.
-  */
--int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
-+int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name)
- {
-       struct gpio_chip        *chip;
-       struct gpio_device      *gdev;
-@@ -630,6 +630,8 @@ int gpiod_export(struct gpio_desc *desc,
-       offset = gpio_chip_hwgpio(desc);
-       if (chip->names && chip->names[offset])
-               ioname = chip->names[offset];
-+      if (name)
-+              ioname = name;
-       dev = device_create_with_groups(&gpio_class, &gdev->dev,
-                                       MKDEV(0, 0), data, gpio_groups,
-@@ -651,6 +653,12 @@ err_unlock:
-       gpiod_dbg(desc, "%s: status %d\n", __func__, status);
-       return status;
- }
-+EXPORT_SYMBOL_GPL(__gpiod_export);
-+
-+int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
-+{
-+      return __gpiod_export(desc, direction_may_change, NULL);
-+}
- EXPORT_SYMBOL_GPL(gpiod_export);
- static int match_export(struct device *dev, const void *desc)
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -127,6 +127,12 @@ static inline int gpio_export(unsigned g
-       return gpiod_export(gpio_to_desc(gpio), direction_may_change);
- }
-+int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
-+static inline int gpio_export_with_name(unsigned gpio, bool direction_may_change, const char *name)
-+{
-+      return __gpiod_export(gpio_to_desc(gpio), direction_may_change, name);
-+}
-+
- static inline int gpio_export_link(struct device *dev, const char *name,
-                                  unsigned gpio)
- {
---- a/include/linux/gpio/consumer.h
-+++ b/include/linux/gpio/consumer.h
-@@ -533,6 +533,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_
- #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
-+int _gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
- int gpiod_export(struct gpio_desc *desc, bool direction_may_change);
- int gpiod_export_link(struct device *dev, const char *name,
-                     struct gpio_desc *desc);
-@@ -540,6 +541,13 @@ void gpiod_unexport(struct gpio_desc *de
- #else  /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */
-+static inline int _gpiod_export(struct gpio_desc *desc,
-+                             bool direction_may_change,
-+                             const char *name)
-+{
-+      return -ENOSYS;
-+}
-+
- static inline int gpiod_export(struct gpio_desc *desc,
-                              bool direction_may_change)
- {
diff --git a/target/linux/ath79/patches-4.19/0036-MIPS-ath79-remove-irq-code-from-pci.patch b/target/linux/ath79/patches-4.19/0036-MIPS-ath79-remove-irq-code-from-pci.patch
deleted file mode 100644 (file)
index 460c458..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
---- a/arch/mips/pci/pci-ar71xx.c
-+++ b/arch/mips/pci/pci-ar71xx.c
-@@ -54,11 +54,9 @@
- struct ar71xx_pci_controller {
-       struct device_node *np;
-       void __iomem *cfg_base;
--      int irq;
-       struct pci_controller pci_ctrl;
-       struct resource io_res;
-       struct resource mem_res;
--      struct irq_domain *domain;
- };
- /* Byte lane enable bits */
-@@ -230,104 +228,6 @@ static struct pci_ops ar71xx_pci_ops = {
-       .write  = ar71xx_pci_write_config,
- };
--static void ar71xx_pci_irq_handler(struct irq_desc *desc)
--{
--      void __iomem *base = ath79_reset_base;
--      struct irq_chip *chip = irq_desc_get_chip(desc);
--      struct ar71xx_pci_controller *apc = irq_desc_get_handler_data(desc);
--      u32 pending;
--
--      chained_irq_enter(chip, desc);
--      pending = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_STATUS) &
--                __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--
--      if (pending & AR71XX_PCI_INT_DEV0)
--              generic_handle_irq(irq_linear_revmap(apc->domain, 1));
--
--      else if (pending & AR71XX_PCI_INT_DEV1)
--              generic_handle_irq(irq_linear_revmap(apc->domain, 2));
--
--      else if (pending & AR71XX_PCI_INT_DEV2)
--              generic_handle_irq(irq_linear_revmap(apc->domain, 3));
--
--      else if (pending & AR71XX_PCI_INT_CORE)
--              generic_handle_irq(irq_linear_revmap(apc->domain, 4));
--
--      else
--              spurious_interrupt();
--      chained_irq_exit(chip, desc);
--}
--
--static void ar71xx_pci_irq_unmask(struct irq_data *d)
--{
--      struct ar71xx_pci_controller *apc;
--      unsigned int irq;
--      void __iomem *base = ath79_reset_base;
--      u32 t;
--
--      apc = irq_data_get_irq_chip_data(d);
--      irq = irq_linear_revmap(apc->domain, d->irq);
--
--      t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--      __raw_writel(t | (1 << irq), base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--
--      /* flush write */
--      __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--}
--
--static void ar71xx_pci_irq_mask(struct irq_data *d)
--{
--      struct ar71xx_pci_controller *apc;
--      unsigned int irq;
--      void __iomem *base = ath79_reset_base;
--      u32 t;
--
--      apc = irq_data_get_irq_chip_data(d);
--      irq = irq_linear_revmap(apc->domain, d->irq);
--
--      t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--      __raw_writel(t & ~(1 << irq), base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--
--      /* flush write */
--      __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--}
--
--static struct irq_chip ar71xx_pci_irq_chip = {
--      .name           = "AR71XX PCI",
--      .irq_mask       = ar71xx_pci_irq_mask,
--      .irq_unmask     = ar71xx_pci_irq_unmask,
--      .irq_mask_ack   = ar71xx_pci_irq_mask,
--};
--
--static int ar71xx_pci_irq_map(struct irq_domain *d,
--                            unsigned int irq, irq_hw_number_t hw)
--{
--      struct ar71xx_pci_controller *apc = d->host_data;
--
--      irq_set_chip_and_handler(irq, &ar71xx_pci_irq_chip, handle_level_irq);
--      irq_set_chip_data(irq, apc);
--
--      return 0;
--}
--
--static const struct irq_domain_ops ar71xx_pci_domain_ops = {
--      .xlate = irq_domain_xlate_onecell,
--      .map = ar71xx_pci_irq_map,
--};
--
--static void ar71xx_pci_irq_init(struct ar71xx_pci_controller *apc)
--{
--      void __iomem *base = ath79_reset_base;
--
--      __raw_writel(0, base + AR71XX_RESET_REG_PCI_INT_ENABLE);
--      __raw_writel(0, base + AR71XX_RESET_REG_PCI_INT_STATUS);
--
--      apc->domain = irq_domain_add_linear(apc->np, AR71XX_PCI_IRQ_COUNT,
--                                          &ar71xx_pci_domain_ops, apc);
--      irq_set_chained_handler_and_data(apc->irq, ar71xx_pci_irq_handler,
--                                       apc);
--}
--
- static void ar71xx_pci_reset(void)
- {
-       ath79_device_reset_set(AR71XX_RESET_PCI_BUS | AR71XX_RESET_PCI_CORE);
-@@ -361,10 +261,6 @@ static int ar71xx_pci_probe(struct platf
-       if (IS_ERR(apc->cfg_base))
-               return PTR_ERR(apc->cfg_base);
--      apc->irq = platform_get_irq(pdev, 0);
--      if (apc->irq < 0)
--              return -EINVAL;
--
-       ar71xx_pci_reset();
-       /* setup COMMAND register */
-@@ -375,8 +271,6 @@ static int ar71xx_pci_probe(struct platf
-       /* clear bus errors */
-       ar71xx_pci_check_error(apc, 1);
--      ar71xx_pci_irq_init(apc);
--
-       apc->np = pdev->dev.of_node;
-       apc->pci_ctrl.pci_ops = &ar71xx_pci_ops;
-       apc->pci_ctrl.mem_resource = &apc->mem_res;
diff --git a/target/linux/ath79/patches-4.19/0037-missing-registers.patch b/target/linux/ath79/patches-4.19/0037-missing-registers.patch
deleted file mode 100644 (file)
index 9fde3d3..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-commit f3ffac90bc7266b7d917616f3233f58e8c08a196
-Author: Christian Lamparter <chunkeey@gmail.com>
-Date:   Fri Aug 10 23:24:47 2018 +0200
-
-    ath79: gmac: add parsers for rxd(v)- and tx(d|en)-delay for AR9344
-
-    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-
---- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -1229,6 +1229,10 @@
- #define AR934X_ETH_CFG_RDV_DELAY        BIT(16)
- #define AR934X_ETH_CFG_RDV_DELAY_MASK   0x3
- #define AR934X_ETH_CFG_RDV_DELAY_SHIFT  16
-+#define AR934X_ETH_CFG_TXD_DELAY_MASK   0x3
-+#define AR934X_ETH_CFG_TXD_DELAY_SHIFT  18
-+#define AR934X_ETH_CFG_TXE_DELAY_MASK   0x3
-+#define AR934X_ETH_CFG_TXE_DELAY_SHIFT  20
- /*
-  * QCA953X GMAC Interface
diff --git a/target/linux/ath79/patches-4.19/004-register_gpio_driver_earlier.patch b/target/linux/ath79/patches-4.19/004-register_gpio_driver_earlier.patch
deleted file mode 100644 (file)
index 78899c4..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-HACK: register the GPIO driver earlier to ensure that gpio_request calls
-from mach files succeed.
-
---- a/drivers/gpio/gpio-ath79.c
-+++ b/drivers/gpio/gpio-ath79.c
-@@ -325,7 +325,11 @@ static struct platform_driver ath79_gpio
-       .remove = ath79_gpio_remove,
- };
--module_platform_driver(ath79_gpio_driver);
-+static int __init ath79_gpio_init(void)
-+{
-+      return platform_driver_register(&ath79_gpio_driver);
-+}
-+postcore_initcall(ath79_gpio_init);
- MODULE_DESCRIPTION("Atheros AR71XX/AR724X/AR913X GPIO API support");
- MODULE_LICENSE("GPL v2");
diff --git a/target/linux/ath79/patches-4.19/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ath79/patches-4.19/403-mtd_fix_cfi_cmdset_0002_status_check.patch
deleted file mode 100644 (file)
index eeda620..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1634,8 +1634,8 @@ static int __xipram do_write_oneword(str
-                       break;
-               }
--              if (chip_ready(map, adr))
--                      break;
-+              if (chip_good(map, adr, datum))
-+                      goto enable_xip;
-               /* Latency issues. Drop the lock, wait a while and retry */
-               UDELAY(map, chip, adr, 1);
-@@ -1651,6 +1651,8 @@ static int __xipram do_write_oneword(str
-               ret = -EIO;
-       }
-+
-+ enable_xip:
-       xip_enable(map, chip, adr);
-  op_done:
-       if (mode == FL_OTP_WRITE)
-@@ -2229,7 +2231,6 @@ static int cfi_amdstd_panic_write(struct
-       return 0;
- }
--
- /*
-  * Handle devices with one erase region, that only implement
-  * the chip erase command.
-@@ -2297,7 +2298,7 @@ static int __xipram do_erase_chip(struct
-               }
-               if (chip_good(map, adr, map_word_ff(map)))
--                      break;
-+                      goto op_done;
-               if (time_after(jiffies, timeo)) {
-                       printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -2321,6 +2322,7 @@ static int __xipram do_erase_chip(struct
-               }
-       }
-+ op_done:
-       chip->state = FL_READY;
-       xip_enable(map, chip, adr);
-       DISABLE_VPP(map);
-@@ -2393,7 +2395,7 @@ static int __xipram do_erase_oneblock(st
-               }
-               if (chip_good(map, adr, map_word_ff(map)))
--                      break;
-+                      goto op_done;
-               if (time_after(jiffies, timeo)) {
-                       printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -2417,6 +2419,7 @@ static int __xipram do_erase_oneblock(st
-               }
-       }
-+ op_done:
-       chip->state = FL_READY;
-       xip_enable(map, chip, adr);
-       DISABLE_VPP(map);
diff --git a/target/linux/ath79/patches-4.19/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-4.19/404-mtd-cybertan-trx-parser.patch
deleted file mode 100644 (file)
index 22e31db..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/mtd/parsers/Makefile
-+++ b/drivers/mtd/parsers/Makefile
-@@ -1,2 +1,3 @@
-+obj-$(CONFIG_MTD_PARSER_CYBERTAN)     += parser_cybertan.o
- obj-$(CONFIG_MTD_PARSER_TRX)          += parser_trx.o
- obj-$(CONFIG_MTD_SHARPSL_PARTS)               += sharpslpart.o
---- a/drivers/mtd/parsers/Kconfig
-+++ b/drivers/mtd/parsers/Kconfig
-@@ -1,3 +1,11 @@
-+config MTD_PARSER_CYBERTAN
-+      tristate "Parser for Cybertan format partitions"
-+      depends on MTD && (ATH79 || COMPILE_TEST)
-+      help
-+        Cybertan has a proprietory header than encompasses a Broadcom trx
-+        header. This driver will parse the header and take care of the
-+        special offsets that result in the extra headers.
-+
- config MTD_PARSER_TRX
-       tristate "Parser for TRX format partitions"
-       depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST)
diff --git a/target/linux/ath79/patches-4.19/405-mtd-tp-link-partition-parser.patch b/target/linux/ath79/patches-4.19/405-mtd-tp-link-partition-parser.patch
deleted file mode 100644 (file)
index 16fe5ed..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -193,6 +193,12 @@ config MTD_MYLOADER_PARTS
-         You will still need the parsing functions to be called by the driver
-         for your particular device. It won't happen automatically.
-+config MTD_TPLINK_PARTS
-+      tristate "TP-Link AR7XXX/AR9XXX partitioning support"
-+      depends on ATH79
-+      ---help---
-+        TBD.
-+
- comment "User Modules And Translation Layers"
- #
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_MTD_BCM63XX_PARTS)      += bcm63
- obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
- obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- obj-y                         += parsers/
-+obj-$(CONFIG_MTD_TPLINK_PARTS)        += tplinkpart.o
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_BLKDEVS)     += mtd_blkdevs.o
diff --git a/target/linux/ath79/patches-4.19/420-net-ar71xx_mac_driver.patch b/target/linux/ath79/patches-4.19/420-net-ar71xx_mac_driver.patch
deleted file mode 100644 (file)
index 6377db0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/net/ethernet/atheros/Kconfig
-+++ b/drivers/net/ethernet/atheros/Kconfig
-@@ -5,7 +5,7 @@
- config NET_VENDOR_ATHEROS
-       bool "Atheros devices"
-       default y
--      depends on PCI
-+      depends on (PCI || ATH79)
-       ---help---
-         If you have a network (Ethernet) card belonging to this class, say Y.
-@@ -78,4 +78,6 @@ config ALX
-         To compile this driver as a module, choose M here.  The module
-         will be called alx.
-+source drivers/net/ethernet/atheros/ag71xx/Kconfig
-+
- endif # NET_VENDOR_ATHEROS
---- a/drivers/net/ethernet/atheros/Makefile
-+++ b/drivers/net/ethernet/atheros/Makefile
-@@ -3,6 +3,7 @@
- # Makefile for the Atheros network device drivers.
- #
-+obj-$(CONFIG_AG71XX) += ag71xx/
- obj-$(CONFIG_ATL1) += atlx/
- obj-$(CONFIG_ATL2) += atlx/
- obj-$(CONFIG_ATL1E) += atl1e/
diff --git a/target/linux/ath79/patches-4.19/430-drivers-link-spi-before-mtd.patch b/target/linux/ath79/patches-4.19/430-drivers-link-spi-before-mtd.patch
deleted file mode 100644 (file)
index 4c6558d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -80,8 +80,8 @@ obj-y                                += scsi/
- obj-y                         += nvme/
- obj-$(CONFIG_ATA)             += ata/
- obj-$(CONFIG_TARGET_CORE)     += target/
--obj-$(CONFIG_MTD)             += mtd/
- obj-$(CONFIG_SPI)             += spi/
-+obj-$(CONFIG_MTD)             += mtd/
- obj-$(CONFIG_SPMI)            += spmi/
- obj-$(CONFIG_HSI)             += hsi/
- obj-$(CONFIG_SLIMBUS)         += slimbus/
diff --git a/target/linux/ath79/patches-4.19/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch b/target/linux/ath79/patches-4.19/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch
deleted file mode 100644 (file)
index 634ce56..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ath79/mangle-port.h
-@@ -0,0 +1,37 @@
-+/*
-+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This file was derived from: inlude/asm-mips/mach-generic/mangle-port.h
-+ *      Copyright (C) 2003, 2004 Ralf Baechle
-+ *
-+ *  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.
-+ */
-+
-+#ifndef __ASM_MACH_ATH79_MANGLE_PORT_H
-+#define __ASM_MACH_ATH79_MANGLE_PORT_H
-+
-+#ifdef CONFIG_PCI_AR71XX
-+extern unsigned long (ath79_pci_swizzle_b)(unsigned long port);
-+extern unsigned long (ath79_pci_swizzle_w)(unsigned long port);
-+#else
-+#define ath79_pci_swizzle_b(port) (port)
-+#define ath79_pci_swizzle_w(port) (port)
-+#endif
-+
-+#define __swizzle_addr_b(port)        ath79_pci_swizzle_b(port)
-+#define __swizzle_addr_w(port)        ath79_pci_swizzle_w(port)
-+#define __swizzle_addr_l(port)        (port)
-+#define __swizzle_addr_q(port)        (port)
-+
-+# define ioswabb(a, x)           (x)
-+# define __mem_ioswabb(a, x)     (x)
-+# define ioswabw(a, x)           (x)
-+# define __mem_ioswabw(a, x)     cpu_to_le16(x)
-+# define ioswabl(a, x)           (x)
-+# define __mem_ioswabl(a, x)     cpu_to_le32(x)
-+# define ioswabq(a, x)           (x)
-+# define __mem_ioswabq(a, x)     cpu_to_le64(x)
-+
-+#endif /* __ASM_MACH_ATH79_MANGLE_PORT_H */
---- a/arch/mips/pci/pci-ar71xx.c
-+++ b/arch/mips/pci/pci-ar71xx.c
-@@ -71,6 +71,45 @@ static const u32 ar71xx_pci_read_mask[8]
-       0, 0xff, 0xffff, 0, 0xffffffff, 0, 0, 0
- };
-+static unsigned long (*__ath79_pci_swizzle_b)(unsigned long port);
-+static unsigned long (*__ath79_pci_swizzle_w)(unsigned long port);
-+
-+static inline bool ar71xx_is_pci_addr(unsigned long port)
-+{
-+      unsigned long phys = CPHYSADDR(port);
-+
-+      return (phys >= AR71XX_PCI_MEM_BASE &&
-+              phys < AR71XX_PCI_MEM_BASE + AR71XX_PCI_MEM_SIZE);
-+}
-+
-+static unsigned long ar71xx_pci_swizzle_b(unsigned long port)
-+{
-+      return ar71xx_is_pci_addr(port) ? port ^ 3 : port;
-+}
-+
-+static unsigned long ar71xx_pci_swizzle_w(unsigned long port)
-+{
-+      return ar71xx_is_pci_addr(port) ? port ^ 2 : port;
-+}
-+
-+unsigned long ath79_pci_swizzle_b(unsigned long port)
-+{
-+      if (__ath79_pci_swizzle_b)
-+              return __ath79_pci_swizzle_b(port);
-+
-+      return port;
-+}
-+EXPORT_SYMBOL(ath79_pci_swizzle_b);
-+
-+unsigned long ath79_pci_swizzle_w(unsigned long port)
-+{
-+      if (__ath79_pci_swizzle_w)
-+              return __ath79_pci_swizzle_w(port);
-+
-+      return port;
-+}
-+EXPORT_SYMBOL(ath79_pci_swizzle_w);
-+
- static inline u32 ar71xx_pci_get_ble(int where, int size, int local)
- {
-       u32 t;
-@@ -279,6 +318,9 @@ static int ar71xx_pci_probe(struct platf
-       register_pci_controller(&apc->pci_ctrl);
-+      __ath79_pci_swizzle_b = ar71xx_pci_swizzle_b;
-+      __ath79_pci_swizzle_w = ar71xx_pci_swizzle_w;
-+
-       return 0;
- }
diff --git a/target/linux/ath79/patches-4.19/490-usb-ehci-add-quirks-for-qca-socs.patch b/target/linux/ath79/patches-4.19/490-usb-ehci-add-quirks-for-qca-socs.patch
deleted file mode 100644 (file)
index 4e2a6fe..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -239,6 +239,37 @@ int ehci_reset(struct ehci_hcd *ehci)
-       command |= CMD_RESET;
-       dbg_cmd (ehci, "reset", command);
-       ehci_writel(ehci, command, &ehci->regs->command);
-+
-+      if (ehci->qca_force_host_mode) {
-+              u32 usbmode;
-+
-+              udelay(1000);
-+
-+              usbmode = ehci_readl(ehci, &ehci->regs->usbmode);
-+              usbmode |= USBMODE_CM_HC | (1 << 4);
-+              ehci_writel(ehci, usbmode, &ehci->regs->usbmode);
-+
-+              ehci_dbg(ehci, "forced host mode, usbmode: %08x\n",
-+                       ehci_readl(ehci, &ehci->regs->usbmode));
-+      }
-+
-+      if (ehci->qca_force_16bit_ptw) {
-+              u32 port_status;
-+
-+              udelay(1000);
-+
-+              /* enable 16-bit UTMI interface */
-+              port_status = ehci_readl(ehci, &ehci->regs->port_status[0]);
-+              port_status |= BIT(28);
-+              ehci_writel(ehci, port_status, &ehci->regs->port_status[0]);
-+
-+              ehci_dbg(ehci, "16-bit UTMI interface enabled, status: %08x\n",
-+                       ehci_readl(ehci, &ehci->regs->port_status[0]));
-+      }
-+
-+      if (ehci->reset_notifier)
-+              ehci->reset_notifier(ehci_to_hcd(ehci));
-+
-       ehci->rh_state = EHCI_RH_HALTED;
-       ehci->next_statechange = jiffies;
-       retval = ehci_handshake(ehci, &ehci->regs->command,
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -219,6 +219,10 @@ struct ehci_hcd {                 /* one per controlle
-       unsigned                need_oc_pp_cycle:1; /* MPC834X port power */
-       unsigned                imx28_write_fix:1; /* For Freescale i.MX28 */
-       unsigned                ignore_oc:1;
-+      unsigned                qca_force_host_mode:1;
-+      unsigned                qca_force_16bit_ptw:1; /* force 16 bit UTMI */
-+
-+      void (*reset_notifier)(struct usb_hcd *hcd);
-       /* required for usb32 quirk */
-       #define OHCI_CTRL_HCFS          (3 << 6)
---- a/include/linux/usb/ehci_pdriver.h
-+++ b/include/linux/usb/ehci_pdriver.h
-@@ -51,6 +51,8 @@ struct usb_ehci_pdata {
-       unsigned        reset_on_resume:1;
-       unsigned        dma_mask_64:1;
-       unsigned        ignore_oc:1;
-+      unsigned        qca_force_host_mode:1;
-+      unsigned        qca_force_16bit_ptw:1;
-       /* Turn on all power and clocks */
-       int (*power_on)(struct platform_device *pdev);
-@@ -60,6 +62,7 @@ struct usb_ehci_pdata {
-        * turn off everything else */
-       void (*power_suspend)(struct platform_device *pdev);
-       int (*pre_setup)(struct usb_hcd *hcd);
-+      void (*reset_notifier)(struct platform_device *pdev);
- };
- #endif /* __USB_CORE_EHCI_PDRIVER_H */
---- a/drivers/usb/host/ehci-platform.c
-+++ b/drivers/usb/host/ehci-platform.c
-@@ -48,6 +48,14 @@ struct ehci_platform_priv {
- static const char hcd_name[] = "ehci-platform";
-+static void ehci_platform_reset_notifier(struct usb_hcd *hcd)
-+{
-+      struct platform_device *pdev = to_platform_device(hcd->self.controller);
-+      struct usb_ehci_pdata *pdata = pdev->dev.platform_data;
-+
-+      pdata->reset_notifier(pdev);
-+}
-+
- static int ehci_platform_reset(struct usb_hcd *hcd)
- {
-       struct platform_device *pdev = to_platform_device(hcd->self.controller);
-@@ -215,6 +223,13 @@ static int ehci_platform_probe(struct pl
-               priv->reset_on_resume = true;
-       if (pdata->ignore_oc)
-               ehci->ignore_oc = 1;
-+      if (pdata->qca_force_host_mode)
-+              ehci->qca_force_host_mode = 1;
-+      if (pdata->qca_force_16bit_ptw)
-+              ehci->qca_force_16bit_ptw = 1;
-+
-+      if (pdata->reset_notifier)
-+              ehci->reset_notifier = ehci_platform_reset_notifier;
- #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
-       if (ehci->big_endian_mmio) {
diff --git a/target/linux/ath79/patches-4.19/900-mdio_bitbang_ignore_ta_value.patch b/target/linux/ath79/patches-4.19/900-mdio_bitbang_ignore_ta_value.patch
deleted file mode 100644 (file)
index 8f8f349..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/drivers/net/phy/mdio-bitbang.c
-+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -155,7 +155,7 @@ static int mdiobb_cmd_addr(struct mdiobb
- static int mdiobb_read(struct mii_bus *bus, int phy, int reg)
- {
-       struct mdiobb_ctrl *ctrl = bus->priv;
--      int ret, i;
-+      int ret;
-       if (reg & MII_ADDR_C45) {
-               reg = mdiobb_cmd_addr(ctrl, phy, reg);
-@@ -165,19 +165,7 @@ static int mdiobb_read(struct mii_bus *b
-       ctrl->ops->set_mdio_dir(ctrl, 0);
--      /* check the turnaround bit: the PHY should be driving it to zero, if this
--       * PHY is listed in phy_ignore_ta_mask as having broken TA, skip that
--       */
--      if (mdiobb_get_bit(ctrl) != 0 &&
--          !(bus->phy_ignore_ta_mask & (1 << phy))) {
--              /* PHY didn't drive TA low -- flush any bits it
--               * may be trying to send.
--               */
--              for (i = 0; i < 32; i++)
--                      mdiobb_get_bit(ctrl);
--
--              return 0xffff;
--      }
-+      mdiobb_get_bit(ctrl);
-       ret = mdiobb_get_num(ctrl, 16);
-       mdiobb_get_bit(ctrl);
diff --git a/target/linux/ath79/patches-4.19/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch b/target/linux/ath79/patches-4.19/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch
deleted file mode 100644 (file)
index a830346..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 66e584435ac0de6e0abeb6d7166fe4fe25d6bb73 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 16 Jun 2015 13:15:08 +0200
-Subject: [PATCH] phy/mdio-bitbang: prevent rescheduling during command
-
-It seems some phys have some maximum timings for accessing the MDIO line,
-resulting in bit errors under cpu stress. Prevent this from happening by
-disabling interrupts when sending commands.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/net/phy/mdio-bitbang.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/net/phy/mdio-bitbang.c
-+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -17,6 +17,7 @@
-  * kind, whether express or implied.
-  */
-+#include <linux/irqflags.h>
- #include <linux/module.h>
- #include <linux/mdio-bitbang.h>
- #include <linux/types.h>
-@@ -156,7 +157,9 @@ static int mdiobb_read(struct mii_bus *b
- {
-       struct mdiobb_ctrl *ctrl = bus->priv;
-       int ret;
-+      unsigned long flags;
-+      local_irq_save(flags);
-       if (reg & MII_ADDR_C45) {
-               reg = mdiobb_cmd_addr(ctrl, phy, reg);
-               mdiobb_cmd(ctrl, MDIO_C45_READ, phy, reg);
-@@ -169,13 +172,17 @@ static int mdiobb_read(struct mii_bus *b
-       ret = mdiobb_get_num(ctrl, 16);
-       mdiobb_get_bit(ctrl);
-+      local_irq_restore(flags);
-+
-       return ret;
- }
- static int mdiobb_write(struct mii_bus *bus, int phy, int reg, u16 val)
- {
-       struct mdiobb_ctrl *ctrl = bus->priv;
-+      unsigned long flags;
-+      local_irq_save(flags);
-       if (reg & MII_ADDR_C45) {
-               reg = mdiobb_cmd_addr(ctrl, phy, reg);
-               mdiobb_cmd(ctrl, MDIO_C45_WRITE, phy, reg);
-@@ -190,6 +197,8 @@ static int mdiobb_write(struct mii_bus *
-       ctrl->ops->set_mdio_dir(ctrl, 0);
-       mdiobb_get_bit(ctrl);
-+      local_irq_restore(flags);
-+
-       return 0;
- }
diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
deleted file mode 100644 (file)
index f765a08..0000000
+++ /dev/null
@@ -1,891 +0,0 @@
---- a/arch/mips/include/asm/checksum.h
-+++ b/arch/mips/include/asm/checksum.h
-@@ -134,26 +134,30 @@ static inline __sum16 ip_fast_csum(const
-       const unsigned int *stop = word + ihl;
-       unsigned int csum;
-       int carry;
-+      unsigned int w;
--      csum = word[0];
--      csum += word[1];
--      carry = (csum < word[1]);
-+      csum = net_hdr_word(word++);
-+
-+      w = net_hdr_word(word++);
-+      csum += w;
-+      carry = (csum < w);
-       csum += carry;
--      csum += word[2];
--      carry = (csum < word[2]);
-+      w = net_hdr_word(word++);
-+      csum += w;
-+      carry = (csum < w);
-       csum += carry;
--      csum += word[3];
--      carry = (csum < word[3]);
-+      w = net_hdr_word(word++);
-+      csum += w;
-+      carry = (csum < w);
-       csum += carry;
--      word += 4;
-       do {
--              csum += *word;
--              carry = (csum < *word);
-+              w = net_hdr_word(word++);
-+              csum += w;
-+              carry = (csum < w);
-               csum += carry;
--              word++;
-       } while (word != stop);
-       return csum_fold(csum);
-@@ -214,73 +218,6 @@ static inline __sum16 ip_compute_csum(co
-       return csum_fold(csum_partial(buff, len, 0));
- }
--#define _HAVE_ARCH_IPV6_CSUM
--static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
--                                        const struct in6_addr *daddr,
--                                        __u32 len, __u8 proto,
--                                        __wsum sum)
--{
--      __wsum tmp;
--
--      __asm__(
--      "       .set    push            # csum_ipv6_magic\n"
--      "       .set    noreorder       \n"
--      "       .set    noat            \n"
--      "       addu    %0, %5          # proto (long in network byte order)\n"
--      "       sltu    $1, %0, %5      \n"
--      "       addu    %0, $1          \n"
--
--      "       addu    %0, %6          # csum\n"
--      "       sltu    $1, %0, %6      \n"
--      "       lw      %1, 0(%2)       # four words source address\n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       lw      %1, 4(%2)       \n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       lw      %1, 8(%2)       \n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       lw      %1, 12(%2)      \n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       lw      %1, 0(%3)       \n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       lw      %1, 4(%3)       \n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       lw      %1, 8(%3)       \n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       lw      %1, 12(%3)      \n"
--      "       addu    %0, $1          \n"
--      "       addu    %0, %1          \n"
--      "       sltu    $1, %0, %1      \n"
--
--      "       addu    %0, $1          # Add final carry\n"
--      "       .set    pop"
--      : "=&r" (sum), "=&r" (tmp)
--      : "r" (saddr), "r" (daddr),
--        "0" (htonl(len)), "r" (htonl(proto)), "r" (sum));
--
--      return csum_fold(sum);
--}
--
- #include <asm-generic/checksum.h>
- #endif /* CONFIG_GENERIC_CSUM */
---- a/include/uapi/linux/ip.h
-+++ b/include/uapi/linux/ip.h
-@@ -103,7 +103,7 @@ struct iphdr {
-       __be32  saddr;
-       __be32  daddr;
-       /*The options start here. */
--};
-+} __attribute__((packed, aligned(2)));
- struct ip_auth_hdr {
---- a/include/uapi/linux/ipv6.h
-+++ b/include/uapi/linux/ipv6.h
-@@ -131,7 +131,7 @@ struct ipv6hdr {
-       struct  in6_addr        saddr;
-       struct  in6_addr        daddr;
--};
-+} __attribute__((packed, aligned(2)));
- /* index values for the variables in ipv6_devconf */
---- a/include/uapi/linux/tcp.h
-+++ b/include/uapi/linux/tcp.h
-@@ -55,7 +55,7 @@ struct tcphdr {
-       __be16  window;
-       __sum16 check;
-       __be16  urg_ptr;
--};
-+} __attribute__((packed, aligned(2)));
- /*
-  *    The union cast uses a gcc extension to avoid aliasing problems
-@@ -65,7 +65,7 @@ struct tcphdr {
- union tcp_word_hdr { 
-       struct tcphdr hdr;
-       __be32            words[5];
--}; 
-+} __attribute__((packed, aligned(2)));
- #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
---- a/include/uapi/linux/udp.h
-+++ b/include/uapi/linux/udp.h
-@@ -25,7 +25,7 @@ struct udphdr {
-       __be16  dest;
-       __be16  len;
-       __sum16 check;
--};
-+} __attribute__((packed, aligned(2)));
- /* UDP socket options */
- #define UDP_CORK      1       /* Never send partially complete segments */
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -263,8 +263,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
-       switch (l3num) {
-       case NFPROTO_IPV4:
--              tuple->src.u3.ip = ap[0];
--              tuple->dst.u3.ip = ap[1];
-+              tuple->src.u3.ip = net_hdr_word(ap++);
-+              tuple->dst.u3.ip = net_hdr_word(ap);
-               break;
-       case NFPROTO_IPV6:
-               memcpy(tuple->src.u3.ip6, ap, sizeof(tuple->src.u3.ip6));
---- a/include/uapi/linux/icmp.h
-+++ b/include/uapi/linux/icmp.h
-@@ -82,7 +82,7 @@ struct icmphdr {
-       } frag;
-       __u8    reserved[4];
-   } un;
--};
-+} __attribute__((packed, aligned(2)));
- /*
---- a/include/uapi/linux/in6.h
-+++ b/include/uapi/linux/in6.h
-@@ -43,7 +43,7 @@ struct in6_addr {
- #define s6_addr16             in6_u.u6_addr16
- #define s6_addr32             in6_u.u6_addr32
- #endif
--};
-+} __attribute__((packed, aligned(2)));
- #endif /* __UAPI_DEF_IN6_ADDR */
- #if __UAPI_DEF_SOCKADDR_IN6
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -39,6 +39,7 @@
- #include <linux/ipsec.h>
- #include <linux/times.h>
- #include <linux/slab.h>
-+#include <asm/unaligned.h>
- #include <linux/uaccess.h>
- #include <linux/ipv6.h>
- #include <linux/icmpv6.h>
-@@ -836,10 +837,10 @@ static void tcp_v6_send_response(const s
-       topt = (__be32 *)(t1 + 1);
-       if (tsecr) {
--              *topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
--                              (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP);
--              *topt++ = htonl(tsval);
--              *topt++ = htonl(tsecr);
-+              put_unaligned_be32((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
-+                              (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP, topt++);
-+              put_unaligned_be32(tsval, topt++);
-+              put_unaligned_be32(tsecr, topt++);
-       }
- #ifdef CONFIG_TCP_MD5SIG
---- a/include/linux/ipv6.h
-+++ b/include/linux/ipv6.h
-@@ -6,6 +6,7 @@
- #define ipv6_optlen(p)  (((p)->hdrlen+1) << 3)
- #define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
-+
- /*
-  * This structure contains configuration options per IPv6 link.
-  */
---- a/net/ipv6/datagram.c
-+++ b/net/ipv6/datagram.c
-@@ -478,7 +478,7 @@ int ipv6_recv_error(struct sock *sk, str
-                               ipv6_iface_scope_id(&sin->sin6_addr,
-                                                   IP6CB(skb)->iif);
-               } else {
--                      ipv6_addr_set_v4mapped(*(__be32 *)(nh + serr->addr_offset),
-+                      ipv6_addr_set_v4mapped(net_hdr_word(nh + serr->addr_offset),
-                                              &sin->sin6_addr);
-                       sin->sin6_scope_id = 0;
-               }
-@@ -828,12 +828,12 @@ int ip6_datagram_send_ctl(struct net *ne
-                       }
-                       if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
--                              if ((fl6->flowlabel^*(__be32 *)CMSG_DATA(cmsg))&~IPV6_FLOWINFO_MASK) {
-+                              if ((fl6->flowlabel^net_hdr_word(CMSG_DATA(cmsg)))&~IPV6_FLOWINFO_MASK) {
-                                       err = -EINVAL;
-                                       goto exit_f;
-                               }
-                       }
--                      fl6->flowlabel = IPV6_FLOWINFO_MASK & *(__be32 *)CMSG_DATA(cmsg);
-+                      fl6->flowlabel = IPV6_FLOWINFO_MASK & net_hdr_word(CMSG_DATA(cmsg));
-                       break;
-               case IPV6_2292HOPOPTS:
---- a/net/ipv6/ip6_gre.c
-+++ b/net/ipv6/ip6_gre.c
-@@ -452,7 +452,7 @@ static void ip6gre_err(struct sk_buff *s
-               return;
-       ipv6h = (const struct ipv6hdr *)skb->data;
-       greh = (const struct gre_base_hdr *)(skb->data + offset);
--      key = key_off ? *(__be32 *)(skb->data + key_off) : 0;
-+      key = key_off ? net_hdr_word((__be32 *)(skb->data + key_off)) : 0;
-       t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
-                                key, greh->protocol);
---- a/net/ipv6/exthdrs.c
-+++ b/net/ipv6/exthdrs.c
-@@ -756,7 +756,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
-               goto drop;
-       }
--      pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));
-+      pkt_len = ntohl(net_hdr_word(nh + optoff + 2));
-       if (pkt_len <= IPV6_MAXPLEN) {
-               __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
-               icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);
---- a/include/linux/types.h
-+++ b/include/linux/types.h
-@@ -230,5 +230,11 @@ struct callback_head {
- typedef void (*rcu_callback_t)(struct rcu_head *head);
- typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
-+struct net_hdr_word {
-+       u32 words[1];
-+} __attribute__((packed, aligned(2)));
-+
-+#define net_hdr_word(_p) (((struct net_hdr_word *) (_p))->words[0])
-+
- #endif /*  __ASSEMBLY__ */
- #endif /* _LINUX_TYPES_H */
---- a/net/ipv4/af_inet.c
-+++ b/net/ipv4/af_inet.c
-@@ -1422,8 +1422,8 @@ struct sk_buff *inet_gro_receive(struct
-       if (unlikely(ip_fast_csum((u8 *)iph, 5)))
-               goto out_unlock;
--      id = ntohl(*(__be32 *)&iph->id);
--      flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF));
-+      id = ntohl(net_hdr_word(&iph->id));
-+      flush = (u16)((ntohl(net_hdr_word(iph)) ^ skb_gro_len(skb)) | (id & ~IP_DF));
-       id >>= 16;
-       list_for_each_entry(p, head, list) {
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -448,7 +448,7 @@ static struct neighbour *ipv4_neigh_look
-       else if (skb)
-               pkey = &ip_hdr(skb)->daddr;
--      n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey);
-+      n = __ipv4_neigh_lookup(dev, net_hdr_word(pkey));
-       if (n)
-               return n;
-       return neigh_create(&arp_tbl, pkey, dev);
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -461,48 +461,53 @@ static void tcp_options_write(__be32 *pt
-       u16 options = opts->options;    /* mungable copy */
-       if (unlikely(OPTION_MD5 & options)) {
--              *ptr++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
--                             (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
-+              net_hdr_word(ptr++) =
-+                      htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
-+                            (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
-               /* overload cookie hash location */
-               opts->hash_location = (__u8 *)ptr;
-               ptr += 4;
-       }
-       if (unlikely(opts->mss)) {
--              *ptr++ = htonl((TCPOPT_MSS << 24) |
--                             (TCPOLEN_MSS << 16) |
--                             opts->mss);
-+              net_hdr_word(ptr++) =
-+                      htonl((TCPOPT_MSS << 24) | (TCPOLEN_MSS << 16) |
-+                            opts->mss);
-       }
-       if (likely(OPTION_TS & options)) {
-               if (unlikely(OPTION_SACK_ADVERTISE & options)) {
--                      *ptr++ = htonl((TCPOPT_SACK_PERM << 24) |
--                                     (TCPOLEN_SACK_PERM << 16) |
--                                     (TCPOPT_TIMESTAMP << 8) |
--                                     TCPOLEN_TIMESTAMP);
-+                      net_hdr_word(ptr++) =
-+                              htonl((TCPOPT_SACK_PERM << 24) |
-+                                    (TCPOLEN_SACK_PERM << 16) |
-+                                    (TCPOPT_TIMESTAMP << 8) |
-+                                    TCPOLEN_TIMESTAMP);
-                       options &= ~OPTION_SACK_ADVERTISE;
-               } else {
--                      *ptr++ = htonl((TCPOPT_NOP << 24) |
--                                     (TCPOPT_NOP << 16) |
--                                     (TCPOPT_TIMESTAMP << 8) |
--                                     TCPOLEN_TIMESTAMP);
-+                      net_hdr_word(ptr++) =
-+                              htonl((TCPOPT_NOP << 24) |
-+                                    (TCPOPT_NOP << 16) |
-+                                    (TCPOPT_TIMESTAMP << 8) |
-+                                    TCPOLEN_TIMESTAMP);
-               }
--              *ptr++ = htonl(opts->tsval);
--              *ptr++ = htonl(opts->tsecr);
-+              net_hdr_word(ptr++) = htonl(opts->tsval);
-+              net_hdr_word(ptr++) = htonl(opts->tsecr);
-       }
-       if (unlikely(OPTION_SACK_ADVERTISE & options)) {
--              *ptr++ = htonl((TCPOPT_NOP << 24) |
--                             (TCPOPT_NOP << 16) |
--                             (TCPOPT_SACK_PERM << 8) |
--                             TCPOLEN_SACK_PERM);
-+              net_hdr_word(ptr++) =
-+                      htonl((TCPOPT_NOP << 24) |
-+                            (TCPOPT_NOP << 16) |
-+                            (TCPOPT_SACK_PERM << 8) |
-+                            TCPOLEN_SACK_PERM);
-       }
-       if (unlikely(OPTION_WSCALE & options)) {
--              *ptr++ = htonl((TCPOPT_NOP << 24) |
--                             (TCPOPT_WINDOW << 16) |
--                             (TCPOLEN_WINDOW << 8) |
--                             opts->ws);
-+              net_hdr_word(ptr++) =
-+                      htonl((TCPOPT_NOP << 24) |
-+                            (TCPOPT_WINDOW << 16) |
-+                            (TCPOLEN_WINDOW << 8) |
-+                            opts->ws);
-       }
-       if (unlikely(opts->num_sack_blocks)) {
-@@ -510,16 +515,17 @@ static void tcp_options_write(__be32 *pt
-                       tp->duplicate_sack : tp->selective_acks;
-               int this_sack;
--              *ptr++ = htonl((TCPOPT_NOP  << 24) |
--                             (TCPOPT_NOP  << 16) |
--                             (TCPOPT_SACK <<  8) |
--                             (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
-+              net_hdr_word(ptr++) =
-+                      htonl((TCPOPT_NOP << 24) |
-+                            (TCPOPT_NOP << 16) |
-+                            (TCPOPT_SACK << 8) |
-+                            (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
-                                                    TCPOLEN_SACK_PERBLOCK)));
-               for (this_sack = 0; this_sack < opts->num_sack_blocks;
-                    ++this_sack) {
--                      *ptr++ = htonl(sp[this_sack].start_seq);
--                      *ptr++ = htonl(sp[this_sack].end_seq);
-+                      net_hdr_word(ptr++) = htonl(sp[this_sack].start_seq);
-+                      net_hdr_word(ptr++) = htonl(sp[this_sack].end_seq);
-               }
-               tp->rx_opt.dsack = 0;
-@@ -532,13 +538,14 @@ static void tcp_options_write(__be32 *pt
-               if (foc->exp) {
-                       len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
--                      *ptr = htonl((TCPOPT_EXP << 24) | (len << 16) |
-+                      net_hdr_word(ptr) =
-+                              htonl((TCPOPT_EXP << 24) | (len << 16) |
-                                    TCPOPT_FASTOPEN_MAGIC);
-                       p += TCPOLEN_EXP_FASTOPEN_BASE;
-               } else {
-                       len = TCPOLEN_FASTOPEN_BASE + foc->len;
--                      *p++ = TCPOPT_FASTOPEN;
--                      *p++ = len;
-+                      net_hdr_word(p++) = TCPOPT_FASTOPEN;
-+                      net_hdr_word(p++) = len;
-               }
-               memcpy(p, foc->val, foc->len);
---- a/include/uapi/linux/igmp.h
-+++ b/include/uapi/linux/igmp.h
-@@ -33,7 +33,7 @@ struct igmphdr {
-       __u8 code;              /* For newer IGMP */
-       __sum16 csum;
-       __be32 group;
--};
-+} __attribute__((packed, aligned(2)));
- /* V3 group record types [grec_type] */
- #define IGMPV3_MODE_IS_INCLUDE                1
-@@ -49,7 +49,7 @@ struct igmpv3_grec {
-       __be16  grec_nsrcs;
-       __be32  grec_mca;
-       __be32  grec_src[0];
--};
-+} __attribute__((packed, aligned(2)));
- struct igmpv3_report {
-       __u8 type;
-@@ -58,7 +58,7 @@ struct igmpv3_report {
-       __be16 resv2;
-       __be16 ngrec;
-       struct igmpv3_grec grec[0];
--};
-+} __attribute__((packed, aligned(2)));
- struct igmpv3_query {
-       __u8 type;
-@@ -79,7 +79,7 @@ struct igmpv3_query {
-       __u8 qqic;
-       __be16 nsrcs;
-       __be32 srcs[0];
--};
-+} __attribute__((packed, aligned(2)));
- #define IGMP_HOST_MEMBERSHIP_QUERY    0x11    /* From RFC1112 */
- #define IGMP_HOST_MEMBERSHIP_REPORT   0x12    /* Ditto */
---- a/net/core/flow_dissector.c
-+++ b/net/core/flow_dissector.c
-@@ -111,7 +111,7 @@ __be32 __skb_flow_get_ports(const struct
-               ports = __skb_header_pointer(skb, thoff + poff,
-                                            sizeof(_ports), data, hlen, &_ports);
-               if (ports)
--                      return *ports;
-+                      return (__be32)net_hdr_word(ports);
-       }
-       return 0;
---- a/include/uapi/linux/icmpv6.h
-+++ b/include/uapi/linux/icmpv6.h
-@@ -77,7 +77,7 @@ struct icmp6hdr {
- #define icmp6_addrconf_other  icmp6_dataun.u_nd_ra.other
- #define icmp6_rt_lifetime     icmp6_dataun.u_nd_ra.rt_lifetime
- #define icmp6_router_pref     icmp6_dataun.u_nd_ra.router_pref
--};
-+} __attribute__((packed, aligned(2)));
- #define ICMPV6_ROUTER_PREF_LOW                0x3
---- a/include/net/ndisc.h
-+++ b/include/net/ndisc.h
-@@ -89,7 +89,7 @@ struct ra_msg {
-         struct icmp6hdr               icmph;
-       __be32                  reachable_time;
-       __be32                  retrans_timer;
--};
-+} __attribute__((packed, aligned(2)));
- struct rd_msg {
-       struct icmp6hdr icmph;
-@@ -368,10 +368,10 @@ static inline u32 ndisc_hashfn(const voi
- {
-       const u32 *p32 = pkey;
--      return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) +
--              (p32[1] * hash_rnd[1]) +
--              (p32[2] * hash_rnd[2]) +
--              (p32[3] * hash_rnd[3]));
-+      return (((net_hdr_word(&p32[0]) ^ hash32_ptr(dev)) * hash_rnd[0]) +
-+              (net_hdr_word(&p32[1]) * hash_rnd[1]) +
-+              (net_hdr_word(&p32[2]) * hash_rnd[2]) +
-+              (net_hdr_word(&p32[3]) * hash_rnd[3]));
- }
- static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
---- a/net/sched/cls_u32.c
-+++ b/net/sched/cls_u32.c
-@@ -165,7 +165,7 @@ next_knode:
-                       data = skb_header_pointer(skb, toff, 4, &hdata);
-                       if (!data)
-                               goto out;
--                      if ((*data ^ key->val) & key->mask) {
-+                      if ((net_hdr_word(data) ^ key->val) & key->mask) {
-                               n = rcu_dereference_bh(n->next);
-                               goto next_knode;
-                       }
-@@ -218,8 +218,8 @@ check_terminal:
-                                                 &hdata);
-                       if (!data)
-                               goto out;
--                      sel = ht->divisor & u32_hash_fold(*data, &n->sel,
--                                                        n->fshift);
-+                      sel = ht->divisor & u32_hash_fold(net_hdr_word(data),
-+                                                        &n->sel, n->fshift);
-               }
-               if (!(n->sel.flags & (TC_U32_VAROFFSET | TC_U32_OFFSET | TC_U32_EAT)))
-                       goto next_ht;
---- a/net/ipv6/ip6_offload.c
-+++ b/net/ipv6/ip6_offload.c
-@@ -223,7 +223,7 @@ static struct sk_buff *ipv6_gro_receive(
-                       continue;
-               iph2 = (struct ipv6hdr *)(p->data + off);
--              first_word = *(__be32 *)iph ^ *(__be32 *)iph2;
-+              first_word = net_hdr_word(iph) ^ net_hdr_word(iph2);
-               /* All fields must match except length and Traffic Class.
-                * XXX skbs on the gro_list have all been parsed and pulled
---- a/include/net/addrconf.h
-+++ b/include/net/addrconf.h
-@@ -47,7 +47,7 @@ struct prefix_info {
-       __be32                  reserved2;
-       struct in6_addr         prefix;
--};
-+} __attribute__((packed, aligned(2)));
- #include <linux/netdevice.h>
- #include <net/if_inet6.h>
---- a/include/net/inet_ecn.h
-+++ b/include/net/inet_ecn.h
-@@ -125,9 +125,9 @@ static inline int IP6_ECN_set_ce(struct
-       if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
-               return 0;
--      from = *(__be32 *)iph;
-+      from = net_hdr_word(iph);
-       to = from | htonl(INET_ECN_CE << 20);
--      *(__be32 *)iph = to;
-+      net_hdr_word(iph) = to;
-       if (skb->ip_summed == CHECKSUM_COMPLETE)
-               skb->csum = csum_add(csum_sub(skb->csum, (__force __wsum)from),
-                                    (__force __wsum)to);
---- a/include/net/ipv6.h
-+++ b/include/net/ipv6.h
-@@ -149,7 +149,7 @@ struct frag_hdr {
-       __u8    reserved;
-       __be16  frag_off;
-       __be32  identification;
--};
-+} __attribute__((packed, aligned(2)));
- #define       IP6_MF          0x0001
- #define       IP6_OFFSET      0xFFF8
-@@ -499,8 +499,8 @@ static inline void __ipv6_addr_set_half(
-       }
- #endif
- #endif
--      addr[0] = wh;
--      addr[1] = wl;
-+      net_hdr_word(&addr[0]) = wh;
-+      net_hdr_word(&addr[1]) = wl;
- }
- static inline void ipv6_addr_set(struct in6_addr *addr,
-@@ -559,6 +559,8 @@ static inline bool ipv6_prefix_equal(con
-       const __be32 *a1 = addr1->s6_addr32;
-       const __be32 *a2 = addr2->s6_addr32;
-       unsigned int pdw, pbi;
-+      /* Used for last <32-bit fraction of prefix */
-+      u32 pbia1, pbia2;
-       /* check complete u32 in prefix */
-       pdw = prefixlen >> 5;
-@@ -567,7 +569,9 @@ static inline bool ipv6_prefix_equal(con
-       /* check incomplete u32 in prefix */
-       pbi = prefixlen & 0x1f;
--      if (pbi && ((a1[pdw] ^ a2[pdw]) & htonl((0xffffffff) << (32 - pbi))))
-+      pbia1 = net_hdr_word(&a1[pdw]);
-+      pbia2 = net_hdr_word(&a2[pdw]);
-+      if (pbi && ((pbia1 ^ pbia2) & htonl((0xffffffff) << (32 - pbi))))
-               return false;
-       return true;
-@@ -683,13 +687,13 @@ static inline void ipv6_addr_set_v4mappe
-  */
- static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
- {
--      const __be32 *a1 = token1, *a2 = token2;
-+      const struct in6_addr *a1 = token1, *a2 = token2;
-       int i;
-       addrlen >>= 2;
-       for (i = 0; i < addrlen; i++) {
--              __be32 xb = a1[i] ^ a2[i];
-+              __be32 xb = a1->s6_addr32[i] ^ a2->s6_addr32[i];
-               if (xb)
-                       return i * 32 + 31 - __fls(ntohl(xb));
-       }
-@@ -876,17 +880,18 @@ static inline int ip6_multipath_hash_pol
- static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
-                               __be32 flowlabel)
- {
--      *(__be32 *)hdr = htonl(0x60000000 | (tclass << 20)) | flowlabel;
-+      net_hdr_word((__be32 *)hdr) =
-+              htonl(0x60000000 | (tclass << 20)) | flowlabel;
- }
- static inline __be32 ip6_flowinfo(const struct ipv6hdr *hdr)
- {
--      return *(__be32 *)hdr & IPV6_FLOWINFO_MASK;
-+      return net_hdr_word((__be32 *)hdr) & IPV6_FLOWINFO_MASK;
- }
- static inline __be32 ip6_flowlabel(const struct ipv6hdr *hdr)
- {
--      return *(__be32 *)hdr & IPV6_FLOWLABEL_MASK;
-+      return net_hdr_word((__be32 *)hdr) & IPV6_FLOWLABEL_MASK;
- }
- static inline u8 ip6_tclass(__be32 flowinfo)
---- a/include/net/secure_seq.h
-+++ b/include/net/secure_seq.h
-@@ -3,6 +3,7 @@
- #define _NET_SECURE_SEQ
- #include <linux/types.h>
-+#include <linux/in6.h>
- u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
- u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
---- a/include/uapi/linux/in.h
-+++ b/include/uapi/linux/in.h
-@@ -84,7 +84,7 @@ enum {
- /* Internet address. */
- struct in_addr {
-       __be32  s_addr;
--};
-+} __attribute__((packed, aligned(2)));
- #endif
- #define IP_TOS                1
---- a/net/ipv6/ip6_fib.c
-+++ b/net/ipv6/ip6_fib.c
-@@ -142,7 +142,7 @@ static __be32 addr_bit_set(const void *t
-        * See include/asm-generic/bitops/le.h.
-        */
-       return (__force __be32)(1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)) &
--             addr[fn_bit >> 5];
-+             net_hdr_word(&addr[fn_bit >> 5]);
- }
- struct fib6_info *fib6_info_alloc(gfp_t gfp_flags)
---- a/net/netfilter/nf_conntrack_proto_tcp.c
-+++ b/net/netfilter/nf_conntrack_proto_tcp.c
-@@ -423,7 +423,7 @@ static void tcp_sack(const struct sk_buf
-       /* Fast path for timestamp-only option */
-       if (length == TCPOLEN_TSTAMP_ALIGNED
--          && *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
-+          && net_hdr_word(ptr) == htonl((TCPOPT_NOP << 24)
-                                      | (TCPOPT_NOP << 16)
-                                      | (TCPOPT_TIMESTAMP << 8)
-                                      | TCPOLEN_TIMESTAMP))
---- a/net/xfrm/xfrm_input.c
-+++ b/net/xfrm/xfrm_input.c
-@@ -194,8 +194,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
-       if (!pskb_may_pull(skb, hlen))
-               return -EINVAL;
--      *spi = *(__be32 *)(skb_transport_header(skb) + offset);
--      *seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
-+      *spi = net_hdr_word(skb_transport_header(skb) + offset);
-+      *seq = net_hdr_word(skb_transport_header(skb) + offset_seq);
-       return 0;
- }
- EXPORT_SYMBOL(xfrm_parse_spi);
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -3898,14 +3898,16 @@ static bool tcp_parse_aligned_timestamp(
- {
-       const __be32 *ptr = (const __be32 *)(th + 1);
--      if (*ptr == htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16)
--                        | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
-+      if (net_hdr_word(ptr) ==
-+          htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
-+                (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
-               tp->rx_opt.saw_tstamp = 1;
-               ++ptr;
--              tp->rx_opt.rcv_tsval = ntohl(*ptr);
-+              tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr);
-               ++ptr;
--              if (*ptr)
--                      tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset;
-+              if (net_hdr_word(ptr))
-+                      tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) -
-+                                             tp->tsoffset;
-               else
-                       tp->rx_opt.rcv_tsecr = 0;
-               return true;
---- a/include/uapi/linux/if_pppox.h
-+++ b/include/uapi/linux/if_pppox.h
-@@ -51,6 +51,7 @@ struct pppoe_addr {
-  */
- struct pptp_addr {
-       __u16           call_id;
-+      __u16           pad;
-       struct in_addr  sin_addr;
- };
---- a/net/ipv6/netfilter/nf_log_ipv6.c
-+++ b/net/ipv6/netfilter/nf_log_ipv6.c
-@@ -66,9 +66,9 @@ static void dump_ipv6_packet(struct net
-       /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
-       nf_log_buf_add(m, "LEN=%zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
-              ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
--             (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
-+             (ntohl(net_hdr_word(ih)) & 0x0ff00000) >> 20,
-              ih->hop_limit,
--             (ntohl(*(__be32 *)ih) & 0x000fffff));
-+             (ntohl(net_hdr_word(ih)) & 0x000fffff));
-       fragment = 0;
-       ptr = ip6hoff + sizeof(struct ipv6hdr);
---- a/include/net/neighbour.h
-+++ b/include/net/neighbour.h
-@@ -266,8 +266,10 @@ static inline bool neigh_key_eq128(const
-       const u32 *n32 = (const u32 *)n->primary_key;
-       const u32 *p32 = pkey;
--      return ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
--              (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0;
-+      return ((n32[0] ^ net_hdr_word(&p32[0])) |
-+              (n32[1] ^ net_hdr_word(&p32[1])) |
-+              (n32[2] ^ net_hdr_word(&p32[2])) |
-+              (n32[3] ^ net_hdr_word(&p32[3]))) == 0;
- }
- static inline struct neighbour *___neigh_lookup_noref(
---- a/include/uapi/linux/netfilter_arp/arp_tables.h
-+++ b/include/uapi/linux/netfilter_arp/arp_tables.h
-@@ -70,7 +70,7 @@ struct arpt_arp {
-       __u8 flags;
-       /* Inverse flags */
-       __u16 invflags;
--};
-+} __attribute__((aligned(4)));
- /* Values for "flag" field in struct arpt_ip (general arp structure).
-  * No flags defined yet.
---- a/net/core/utils.c
-+++ b/net/core/utils.c
-@@ -447,8 +447,14 @@ void inet_proto_csum_replace16(__sum16 *
-                              bool pseudohdr)
- {
-       __be32 diff[] = {
--              ~from[0], ~from[1], ~from[2], ~from[3],
--              to[0], to[1], to[2], to[3],
-+              ~net_hdr_word(&from[0]),
-+              ~net_hdr_word(&from[1]),
-+              ~net_hdr_word(&from[2]),
-+              ~net_hdr_word(&from[3]),
-+              net_hdr_word(&to[0]),
-+              net_hdr_word(&to[1]),
-+              net_hdr_word(&to[2]),
-+              net_hdr_word(&to[3]),
-       };
-       if (skb->ip_summed != CHECKSUM_PARTIAL) {
-               *sum = csum_fold(csum_partial(diff, sizeof(diff),
---- a/include/linux/etherdevice.h
-+++ b/include/linux/etherdevice.h
-@@ -480,7 +480,7 @@ static inline bool is_etherdev_addr(cons
-  * @b: Pointer to Ethernet header
-  *
-  * Compare two Ethernet headers, returns 0 if equal.
-- * This assumes that the network header (i.e., IP header) is 4-byte
-+ * This assumes that the network header (i.e., IP header) is 2-byte
-  * aligned OR the platform can handle unaligned access.  This is the
-  * case for all packets coming into netif_receive_skb or similar
-  * entry points.
-@@ -503,11 +503,12 @@ static inline unsigned long compare_ethe
-       fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
-       return fold;
- #else
--      u32 *a32 = (u32 *)((u8 *)a + 2);
--      u32 *b32 = (u32 *)((u8 *)b + 2);
-+      const u16 *a16 = a;
-+      const u16 *b16 = b;
--      return (*(u16 *)a ^ *(u16 *)b) | (a32[0] ^ b32[0]) |
--             (a32[1] ^ b32[1]) | (a32[2] ^ b32[2]);
-+      return (a16[0] ^ b16[0]) | (a16[1] ^ b16[1]) | (a16[2] ^ b16[2]) |
-+             (a16[3] ^ b16[3]) | (a16[4] ^ b16[4]) | (a16[5] ^ b16[5]) |
-+             (a16[6] ^ b16[6]);
- #endif
- }
---- a/net/ipv4/tcp_offload.c
-+++ b/net/ipv4/tcp_offload.c
-@@ -226,7 +226,7 @@ struct sk_buff *tcp_gro_receive(struct l
-               th2 = tcp_hdr(p);
--              if (*(u32 *)&th->source ^ *(u32 *)&th2->source) {
-+              if (net_hdr_word(&th->source) ^ net_hdr_word(&th2->source)) {
-                       NAPI_GRO_CB(p)->same_flow = 0;
-                       continue;
-               }
-@@ -244,8 +244,8 @@ found:
-                 ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH));
-       flush |= (__force int)(th->ack_seq ^ th2->ack_seq);
-       for (i = sizeof(*th); i < thlen; i += 4)
--              flush |= *(u32 *)((u8 *)th + i) ^
--                       *(u32 *)((u8 *)th2 + i);
-+              flush |= net_hdr_word((u8 *)th + i) ^
-+                       net_hdr_word((u8 *)th2 + i);
-       /* When we receive our second frame we can made a decision on if we
-        * continue this flow as an atomic flow with a fixed ID or if we use
---- a/net/ipv6/netfilter/ip6table_mangle.c
-+++ b/net/ipv6/netfilter/ip6table_mangle.c
-@@ -50,7 +50,7 @@ ip6t_mangle_out(struct sk_buff *skb, con
-       hop_limit = ipv6_hdr(skb)->hop_limit;
-       /* flowlabel and prio (includes version, which shouldn't change either */
--      flowlabel = *((u_int32_t *)ipv6_hdr(skb));
-+      flowlabel = net_hdr_word(ipv6_hdr(skb));
-       ret = ip6t_do_table(skb, state, state->net->ipv6.ip6table_mangle);
-@@ -59,7 +59,7 @@ ip6t_mangle_out(struct sk_buff *skb, con
-            !ipv6_addr_equal(&ipv6_hdr(skb)->daddr, &daddr) ||
-            skb->mark != mark ||
-            ipv6_hdr(skb)->hop_limit != hop_limit ||
--           flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) {
-+           flowlabel != net_hdr_word(ipv6_hdr(skb)))) {
-               err = ip6_route_me_harder(state->net, skb);
-               if (err < 0)
-                       ret = NF_DROP_ERR(err);
index 4171a04ee4c858607a7c3fd6b32a20dbd5db3439..2af1c7e719d6f55f244576cda1a2f01d5a9ae717 100644 (file)
@@ -14,7 +14,6 @@ MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 CPU_TYPE:=cortex-a9
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 define Target/Description
        Build firmware images for Broadcom based BCM47xx/53xx routers with ARM CPU, *not* MIPS.
diff --git a/target/linux/bcm53xx/patches-4.19/030-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch b/target/linux/bcm53xx/patches-4.19/030-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch
deleted file mode 100644 (file)
index e6e2522..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From b0465fdfdd7e7c1afe2fae1cb36b94e1ce89732e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sat, 28 Jul 2018 14:13:57 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Specify flash partitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Most devices use Broadcom standard partitions which allows them to be
-described with the "brcm,bcm947xx-cfe-partitions". Exceptions are:
-1) TP-LINK devices which use "os-image" partition with TRX containing
-   kernel only + separated rootfs partition.
-2) Asus RT-AC87U with custom "asus" partition.
-
-This commit also removes undocumented and unsupported linux,part-probe
-binding which got accidentally upstreamed while describing SPI
-controller.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 28 +++++++++++++++++++
- arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts        | 31 ++++++++++++++++++++++
- arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 28 +++++++++++++++++++
- arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi           |  4 +++
- arch/arm/boot/dts/bcm5301x.dtsi                    |  5 +++-
- 5 files changed, 95 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-@@ -94,6 +94,34 @@
- &spi_nor {
-       status = "okay";
-+
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              boot@0 {
-+                      label = "boot";
-+                      reg = <0x000000 0x040000>;
-+                      read-only;
-+              };
-+
-+              os-image@100000 {
-+                      label = "os-image";
-+                      reg = <0x040000 0x200000>;
-+                      compatible = "brcm,trx";
-+              };
-+
-+              rootfs@240000 {
-+                      label = "rootfs";
-+                      reg = <0x240000 0xc00000>;
-+              };
-+
-+              nvram@ff0000 {
-+                      label = "nvram";
-+                      reg = <0xff0000 0x010000>;
-+              };
-+      };
- };
- &usb2 {
---- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-@@ -66,3 +66,34 @@
- &usb3_phy {
-       status = "okay";
- };
-+
-+&nandcs {
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              boot@0 {
-+                      label = "boot";
-+                      reg = <0x00000000 0x00080000>;
-+                      read-only;
-+              };
-+
-+              nvram@80000 {
-+                      label = "nvram";
-+                      reg = <0x00080000 0x00180000>;
-+              };
-+
-+              firmware@200000 {
-+                      label = "firmware";
-+                      reg = <0x00200000 0x07cc0000>;
-+                      compatible = "brcm,trx";
-+              };
-+
-+              asus@7ec0000 {
-+                      label = "asus";
-+                      reg = <0x07ec0000 0x00140000>;
-+                      read-only;
-+              };
-+      };
-+};
---- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-@@ -103,6 +103,34 @@
- &spi_nor {
-       status = "okay";
-+
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              boot@0 {
-+                      label = "boot";
-+                      reg = <0x000000 0x040000>;
-+                      read-only;
-+              };
-+
-+              os-image@100000 {
-+                      label = "os-image";
-+                      reg = <0x040000 0x200000>;
-+                      compatible = "brcm,trx";
-+              };
-+
-+              rootfs@240000 {
-+                      label = "rootfs";
-+                      reg = <0x240000 0xc00000>;
-+              };
-+
-+              nvram@ff0000 {
-+                      label = "nvram";
-+                      reg = <0xff0000 0x010000>;
-+              };
-+      };
- };
- &usb3_phy {
---- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-@@ -12,6 +12,10 @@
-                       reg = <0>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-+
-+                      partitions {
-+                              compatible = "brcm,bcm947xx-cfe-partitions";
-+                      };
-               };
-       };
- };
---- a/arch/arm/boot/dts/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -475,8 +475,11 @@
-                       compatible = "jedec,spi-nor";
-                       reg = <0>;
-                       spi-max-frequency = <20000000>;
--                      linux,part-probe = "ofpart", "bcm47xxpart";
-                       status = "disabled";
-+
-+                      partitions {
-+                              compatible = "brcm,bcm947xx-cfe-partitions";
-+                      };
-               };
-       };
diff --git a/target/linux/bcm53xx/patches-4.19/031-v4.21-0001-ARM-dts-BCM5301X-Relicense-BCM47081-BCM4709-files-to.patch b/target/linux/bcm53xx/patches-4.19/031-v4.21-0001-ARM-dts-BCM5301X-Relicense-BCM47081-BCM4709-files-to.patch
deleted file mode 100644 (file)
index 2dc6b2c..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 26ff86f7794b9466481ccf29ac79925d327f106d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 20 Sep 2018 13:18:47 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Relicense BCM47081/BCM4709 files to the
- GPL 2.0+ / MIT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This matches licensing used by other BCM5301X files and is preferred as:
-1) GPL 2.0+ makes it clearly compatible with Linux kernel
-2) MIT is also permissive but preferred over ISC
-
-Both files were fully developed by me. Commits touching them were signed
-by Florian and Hauke due to submitting process only.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/bcm47081.dtsi | 13 +------------
- arch/arm/boot/dts/bcm4709.dtsi  |  3 +--
- 2 files changed, 2 insertions(+), 14 deletions(-)
-
---- a/arch/arm/boot/dts/bcm47081.dtsi
-+++ b/arch/arm/boot/dts/bcm47081.dtsi
-@@ -1,20 +1,9 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- /*
-  * Broadcom BCM470X / BCM5301X ARM platform code.
-  * DTS for BCM47081 SoC.
-  *
-  * Copyright Â© 2014 RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
-- *
-- * Permission to use, copy, modify, and/or distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-- * PERFORMANCE OF THIS SOFTWARE.
-  */
- #include "bcm5301x.dtsi"
---- a/arch/arm/boot/dts/bcm4709.dtsi
-+++ b/arch/arm/boot/dts/bcm4709.dtsi
-@@ -1,7 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- /*
-  * Copyright (C) 2016 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-- *
-- * Licensed under the ISC license.
-  */
- #include "bcm4708.dtsi"
diff --git a/target/linux/bcm53xx/patches-4.19/031-v4.21-0002-ARM-dts-BCM5301X-Relicense-BCM47094-file-to-the-GPL-.patch b/target/linux/bcm53xx/patches-4.19/031-v4.21-0002-ARM-dts-BCM5301X-Relicense-BCM47094-file-to-the-GPL-.patch
deleted file mode 100644 (file)
index 86c6b0a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From d10967344375026ca8762b6080dec2585d895906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 20 Sep 2018 13:20:19 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Relicense BCM47094 file to the GPL 2.0+ /
- MIT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This matches licensing used by other BCM5301X files and is preferred as:
-1) GPL 2.0+ makes it clearly compatible with Linux kernel
-2) MIT is also permissive but preferred over ISC
-
-This file has been developed by me & once modified by Vivek.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Vivek Unune <npcomplete13@gmail.com>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/bcm47094.dtsi | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm47094.dtsi
-+++ b/arch/arm/boot/dts/bcm47094.dtsi
-@@ -1,7 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- /*
-  * Copyright (C) 2016 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-- *
-- * Licensed under the ISC license.
-  */
- #include "bcm4708.dtsi"
diff --git a/target/linux/bcm53xx/patches-4.19/031-v4.21-0003-ARM-dts-BCM53573-Relicense-Tenda-AC9-file-to-the-GPL.patch b/target/linux/bcm53xx/patches-4.19/031-v4.21-0003-ARM-dts-BCM53573-Relicense-Tenda-AC9-file-to-the-GPL.patch
deleted file mode 100644 (file)
index a5358b7..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1c9001b4f69a37820862286b3bbcdde152a52dcf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 20 Sep 2018 13:37:47 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Relicense Tenda AC9 file to the GPL 2.0+
- / MIT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This matches licensing used by most of BCM5301X files and is preferred as:
-1) GPL 2.0+ makes it clearly compatible with Linux kernel
-2) MIT is also permissive but preferred over ISC
-
-This file was fully developed by me.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
-+++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
-@@ -1,7 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- /*
-  * Copyright (C) 2016 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-- *
-- * Licensed under the ISC license.
-  */
- /dts-v1/;
diff --git a/target/linux/bcm53xx/patches-4.19/031-v4.21-0004-ARM-dts-BCM53573-Relicense-SoC-file-to-the-GPL-2.0-M.patch b/target/linux/bcm53xx/patches-4.19/031-v4.21-0004-ARM-dts-BCM53573-Relicense-SoC-file-to-the-GPL-2.0-M.patch
deleted file mode 100644 (file)
index 56cd637..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From ca3a6e705cad10662827093d5426abe078861793 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 20 Sep 2018 13:39:28 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Relicense SoC file to the GPL 2.0+ / MIT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This matches licensing used by most of BCM5301X files and is preferred as:
-1) GPL 2.0+ makes it clearly compatible with Linux kernel
-2) MIT is also permissive but preferred over ISC
-
-This file has been developed by me & once modified by Rob dropping a
-single leading zero in an UART address.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/bcm53573.dtsi | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm53573.dtsi
-+++ b/arch/arm/boot/dts/bcm53573.dtsi
-@@ -1,7 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- /*
-  * Copyright (C) 2016 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-- *
-- * Licensed under the ISC license.
-  */
- #include <dt-bindings/gpio/gpio.h>
diff --git a/target/linux/bcm53xx/patches-4.19/031-v4.21-0005-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch b/target/linux/bcm53xx/patches-4.19/031-v4.21-0005-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch
deleted file mode 100644 (file)
index da37542..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-From 03e96644d7a810916fc4997d572577e876908b18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ren=C3=A9=20Kjellerup?= <rk.katana.steel@gmail.com>
-Date: Mon, 1 Oct 2018 15:07:16 -0700
-Subject: [PATCH] ARM: dts: BCM5301X: Add basic DT for Linksys EA6500 V2
-
-It is wireless home router based on BCM4708A0 with BCM4360 + BCM4331
-wireless chipsets. The BCM4331 5GHz chip currently isn't supported only
-due to missing compatible firmware.
-
-Signed-off-by: Rene Kjellerup <rk.katana.steel@gmail.com>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/Makefile                      |  1 +
- arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 45 +++++++++++++++++++++++++
- 2 files changed, 46 insertions(+)
- create mode 100644 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
-       bcm4708-asus-rt-ac68u.dtb \
-       bcm4708-buffalo-wzr-1750dhp.dtb \
-       bcm4708-linksys-ea6300-v1.dtb \
-+      bcm4708-linksys-ea6500-v2.dtb \
-       bcm4708-luxul-xap-1510.dtb \
-       bcm4708-luxul-xwc-1000.dtb \
-       bcm4708-netgear-r6250.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
-@@ -0,0 +1,45 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+/*
-+ * Copyright (C) 2017 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-+ * Copyright (C) 2018 Rene Kjellerup <rk.katana.steel@gmail.com>
-+ */
-+
-+/dts-v1/;
-+
-+#include "bcm4708.dtsi"
-+#include "bcm5301x-nand-cs0-bch8.dtsi"
-+
-+/ {
-+      compatible = "linksys,ea6500-v2", "brcm,bcm4708";
-+      model = "Linksys EA6500 V2";
-+
-+      chosen {
-+              bootargs = "console=ttyS0,115200";
-+      };
-+
-+      memory {
-+              reg = <0x00000000 0x08000000>;
-+      };
-+
-+      gpio-keys {
-+              compatible = "gpio-keys";
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              wps {
-+                      label = "WPS";
-+                      linux,code = <KEY_WPS_BUTTON>;
-+                      gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              restart {
-+                      label = "Reset";
-+                      linux,code = <KEY_RESTART>;
-+                      gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+};
-+
-+&usb3_phy {
-+      status = "okay";
-+};
diff --git a/target/linux/bcm53xx/patches-4.19/031-v4.21-0006-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch b/target/linux/bcm53xx/patches-4.19/031-v4.21-0006-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch
deleted file mode 100644 (file)
index 5f6dd17..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9994241ac97cb84d1df98fdc172d3cc6b04b11bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 9 Nov 2018 09:56:49 +0100
-Subject: [PATCH] ARM: dts: BCM5301X: Describe Northstar pins mux controller
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This describes hardware & will allow referencing pin functions. The
-first usage is UART1 which allows supporting devices using it.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/bcm5301x.dtsi | 44 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
-
---- a/arch/arm/boot/dts/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -37,6 +37,8 @@
-                       reg = <0x0400 0x100>;
-                       interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&iprocslow>;
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&pinmux_uart1>;
-                       status = "disabled";
-               };
-       };
-@@ -391,6 +393,48 @@
-               status = "disabled";
-       };
-+      dmu@1800c000 {
-+              compatible = "simple-bus";
-+              ranges = <0 0x1800c000 0x1000>;
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              cru@100 {
-+                      compatible = "simple-bus";
-+                      reg = <0x100 0x1a4>;
-+                      ranges;
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+
-+                      pin-controller@1c0 {
-+                              compatible = "brcm,bcm4708-pinmux";
-+                              reg = <0x1c0 0x24>;
-+                              reg-names = "cru_gpio_control";
-+
-+                              spi-pins {
-+                                      groups = "spi_grp";
-+                                      function = "spi";
-+                              };
-+
-+                              i2c {
-+                                      groups = "i2c_grp";
-+                                      function = "i2c";
-+                              };
-+
-+                              pwm {
-+                                      groups = "pwm0_grp", "pwm1_grp",
-+                                               "pwm2_grp", "pwm3_grp";
-+                                      function = "pwm";
-+                              };
-+
-+                              pinmux_uart1: uart1 {
-+                                      groups = "uart1_grp";
-+                                      function = "uart1";
-+                              };
-+                      };
-+              };
-+      };
-+
-       lcpll0: lcpll0@1800c100 {
-               #clock-cells = <1>;
-               compatible = "brcm,nsp-lcpll0";
diff --git a/target/linux/bcm53xx/patches-4.19/032-v5.1-0001-ARM-dts-BCM53573-Relicense-Luxul-files-to-the-GPL-2..patch b/target/linux/bcm53xx/patches-4.19/032-v5.1-0001-ARM-dts-BCM53573-Relicense-Luxul-files-to-the-GPL-2..patch
deleted file mode 100644 (file)
index 5883577..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From b7f264fa496eb2a6dd1d67dc91dbe8ffcb142487 Mon Sep 17 00:00:00 2001
-From: Dan Haab <riproute@gmail.com>
-Date: Sun, 2 Dec 2018 17:00:15 -0700
-Subject: [PATCH] ARM: dts: BCM53573: Relicense Luxul files to the GPL 2.0+ /
- MIT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This matches licensing used by other BCM53573 files and BCM5301X.
-
-Signed-off-by: Dan Haab <dan.haab@luxul.com>
-Acked-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 3 +--
- arch/arm/boot/dts/bcm47189-luxul-xap-810.dts  | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
---- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-@@ -1,7 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- /*
-  * Copyright 2017 Luxul Inc.
-- *
-- * Licensed under the ISC license.
-  */
- /dts-v1/;
---- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-@@ -1,7 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- /*
-  * Copyright 2017 Luxul Inc.
-- *
-- * Licensed under the ISC license.
-  */
- /dts-v1/;
diff --git a/target/linux/bcm53xx/patches-4.19/032-v5.1-0002-ARM-dts-BCM5301X-Add-basic-DT-for-Phicomm-K3.patch b/target/linux/bcm53xx/patches-4.19/032-v5.1-0002-ARM-dts-BCM5301X-Add-basic-DT-for-Phicomm-K3.patch
deleted file mode 100644 (file)
index 3702dac..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-From 40a17923367118e32e5e413a952736dd83635b32 Mon Sep 17 00:00:00 2001
-From: Hao Dong <halbertdong@gmail.com>
-Date: Sun, 20 Jan 2019 23:33:27 +0100
-Subject: [PATCH] ARM: dts: BCM5301X: Add basic DT for Phicomm K3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This router has BCM4709C0 SoC, 128 MiB NAND flash (MX30LF1G18AC-TI),
-512 MiB memory and 3 x LAN and 1 x WAN ports. WiFi chips are
-BCM4366C0 x 2. The router has a small LCD and 3 capactive keys driven by
-a PIC microcontroller, which is in turn wired to UART1 of main board.
-
-Signed-off-by: Hao Dong <halbertdong@gmail.com>
-[rmilecki: drop chosen { }, fix whitespaces, update commit message]
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- arch/arm/boot/dts/Makefile                |  1 +
- arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 71 +++++++++++++++++++++++
- 2 files changed, 72 insertions(+)
- create mode 100644 arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -114,6 +114,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
-       bcm47094-luxul-xwr-3100.dtb \
-       bcm47094-luxul-xwr-3150-v1.dtb \
-       bcm47094-netgear-r8500.dtb \
-+      bcm47094-phicomm-k3.dtb \
-       bcm94708.dtb \
-       bcm94709.dtb \
-       bcm953012er.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-@@ -0,0 +1,71 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+/*
-+ * Copyright (C) 2017 Hamster Tian <haotia@gmail.com>
-+ * Copyright (C) 2019 Hao Dong <halbertdong@gmail.com>
-+ */
-+
-+/dts-v1/;
-+
-+#include "bcm47094.dtsi"
-+#include "bcm5301x-nand-cs0-bch4.dtsi"
-+
-+/ {
-+      compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
-+      model = "Phicomm K3";
-+
-+      memory {
-+              reg = <0x00000000 0x08000000
-+                     0x88000000 0x18000000>;
-+      };
-+
-+      gpio-keys {
-+              compatible = "gpio-keys";
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              restart {
-+                      label = "Reset";
-+                      linux,code = <KEY_RESTART>;
-+                      gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+};
-+
-+&uart1 {
-+      status = "okay";
-+};
-+
-+&usb3_phy {
-+      status = "okay";
-+};
-+
-+&nandcs {
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              partition@0 {
-+                      label = "boot";
-+                      reg = <0x0000000 0x0080000>;
-+                      read-only;
-+              };
-+
-+              partition@80000 {
-+                      label = "nvram";
-+                      reg = <0x0080000 0x0100000>;
-+              };
-+
-+              partition@180000{
-+                      label = "phicomm";
-+                      reg = <0x0180000 0x0280000>;
-+                      read-only;
-+              };
-+
-+              partition@400000 {
-+                      label = "firmware";
-+                      reg = <0x0400000 0x7C00000>;
-+                      compatible = "brcm,trx";
-+              };
-+      };
-+};
diff --git a/target/linux/bcm53xx/patches-4.19/080-v4.20-0001-pinctrl-bcm-add-Northstar-driver.patch b/target/linux/bcm53xx/patches-4.19/080-v4.20-0001-pinctrl-bcm-add-Northstar-driver.patch
deleted file mode 100644 (file)
index 44871e2..0000000
+++ /dev/null
@@ -1,427 +0,0 @@
-From c12fb1774deaa9c9408b19db8d43d3612f6e47a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 26 Sep 2018 21:31:03 +0200
-Subject: [PATCH] pinctrl: bcm: add Northstar driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This driver provides support for Northstar mux controller. It differs
-from Northstar Plus one so a new binding and driver were needed.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/bcm/Kconfig      |  13 ++
- drivers/pinctrl/bcm/Makefile     |   1 +
- drivers/pinctrl/bcm/pinctrl-ns.c | 372 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 386 insertions(+)
- create mode 100644 drivers/pinctrl/bcm/pinctrl-ns.c
-
---- a/drivers/pinctrl/bcm/Kconfig
-+++ b/drivers/pinctrl/bcm/Kconfig
-@@ -73,6 +73,19 @@ config PINCTRL_CYGNUS_MUX
-         configuration, with the exception that certain individual pins
-         can be overridden to GPIO function
-+config PINCTRL_NS
-+      bool "Broadcom Northstar pins driver"
-+      depends on OF && (ARCH_BCM_5301X || COMPILE_TEST)
-+      select PINMUX
-+      select GENERIC_PINCONF
-+      default ARCH_BCM_5301X
-+      help
-+        Say yes here to enable the Broadcom NS SoC pins driver.
-+
-+        The Broadcom Northstar pins driver supports muxing multi-purpose pins
-+        that can be used for various functions (e.g. SPI, I2C, UART) as well
-+        as GPIOs.
-+
- config PINCTRL_NSP_GPIO
-       bool "Broadcom NSP GPIO (with PINCONF) driver"
-       depends on OF_GPIO && (ARCH_BCM_NSP || COMPILE_TEST)
---- a/drivers/pinctrl/bcm/Makefile
-+++ b/drivers/pinctrl/bcm/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_PINCTRL_BCM281XX)         += pinct
- obj-$(CONFIG_PINCTRL_BCM2835)         += pinctrl-bcm2835.o
- obj-$(CONFIG_PINCTRL_IPROC_GPIO)      += pinctrl-iproc-gpio.o
- obj-$(CONFIG_PINCTRL_CYGNUS_MUX)      += pinctrl-cygnus-mux.o
-+obj-$(CONFIG_PINCTRL_NS)              += pinctrl-ns.o
- obj-$(CONFIG_PINCTRL_NSP_GPIO)                += pinctrl-nsp-gpio.o
- obj-$(CONFIG_PINCTRL_NS2_MUX)         += pinctrl-ns2-mux.o
- obj-$(CONFIG_PINCTRL_NSP_MUX)         += pinctrl-nsp-mux.o
---- /dev/null
-+++ b/drivers/pinctrl/bcm/pinctrl-ns.c
-@@ -0,0 +1,372 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (C) 2018 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-+ */
-+
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/pinctrl/pinmux.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+
-+#define FLAG_BCM4708          BIT(1)
-+#define FLAG_BCM4709          BIT(2)
-+#define FLAG_BCM53012         BIT(3)
-+
-+struct ns_pinctrl {
-+      struct device *dev;
-+      unsigned int chipset_flag;
-+      struct pinctrl_dev *pctldev;
-+      void __iomem *base;
-+
-+      struct pinctrl_desc pctldesc;
-+      struct ns_pinctrl_group *groups;
-+      unsigned int num_groups;
-+      struct ns_pinctrl_function *functions;
-+      unsigned int num_functions;
-+};
-+
-+/*
-+ * Pins
-+ */
-+
-+static const struct pinctrl_pin_desc ns_pinctrl_pins[] = {
-+      { 0, "spi_clk", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 1, "spi_ss", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 2, "spi_mosi", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 3, "spi_miso", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 4, "i2c_scl", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 5, "i2c_sda", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 6, "mdc", (void *)(FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 7, "mdio", (void *)(FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 8, "pwm0", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 9, "pwm1", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 10, "pwm2", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 11, "pwm3", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 12, "uart1_rx", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 13, "uart1_tx", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 14, "uart1_cts", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 15, "uart1_rts", (void *)(FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 16, "uart2_rx", (void *)(FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 17, "uart2_tx", (void *)(FLAG_BCM4709 | FLAG_BCM53012) },
-+/* TODO { ??, "xtal_out", (void *)(FLAG_BCM4709) }, */
-+      { 22, "sdio_pwr", (void *)(FLAG_BCM4709 | FLAG_BCM53012) },
-+      { 23, "sdio_en_1p8v", (void *)(FLAG_BCM4709 | FLAG_BCM53012) },
-+};
-+
-+/*
-+ * Groups
-+ */
-+
-+struct ns_pinctrl_group {
-+      const char *name;
-+      const unsigned int *pins;
-+      const unsigned int num_pins;
-+      unsigned int chipsets;
-+};
-+
-+static const unsigned int spi_pins[] = { 0, 1, 2, 3 };
-+static const unsigned int i2c_pins[] = { 4, 5 };
-+static const unsigned int mdio_pins[] = { 6, 7 };
-+static const unsigned int pwm0_pins[] = { 8 };
-+static const unsigned int pwm1_pins[] = { 9 };
-+static const unsigned int pwm2_pins[] = { 10 };
-+static const unsigned int pwm3_pins[] = { 11 };
-+static const unsigned int uart1_pins[] = { 12, 13, 14, 15 };
-+static const unsigned int uart2_pins[] = { 16, 17 };
-+static const unsigned int sdio_pwr_pins[] = { 22 };
-+static const unsigned int sdio_1p8v_pins[] = { 23 };
-+
-+#define NS_GROUP(_name, _pins, _chipsets)             \
-+{                                                     \
-+      .name = _name,                                  \
-+      .pins = _pins,                                  \
-+      .num_pins = ARRAY_SIZE(_pins),                  \
-+      .chipsets = _chipsets,                          \
-+}
-+
-+static const struct ns_pinctrl_group ns_pinctrl_groups[] = {
-+      NS_GROUP("spi_grp", spi_pins, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("i2c_grp", i2c_pins, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("mdio_grp", mdio_pins, FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("pwm0_grp", pwm0_pins, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("pwm1_grp", pwm1_pins, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("pwm2_grp", pwm2_pins, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("pwm3_grp", pwm3_pins, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("uart1_grp", uart1_pins, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("uart2_grp", uart2_pins, FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("sdio_pwr_grp", sdio_pwr_pins, FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_GROUP("sdio_1p8v_grp", sdio_1p8v_pins, FLAG_BCM4709 | FLAG_BCM53012),
-+};
-+
-+/*
-+ * Functions
-+ */
-+
-+struct ns_pinctrl_function {
-+      const char *name;
-+      const char * const *groups;
-+      const unsigned int num_groups;
-+      unsigned int chipsets;
-+};
-+
-+static const char * const spi_groups[] = { "spi_grp" };
-+static const char * const i2c_groups[] = { "i2c_grp" };
-+static const char * const mdio_groups[] = { "mdio_grp" };
-+static const char * const pwm_groups[] = { "pwm0_grp", "pwm1_grp", "pwm2_grp",
-+                                         "pwm3_grp" };
-+static const char * const uart1_groups[] = { "uart1_grp" };
-+static const char * const uart2_groups[] = { "uart2_grp" };
-+static const char * const sdio_groups[] = { "sdio_pwr_grp", "sdio_1p8v_grp" };
-+
-+#define NS_FUNCTION(_name, _groups, _chipsets)                \
-+{                                                     \
-+      .name = _name,                                  \
-+      .groups = _groups,                              \
-+      .num_groups = ARRAY_SIZE(_groups),              \
-+      .chipsets = _chipsets,                          \
-+}
-+
-+static const struct ns_pinctrl_function ns_pinctrl_functions[] = {
-+      NS_FUNCTION("spi", spi_groups, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_FUNCTION("i2c", i2c_groups, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_FUNCTION("mdio", mdio_groups, FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_FUNCTION("pwm", pwm_groups, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_FUNCTION("uart1", uart1_groups, FLAG_BCM4708 | FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_FUNCTION("uart2", uart2_groups, FLAG_BCM4709 | FLAG_BCM53012),
-+      NS_FUNCTION("sdio", sdio_groups, FLAG_BCM4709 | FLAG_BCM53012),
-+};
-+
-+/*
-+ * Groups code
-+ */
-+
-+static int ns_pinctrl_get_groups_count(struct pinctrl_dev *pctrl_dev)
-+{
-+      struct ns_pinctrl *ns_pinctrl = pinctrl_dev_get_drvdata(pctrl_dev);
-+
-+      return ns_pinctrl->num_groups;
-+}
-+
-+static const char *ns_pinctrl_get_group_name(struct pinctrl_dev *pctrl_dev,
-+                                           unsigned int selector)
-+{
-+      struct ns_pinctrl *ns_pinctrl = pinctrl_dev_get_drvdata(pctrl_dev);
-+
-+      return ns_pinctrl->groups[selector].name;
-+}
-+
-+static int ns_pinctrl_get_group_pins(struct pinctrl_dev *pctrl_dev,
-+                                   unsigned int selector,
-+                                   const unsigned int **pins,
-+                                   unsigned int *num_pins)
-+{
-+      struct ns_pinctrl *ns_pinctrl = pinctrl_dev_get_drvdata(pctrl_dev);
-+
-+      *pins = ns_pinctrl->groups[selector].pins;
-+      *num_pins = ns_pinctrl->groups[selector].num_pins;
-+
-+      return 0;
-+}
-+
-+static const struct pinctrl_ops ns_pinctrl_ops = {
-+      .get_groups_count = ns_pinctrl_get_groups_count,
-+      .get_group_name = ns_pinctrl_get_group_name,
-+      .get_group_pins = ns_pinctrl_get_group_pins,
-+      .dt_node_to_map = pinconf_generic_dt_node_to_map_group,
-+      .dt_free_map = pinconf_generic_dt_free_map,
-+};
-+
-+/*
-+ * Functions code
-+ */
-+
-+static int ns_pinctrl_get_functions_count(struct pinctrl_dev *pctrl_dev)
-+{
-+      struct ns_pinctrl *ns_pinctrl = pinctrl_dev_get_drvdata(pctrl_dev);
-+
-+      return ns_pinctrl->num_functions;
-+}
-+
-+static const char *ns_pinctrl_get_function_name(struct pinctrl_dev *pctrl_dev,
-+                                              unsigned int selector)
-+{
-+      struct ns_pinctrl *ns_pinctrl = pinctrl_dev_get_drvdata(pctrl_dev);
-+
-+      return ns_pinctrl->functions[selector].name;
-+}
-+
-+static int ns_pinctrl_get_function_groups(struct pinctrl_dev *pctrl_dev,
-+                                        unsigned int selector,
-+                                        const char * const **groups,
-+                                        unsigned * const num_groups)
-+{
-+      struct ns_pinctrl *ns_pinctrl = pinctrl_dev_get_drvdata(pctrl_dev);
-+
-+      *groups = ns_pinctrl->functions[selector].groups;
-+      *num_groups = ns_pinctrl->functions[selector].num_groups;
-+
-+      return 0;
-+}
-+
-+static int ns_pinctrl_set_mux(struct pinctrl_dev *pctrl_dev,
-+                            unsigned int func_select,
-+                            unsigned int grp_select)
-+{
-+      struct ns_pinctrl *ns_pinctrl = pinctrl_dev_get_drvdata(pctrl_dev);
-+      u32 unset = 0;
-+      u32 tmp;
-+      int i;
-+
-+      for (i = 0; i < ns_pinctrl->groups[grp_select].num_pins; i++) {
-+              int pin_number = ns_pinctrl->groups[grp_select].pins[i];
-+
-+              unset |= BIT(pin_number);
-+      }
-+
-+      tmp = readl(ns_pinctrl->base);
-+      tmp &= ~unset;
-+      writel(tmp, ns_pinctrl->base);
-+
-+      return 0;
-+}
-+
-+static const struct pinmux_ops ns_pinctrl_pmxops = {
-+      .get_functions_count = ns_pinctrl_get_functions_count,
-+      .get_function_name = ns_pinctrl_get_function_name,
-+      .get_function_groups = ns_pinctrl_get_function_groups,
-+      .set_mux = ns_pinctrl_set_mux,
-+};
-+
-+/*
-+ * Controller code
-+ */
-+
-+static struct pinctrl_desc ns_pinctrl_desc = {
-+      .name = "pinctrl-ns",
-+      .pctlops = &ns_pinctrl_ops,
-+      .pmxops = &ns_pinctrl_pmxops,
-+};
-+
-+static const struct of_device_id ns_pinctrl_of_match_table[] = {
-+      { .compatible = "brcm,bcm4708-pinmux", .data = (void *)FLAG_BCM4708, },
-+      { .compatible = "brcm,bcm4709-pinmux", .data = (void *)FLAG_BCM4709, },
-+      { .compatible = "brcm,bcm53012-pinmux", .data = (void *)FLAG_BCM53012, },
-+      { }
-+};
-+
-+static int ns_pinctrl_probe(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      const struct of_device_id *of_id;
-+      struct ns_pinctrl *ns_pinctrl;
-+      struct pinctrl_desc *pctldesc;
-+      struct pinctrl_pin_desc *pin;
-+      struct ns_pinctrl_group *group;
-+      struct ns_pinctrl_function *function;
-+      struct resource *res;
-+      int i;
-+
-+      ns_pinctrl = devm_kzalloc(dev, sizeof(*ns_pinctrl), GFP_KERNEL);
-+      if (!ns_pinctrl)
-+              return -ENOMEM;
-+      pctldesc = &ns_pinctrl->pctldesc;
-+      platform_set_drvdata(pdev, ns_pinctrl);
-+
-+      /* Set basic properties */
-+
-+      ns_pinctrl->dev = dev;
-+
-+      of_id = of_match_device(ns_pinctrl_of_match_table, dev);
-+      if (!of_id)
-+              return -EINVAL;
-+      ns_pinctrl->chipset_flag = (unsigned int)of_id->data;
-+
-+      res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+                                         "cru_gpio_control");
-+      ns_pinctrl->base = devm_ioremap_resource(dev, res);
-+      if (IS_ERR(ns_pinctrl->base)) {
-+              dev_err(dev, "Failed to map pinctrl regs\n");
-+              return PTR_ERR(ns_pinctrl->base);
-+      }
-+
-+      memcpy(pctldesc, &ns_pinctrl_desc, sizeof(*pctldesc));
-+
-+      /* Set pinctrl properties */
-+
-+      pctldesc->pins = devm_kcalloc(dev, ARRAY_SIZE(ns_pinctrl_pins),
-+                                    sizeof(struct pinctrl_pin_desc),
-+                                    GFP_KERNEL);
-+      if (!pctldesc->pins)
-+              return -ENOMEM;
-+      for (i = 0, pin = (struct pinctrl_pin_desc *)&pctldesc->pins[0];
-+           i < ARRAY_SIZE(ns_pinctrl_pins); i++) {
-+              const struct pinctrl_pin_desc *src = &ns_pinctrl_pins[i];
-+              unsigned int chipsets = (unsigned int)src->drv_data;
-+
-+              if (chipsets & ns_pinctrl->chipset_flag) {
-+                      memcpy(pin++, src, sizeof(*src));
-+                      pctldesc->npins++;
-+              }
-+      }
-+
-+      ns_pinctrl->groups = devm_kcalloc(dev, ARRAY_SIZE(ns_pinctrl_groups),
-+                                        sizeof(struct ns_pinctrl_group),
-+                                        GFP_KERNEL);
-+      if (!ns_pinctrl->groups)
-+              return -ENOMEM;
-+      for (i = 0, group = &ns_pinctrl->groups[0];
-+           i < ARRAY_SIZE(ns_pinctrl_groups); i++) {
-+              const struct ns_pinctrl_group *src = &ns_pinctrl_groups[i];
-+
-+              if (src->chipsets & ns_pinctrl->chipset_flag) {
-+                      memcpy(group++, src, sizeof(*src));
-+                      ns_pinctrl->num_groups++;
-+              }
-+      }
-+
-+      ns_pinctrl->functions = devm_kcalloc(dev,
-+                                           ARRAY_SIZE(ns_pinctrl_functions),
-+                                           sizeof(struct ns_pinctrl_function),
-+                                           GFP_KERNEL);
-+      if (!ns_pinctrl->functions)
-+              return -ENOMEM;
-+      for (i = 0, function = &ns_pinctrl->functions[0];
-+           i < ARRAY_SIZE(ns_pinctrl_functions); i++) {
-+              const struct ns_pinctrl_function *src = &ns_pinctrl_functions[i];
-+
-+              if (src->chipsets & ns_pinctrl->chipset_flag) {
-+                      memcpy(function++, src, sizeof(*src));
-+                      ns_pinctrl->num_functions++;
-+              }
-+      }
-+
-+      /* Register */
-+
-+      ns_pinctrl->pctldev = devm_pinctrl_register(dev, pctldesc, ns_pinctrl);
-+      if (IS_ERR(ns_pinctrl->pctldev)) {
-+              dev_err(dev, "Failed to register pinctrl\n");
-+              return PTR_ERR(ns_pinctrl->pctldev);
-+      }
-+
-+      return 0;
-+}
-+
-+static struct platform_driver ns_pinctrl_driver = {
-+      .probe = ns_pinctrl_probe,
-+      .driver = {
-+              .name = "ns-pinmux",
-+              .of_match_table = ns_pinctrl_of_match_table,
-+      },
-+};
-+
-+module_platform_driver(ns_pinctrl_driver);
-+
-+MODULE_AUTHOR("RafaÅ‚ MiÅ‚ecki");
-+MODULE_LICENSE("GPL v2");
-+MODULE_DEVICE_TABLE(of, ns_pinctrl_of_match_table);
diff --git a/target/linux/bcm53xx/patches-4.19/080-v4.20-0002-pinctrl-bcm-ns-Use-uintptr_t-for-casting-data.patch b/target/linux/bcm53xx/patches-4.19/080-v4.20-0002-pinctrl-bcm-ns-Use-uintptr_t-for-casting-data.patch
deleted file mode 100644 (file)
index afaed68..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From ce7bdb957b8e3f1cbf0a3358f1deef385dff6502 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 11 Oct 2018 13:23:40 +0200
-Subject: [PATCH] pinctrl: bcm: ns: Use uintptr_t for casting data
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix up a compiler error on 64bit architectures where pointers
-and integers differ in size.
-
-Suggested-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/bcm/pinctrl-ns.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/pinctrl/bcm/pinctrl-ns.c
-+++ b/drivers/pinctrl/bcm/pinctrl-ns.c
-@@ -285,7 +285,7 @@ static int ns_pinctrl_probe(struct platf
-       of_id = of_match_device(ns_pinctrl_of_match_table, dev);
-       if (!of_id)
-               return -EINVAL;
--      ns_pinctrl->chipset_flag = (unsigned int)of_id->data;
-+      ns_pinctrl->chipset_flag = (uintptr_t)of_id->data;
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-                                          "cru_gpio_control");
-@@ -307,7 +307,7 @@ static int ns_pinctrl_probe(struct platf
-       for (i = 0, pin = (struct pinctrl_pin_desc *)&pctldesc->pins[0];
-            i < ARRAY_SIZE(ns_pinctrl_pins); i++) {
-               const struct pinctrl_pin_desc *src = &ns_pinctrl_pins[i];
--              unsigned int chipsets = (unsigned int)src->drv_data;
-+              unsigned int chipsets = (uintptr_t)src->drv_data;
-               if (chipsets & ns_pinctrl->chipset_flag) {
-                       memcpy(pin++, src, sizeof(*src));
diff --git a/target/linux/bcm53xx/patches-4.19/081-v4.21-0001-pinctrl-bcm-ns-support-updated-DT-binding-as-syscon-.patch b/target/linux/bcm53xx/patches-4.19/081-v4.21-0001-pinctrl-bcm-ns-support-updated-DT-binding-as-syscon-.patch
deleted file mode 100644 (file)
index 45595bd..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-From a49d784d5a8272d0f63c448fe8dc69e589db006e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 18 Dec 2018 16:58:08 +0100
-Subject: [PATCH] pinctrl: bcm: ns: support updated DT binding as syscon
- subnode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Documentation has been recently updated specifying that pinctrl should
-be subnode of the CRU "syscon". Support that by using parent node for
-regmap and reading "offset" property from the DT.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/bcm/pinctrl-ns.c | 29 +++++++++++++++++++----------
- 1 file changed, 19 insertions(+), 10 deletions(-)
-
---- a/drivers/pinctrl/bcm/pinctrl-ns.c
-+++ b/drivers/pinctrl/bcm/pinctrl-ns.c
-@@ -5,6 +5,7 @@
- #include <linux/err.h>
- #include <linux/io.h>
-+#include <linux/mfd/syscon.h>
- #include <linux/module.h>
- #include <linux/of.h>
- #include <linux/of_device.h>
-@@ -12,6 +13,7 @@
- #include <linux/pinctrl/pinctrl.h>
- #include <linux/pinctrl/pinmux.h>
- #include <linux/platform_device.h>
-+#include <linux/regmap.h>
- #include <linux/slab.h>
- #define FLAG_BCM4708          BIT(1)
-@@ -22,7 +24,8 @@ struct ns_pinctrl {
-       struct device *dev;
-       unsigned int chipset_flag;
-       struct pinctrl_dev *pctldev;
--      void __iomem *base;
-+      struct regmap *regmap;
-+      u32 offset;
-       struct pinctrl_desc pctldesc;
-       struct ns_pinctrl_group *groups;
-@@ -229,9 +232,9 @@ static int ns_pinctrl_set_mux(struct pin
-               unset |= BIT(pin_number);
-       }
--      tmp = readl(ns_pinctrl->base);
-+      regmap_read(ns_pinctrl->regmap, ns_pinctrl->offset, &tmp);
-       tmp &= ~unset;
--      writel(tmp, ns_pinctrl->base);
-+      regmap_write(ns_pinctrl->regmap, ns_pinctrl->offset, tmp);
-       return 0;
- }
-@@ -263,13 +266,13 @@ static const struct of_device_id ns_pinc
- static int ns_pinctrl_probe(struct platform_device *pdev)
- {
-       struct device *dev = &pdev->dev;
-+      struct device_node *np = dev->of_node;
-       const struct of_device_id *of_id;
-       struct ns_pinctrl *ns_pinctrl;
-       struct pinctrl_desc *pctldesc;
-       struct pinctrl_pin_desc *pin;
-       struct ns_pinctrl_group *group;
-       struct ns_pinctrl_function *function;
--      struct resource *res;
-       int i;
-       ns_pinctrl = devm_kzalloc(dev, sizeof(*ns_pinctrl), GFP_KERNEL);
-@@ -287,12 +290,18 @@ static int ns_pinctrl_probe(struct platf
-               return -EINVAL;
-       ns_pinctrl->chipset_flag = (uintptr_t)of_id->data;
--      res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
--                                         "cru_gpio_control");
--      ns_pinctrl->base = devm_ioremap_resource(dev, res);
--      if (IS_ERR(ns_pinctrl->base)) {
--              dev_err(dev, "Failed to map pinctrl regs\n");
--              return PTR_ERR(ns_pinctrl->base);
-+      ns_pinctrl->regmap = syscon_node_to_regmap(of_get_parent(np));
-+      if (IS_ERR(ns_pinctrl->regmap)) {
-+              int err = PTR_ERR(ns_pinctrl->regmap);
-+
-+              dev_err(dev, "Failed to map pinctrl regs: %d\n", err);
-+
-+              return err;
-+      }
-+
-+      if (of_property_read_u32(np, "offset", &ns_pinctrl->offset)) {
-+              dev_err(dev, "Failed to get register offset\n");
-+              return -ENOENT;
-       }
-       memcpy(pctldesc, &ns_pinctrl_desc, sizeof(*pctldesc));
diff --git a/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
deleted file mode 100644 (file)
index 6bd99b7..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sat, 1 Oct 2016 22:54:48 +0200
-Subject: [PATCH] usb: xhci: add support for performing fake doorbell
-
-Broadcom's Northstar XHCI controllers seem to need a special start
-procedure to work correctly. There isn't any official documentation of
-this, the problem is that controller doesn't detect any connected
-devices with default setup. Moreover connecting USB device to controller
-that doesn't run properly can cause SoC's watchdog issues.
-
-A workaround that was successfully tested on multiple devices is to
-perform a fake doorbell. This patch adds code for doing this and enables
-it on BCM4708 family.
----
- drivers/usb/host/xhci-plat.c |  6 +++++
- drivers/usb/host/xhci.c      | 63 +++++++++++++++++++++++++++++++++++++++++---
- drivers/usb/host/xhci.h      |  1 +
- 3 files changed, 67 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/host/xhci-plat.c
-+++ b/drivers/usb/host/xhci-plat.c
-@@ -65,12 +65,18 @@ static int xhci_priv_resume_quirk(struct
- static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci)
- {
-+      struct platform_device  *pdev = to_platform_device(dev);
-+      struct device_node      *node = pdev->dev.of_node;
-+
-       /*
-        * As of now platform drivers don't provide MSI support so we ensure
-        * here that the generic code does not try to make a pci_dev from our
-        * dev struct in order to setup MSI
-        */
-       xhci->quirks |= XHCI_PLAT;
-+
-+      if (node && of_machine_is_compatible("brcm,bcm4708"))
-+              xhci->quirks |= XHCI_FAKE_DOORBELL;
- }
- /* called during probe() after chip reset completes */
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -158,6 +158,49 @@ int xhci_start(struct xhci_hcd *xhci)
-       return ret;
- }
-+/**
-+ * xhci_fake_doorbell - Perform a fake doorbell on a specified slot
-+ *
-+ * Some controllers require a fake doorbell to start correctly. Without that
-+ * they simply don't detect any devices.
-+ */
-+static int xhci_fake_doorbell(struct xhci_hcd *xhci, int slot_id)
-+{
-+      u32 temp;
-+
-+      /* Alloc a virt device for that slot */
-+      if (!xhci_alloc_virt_device(xhci, slot_id, NULL, GFP_NOIO)) {
-+              xhci_warn(xhci, "Could not allocate xHCI USB device data structures\n");
-+              return -ENOMEM;
-+      }
-+
-+      /* Ring fake doorbell for slot_id ep 0 */
-+      xhci_ring_ep_doorbell(xhci, slot_id, 0, 0);
-+      usleep_range(1000, 1500);
-+
-+      /* Read the status to check if HSE is set or not */
-+      temp = readl(&xhci->op_regs->status);
-+
-+      /* Clear HSE if set */
-+      if (temp & STS_FATAL) {
-+              xhci_dbg(xhci, "HSE problem detected, status: 0x%08x\n", temp);
-+              temp &= ~0x1fff;
-+              temp |= STS_FATAL;
-+              writel(temp, &xhci->op_regs->status);
-+              usleep_range(1000, 1500);
-+              readl(&xhci->op_regs->status);
-+      }
-+
-+      /* Free virt device */
-+      xhci_free_virt_device(xhci, slot_id);
-+
-+      /* We're done if controller is already running */
-+      if (readl(&xhci->op_regs->command) & CMD_RUN)
-+              return 0;
-+
-+      return xhci_start(xhci);
-+}
-+
- /*
-  * Reset a halted HC.
-  *
-@@ -605,10 +648,20 @@ static int xhci_init(struct usb_hcd *hcd
- static int xhci_run_finished(struct xhci_hcd *xhci)
- {
--      if (xhci_start(xhci)) {
--              xhci_halt(xhci);
--              return -ENODEV;
-+      int err;
-+
-+      err = xhci_start(xhci);
-+      if (err) {
-+              err = -ENODEV;
-+              goto err_halt;
-       }
-+
-+      if (xhci->quirks & XHCI_FAKE_DOORBELL) {
-+              err = xhci_fake_doorbell(xhci, 1);
-+              if (err)
-+                      goto err_halt;
-+      }
-+
-       xhci->shared_hcd->state = HC_STATE_RUNNING;
-       xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
-@@ -618,6 +671,10 @@ static int xhci_run_finished(struct xhci
-       xhci_dbg_trace(xhci, trace_xhci_dbg_init,
-                       "Finished xhci_run for USB3 roothub");
-       return 0;
-+
-+err_halt:
-+      xhci_halt(xhci);
-+      return err;
- }
- /*
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1856,6 +1856,7 @@ struct xhci_hcd {
- #define XHCI_ZERO_64B_REGS    BIT_ULL(32)
- #define XHCI_RESET_PLL_ON_DISCONNECT  BIT_ULL(34)
- #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)
-+#define XHCI_FAKE_DOORBELL    BIT_ULL(36)
-       unsigned int            num_active_eps;
-       unsigned int            limit_active_eps;
diff --git a/target/linux/bcm53xx/patches-4.19/300-ARM-BCM5301X-Disable-MMU-and-Dcache-during-decompres.patch b/target/linux/bcm53xx/patches-4.19/300-ARM-BCM5301X-Disable-MMU-and-Dcache-during-decompres.patch
deleted file mode 100644 (file)
index 034d5b5..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 24 Sep 2014 22:14:07 +0200
-Subject: [PATCH] ARM: BCM5301X: Disable MMU and Dcache during decompression
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Broadcom devices have broken CFE (bootloader) that leaves hardware in an
-invalid state. It causes problems with booting Linux. On Northstar
-devices kernel was randomly hanging in ~25% of tries during early init.
-Hangs used to happen at random places in the start_kernel. On BCM53573
-kernel doesn't even seem to start booting.
-
-To workaround this problem we need to do following very early:
-1) Clear 2 following bits in the SCTLR register:
-#define CR_M    (1 << 0)        /* MMU enable */
-#define CR_C    (1 << 2)        /* Dcache enable */
-2) Flush the whole D-cache
-3) Disable L2 cache
-
-Unfortunately this patch is not upstreamable as it does above things
-unconditionally. We can't check if we are running on Broadcom platform
-in any safe way and doing such hacks with ARCH_MULTI_V7 is unacceptable
-as it could break other devices support.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
-
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -35,6 +35,11 @@ ifeq ($(CONFIG_ARCH_ACORN),y)
- OBJS          += ll_char_wr.o font.o
- endif
-+ifeq ($(CONFIG_ARCH_BCM_5301X),y)
-+OBJS          += head-bcm_5301x-mpcore.o
-+OBJS          += cache-v7-min.o
-+endif
-+
- ifeq ($(CONFIG_ARCH_SA1100),y)
- OBJS          += head-sa1100.o
- endif
---- /dev/null
-+++ b/arch/arm/boot/compressed/head-bcm_5301x-mpcore.S
-@@ -0,0 +1,37 @@
-+/*
-+ *
-+ * Platform specific tweaks.  This is merged into head.S by the linker.
-+ *
-+ */
-+
-+#include <linux/linkage.h>
-+#include <asm/assembler.h>
-+#include <asm/cp15.h>
-+
-+              .section        ".start", "ax"
-+
-+/*
-+ * This code section is spliced into the head code by the linker
-+ */
-+
-+__plat_uncompress_start:
-+
-+      @ Preserve r8/r7 i.e. kernel entry values
-+      mov     r12, r8
-+
-+      @ Clear MMU enable and Dcache enable bits
-+      mrc     p15, 0, r0, c1, c0, 0           @ Read SCTLR
-+      bic     r0, #CR_C|CR_M
-+      mcr     p15, 0, r0, c1, c0, 0           @ Write SCTLR
-+      nop
-+
-+      @ Call the cache invalidation routine
-+      bl      v7_flush_dcache_all
-+      nop
-+      mov     r0,#0
-+      ldr     r3, =0x19022000                 @ L2 cache controller, control reg
-+      str     r0, [r3, #0x100]                @ Disable L2 cache
-+      nop
-+
-+      @ Restore
-+      mov     r8, r12
---- a/arch/arm/boot/compressed/cache-v7-min.S
-+++ b/arch/arm/boot/compressed/cache-v7-min.S
-@@ -12,6 +12,7 @@
- #include <linux/linkage.h>
- #include <linux/init.h>
-+#include <asm/assembler.h>
-       __INIT
-@@ -63,7 +64,7 @@ loop2:
-  ARM( orr     r11, r11, r9, lsl r2    )       @ factor index number into r11
-  THUMB(       lsl     r6, r9, r2              )
-  THUMB(       orr     r11, r11, r6            )       @ factor index number into r11
--      mcr     p15, 0, r11, c7, c14, 2         @ clean & invalidate by set/way
-+      mcr     p15, 0, r11, c7, c6, 2          @ clean & invalidate by set/way
-       subs    r9, r9, #1                      @ decrement the index
-       bge     loop2
-       subs    r4, r4, #1                      @ decrement the way
diff --git a/target/linux/bcm53xx/patches-4.19/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch b/target/linux/bcm53xx/patches-4.19/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch
deleted file mode 100644 (file)
index d1d2875..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Subject: [PATCH] ARM: dts: BCM5301X: Update Northstar pinctrl binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
-
---- a/arch/arm/boot/dts/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -400,16 +400,12 @@
-               #size-cells = <1>;
-               cru@100 {
--                      compatible = "simple-bus";
-+                      compatible = "syscon", "simple-mfd";
-                       reg = <0x100 0x1a4>;
--                      ranges;
--                      #address-cells = <1>;
--                      #size-cells = <1>;
--                      pin-controller@1c0 {
-+                      pinctrl {
-                               compatible = "brcm,bcm4708-pinmux";
--                              reg = <0x1c0 0x24>;
--                              reg-names = "cru_gpio_control";
-+                              offset = <0xc0>;
-                               spi-pins {
-                                       groups = "spi_grp";
diff --git a/target/linux/bcm53xx/patches-4.19/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch b/target/linux/bcm53xx/patches-4.19/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch
deleted file mode 100644 (file)
index fca2b88..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Subject: [PATCH] ARM: BCM5301X: Add DT for Netgear R7900
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -104,6 +104,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
-       bcm4709-buffalo-wxr-1900dhp.dtb \
-       bcm4709-linksys-ea9200.dtb \
-       bcm4709-netgear-r7000.dtb \
-+      bcm4709-netgear-r7900.dtb \
-       bcm4709-netgear-r8000.dtb \
-       bcm4709-tplink-archer-c9-v1.dtb \
-       bcm47094-dlink-dir-885l.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm4709-netgear-r7900.dts
-@@ -0,0 +1,42 @@
-+/*
-+ * Broadcom BCM470X / BCM5301X ARM platform code.
-+ * DTS for Netgear R7900
-+ *
-+ * Copyright (C) 2016 RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+/dts-v1/;
-+
-+#include "bcm4709.dtsi"
-+#include "bcm5301x-nand-cs0-bch8.dtsi"
-+
-+/ {
-+      compatible = "netgear,r7900", "brcm,bcm4709", "brcm,bcm4708";
-+      model = "Netgear R7900";
-+
-+      chosen {
-+              bootargs = "console=ttyS0,115200";
-+      };
-+
-+      memory {
-+              reg = <0x00000000 0x08000000
-+                     0x88000000 0x08000000>;
-+      };
-+
-+      axi@18000000 {
-+              usb3@23000 {
-+                      reg = <0x00023000 0x1000>;
-+
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+
-+                      vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
-+              };
-+      };
-+};
-+
-+&uart0 {
-+      status = "okay";
-+};
diff --git a/target/linux/bcm53xx/patches-4.19/311-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-4.19/311-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
deleted file mode 100644 (file)
index 5ebc7f8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: [PATCH] ARM: BCM5301X: Add power button for Buffalo WZR-1750DHP
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -101,6 +101,12 @@
-               #address-cells = <1>;
-               #size-cells = <0>;
-+              power {
-+                      label = "Power";
-+                      linux,code = <KEY_POWER>;
-+                      gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
-+              };
-+
-               restart {
-                       label = "Reset";
-                       linux,code = <KEY_RESTART>;
diff --git a/target/linux/bcm53xx/patches-4.19/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch b/target/linux/bcm53xx/patches-4.19/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch
deleted file mode 100644 (file)
index 65f9a52..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Subject: [PATCH] ARM: dts: BCM5301X: Add serial= to the bootargs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's enough to have proper stdout-path for getting serial working but
-for some reason LEDE doesn't offer "Please press Enter to activate this
-console." unless ttyS0 is specified.
-
-This is a workaround to get serial working in LEDE.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
-
---- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-@@ -12,7 +12,7 @@
-       model = "TP-LINK Archer C5 V2";
-       chosen {
--              bootargs = "earlycon";
-+              bootargs = "console=ttyS0,115200 earlycon";
-       };
-       memory {
---- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
-+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
-@@ -13,7 +13,7 @@
-       model = "Luxul ABR-4500 V1";
-       chosen {
--              bootargs = "earlycon";
-+              bootargs = "console=ttyS0,115200 earlycon";
-       };
-       memory {
---- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
-+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
-@@ -13,7 +13,7 @@
-       model = "Luxul XBR-4500 V1";
-       chosen {
--              bootargs = "earlycon";
-+              bootargs = "console=ttyS0,115200 earlycon";
-       };
-       memory {
---- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-@@ -12,7 +12,7 @@
-       model = "Luxul XAP-1440 V1";
-       chosen {
--              bootargs = "earlycon";
-+              bootargs = "console=ttyS0,115200 earlycon";
-       };
-       memory {
---- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-@@ -12,7 +12,7 @@
-       model = "Luxul XAP-810 V1";
-       chosen {
--              bootargs = "earlycon";
-+              bootargs = "console=ttyS0,115200 earlycon";
-       };
-       memory {
---- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
-+++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
-@@ -12,7 +12,7 @@
-       model = "Luxul XAP-1610 V1";
-       chosen {
--              bootargs = "earlycon";
-+              bootargs = "console=ttyS0,115200        earlycon";
-       };
-       memory {
---- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
-+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
-@@ -13,7 +13,7 @@
-       model = "Luxul XWR-3150 V1";
-       chosen {
--              bootargs = "earlycon";
-+              bootargs = "console=ttyS0,115200 earlycon";
-       };
-       memory {
---- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-+++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-@@ -13,6 +13,10 @@
-       compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
-       model = "Phicomm K3";
-+      chosen {
-+              bootargs = "console=ttyS0,115200";
-+      };
-+
-       memory {
-               reg = <0x00000000 0x08000000
-                      0x88000000 0x18000000>;
diff --git a/target/linux/bcm53xx/patches-4.19/321-ARM-dts-BCM5301X-Describe-partition-formats.patch b/target/linux/bcm53xx/patches-4.19/321-ARM-dts-BCM5301X-Describe-partition-formats.patch
deleted file mode 100644 (file)
index 66ae6dc..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7166207bd1d8c46d09d640d46afc685df9bb9083 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 22 Nov 2018 09:21:49 +0100
-Subject: [PATCH] ARM: dts: BCM5301X: Describe partition formats
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's needed by OpenWrt for custom partitioning.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
- arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-@@ -34,6 +34,7 @@
-                               partition@0 {
-                                       label = "firmware";
-                                       reg = <0x00000000 0x08000000>;
-+                                      compatible = "seama";
-                               };
-                       };
-               };
diff --git a/target/linux/bcm53xx/patches-4.19/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch b/target/linux/bcm53xx/patches-4.19/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
deleted file mode 100644 (file)
index b05749f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Subject: [PATCH] mtd: spi-nor: detect JEDEC incompatible w25q128 using 0x90
- command
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some w25q128 chipsets don't support RDID (0x9f) command, they reply with
-0xff-s only. To suppose such flashes fallback to the 0x90 command.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1295,6 +1295,18 @@ static const struct flash_info *spi_nor_
-       }
-       dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
-               id[0], id[1], id[2]);
-+
-+      tmp = nor->read_reg(nor, 0x90, id, SPI_NOR_MAX_ID_LEN);
-+      if (tmp < 0) {
-+              dev_dbg(nor->dev, " error %d reading JEDEC ID\n", tmp);
-+              return ERR_PTR(tmp);
-+      }
-+      dev_info(nor->dev, "using Read Manufacturer / Device ID command (0x%02x) returned %02x %02x\n",
-+               0x90, id[0x03], id[0x04]);
-+      if (id[0x03] == 0xef && id[0x04] == 0x17) {
-+              return spi_nor_match_id("w25q128");
-+      }
-+
-       return ERR_PTR(-ENODEV);
- }
diff --git a/target/linux/bcm53xx/patches-4.19/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch b/target/linux/bcm53xx/patches-4.19/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch
deleted file mode 100644 (file)
index 6d7a45f..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2a2af518266a29323cf30c3f9ba9ef2ceb1dd84b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 16 Oct 2014 20:52:16 +0200
-Subject: [PATCH] UBI: Detect EOF mark and erase all remaining blocks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
- drivers/mtd/ubi/attach.c | 5 +++++
- drivers/mtd/ubi/io.c     | 4 ++++
- drivers/mtd/ubi/ubi.h    | 1 +
- 3 files changed, 10 insertions(+)
-
---- a/drivers/mtd/ubi/attach.c
-+++ b/drivers/mtd/ubi/attach.c
-@@ -95,6 +95,9 @@ static int self_check_ai(struct ubi_devi
- #define AV_ADD                BIT(1)
- #define AV_FIND_OR_ADD        (AV_FIND | AV_ADD)
-+/* Set on finding block with 0xdeadc0de, indicates erasing all blocks behind */
-+bool erase_all_next;
-+
- /**
-  * find_or_add_av - internal function to find a volume, add a volume or do
-  *                both (find and add if missing).
-@@ -1592,6 +1595,8 @@ int ubi_attach(struct ubi_device *ubi, i
-       if (!ai)
-               return -ENOMEM;
-+      erase_all_next = false;
-+
- #ifdef CONFIG_MTD_UBI_FASTMAP
-       /* On small flash devices we disable fastmap in any case. */
-       if ((int)mtd_div_by_eb(ubi->mtd->size, ubi->mtd) <= UBI_FM_MAX_START) {
---- a/drivers/mtd/ubi/io.c
-+++ b/drivers/mtd/ubi/io.c
-@@ -723,6 +723,10 @@ int ubi_io_read_ec_hdr(struct ubi_device
-       }
-       magic = be32_to_cpu(ec_hdr->magic);
-+      if (magic == 0xdeadc0de)
-+              erase_all_next = true;
-+      if (erase_all_next)
-+              return read_err ? UBI_IO_FF_BITFLIPS : UBI_IO_FF;
-       if (magic != UBI_EC_HDR_MAGIC) {
-               if (mtd_is_eccerr(read_err))
-                       return UBI_IO_BAD_HDR_EBADMSG;
---- a/drivers/mtd/ubi/ubi.h
-+++ b/drivers/mtd/ubi/ubi.h
-@@ -833,6 +833,7 @@ extern struct mutex ubi_devices_mutex;
- extern struct blocking_notifier_head ubi_notifiers;
- /* attach.c */
-+extern bool erase_all_next;
- struct ubi_ainf_peb *ubi_alloc_aeb(struct ubi_attach_info *ai, int pnum,
-                                  int ec);
- void ubi_free_aeb(struct ubi_attach_info *ai, struct ubi_ainf_peb *aeb);
diff --git a/target/linux/bcm53xx/patches-4.19/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch b/target/linux/bcm53xx/patches-4.19/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
deleted file mode 100644 (file)
index 91bb4fa..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4abdde3ad6bc0b3b157c4bf6ec0bf139d11d07e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 13 May 2015 14:13:28 +0200
-Subject: [PATCH] b53: add hacky CPU port fixes for devices not using port 5
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
- drivers/net/phy/b53/b53_common.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/net/phy/b53/b53_common.c
-+++ b/drivers/net/phy/b53/b53_common.c
-@@ -28,6 +28,7 @@
- #include <linux/of.h>
- #include <linux/of_net.h>
- #include <linux/platform_data/b53.h>
-+#include <linux/of.h>
- #include "b53_regs.h"
- #include "b53_priv.h"
-@@ -1579,6 +1580,28 @@ static int b53_switch_init(struct b53_de
-                       return ret;
-       }
-+      /* Set correct CPU port */
-+      if (of_machine_is_compatible("asus,rt-ac87u"))
-+              sw_dev->cpu_port = 7;
-+      else if (of_machine_is_compatible("netgear,r7900"))
-+              sw_dev->cpu_port = 8;
-+      else if (of_machine_is_compatible("netgear,r8000"))
-+              sw_dev->cpu_port = 8;
-+      else if (of_machine_is_compatible("netgear,r8500"))
-+              sw_dev->cpu_port = 8;
-+
-+      /* Enable extra ports */
-+      if (of_machine_is_compatible("tenda,ac9"))
-+              dev->enabled_ports |= BIT(5);
-+
-+      /*
-+       * Workaround for devices using port 8 (connected to the 3rd iface).
-+       * For some reason it doesn't work (no packets on eth2).
-+       */
-+      if (of_machine_is_compatible("netgear,r7900") ||
-+          of_machine_is_compatible("netgear,r8000"))
-+              sw_dev->cpu_port = 5;
-+
-       dev->enabled_ports |= BIT(sw_dev->cpu_port);
-       sw_dev->ports = fls(dev->enabled_ports);
diff --git a/target/linux/bcm53xx/patches-4.19/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-4.19/905-BCM53573-minor-hacks.patch
deleted file mode 100644 (file)
index 470b17a..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-From 6f1c62440eb6846cb8045d7a5480ec7bbe47c96f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 15 Aug 2016 10:30:41 +0200
-Subject: [PATCH] BCM53573 minor hacks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
-
---- a/arch/arm/boot/dts/bcm53573.dtsi
-+++ b/arch/arm/boot/dts/bcm53573.dtsi
-@@ -53,6 +53,7 @@
-                            <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
-                            <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
-                            <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
-+              clocks = <&ilp>;
-       };
-       clocks {
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -330,14 +330,6 @@ static int bcma_register_devices(struct
-       }
- #endif
--#ifdef CONFIG_BCMA_SFLASH
--      if (bus->drv_cc.sflash.present) {
--              err = platform_device_register(&bcma_sflash_dev);
--              if (err)
--                      bcma_err(bus, "Error registering serial flash\n");
--      }
--#endif
--
- #ifdef CONFIG_BCMA_NFLASH
-       if (bus->drv_cc.nflash.present) {
-               err = platform_device_register(&bcma_nflash_dev);
-@@ -415,6 +407,14 @@ int bcma_bus_register(struct bcma_bus *b
-                       bcma_register_core(bus, core);
-       }
-+#ifdef CONFIG_BCMA_SFLASH
-+      if (bus->drv_cc.sflash.present) {
-+              err = platform_device_register(&bcma_sflash_dev);
-+              if (err)
-+                      bcma_err(bus, "Error registering serial flash\n");
-+      }
-+#endif
-+
-       /* Try to get SPROM */
-       err = bcma_sprom_get(bus);
-       if (err == -ENOENT) {
---- a/drivers/clocksource/arm_arch_timer.c
-+++ b/drivers/clocksource/arm_arch_timer.c
-@@ -17,6 +17,7 @@
- #include <linux/smp.h>
- #include <linux/cpu.h>
- #include <linux/cpu_pm.h>
-+#include <linux/clk.h>
- #include <linux/clockchips.h>
- #include <linux/clocksource.h>
- #include <linux/interrupt.h>
-@@ -919,6 +920,16 @@ static void arch_timer_of_configure_rate
-       if (of_property_read_u32(np, "clock-frequency", &arch_timer_rate))
-               arch_timer_rate = rate;
-+      /* Get clk rate through clk driver if present */
-+      if (!arch_timer_rate) {
-+              struct clk *clk = of_clk_get(np, 0);
-+
-+              if (!IS_ERR(clk)) {
-+                      if (!clk_prepare_enable(clk))
-+                              arch_timer_rate = clk_get_rate(clk);
-+              }
-+      }
-+
-       /* Check the timer frequency. */
-       if (arch_timer_rate == 0)
-               pr_warn("frequency not available\n");
index b991770e12cb1a11512c59c03403c5f6051bb5ac..af91d8bada52a58264b1cb2d5b34555c35c2f1db 100644 (file)
@@ -14,7 +14,6 @@ SUBTARGETS:=generic mips74k legacy
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 define Target/Description
        Build firmware images for Broadcom based BCM47xx/53xx routers with MIPS CPU, *not* ARM.
diff --git a/target/linux/brcm47xx/patches-4.19/030-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch b/target/linux/brcm47xx/patches-4.19/030-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch
deleted file mode 100644 (file)
index c824e28..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From feef7918667b84f9d5653c501542dd8d84ae32af Mon Sep 17 00:00:00 2001
-From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
-Date: Sun, 19 Aug 2018 22:20:23 +0300
-Subject: [PATCH] MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Setting GPIO 21 high seems to be required to enable power to USB ports
-on the WNDR3400v3. As there is already similar code for WNR3500L,
-make the existing USB power GPIO code generic and use that.
-
-Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
-Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Patchwork: https://patchwork.linux-mips.org/patch/20259/
-Cc: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: linux-kernel@vger.kernel.org
----
- arch/mips/bcm47xx/workarounds.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/arch/mips/bcm47xx/workarounds.c
-+++ b/arch/mips/bcm47xx/workarounds.c
-@@ -5,9 +5,8 @@
- #include <bcm47xx_board.h>
- #include <bcm47xx.h>
--static void __init bcm47xx_workarounds_netgear_wnr3500l(void)
-+static void __init bcm47xx_workarounds_enable_usb_power(int usb_power)
- {
--      const int usb_power = 12;
-       int err;
-       err = gpio_request_one(usb_power, GPIOF_OUT_INIT_HIGH, "usb_power");
-@@ -23,7 +22,10 @@ void __init bcm47xx_workarounds(void)
-       switch (board) {
-       case BCM47XX_BOARD_NETGEAR_WNR3500L:
--              bcm47xx_workarounds_netgear_wnr3500l();
-+              bcm47xx_workarounds_enable_usb_power(12);
-+              break;
-+      case BCM47XX_BOARD_NETGEAR_WNDR3400_V3:
-+              bcm47xx_workarounds_enable_usb_power(21);
-               break;
-       default:
-               /* No workaround(s) needed */
diff --git a/target/linux/brcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch b/target/linux/brcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch
deleted file mode 100644 (file)
index 34a79f9..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From cdb8faa00e3fcdd0ad10add743516d616dc7d38e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
-Date: Mon, 11 Mar 2019 22:08:22 +0100
-Subject: [PATCH] mips: bcm47xx: Enable USB power on Netgear WNDR3400v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Eric has reported on OpenWrt's bug tracking system[1], that he's not
-able to use USB devices on his WNDR3400v2 device after the boot, until
-he turns on GPIO #21 manually through sysfs.
-
-1. https://bugs.openwrt.org/index.php?do=details&task_id=2170
-
-Cc: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Reported-by: Eric Bohlman <ericbohlman@gmail.com>
-Tested-by: Eric Bohlman <ericbohlman@gmail.com>
-Signed-off-by: Petr Å tetiar <ynezz@true.cz>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
----
- arch/mips/bcm47xx/workarounds.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/mips/bcm47xx/workarounds.c
-+++ b/arch/mips/bcm47xx/workarounds.c
-@@ -24,6 +24,7 @@ void __init bcm47xx_workarounds(void)
-       case BCM47XX_BOARD_NETGEAR_WNR3500L:
-               bcm47xx_workarounds_enable_usb_power(12);
-               break;
-+      case BCM47XX_BOARD_NETGEAR_WNDR3400V2:
-       case BCM47XX_BOARD_NETGEAR_WNDR3400_V3:
-               bcm47xx_workarounds_enable_usb_power(21);
-               break;
diff --git a/target/linux/brcm47xx/patches-4.19/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.19/159-cpu_fixes.patch
deleted file mode 100644 (file)
index 68fdc50..0000000
+++ /dev/null
@@ -1,510 +0,0 @@
---- a/arch/mips/include/asm/r4kcache.h
-+++ b/arch/mips/include/asm/r4kcache.h
-@@ -26,6 +26,38 @@
- extern void (*r4k_blast_dcache)(void);
- extern void (*r4k_blast_icache)(void);
-+#if defined(CONFIG_BCM47XX) && !defined(CONFIG_CPU_MIPS32_R2)
-+#include <asm/paccess.h>
-+#include <linux/ssb/ssb.h>
-+#define BCM4710_DUMMY_RREG() bcm4710_dummy_rreg()
-+
-+static inline unsigned long bcm4710_dummy_rreg(void)
-+{
-+      return *(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE));
-+}
-+
-+#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void *)(addr))
-+
-+static inline unsigned long bcm4710_fill_tlb(void *addr)
-+{
-+      return *(unsigned long *)addr;
-+}
-+
-+#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void *)(addr))
-+
-+static inline void bcm4710_protected_fill_tlb(void *addr)
-+{
-+      unsigned long x;
-+      get_dbe(x, (unsigned long *)addr);;
-+}
-+
-+#else
-+#define BCM4710_DUMMY_RREG()
-+
-+#define BCM4710_FILL_TLB(addr)
-+#define BCM4710_PROTECTED_FILL_TLB(addr)
-+#endif
-+
- /*
-  * This macro return a properly sign-extended address suitable as base address
-  * for indexed cache operations.  Two issues here:
-@@ -99,6 +131,7 @@ static inline void flush_icache_line_ind
- static inline void flush_dcache_line_indexed(unsigned long addr)
- {
-       __dflush_prologue
-+      BCM4710_DUMMY_RREG();
-       cache_op(Index_Writeback_Inv_D, addr);
-       __dflush_epilogue
- }
-@@ -126,6 +159,7 @@ static inline void flush_icache_line(uns
- static inline void flush_dcache_line(unsigned long addr)
- {
-       __dflush_prologue
-+      BCM4710_DUMMY_RREG();
-       cache_op(Hit_Writeback_Inv_D, addr);
-       __dflush_epilogue
- }
-@@ -133,6 +167,7 @@ static inline void flush_dcache_line(uns
- static inline void invalidate_dcache_line(unsigned long addr)
- {
-       __dflush_prologue
-+      BCM4710_DUMMY_RREG();
-       cache_op(Hit_Invalidate_D, addr);
-       __dflush_epilogue
- }
-@@ -206,6 +241,7 @@ static inline int protected_flush_icache
- #ifdef CONFIG_EVA
-               return protected_cachee_op(Hit_Invalidate_I, addr);
- #else
-+              BCM4710_DUMMY_RREG();
-               return protected_cache_op(Hit_Invalidate_I, addr);
- #endif
-       }
-@@ -219,6 +255,7 @@ static inline int protected_flush_icache
-  */
- static inline int protected_writeback_dcache_line(unsigned long addr)
- {
-+      BCM4710_DUMMY_RREG();
- #ifdef CONFIG_EVA
-       return protected_cachee_op(Hit_Writeback_Inv_D, addr);
- #else
-@@ -576,8 +613,51 @@ static inline void invalidate_tcache_pag
-               : "r" (base),                                           \
-                 "i" (op));
-+static inline void blast_dcache(void)
-+{
-+      unsigned long start = KSEG0;
-+      unsigned long dcache_size = current_cpu_data.dcache.waysize * current_cpu_data.dcache.ways;
-+      unsigned long end = (start + dcache_size);
-+
-+      do {
-+              BCM4710_DUMMY_RREG();
-+              cache_op(Index_Writeback_Inv_D, start);
-+              start += current_cpu_data.dcache.linesz;
-+      } while(start < end);
-+}
-+
-+static inline void blast_dcache_page(unsigned long page)
-+{
-+      unsigned long start = page;
-+      unsigned long end = start + PAGE_SIZE;
-+
-+      BCM4710_FILL_TLB(start);
-+      do {
-+              BCM4710_DUMMY_RREG();
-+              cache_op(Hit_Writeback_Inv_D, start);
-+              start += current_cpu_data.dcache.linesz;
-+      } while(start < end);
-+}
-+
-+static inline void blast_dcache_page_indexed(unsigned long page)
-+{
-+      unsigned long start = page;
-+      unsigned long end = start + PAGE_SIZE;
-+      unsigned long ws_inc = 1UL << current_cpu_data.dcache.waybit;
-+      unsigned long ws_end = current_cpu_data.dcache.ways <<
-+                             current_cpu_data.dcache.waybit;
-+      unsigned long ws, addr;
-+      for (ws = 0; ws < ws_end; ws += ws_inc) {
-+              start = page + ws;
-+              for (addr = start; addr < end; addr += current_cpu_data.dcache.linesz) {
-+                      BCM4710_DUMMY_RREG();
-+                      cache_op(Index_Writeback_Inv_D, addr);
-+              }
-+      }
-+}
-+
- /* build blast_xxx, blast_xxx_page, blast_xxx_page_indexed */
--#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize, extra)  \
-+#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize, extra, war) \
- static inline void extra##blast_##pfx##cache##lsize(void)             \
- {                                                                     \
-       unsigned long start = INDEX_BASE;                               \
-@@ -589,6 +669,7 @@ static inline void extra##blast_##pfx##c
-                                                                       \
-       __##pfx##flush_prologue                                         \
-                                                                       \
-+      war                                                             \
-       for (ws = 0; ws < ws_end; ws += ws_inc)                         \
-               for (addr = start; addr < end; addr += lsize * 32)      \
-                       cache##lsize##_unroll32(addr|ws, indexop);      \
-@@ -603,6 +684,7 @@ static inline void extra##blast_##pfx##c
-                                                                       \
-       __##pfx##flush_prologue                                         \
-                                                                       \
-+      war                                                             \
-       do {                                                            \
-               cache##lsize##_unroll32(start, hitop);                  \
-               start += lsize * 32;                                    \
-@@ -621,6 +703,8 @@ static inline void extra##blast_##pfx##c
-                              current_cpu_data.desc.waybit;            \
-       unsigned long ws, addr;                                         \
-                                                                       \
-+      war                                                             \
-+                                                                      \
-       __##pfx##flush_prologue                                         \
-                                                                       \
-       for (ws = 0; ws < ws_end; ws += ws_inc)                         \
-@@ -630,26 +714,26 @@ static inline void extra##blast_##pfx##c
-       __##pfx##flush_epilogue                                         \
- }
--__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16, )
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16, )
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16, )
--__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32, )
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, )
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I_Loongson2, 32, loongson2_)
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32, )
--__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64, )
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64, )
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64, )
--__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 128, )
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 128, )
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128, )
--
--__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16, )
--__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 32, )
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 16, )
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 32, )
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 64, )
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 128, )
-+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16, , )
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16, , BCM4710_FILL_TLB(start);)
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16, , )
-+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32, , )
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, , BCM4710_FILL_TLB(start);)
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I_Loongson2, 32, loongson2_, BCM4710_FILL_TLB(start);)
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32, , )
-+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64, , )
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64, , BCM4710_FILL_TLB(start);)
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64, , )
-+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 128, , )
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 128, , )
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128, , )
-+
-+__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16, , )
-+__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 32, , )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 16, , )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 32, , )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 64, , )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 128, , )
- #define __BUILD_BLAST_USER_CACHE(pfx, desc, indexop, hitop, lsize) \
- static inline void blast_##pfx##cache##lsize##_user_page(unsigned long page) \
-@@ -678,53 +762,23 @@ __BUILD_BLAST_USER_CACHE(d, dcache, Inde
- __BUILD_BLAST_USER_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64)
- /* build blast_xxx_range, protected_blast_xxx_range */
--#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot, extra)      \
-+#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot, extra, war, war2)   \
- static inline void prot##extra##blast_##pfx##cache##_range(unsigned long start, \
-                                                   unsigned long end)  \
- {                                                                     \
-       unsigned long lsize = cpu_##desc##_line_size();                 \
--      unsigned long lsize_2 = lsize * 2;                              \
--      unsigned long lsize_3 = lsize * 3;                              \
--      unsigned long lsize_4 = lsize * 4;                              \
--      unsigned long lsize_5 = lsize * 5;                              \
--      unsigned long lsize_6 = lsize * 6;                              \
--      unsigned long lsize_7 = lsize * 7;                              \
--      unsigned long lsize_8 = lsize * 8;                              \
-       unsigned long addr = start & ~(lsize - 1);                      \
--      unsigned long aend = (end + lsize - 1) & ~(lsize - 1);          \
--      int lines = (aend - addr) / lsize;                              \
-+      unsigned long aend = (end - 1) & ~(lsize - 1);                  \
-+      war                                                             \
-                                                                       \
-       __##pfx##flush_prologue                                         \
-                                                                       \
--      while (lines >= 8) {                                            \
--              prot##cache_op(hitop, addr);                            \
--              prot##cache_op(hitop, addr + lsize);                    \
--              prot##cache_op(hitop, addr + lsize_2);                  \
--              prot##cache_op(hitop, addr + lsize_3);                  \
--              prot##cache_op(hitop, addr + lsize_4);                  \
--              prot##cache_op(hitop, addr + lsize_5);                  \
--              prot##cache_op(hitop, addr + lsize_6);                  \
--              prot##cache_op(hitop, addr + lsize_7);                  \
--              addr += lsize_8;                                        \
--              lines -= 8;                                             \
--      }                                                               \
--                                                                      \
--      if (lines & 0x4) {                                              \
--              prot##cache_op(hitop, addr);                            \
--              prot##cache_op(hitop, addr + lsize);                    \
--              prot##cache_op(hitop, addr + lsize_2);                  \
--              prot##cache_op(hitop, addr + lsize_3);                  \
--              addr += lsize_4;                                        \
--      }                                                               \
--                                                                      \
--      if (lines & 0x2) {                                              \
--              prot##cache_op(hitop, addr);                            \
--              prot##cache_op(hitop, addr + lsize);                    \
--              addr += lsize_2;                                        \
--      }                                                               \
--                                                                      \
--      if (lines & 0x1) {                                              \
-+      while (1) {                                                     \
-+              war2                                                    \
-               prot##cache_op(hitop, addr);                            \
-+              if (addr == aend)                                       \
-+                      break;                                          \
-+              addr += lsize;                                          \
-       }                                                               \
-                                                                       \
-       __##pfx##flush_epilogue                                         \
-@@ -732,8 +786,8 @@ static inline void prot##extra##blast_##
- #ifndef CONFIG_EVA
--__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_, )
--__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_, )
-+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_, , BCM4710_PROTECTED_FILL_TLB(addr); BCM4710_PROTECTED_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
-+__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_, , , )
- #else
-@@ -770,15 +824,15 @@ __BUILD_PROT_BLAST_CACHE_RANGE(d, dcache
- __BUILD_PROT_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I)
- #endif
--__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_, )
-+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_, , , )
- __BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I_Loongson2, \
--      protected_, loongson2_)
--__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, , )
--__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, , )
--__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, , )
-+      protected_, loongson2_, , )
-+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, , , BCM4710_FILL_TLB(addr); BCM4710_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
-+__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, , , , )
-+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, , , , )
- /* blast_inv_dcache_range */
--__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D, , )
--__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD, , )
-+__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D, , , , BCM4710_DUMMY_RREG();)
-+__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD, , , , )
- /* Currently, this is very specific to Loongson-3 */
- #define __BUILD_BLAST_CACHE_NODE(pfx, desc, indexop, hitop, lsize)    \
---- a/arch/mips/include/asm/stackframe.h
-+++ b/arch/mips/include/asm/stackframe.h
-@@ -428,6 +428,10 @@
-               eretnc
- #else
-               .set    arch=r4000
-+#ifdef CONFIG_BCM47XX
-+              nop
-+              nop
-+#endif
-               eret
-               .set    mips0
- #endif
---- a/arch/mips/kernel/genex.S
-+++ b/arch/mips/kernel/genex.S
-@@ -21,6 +21,19 @@
- #include <asm/war.h>
- #include <asm/thread_info.h>
-+#ifdef CONFIG_BCM47XX
-+# ifdef eret
-+#  undef eret
-+# endif
-+# define eret                                         \
-+      .set push;                              \
-+      .set noreorder;                         \
-+       nop;                                   \
-+       nop;                                   \
-+       eret;                                  \
-+      .set pop;
-+#endif
-+
-       __INIT
- /*
-@@ -32,6 +45,9 @@
- NESTED(except_vec3_generic, 0, sp)
-       .set    push
-       .set    noat
-+#ifdef CONFIG_BCM47XX
-+      nop
-+#endif
- #if R5432_CP0_INTERRUPT_WAR
-       mfc0    k0, CP0_INDEX
- #endif
-@@ -55,6 +71,9 @@ NESTED(except_vec3_r4000, 0, sp)
-       .set    push
-       .set    arch=r4000
-       .set    noat
-+#ifdef CONFIG_BCM47XX
-+      nop
-+#endif
-       mfc0    k1, CP0_CAUSE
-       li      k0, 31<<2
-       andi    k1, k1, 0x7c
---- a/arch/mips/mm/c-r4k.c
-+++ b/arch/mips/mm/c-r4k.c
-@@ -39,6 +39,9 @@
- #include <asm/dma-coherence.h>
- #include <asm/mips-cps.h>
-+/* For enabling BCM4710 cache workarounds */
-+static int bcm4710 = 0;
-+
- /*
-  * Bits describing what cache ops an SMP callback function may perform.
-  *
-@@ -190,6 +193,9 @@ static void r4k_blast_dcache_user_page_s
- {
-       unsigned long  dc_lsize = cpu_dcache_line_size();
-+      if (bcm4710)
-+              r4k_blast_dcache_page = blast_dcache_page;
-+      else
-       if (dc_lsize == 0)
-               r4k_blast_dcache_user_page = (void *)cache_noop;
-       else if (dc_lsize == 16)
-@@ -208,6 +214,9 @@ static void r4k_blast_dcache_page_indexe
- {
-       unsigned long dc_lsize = cpu_dcache_line_size();
-+      if (bcm4710)
-+              r4k_blast_dcache_page_indexed = blast_dcache_page_indexed;
-+      else
-       if (dc_lsize == 0)
-               r4k_blast_dcache_page_indexed = (void *)cache_noop;
-       else if (dc_lsize == 16)
-@@ -227,6 +236,9 @@ static void r4k_blast_dcache_setup(void)
- {
-       unsigned long dc_lsize = cpu_dcache_line_size();
-+      if (bcm4710)
-+              r4k_blast_dcache = blast_dcache;
-+      else
-       if (dc_lsize == 0)
-               r4k_blast_dcache = (void *)cache_noop;
-       else if (dc_lsize == 16)
-@@ -986,6 +998,8 @@ static void local_r4k_flush_cache_sigtra
-       }
-       R4600_HIT_CACHEOP_WAR_IMPL;
-+      BCM4710_PROTECTED_FILL_TLB(addr);
-+      BCM4710_PROTECTED_FILL_TLB(addr + 4);
-       if (!cpu_has_ic_fills_f_dc) {
-               if (dc_lsize)
-                       vaddr ? flush_dcache_line(addr & ~(dc_lsize - 1))
-@@ -1888,6 +1902,17 @@ static void coherency_setup(void)
-        * silly idea of putting something else there ...
-        */
-       switch (current_cpu_type()) {
-+      case CPU_BMIPS3300:
-+              {
-+                      u32 cm;
-+                      cm = read_c0_diag();
-+                      /* Enable icache */
-+                      cm |= (1 << 31);
-+                      /* Enable dcache */
-+                      cm |= (1 << 30);
-+                      write_c0_diag(cm);
-+              }
-+              break;
-       case CPU_R4000PC:
-       case CPU_R4000SC:
-       case CPU_R4000MC:
-@@ -1934,6 +1959,15 @@ void r4k_cache_init(void)
-       extern void build_copy_page(void);
-       struct cpuinfo_mips *c = &current_cpu_data;
-+      /* Check if special workarounds are required */
-+#if defined(CONFIG_BCM47XX) && !defined(CONFIG_CPU_MIPS32_R2)
-+      if (current_cpu_data.cputype == CPU_BMIPS32 && (current_cpu_data.processor_id & 0xff) == 0) {
-+              printk("Enabling BCM4710A0 cache workarounds.\n");
-+              bcm4710 = 1;
-+      } else
-+#endif
-+              bcm4710 = 0;
-+
-       probe_pcache();
-       probe_vcache();
-       setup_scache();
-@@ -2012,7 +2046,15 @@ void r4k_cache_init(void)
-        */
-       local_r4k___flush_cache_all(NULL);
-+#ifdef CONFIG_BCM47XX
-+      {
-+              static void (*_coherency_setup)(void);
-+              _coherency_setup = (void (*)(void)) KSEG1ADDR(coherency_setup);
-+              _coherency_setup();
-+      }
-+#else
-       coherency_setup();
-+#endif
-       board_cache_error_setup = r4k_cache_error_setup;
-       /*
---- a/arch/mips/mm/tlbex.c
-+++ b/arch/mips/mm/tlbex.c
-@@ -967,6 +967,9 @@ void build_get_pgde32(u32 **p, unsigned
-               uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT);
-               uasm_i_addu(p, ptr, tmp, ptr);
- #else
-+#ifdef CONFIG_BCM47XX
-+              uasm_i_nop(p);
-+#endif
-               UASM_i_LA_mostly(p, ptr, pgdc);
- #endif
-               uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
-@@ -1327,6 +1330,9 @@ static void build_r4000_tlb_refill_handl
- #ifdef CONFIG_64BIT
-               build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
- #else
-+# ifdef CONFIG_BCM47XX
-+              uasm_i_nop(&p);
-+# endif
-               build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
- #endif
-@@ -1338,6 +1344,9 @@ static void build_r4000_tlb_refill_handl
-               build_update_entries(&p, K0, K1);
-               build_tlb_write_entry(&p, &l, &r, tlb_random);
-               uasm_l_leave(&l, p);
-+#ifdef CONFIG_BCM47XX
-+              uasm_i_nop(&p);
-+#endif
-               uasm_i_eret(&p); /* return from trap */
-       }
- #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
-@@ -2028,6 +2037,9 @@ build_r4000_tlbchange_handler_head(u32 *
- #ifdef CONFIG_64BIT
-       build_get_pmde64(p, l, r, wr.r1, wr.r2); /* get pmd in ptr */
- #else
-+# ifdef CONFIG_BCM47XX
-+      uasm_i_nop(p);
-+# endif
-       build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */
- #endif
-@@ -2074,6 +2086,9 @@ build_r4000_tlbchange_handler_tail(u32 *
-       build_tlb_write_entry(p, l, r, tlb_indexed);
-       uasm_l_leave(l, *p);
-       build_restore_work_registers(p);
-+#ifdef CONFIG_BCM47XX
-+      uasm_i_nop(p);
-+#endif
-       uasm_i_eret(p); /* return from trap */
- #ifdef CONFIG_64BIT
diff --git a/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch
deleted file mode 100644 (file)
index db5660b..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Jeff Hansen <jhansen@cardaccess-inc.com>
-Subject: [PATCH] kmap_coherent
-
-On ASUS WL-500gP there are some "Data bus error"s when executing simple
-commands liks "ps" or "cat /proc/1/cmdline".
-
-This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
----
---- a/arch/mips/include/asm/cpu-features.h
-+++ b/arch/mips/include/asm/cpu-features.h
-@@ -226,6 +226,9 @@
- #ifndef cpu_has_local_ebase
- #define cpu_has_local_ebase   1
- #endif
-+#ifndef cpu_use_kmap_coherent
-+#define cpu_use_kmap_coherent 1
-+#endif
- /*
-  * I-Cache snoops remote store.        This only matters on SMP.  Some multiprocessors
---- a/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
-@@ -80,4 +80,6 @@
- #define cpu_scache_line_size()                0
- #define cpu_has_vz                    0
-+#define cpu_use_kmap_coherent         0
-+
- #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
---- a/arch/mips/mm/c-r4k.c
-+++ b/arch/mips/mm/c-r4k.c
-@@ -694,7 +694,7 @@ static inline void local_r4k_flush_cache
-               map_coherent = (cpu_has_dc_aliases &&
-                               page_mapcount(page) &&
-                               !Page_dcache_dirty(page));
--              if (map_coherent)
-+              if (map_coherent && cpu_use_kmap_coherent)
-                       vaddr = kmap_coherent(page, addr);
-               else
-                       vaddr = kmap_atomic(page);
-@@ -719,7 +719,7 @@ static inline void local_r4k_flush_cache
-       }
-       if (vaddr) {
--              if (map_coherent)
-+              if (map_coherent && cpu_use_kmap_coherent)
-                       kunmap_coherent();
-               else
-                       kunmap_atomic(vaddr);
---- a/arch/mips/mm/init.c
-+++ b/arch/mips/mm/init.c
-@@ -168,7 +168,7 @@ void copy_user_highpage(struct page *to,
-       void *vfrom, *vto;
-       vto = kmap_atomic(to);
--      if (cpu_has_dc_aliases &&
-+      if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
-           page_mapcount(from) && !Page_dcache_dirty(from)) {
-               vfrom = kmap_coherent(from, vaddr);
-               copy_page(vto, vfrom);
-@@ -190,7 +190,7 @@ void copy_to_user_page(struct vm_area_st
-       struct page *page, unsigned long vaddr, void *dst, const void *src,
-       unsigned long len)
- {
--      if (cpu_has_dc_aliases &&
-+      if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
-           page_mapcount(page) && !Page_dcache_dirty(page)) {
-               void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
-               memcpy(vto, src, len);
-@@ -208,7 +208,7 @@ void copy_from_user_page(struct vm_area_
-       struct page *page, unsigned long vaddr, void *dst, const void *src,
-       unsigned long len)
- {
--      if (cpu_has_dc_aliases &&
-+      if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
-           page_mapcount(page) && !Page_dcache_dirty(page)) {
-               void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
-               memcpy(dst, vfrom, len);
diff --git a/target/linux/brcm47xx/patches-4.19/209-b44-register-adm-switch.patch b/target/linux/brcm47xx/patches-4.19/209-b44-register-adm-switch.patch
deleted file mode 100644 (file)
index 3706591..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-From b36f694256f41bc71571f467646d015dda128d14 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sat, 9 Nov 2013 17:03:59 +0100
-Subject: [PATCH 210/210] b44: register adm switch
-
----
- drivers/net/ethernet/broadcom/b44.c |   57 +++++++++++++++++++++++++++++++++++
- drivers/net/ethernet/broadcom/b44.h |    3 ++
- 2 files changed, 60 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/b44.c
-+++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -31,6 +31,8 @@
- #include <linux/ssb/ssb.h>
- #include <linux/slab.h>
- #include <linux/phy.h>
-+#include <linux/platform_device.h>
-+#include <linux/platform_data/adm6996-gpio.h>
- #include <linux/uaccess.h>
- #include <asm/io.h>
-@@ -2246,6 +2248,69 @@ static void b44_adjust_link(struct net_d
-       }
- }
-+#ifdef CONFIG_BCM47XX
-+static int b44_register_adm_switch(struct b44 *bp)
-+{
-+      int gpio;
-+      struct platform_device *pdev;
-+      struct adm6996_gpio_platform_data adm_data = {0};
-+      struct platform_device_info info = {0};
-+
-+      adm_data.model = ADM6996L;
-+      gpio = bcm47xx_nvram_gpio_pin("adm_eecs");
-+      if (gpio >= 0)
-+              adm_data.eecs = gpio;
-+      else
-+              adm_data.eecs = 2;
-+
-+      gpio = bcm47xx_nvram_gpio_pin("adm_eesk");
-+      if (gpio >= 0)
-+              adm_data.eesk = gpio;
-+      else
-+              adm_data.eesk = 3;
-+
-+      gpio = bcm47xx_nvram_gpio_pin("adm_eedi");
-+      if (gpio >= 0)
-+              adm_data.eedi = gpio;
-+      else
-+              adm_data.eedi = 4;
-+
-+      /*
-+       * We ignore the "adm_rc" GPIO here. The driver does not use it,
-+       * and it conflicts with the Reset button GPIO on the Linksys WRT54GSv1.
-+       */
-+
-+      info.parent = bp->sdev->dev;
-+      info.name = "adm6996_gpio";
-+      info.id = -1;
-+      info.data = &adm_data;
-+      info.size_data = sizeof(adm_data);
-+
-+      if (!bp->adm_switch) {
-+              pdev = platform_device_register_full(&info);
-+              if (IS_ERR(pdev))
-+                      return PTR_ERR(pdev);
-+
-+              bp->adm_switch = pdev;
-+      }
-+      return 0;
-+}
-+static void b44_unregister_adm_switch(struct b44 *bp)
-+{
-+      if (bp->adm_switch)
-+              platform_device_unregister(bp->adm_switch);
-+}
-+#else
-+static int b44_register_adm_switch(struct b44 *bp)
-+{
-+      return 0;
-+}
-+static void b44_unregister_adm_switch(struct b44 *bp)
-+{
-+
-+}
-+#endif /* CONFIG_BCM47XX */
-+
- static int b44_register_phy_one(struct b44 *bp)
- {
-       struct mii_bus *mii_bus;
-@@ -2281,6 +2346,9 @@ static int b44_register_phy_one(struct b
-       if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) &&
-           (sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {
-+              if (sprom->boardflags_lo & B44_BOARDFLAG_ADM)
-+                      b44_register_adm_switch(bp);
-+
-               dev_info(sdev->dev,
-                        "could not find PHY at %i, use fixed one\n",
-                        bp->phy_addr);
-@@ -2475,6 +2543,7 @@ static void b44_remove_one(struct ssb_de
-       unregister_netdev(dev);
-       if (bp->flags & B44_FLAG_EXTERNAL_PHY)
-               b44_unregister_phy_one(bp);
-+      b44_unregister_adm_switch(bp);
-       ssb_device_disable(sdev, 0);
-       ssb_bus_may_powerdown(sdev->bus);
-       netif_napi_del(&bp->napi);
---- a/drivers/net/ethernet/broadcom/b44.h
-+++ b/drivers/net/ethernet/broadcom/b44.h
-@@ -408,6 +408,9 @@ struct b44 {
-       struct mii_bus          *mii_bus;
-       int                     old_link;
-       struct mii_if_info      mii_if;
-+
-+      /* platform device for associated switch */
-+      struct platform_device *adm_switch;
- };
- #endif /* _B44_H */
diff --git a/target/linux/brcm47xx/patches-4.19/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-4.19/210-b44_phy_fix.patch
deleted file mode 100644 (file)
index 51e4b8c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/drivers/net/ethernet/broadcom/b44.c
-+++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru
- error:
-       pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
- }
-+
-+static void b44_bcm47xx_workarounds(struct b44 *bp)
-+{
-+      char buf[20];
-+      struct ssb_device *sdev = bp->sdev;
-+
-+      /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
-+      if (sdev->bus->sprom.board_num == 100) {
-+              bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
-+      } else {
-+              /* WL-HDD */
-+              if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 &&
-+                  !strncmp(buf, "WL300-", strlen("WL300-"))) {
-+                      if (sdev->bus->sprom.et0phyaddr == 0 &&
-+                          sdev->bus->sprom.et1phyaddr == 1)
-+                              bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
-+              }
-+      }
-+      return;
-+}
- #else
- static inline void b44_wap54g10_workaround(struct b44 *bp)
- {
- }
-+
-+static inline void b44_bcm47xx_workarounds(struct b44 *bp)
-+{
-+}
- #endif
- static int b44_setup_phy(struct b44 *bp)
-@@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp)
-       int err;
-       b44_wap54g10_workaround(bp);
-+      b44_bcm47xx_workarounds(bp);
-       if (bp->flags & B44_FLAG_EXTERNAL_PHY)
-               return 0;
-@@ -2176,6 +2201,8 @@ static int b44_get_invariants(struct b44
-        * valid PHY address. */
-       bp->phy_addr &= 0x1F;
-+      b44_bcm47xx_workarounds(bp);
-+
-       memcpy(bp->dev->dev_addr, addr, ETH_ALEN);
-       if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
diff --git a/target/linux/brcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch
deleted file mode 100644 (file)
index a1c988b..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-This prevents the options from being delete with make kernel_oldconfig.
----
- drivers/ssb/Kconfig |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/bcma/Kconfig
-+++ b/drivers/bcma/Kconfig
-@@ -32,6 +32,7 @@ config BCMA_HOST_PCI
- config BCMA_HOST_SOC
-       bool "Support for BCMA in a SoC"
-       depends on HAS_IOMEM
-+      select USB_HCD_BCMA if USB_EHCI_HCD || USB_OHCI_HCD
-       help
-         Host interface for a Broadcom AIX bus directly mapped into
-         the memory. This only works with the Broadcom SoCs from the
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -135,6 +135,7 @@ config SSB_SFLASH
- config SSB_EMBEDDED
-       bool
-       depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
-+      select USB_HCD_SSB if USB_EHCI_HCD || USB_OHCI_HCD
-       default y
- config SSB_DRIVER_EXTIF
diff --git a/target/linux/brcm47xx/patches-4.19/300-fork_cacheflush.patch b/target/linux/brcm47xx/patches-4.19/300-fork_cacheflush.patch
deleted file mode 100644 (file)
index b5efaaf..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Wolfram Joost <dbox2@frokaschwei.de>
-Subject: [PATCH] fork_cacheflush
-
-On ASUS WL-500gP there are many unexpected "Segmentation fault"s that
-seem to be caused by a kernel. They can be avoided by:
-1) Disabling highpage
-2) Using flush_cache_mm in flush_cache_dup_mm
-
-For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035
----
---- a/arch/mips/include/asm/cacheflush.h
-+++ b/arch/mips/include/asm/cacheflush.h
-@@ -47,7 +47,7 @@
- extern void (*flush_cache_all)(void);
- extern void (*__flush_cache_all)(void);
- extern void (*flush_cache_mm)(struct mm_struct *mm);
--#define flush_cache_dup_mm(mm)        do { (void) (mm); } while (0)
-+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
- extern void (*flush_cache_range)(struct vm_area_struct *vma,
-       unsigned long start, unsigned long end);
- extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
diff --git a/target/linux/brcm47xx/patches-4.19/310-no_highpage.patch b/target/linux/brcm47xx/patches-4.19/310-no_highpage.patch
deleted file mode 100644 (file)
index 09bfc64..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Jeff Hansen <jhansen@cardaccess-inc.com>
-Subject: [PATCH] no highpage
-
-On ASUS WL-500gP there are many unexpected "Segmentation fault"s that
-seem to be caused by a kernel. They can be avoided by:
-1) Disabling highpage
-2) Using flush_cache_mm in flush_cache_dup_mm
-
-For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035
----
---- a/arch/mips/include/asm/page.h
-+++ b/arch/mips/include/asm/page.h
-@@ -71,6 +71,7 @@ static inline unsigned int page_size_ftl
- #endif /* CONFIG_MIPS_HUGE_TLB_SUPPORT */
- #include <linux/pfn.h>
-+#include <asm/cpu-features.h>
- extern void build_clear_page(void);
- extern void build_copy_page(void);
-@@ -110,11 +111,16 @@ static inline void clear_user_page(void
-               flush_data_cache_page((unsigned long)addr);
- }
--struct vm_area_struct;
--extern void copy_user_highpage(struct page *to, struct page *from,
--      unsigned long vaddr, struct vm_area_struct *vma);
-+static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
-+      struct page *to)
-+{
-+      extern void (*flush_data_cache_page)(unsigned long addr);
--#define __HAVE_ARCH_COPY_USER_HIGHPAGE
-+      copy_page(vto, vfrom);
-+      if (!cpu_has_ic_fills_f_dc ||
-+          pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
-+              flush_data_cache_page((unsigned long)vto);
-+}
- /*
-  * These are used to make use of C type-checking..
---- a/arch/mips/mm/init.c
-+++ b/arch/mips/mm/init.c
-@@ -162,30 +162,6 @@ void kunmap_coherent(void)
-       preempt_enable();
- }
--void copy_user_highpage(struct page *to, struct page *from,
--      unsigned long vaddr, struct vm_area_struct *vma)
--{
--      void *vfrom, *vto;
--
--      vto = kmap_atomic(to);
--      if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
--          page_mapcount(from) && !Page_dcache_dirty(from)) {
--              vfrom = kmap_coherent(from, vaddr);
--              copy_page(vto, vfrom);
--              kunmap_coherent();
--      } else {
--              vfrom = kmap_atomic(from);
--              copy_page(vto, vfrom);
--              kunmap_atomic(vfrom);
--      }
--      if ((!cpu_has_ic_fills_f_dc) ||
--          pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
--              flush_data_cache_page((unsigned long)vto);
--      kunmap_atomic(vto);
--      /* Make sure this page is cleared on other CPU's too before using it */
--      smp_wmb();
--}
--
- void copy_to_user_page(struct vm_area_struct *vma,
-       struct page *page, unsigned long vaddr, void *dst, const void *src,
-       unsigned long len)
diff --git a/target/linux/brcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/brcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
deleted file mode 100644 (file)
index 74060e2..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
---- a/arch/mips/bcm47xx/board.c
-+++ b/arch/mips/bcm47xx/board.c
-@@ -141,6 +141,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
-       {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"},
-       {{BCM47XX_BOARD_LINKSYS_WRT310NV1, "Linksys WRT310N V1"}, "WRT310N", "1.0"},
-       {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT320N_V1, "Linksys WRT320N V1"}, "WRT320N", "1.0"},
-       {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
-       {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
-       {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
-@@ -160,9 +161,12 @@ struct bcm47xx_board_type_list1 bcm47xx_
-       {{BCM47XX_BOARD_LUXUL_XVW_P30_V1, "Luxul XVW-P30 V1"}, "luxul_xvwp30_v1"},
-       {{BCM47XX_BOARD_LUXUL_XWR_600_V1, "Luxul XWR-600 V1"}, "luxul_xwr600_v1"},
-       {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
-+      {{BCM47XX_BOARD_NETGEAR_R6300_V1, "Netgear R6300 V1"}, "U12H218T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
-+      {{BCM47XX_BOARD_NETGEAR_WN2500RP_V1, "Netgear WN2500RP V1"}, "U12H197T00_NETGEAR"},
-+      {{BCM47XX_BOARD_NETGEAR_WN2500RP_V2, "Netgear WN2500RP V2"}, "U12H294T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
---- a/arch/mips/bcm47xx/buttons.c
-+++ b/arch/mips/bcm47xx/buttons.c
-@@ -27,6 +27,12 @@
- /* Asus */
- static const struct gpio_keys_button
-+bcm47xx_buttons_asus_rtn10u[] __initconst = {
-+      BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
-+      BCM47XX_GPIO_KEY(21, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
- bcm47xx_buttons_asus_rtn12[] __initconst = {
-       BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
-       BCM47XX_GPIO_KEY(1, KEY_RESTART),
-@@ -277,6 +283,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
- };
- static const struct gpio_keys_button
-+bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
-+      BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
-+      BCM47XX_GPIO_KEY(6, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
-+bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
-+      BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
-+      BCM47XX_GPIO_KEY(8, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
- bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
-       BCM47XX_GPIO_KEY(5, KEY_WIMAX),
-       BCM47XX_GPIO_KEY(6, KEY_RESTART),
-@@ -385,6 +403,17 @@ bcm47xx_buttons_motorola_wr850gv2v3[] __
- /* Netgear */
- static const struct gpio_keys_button
-+bcm47xx_buttons_netgear_r6300_v1[] __initconst = {
-+      BCM47XX_GPIO_KEY(6, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
-+bcm47xx_buttons_netgear_wn2500rp_v1[] __initconst = {
-+      BCM47XX_GPIO_KEY(12, KEY_RESTART),
-+      BCM47XX_GPIO_KEY(31, KEY_WPS_BUTTON),
-+};
-+
-+static const struct gpio_keys_button
- bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
-       BCM47XX_GPIO_KEY(4, KEY_RESTART),
-       BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
-@@ -471,6 +500,9 @@ int __init bcm47xx_buttons_register(void
-       int err;
-       switch (board) {
-+      case BCM47XX_BOARD_ASUS_RTN10U:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u);
-+              break;
-       case BCM47XX_BOARD_ASUS_RTN12:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
-               break;
-@@ -601,6 +633,12 @@ int __init bcm47xx_buttons_register(void
-       case BCM47XX_BOARD_LINKSYS_WRT310NV1:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRT310NV2:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
-+              break;
-+      case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
-+              break;
-       case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
-               break;
-@@ -664,6 +702,12 @@ int __init bcm47xx_buttons_register(void
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_wr850gv2v3);
-               break;
-+      case BCM47XX_BOARD_NETGEAR_R6300_V1:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1);
-+              break;
-+      case BCM47XX_BOARD_NETGEAR_WN2500RP_V1:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wn2500rp_v1);
-+              break;
-       case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
-               break;
---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-@@ -72,6 +72,7 @@ enum bcm47xx_board {
-       BCM47XX_BOARD_LINKSYS_WRT300NV11,
-       BCM47XX_BOARD_LINKSYS_WRT310NV1,
-       BCM47XX_BOARD_LINKSYS_WRT310NV2,
-+      BCM47XX_BOARD_LINKSYS_WRT320N_V1,
-       BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
-       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
-       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
-@@ -98,9 +99,12 @@ enum bcm47xx_board {
-       BCM47XX_BOARD_MOTOROLA_WR850GP,
-       BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
-+      BCM47XX_BOARD_NETGEAR_R6300_V1,
-       BCM47XX_BOARD_NETGEAR_WGR614V8,
-       BCM47XX_BOARD_NETGEAR_WGR614V9,
-       BCM47XX_BOARD_NETGEAR_WGR614_V10,
-+      BCM47XX_BOARD_NETGEAR_WN2500RP_V1,
-+      BCM47XX_BOARD_NETGEAR_WN2500RP_V2,
-       BCM47XX_BOARD_NETGEAR_WNDR3300,
-       BCM47XX_BOARD_NETGEAR_WNDR3400V1,
-       BCM47XX_BOARD_NETGEAR_WNDR3400V2,
---- a/arch/mips/bcm47xx/leds.c
-+++ b/arch/mips/bcm47xx/leds.c
-@@ -30,6 +30,14 @@
- /* Asus */
- static const struct gpio_led
-+bcm47xx_leds_asus_rtn10u[] __initconst = {
-+      BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
-+      BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
-+};
-+
-+static const struct gpio_led
- bcm47xx_leds_asus_rtn12[] __initconst = {
-       BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
-       BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
-@@ -314,6 +322,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
- };
- static const struct gpio_led
-+bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
-+      BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-+      BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-+};
-+
-+static const struct gpio_led
- bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
-       BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
-       BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-@@ -556,6 +571,9 @@ void __init bcm47xx_leds_register(void)
-       enum bcm47xx_board board = bcm47xx_board_get();
-       switch (board) {
-+      case BCM47XX_BOARD_ASUS_RTN10U:
-+              bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u);
-+              break;
-       case BCM47XX_BOARD_ASUS_RTN12:
-               bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
-               break;
-@@ -689,6 +707,9 @@ void __init bcm47xx_leds_register(void)
-       case BCM47XX_BOARD_LINKSYS_WRT310NV1:
-               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
-+              bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
-+              break;
-       case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
-               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
-               break;
diff --git a/target/linux/brcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch
deleted file mode 100644 (file)
index df9d434..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -102,6 +102,7 @@ static int bcm47xxpart_parse(struct mtd_
-       int trx_num = 0; /* Number of found TRX partitions */
-       int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
-       int err;
-+      bool found_nvram = false;
-       /*
-        * Some really old flashes (like AT45DB*) had smaller erasesize-s, but
-@@ -283,12 +284,23 @@ static int bcm47xxpart_parse(struct mtd_
-               if (buf[0] == NVRAM_HEADER) {
-                       bcm47xxpart_add_part(&parts[curr_part++], "nvram",
-                                            master->size - blocksize, 0);
-+                      found_nvram = true;
-                       break;
-               }
-       }
-       kfree(buf);
-+      if (!found_nvram) {
-+              pr_err("can not find a nvram partition reserve last block\n");
-+              bcm47xxpart_add_part(&parts[curr_part++], "nvram_guess",
-+                                   master->size - blocksize * 2, MTD_WRITEABLE);
-+              for (i = 0; i < curr_part; i++) {
-+                      if (parts[i].size + parts[i].offset == master->size)
-+                              parts[i].offset -= blocksize * 2;
-+              }
-+      }
-+
-       /*
-        * Assume that partitions end at the beginning of the one they are
-        * followed by.
diff --git a/target/linux/brcm47xx/patches-4.19/610-pci_ide_fix.patch b/target/linux/brcm47xx/patches-4.19/610-pci_ide_fix.patch
deleted file mode 100644 (file)
index a353eec..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From: b.sander
-Subject: [PATCH] pci: IDE fix
-
-These are standard probing messages when using pdc202xx_old:
-pdc202xx_old 0000:00:01.0: IDE controller (0x105a:0x0d30 rev 0x02)
-PCI: Enabling device 0000:00:01.0 (0004 -> 0007)
-PCI: Fixing up device 0000:00:01.0
-0000:00:01.0: (U)DMA Burst Bit DISABLED Primary PCI Mode Secondary PCI Mode.
-0000:00:01.0: FORCING BURST BIT 0x00->0x01 ACTIVE
-pdc202xx_old 0000:00:01.0: 100% native mode on irq 6
-
-With the default MAX_HWIFS value after above we get:
-    ide2: BM-DMA at 0x0400-0x0407
-    ide3: BM-DMA at 0x0408-0x040f
-Probing IDE interface ide2...
-hde: CF500, CFA DISK drive
-
-As you can see it's ide2 + ide3 and hde.
-
-With this patch applied we get:
-    ide0: BM-DMA at 0x0400-0x0407
-    ide1: BM-DMA at 0x0408-0x040f
-Probing IDE interface ide0...
-hda: CF500, CFA DISK drive
-
-This fixes OpenWrt ticket #7061: https://dev.openwrt.org/ticket/7061
----
---- a/include/linux/ide.h
-+++ b/include/linux/ide.h
-@@ -235,7 +235,11 @@ static inline void ide_std_init_ports(st
-       hw->io_ports.ctl_addr = ctl_addr;
- }
-+#if defined CONFIG_BCM47XX
-+# define MAX_HWIFS    2
-+#else
- #define MAX_HWIFS     10
-+#endif
- /*
-  * Now for the data we need to maintain per-drive:  ide_drive_t
diff --git a/target/linux/brcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch b/target/linux/brcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch
deleted file mode 100644 (file)
index 31c87b3..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-When the Ethernet controller is powered down and someone wants to 
-access the mdio bus like the witch driver (b53) the system crashed if 
-PCI_D3hot was set before. This patch deactivates this power sawing mode 
-when a switch driver is in use.
-
---- a/drivers/net/ethernet/broadcom/tg3.c
-+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -4279,7 +4279,8 @@ static int tg3_power_down_prepare(struct
- static void tg3_power_down(struct tg3 *tp)
- {
-       pci_wake_from_d3(tp->pdev, tg3_flag(tp, WOL_ENABLE));
--      pci_set_power_state(tp->pdev, PCI_D3hot);
-+      if (!tg3_flag(tp, ROBOSWITCH))
-+              pci_set_power_state(tp->pdev, PCI_D3hot);
- }
- static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex)
diff --git a/target/linux/brcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch b/target/linux/brcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
deleted file mode 100644 (file)
index 318dc55..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 597715c61ae75a05ab3310a34ff3857a006f0f63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 20 Nov 2014 21:32:42 +0100
-Subject: [PATCH] bcma: add table of serial flashes with smaller blocks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
- drivers/bcma/driver_chipcommon_sflash.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
---- a/drivers/bcma/driver_chipcommon_sflash.c
-+++ b/drivers/bcma/driver_chipcommon_sflash.c
-@@ -9,6 +9,7 @@
- #include <linux/platform_device.h>
- #include <linux/bcma/bcma.h>
-+#include <bcm47xx_board.h>
- static struct resource bcma_sflash_resource = {
-       .name   = "bcma_sflash",
-@@ -42,6 +43,13 @@ static const struct bcma_sflash_tbl_e bc
-       { NULL },
- };
-+/* Some devices use smaller blocks (and have more of them) */
-+static const struct bcma_sflash_tbl_e bcma_sflash_st_shrink_tbl[] = {
-+      { "M25P16", 0x14, 0x1000, 512, },
-+      { "M25P32", 0x15, 0x1000, 1024, },
-+      { NULL },
-+};
-+
- static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
-       { "SST25WF512", 1, 0x1000, 16, },
-       { "SST25VF512", 0x48, 0x1000, 16, },
-@@ -85,6 +93,24 @@ static void bcma_sflash_cmd(struct bcma_
-       bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n");
- }
-+const struct bcma_sflash_tbl_e *bcma_sflash_shrink_flash(u32 id)
-+{
-+      enum bcm47xx_board board = bcm47xx_board_get();
-+      const struct bcma_sflash_tbl_e *e;
-+
-+      switch (board) {
-+      case BCM47XX_BOARD_NETGEAR_WGR614_V10:
-+      case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
-+              for (e = bcma_sflash_st_shrink_tbl; e->name; e++) {
-+                      if (e->id == id)
-+                              return e;
-+              }
-+              return NULL;
-+      default:
-+              return NULL;
-+      }
-+}
-+
- /* Initialize serial flash access */
- int bcma_sflash_init(struct bcma_drv_cc *cc)
- {
-@@ -115,6 +141,10 @@ int bcma_sflash_init(struct bcma_drv_cc
-               case 0x13:
-                       return -ENOTSUPP;
-               default:
-+                      e = bcma_sflash_shrink_flash(id);
-+                      if (e)
-+                              break;
-+
-                       for (e = bcma_sflash_st_tbl; e->name; e++) {
-                               if (e->id == id)
-                                       break;
diff --git a/target/linux/brcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch
deleted file mode 100644 (file)
index aaab39a..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-The Netgear wgt634u uses a different format for storing the 
-configuration. This patch is needed to read out the correct 
-configuration. The cfe_env.c file uses a different method way to read 
-out the configuration than the in kernel cfe config reader.
-
---- a/drivers/firmware/broadcom/Makefile
-+++ b/drivers/firmware/broadcom/Makefile
-@@ -1,2 +1,2 @@
--obj-$(CONFIG_BCM47XX_NVRAM)           += bcm47xx_nvram.o
-+obj-$(CONFIG_BCM47XX_NVRAM)           += bcm47xx_nvram.o cfe_env.o
- obj-$(CONFIG_BCM47XX_SPROM)           += bcm47xx_sprom.o
---- /dev/null
-+++ b/drivers/firmware/broadcom/cfe_env.c
-@@ -0,0 +1,228 @@
-+/*
-+ * CFE environment variable access
-+ *
-+ * Copyright 2001-2003, Broadcom Corporation
-+ * Copyright 2006, Felix Fietkau <nbd@nbd.name>
-+ * 
-+ * 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/init.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <asm/io.h>
-+#include <linux/uaccess.h>
-+
-+#define NVRAM_SIZE       (0x1ff0)
-+static char _nvdata[NVRAM_SIZE];
-+static char _valuestr[256];
-+
-+/*
-+ * TLV types.  These codes are used in the "type-length-value"
-+ * encoding of the items stored in the NVRAM device (flash or EEPROM)
-+ *
-+ * The layout of the flash/nvram is as follows:
-+ *
-+ * <type> <length> <data ...> <type> <length> <data ...> <type_end>
-+ *
-+ * The type code of "ENV_TLV_TYPE_END" marks the end of the list.
-+ * The "length" field marks the length of the data section, not
-+ * including the type and length fields.
-+ *
-+ * Environment variables are stored as follows:
-+ *
-+ * <type_env> <length> <flags> <name> = <value>
-+ *
-+ * If bit 0 (low bit) is set, the length is an 8-bit value.
-+ * If bit 0 (low bit) is clear, the length is a 16-bit value
-+ * 
-+ * Bit 7 set indicates "user" TLVs.  In this case, bit 0 still
-+ * indicates the size of the length field.  
-+ *
-+ * Flags are from the constants below:
-+ *
-+ */
-+#define ENV_LENGTH_16BITS     0x00    /* for low bit */
-+#define ENV_LENGTH_8BITS      0x01
-+
-+#define ENV_TYPE_USER         0x80
-+
-+#define ENV_CODE_SYS(n,l) (((n)<<1)|(l))
-+#define ENV_CODE_USER(n,l) ((((n)<<1)|(l)) | ENV_TYPE_USER)
-+
-+/*
-+ * The actual TLV types we support
-+ */
-+
-+#define ENV_TLV_TYPE_END      0x00    
-+#define ENV_TLV_TYPE_ENV      ENV_CODE_SYS(0,ENV_LENGTH_8BITS)
-+
-+/*
-+ * Environment variable flags 
-+ */
-+
-+#define ENV_FLG_NORMAL                0x00    /* normal read/write */
-+#define ENV_FLG_BUILTIN               0x01    /* builtin - not stored in flash */
-+#define ENV_FLG_READONLY      0x02    /* read-only - cannot be changed */
-+
-+#define ENV_FLG_MASK          0xFF    /* mask of attributes we keep */
-+#define ENV_FLG_ADMIN         0x100   /* lets us internally override permissions */
-+
-+
-+/*  *********************************************************************
-+    *  _nvram_read(buffer,offset,length)
-+    *  
-+    *  Read data from the NVRAM device
-+    *  
-+    *  Input parameters: 
-+    *            buffer - destination buffer
-+    *            offset - offset of data to read
-+    *            length - number of bytes to read
-+    *            
-+    *  Return value:
-+    *            number of bytes read, or <0 if error occured
-+    ********************************************************************* */
-+static int
-+_nvram_read(unsigned char *nv_buf, unsigned char *buffer, int offset, int length)
-+{
-+    int i;
-+    if (offset > NVRAM_SIZE)
-+      return -1; 
-+
-+    for ( i = 0; i < length; i++) {
-+      buffer[i] = ((volatile unsigned char*)nv_buf)[offset + i];
-+    }
-+    return length;
-+}
-+
-+
-+static char*
-+_strnchr(const char *dest,int c,size_t cnt)
-+{
-+      while (*dest && (cnt > 0)) {
-+      if (*dest == c) return (char *) dest;
-+      dest++;
-+      cnt--;
-+      }
-+      return NULL;
-+}
-+
-+
-+
-+/*
-+ * Core support API: Externally visible.
-+ */
-+
-+/*
-+ * Get the value of an NVRAM variable
-+ * @param     name    name of variable to get
-+ * @return    value of variable or NULL if undefined
-+ */
-+
-+char *cfe_env_get(unsigned char *nv_buf, const char *name)
-+{
-+    int size;
-+    unsigned char *buffer;
-+    unsigned char *ptr;
-+    unsigned char *envval;
-+    unsigned int reclen;
-+    unsigned int rectype;
-+    int offset;
-+    int flg;
-+    
-+      if (!strcmp(name, "nvram_type"))
-+              return "cfe";
-+      
-+    size = NVRAM_SIZE;
-+    buffer = &_nvdata[0];
-+
-+    ptr = buffer;
-+    offset = 0;
-+
-+    /* Read the record type and length */
-+    if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
-+      goto error;
-+    }
-+    
-+    while ((*ptr != ENV_TLV_TYPE_END)  && (size > 1)) {
-+
-+      /* Adjust pointer for TLV type */
-+      rectype = *(ptr);
-+      offset++;
-+      size--;
-+
-+      /* 
-+       * Read the length.  It can be either 1 or 2 bytes
-+       * depending on the code 
-+       */
-+      if (rectype & ENV_LENGTH_8BITS) {
-+          /* Read the record type and length - 8 bits */
-+          if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
-+              goto error;
-+          }
-+          reclen = *(ptr);
-+          size--;
-+          offset++;
-+      }
-+      else {
-+          /* Read the record type and length - 16 bits, MSB first */
-+          if (_nvram_read(nv_buf, ptr,offset,2) != 2) {
-+              goto error;
-+          }
-+          reclen = (((unsigned int) *(ptr)) << 8) + (unsigned int) *(ptr+1);
-+          size -= 2;
-+          offset += 2;
-+      }
-+
-+      if (reclen > size)
-+          break;      /* should not happen, bad NVRAM */
-+
-+      switch (rectype) {
-+          case ENV_TLV_TYPE_ENV:
-+              /* Read the TLV data */
-+              if (_nvram_read(nv_buf, ptr,offset,reclen) != reclen)
-+                  goto error;
-+              flg = *ptr++;
-+              envval = (unsigned char *) _strnchr(ptr,'=',(reclen-1));
-+              if (envval) {
-+                  *envval++ = '\0';
-+                  memcpy(_valuestr,envval,(reclen-1)-(envval-ptr));
-+                  _valuestr[(reclen-1)-(envval-ptr)] = '\0';
-+#if 0                 
-+                  printk(KERN_INFO "NVRAM:%s=%s\n", ptr, _valuestr);
-+#endif
-+                  if(!strcmp(ptr, name)){
-+                      return _valuestr;
-+                  }
-+                  if((strlen(ptr) > 1) && !strcmp(&ptr[1], name))
-+                      return _valuestr;
-+              }
-+              break;
-+              
-+          default: 
-+              /* Unknown TLV type, skip it. */
-+              break;
-+          }
-+
-+      /*
-+       * Advance to next TLV 
-+       */
-+              
-+      size -= (int)reclen;
-+      offset += reclen;
-+
-+      /* Read the next record type */
-+      ptr = buffer;
-+      if (_nvram_read(nv_buf, ptr,offset,1) != 1)
-+          goto error;
-+      }
-+
-+error:
-+    return NULL;
-+
-+}
-+
---- a/drivers/firmware/broadcom/bcm47xx_nvram.c
-+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
-@@ -37,6 +37,8 @@ struct nvram_header {
- static char nvram_buf[NVRAM_SPACE];
- static size_t nvram_len;
- static const u32 nvram_sizes[] = {0x6000, 0x8000, 0xF000, 0x10000};
-+static int cfe_env;
-+extern char *cfe_env_get(char *nv_buf, const char *name);
- static u32 find_nvram_size(void __iomem *end)
- {
-@@ -56,7 +58,9 @@ static u32 find_nvram_size(void __iomem
- static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
- {
-       struct nvram_header __iomem *header;
-+      int i;
-       u32 off;
-+      u32 *src, *dst;
-       u32 size;
-       if (nvram_len) {
-@@ -64,6 +68,26 @@ static int nvram_find_and_copy(void __io
-               return -EEXIST;
-       }
-+      cfe_env = 0;
-+
-+      /* XXX: hack for supporting the CFE environment stuff on WGT634U */
-+      if (lim >= 8 * 1024 * 1024) {
-+              src = (u32 *)(iobase + 8 * 1024 * 1024 - 0x2000);
-+              dst = (u32 *)nvram_buf;
-+
-+              if ((*src & 0xff00ff) == 0x000001) {
-+                      printk("early_nvram_init: WGT634U NVRAM found.\n");
-+
-+                      for (i = 0; i < 0x1ff0; i++) {
-+                              if (*src == 0xFFFFFFFF)
-+                                      break;
-+                              *dst++ = *src++;
-+                      }
-+                      cfe_env = 1;
-+                      return 0;
-+              }
-+      }
-+
-       /* TODO: when nvram is on nand flash check for bad blocks first. */
-       off = FLASH_MIN;
-       while (off <= lim) {
-@@ -174,6 +198,13 @@ int bcm47xx_nvram_getenv(const char *nam
-       if (!name)
-               return -EINVAL;
-+      if (cfe_env) {
-+              value = cfe_env_get(nvram_buf, name);
-+              if (!value)
-+                      return -ENOENT;
-+              return snprintf(val, val_len, "%s", value);
-+      }
-+
-       if (!nvram_len) {
-               err = nvram_init();
-               if (err)
diff --git a/target/linux/brcm47xx/patches-4.19/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-4.19/830-huawei_e970_support.patch
deleted file mode 100644 (file)
index 4d43b99..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -37,6 +37,7 @@
- #include <linux/ssb/ssb.h>
- #include <linux/ssb/ssb_embedded.h>
- #include <linux/bcma/bcma_soc.h>
-+#include <linux/old_gpio_wdt.h>
- #include <asm/bootinfo.h>
- #include <asm/idle.h>
- #include <asm/prom.h>
-@@ -254,6 +255,33 @@ static struct fixed_phy_status bcm47xx_f
-       .duplex = DUPLEX_FULL,
- };
-+static struct gpio_wdt_platform_data gpio_wdt_data;
-+
-+static struct platform_device gpio_wdt_device = {
-+      .name                   = "gpio-wdt",
-+      .id                     = 0,
-+      .dev                    = {
-+              .platform_data  = &gpio_wdt_data,
-+      },
-+};
-+
-+static int __init bcm47xx_register_gpio_watchdog(void)
-+{
-+      enum bcm47xx_board board = bcm47xx_board_get();
-+
-+      switch (board) {
-+      case BCM47XX_BOARD_HUAWEI_E970:
-+              pr_info("bcm47xx: detected Huawei E970 or similar, starting early gpio_wdt timer\n");
-+              gpio_wdt_data.gpio = 7;
-+              gpio_wdt_data.interval = HZ;
-+              gpio_wdt_data.first_interval = HZ / 5;
-+              return platform_device_register(&gpio_wdt_device);
-+      default:
-+              /* Nothing to do */
-+              return 0;
-+      }
-+}
-+
- static int __init bcm47xx_register_bus_complete(void)
- {
-       switch (bcm47xx_bus_type) {
-@@ -275,6 +303,7 @@ static int __init bcm47xx_register_bus_c
-       bcm47xx_workarounds();
-       fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1);
-+      bcm47xx_register_gpio_watchdog();
-       return 0;
- }
- device_initcall(bcm47xx_register_bus_complete);
---- a/arch/mips/configs/bcm47xx_defconfig
-+++ b/arch/mips/configs/bcm47xx_defconfig
-@@ -66,6 +66,7 @@ CONFIG_HW_RANDOM=y
- CONFIG_GPIO_SYSFS=y
- CONFIG_WATCHDOG=y
- CONFIG_BCM47XX_WDT=y
-+CONFIG_GPIO_WDT=y
- CONFIG_SSB_DRIVER_GIGE=y
- CONFIG_BCMA_DRIVER_GMAC_CMN=y
- CONFIG_USB=y
---- a/drivers/ssb/embedded.c
-+++ b/drivers/ssb/embedded.c
-@@ -34,11 +34,36 @@ int ssb_watchdog_timer_set(struct ssb_bu
- }
- EXPORT_SYMBOL(ssb_watchdog_timer_set);
-+#ifdef CONFIG_BCM47XX
-+#include <bcm47xx_board.h>
-+
-+static bool ssb_watchdog_supported(void)
-+{
-+      enum bcm47xx_board board = bcm47xx_board_get();
-+
-+      /* The Huawei E970 has a hardware watchdog using a GPIO */
-+      switch (board) {
-+      case BCM47XX_BOARD_HUAWEI_E970:
-+              return false;
-+      default:
-+              return true;
-+      }
-+}
-+#else
-+static bool ssb_watchdog_supported(void)
-+{
-+      return true;
-+}
-+#endif
-+
- int ssb_watchdog_register(struct ssb_bus *bus)
- {
-       struct bcm47xx_wdt wdt = {};
-       struct platform_device *pdev;
-+      if (!ssb_watchdog_supported())
-+              return 0;
-+
-       if (ssb_chipco_available(&bus->chipco)) {
-               wdt.driver_data = &bus->chipco;
-               wdt.timer_set = ssb_chipco_watchdog_timer_set_wdt;
diff --git a/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch b/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch
deleted file mode 100644 (file)
index ddac791..0000000
+++ /dev/null
@@ -1,360 +0,0 @@
-This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
-
-Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
-
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -1497,6 +1497,15 @@ config WDT_MTX1
-         Hardware driver for the MTX-1 boards. This is a watchdog timer that
-         will reboot the machine after a 100 seconds timer expired.
-+config GPIO_WDT
-+      tristate "GPIO Hardware Watchdog"
-+      help
-+        Hardware driver for GPIO-controlled watchdogs. GPIO pin and
-+        toggle interval settings are platform-specific. The driver
-+        will stop toggling the GPIO (i.e. machine reboots) after a
-+        100 second timer expired and no process has written to
-+        /dev/watchdog during that time.
-+
- config PNX833X_WDT
-       tristate "PNX833x Hardware Watchdog"
-       depends on SOC_PNX8335
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -154,6 +154,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
- obj-$(CONFIG_INDYDOG) += indydog.o
- obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
- obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
-+obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o
- obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
---- /dev/null
-+++ b/drivers/watchdog/old_gpio_wdt.c
-@@ -0,0 +1,301 @@
-+/*
-+ *      Driver for GPIO-controlled Hardware Watchdogs.
-+ *
-+ *      Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
-+ *
-+ *      Replaces mtx1_wdt (driver for the MTX-1 Watchdog):
-+ *
-+ *      (C) Copyright 2005 4G Systems <info@4g-systems.biz>,
-+ *                              All Rights Reserved.
-+ *                              http://www.4g-systems.biz
-+ *
-+ *      (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
-+ *
-+ *      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.
-+ *
-+ *      Neither Michael Stickel nor 4G Systems admit liability nor provide
-+ *      warranty for any of this software. This material is provided
-+ *      "AS-IS" and at no charge.
-+ *
-+ *      (c) Copyright 2005    4G Systems <info@4g-systems.biz>
-+ *
-+ *      Release 0.01.
-+ *      Author: Michael Stickel  michael.stickel@4g-systems.biz
-+ *
-+ *      Release 0.02.
-+ *      Author: Florian Fainelli florian@openwrt.org
-+ *              use the Linux watchdog/timer APIs
-+ *
-+ *      Release 0.03.
-+ *      Author: Mathias Adam <m.adam--linux@adamis.de>
-+ *              make it a generic gpio watchdog driver
-+ *
-+ *      The Watchdog is configured to reset the MTX-1
-+ *      if it is not triggered for 100 seconds.
-+ *      It should not be triggered more often than 1.6 seconds.
-+ *
-+ *      A timer triggers the watchdog every 5 seconds, until
-+ *      it is opened for the first time. After the first open
-+ *      it MUST be triggered every 2..95 seconds.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/miscdevice.h>
-+#include <linux/fs.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/timer.h>
-+#include <linux/completion.h>
-+#include <linux/jiffies.h>
-+#include <linux/watchdog.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/uaccess.h>
-+#include <linux/gpio.h>
-+#include <linux/old_gpio_wdt.h>
-+
-+static int ticks = 100 * HZ;
-+
-+static struct {
-+      struct completion stop;
-+      spinlock_t lock;
-+      int running;
-+      struct timer_list timer;
-+      int queue;
-+      int default_ticks;
-+      unsigned long inuse;
-+      unsigned gpio;
-+      unsigned int gstate;
-+      int interval;
-+      int first_interval;
-+} gpio_wdt_device;
-+
-+static void gpio_wdt_trigger(unsigned long unused)
-+{
-+      spin_lock(&gpio_wdt_device.lock);
-+      if (gpio_wdt_device.running && ticks > 0)
-+              ticks -= gpio_wdt_device.interval;
-+
-+      /* toggle wdt gpio */
-+      gpio_wdt_device.gstate = !gpio_wdt_device.gstate;
-+      gpio_set_value(gpio_wdt_device.gpio, gpio_wdt_device.gstate);
-+
-+      if (gpio_wdt_device.queue && ticks > 0)
-+              mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.interval);
-+      else
-+              complete(&gpio_wdt_device.stop);
-+      spin_unlock(&gpio_wdt_device.lock);
-+}
-+
-+static void gpio_wdt_reset(void)
-+{
-+      ticks = gpio_wdt_device.default_ticks;
-+}
-+
-+
-+static void gpio_wdt_start(void)
-+{
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&gpio_wdt_device.lock, flags);
-+      if (!gpio_wdt_device.queue) {
-+              gpio_wdt_device.queue = 1;
-+              gpio_wdt_device.gstate = 1;
-+              gpio_set_value(gpio_wdt_device.gpio, 1);
-+              mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.first_interval);
-+      }
-+      gpio_wdt_device.running++;
-+      spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
-+}
-+
-+static int gpio_wdt_stop(void)
-+{
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&gpio_wdt_device.lock, flags);
-+      if (gpio_wdt_device.queue) {
-+              gpio_wdt_device.queue = 0;
-+              gpio_wdt_device.gstate = 0;
-+              gpio_set_value(gpio_wdt_device.gpio, 0);
-+      }
-+      ticks = gpio_wdt_device.default_ticks;
-+      spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
-+      return 0;
-+}
-+
-+/* Filesystem functions */
-+
-+static int gpio_wdt_open(struct inode *inode, struct file *file)
-+{
-+      if (test_and_set_bit(0, &gpio_wdt_device.inuse))
-+              return -EBUSY;
-+      return nonseekable_open(inode, file);
-+}
-+
-+
-+static int gpio_wdt_release(struct inode *inode, struct file *file)
-+{
-+      clear_bit(0, &gpio_wdt_device.inuse);
-+      return 0;
-+}
-+
-+static long gpio_wdt_ioctl(struct file *file, unsigned int cmd,
-+                                                      unsigned long arg)
-+{
-+      void __user *argp = (void __user *)arg;
-+      int __user *p = (int __user *)argp;
-+      unsigned int value;
-+      static const struct watchdog_info ident = {
-+              .options = WDIOF_CARDRESET,
-+              .identity = "GPIO WDT",
-+      };
-+
-+      switch (cmd) {
-+      case WDIOC_GETSUPPORT:
-+              if (copy_to_user(argp, &ident, sizeof(ident)))
-+                      return -EFAULT;
-+              break;
-+      case WDIOC_GETSTATUS:
-+      case WDIOC_GETBOOTSTATUS:
-+              put_user(0, p);
-+              break;
-+      case WDIOC_SETOPTIONS:
-+              if (get_user(value, p))
-+                      return -EFAULT;
-+              if (value & WDIOS_ENABLECARD)
-+                      gpio_wdt_start();
-+              else if (value & WDIOS_DISABLECARD)
-+                      gpio_wdt_stop();
-+              else
-+                      return -EINVAL;
-+              return 0;
-+      case WDIOC_KEEPALIVE:
-+              gpio_wdt_reset();
-+              break;
-+      default:
-+              return -ENOTTY;
-+      }
-+      return 0;
-+}
-+
-+
-+static ssize_t gpio_wdt_write(struct file *file, const char *buf,
-+                                              size_t count, loff_t *ppos)
-+{
-+      if (!count)
-+              return -EIO;
-+      gpio_wdt_reset();
-+      return count;
-+}
-+
-+static const struct file_operations gpio_wdt_fops = {
-+      .owner          = THIS_MODULE,
-+      .llseek         = no_llseek,
-+      .unlocked_ioctl = gpio_wdt_ioctl,
-+      .open           = gpio_wdt_open,
-+      .write          = gpio_wdt_write,
-+      .release        = gpio_wdt_release,
-+};
-+
-+
-+static struct miscdevice gpio_wdt_misc = {
-+      .minor  = WATCHDOG_MINOR,
-+      .name   = "watchdog",
-+      .fops   = &gpio_wdt_fops,
-+};
-+
-+
-+static int gpio_wdt_probe(struct platform_device *pdev)
-+{
-+      int ret;
-+      struct gpio_wdt_platform_data *gpio_wdt_data = pdev->dev.platform_data;
-+
-+      gpio_wdt_device.gpio = gpio_wdt_data->gpio;
-+      gpio_wdt_device.interval = gpio_wdt_data->interval;
-+      gpio_wdt_device.first_interval = gpio_wdt_data->first_interval;
-+      if (gpio_wdt_device.first_interval <= 0) {
-+              gpio_wdt_device.first_interval = gpio_wdt_device.interval;
-+      }
-+
-+      ret = gpio_request(gpio_wdt_device.gpio, "gpio-wdt");
-+      if (ret < 0) {
-+              dev_err(&pdev->dev, "failed to request gpio");
-+              return ret;
-+      }
-+
-+      spin_lock_init(&gpio_wdt_device.lock);
-+      init_completion(&gpio_wdt_device.stop);
-+      gpio_wdt_device.queue = 0;
-+      clear_bit(0, &gpio_wdt_device.inuse);
-+      setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
-+      gpio_wdt_device.default_ticks = ticks;
-+
-+      gpio_wdt_start();
-+      dev_info(&pdev->dev, "GPIO Hardware Watchdog driver (gpio=%i interval=%i/%i)\n",
-+              gpio_wdt_data->gpio, gpio_wdt_data->first_interval, gpio_wdt_data->interval);
-+      return 0;
-+}
-+
-+static int gpio_wdt_remove(struct platform_device *pdev)
-+{
-+      /* FIXME: do we need to lock this test ? */
-+      if (gpio_wdt_device.queue) {
-+              gpio_wdt_device.queue = 0;
-+              wait_for_completion(&gpio_wdt_device.stop);
-+      }
-+
-+      gpio_free(gpio_wdt_device.gpio);
-+      misc_deregister(&gpio_wdt_misc);
-+      return 0;
-+}
-+
-+static struct platform_driver gpio_wdt_driver = {
-+      .probe = gpio_wdt_probe,
-+      .remove = gpio_wdt_remove,
-+      .driver.name = "gpio-wdt",
-+      .driver.owner = THIS_MODULE,
-+};
-+
-+static int __init gpio_wdt_init(void)
-+{
-+      return platform_driver_register(&gpio_wdt_driver);
-+}
-+arch_initcall(gpio_wdt_init);
-+
-+/*
-+ * We do wdt initialization in two steps: arch_initcall probes the wdt
-+ * very early to start pinging the watchdog (misc devices are not yet
-+ * available), and later module_init() just registers the misc device.
-+ */
-+static int gpio_wdt_init_late(void)
-+{
-+      int ret;
-+
-+      ret = misc_register(&gpio_wdt_misc);
-+      if (ret < 0) {
-+              pr_err("GPIO_WDT: failed to register misc device\n");
-+              return ret;
-+      }
-+      return 0;
-+}
-+#ifndef MODULE
-+module_init(gpio_wdt_init_late);
-+#endif
-+
-+static void __exit gpio_wdt_exit(void)
-+{
-+      platform_driver_unregister(&gpio_wdt_driver);
-+}
-+module_exit(gpio_wdt_exit);
-+
-+MODULE_AUTHOR("Michael Stickel, Florian Fainelli, Mathias Adam");
-+MODULE_DESCRIPTION("Driver for GPIO hardware watchdogs");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-+MODULE_ALIAS("platform:gpio-wdt");
---- /dev/null
-+++ b/include/linux/old_gpio_wdt.h
-@@ -0,0 +1,21 @@
-+/*
-+ *  Definitions for the GPIO watchdog driver
-+ *
-+ *  Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
-+ *
-+ *  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.
-+ *
-+ */
-+
-+#ifndef _GPIO_WDT_H_
-+#define _GPIO_WDT_H_
-+
-+struct gpio_wdt_platform_data {
-+      int     gpio;           /* GPIO line number */
-+      int     interval;       /* watchdog reset interval in system ticks */
-+      int     first_interval; /* first wd reset interval in system ticks */
-+};
-+
-+#endif /* _GPIO_WDT_H_ */
diff --git a/target/linux/brcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch b/target/linux/brcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
deleted file mode 100644 (file)
index 6b7ee06..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5c81397a0147ea59c778d1de14ef54e2268221f6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 8 Apr 2015 06:58:11 +0200
-Subject: [PATCH] ssb: reject PCI writes setting CardBus bridge resources
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If SoC has a CardBus we can set resources of device at slot 1 only. It's
-impossigle to set bridge resources as it simply overwrites device 1
-configuration and usually results in Data bus error-s.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
- drivers/ssb/driver_pcicore.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/ssb/driver_pcicore.c
-+++ b/drivers/ssb/driver_pcicore.c
-@@ -164,6 +164,10 @@ static int ssb_extpci_write_config(struc
-       WARN_ON(!pc->hostmode);
-       if (unlikely(len != 1 && len != 2 && len != 4))
-               goto out;
-+      /* CardBus SoCs allow configuring dev 1 resources only */
-+      if (extpci_core->cardbusmode && dev != 1 &&
-+          off >= PCI_BASE_ADDRESS_0 && off <= PCI_BASE_ADDRESS_5)
-+              goto out;
-       addr = get_cfgspace_addr(pc, bus, dev, func, off);
-       if (unlikely(!addr))
-               goto out;
diff --git a/target/linux/brcm47xx/patches-4.19/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-4.19/940-bcm47xx-yenta.patch
deleted file mode 100644 (file)
index f5b7bda..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/drivers/pcmcia/yenta_socket.c
-+++ b/drivers/pcmcia/yenta_socket.c
-@@ -920,6 +920,8 @@ static unsigned int yenta_probe_irq(stru
-        * Probe for usable interrupts using the force
-        * register to generate bogus card status events.
-        */
-+#ifndef CONFIG_BCM47XX
-+      /* WRT54G3G does not like this */
-       cb_writel(socket, CB_SOCKET_EVENT, -1);
-       cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
-       reg = exca_readb(socket, I365_CSCINT);
-@@ -935,6 +937,7 @@ static unsigned int yenta_probe_irq(stru
-       }
-       cb_writel(socket, CB_SOCKET_MASK, 0);
-       exca_writeb(socket, I365_CSCINT, reg);
-+#endif
-       mask = probe_irq_mask(val) & 0xffff;
-@@ -1019,6 +1022,10 @@ static void yenta_get_socket_capabilitie
-       else
-               socket->socket.irq_mask = 0;
-+      /* irq mask probing is broken for the WRT54G3G */
-+      if (socket->socket.irq_mask == 0)
-+              socket->socket.irq_mask = 0x6f8;
-+
-       dev_info(&socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n",
-                socket->socket.irq_mask, socket->cb_irq);
- }
-@@ -1250,6 +1257,15 @@ static int yenta_probe(struct pci_dev *d
-       dev_info(&dev->dev, "Socket status: %08x\n",
-                cb_readl(socket, CB_SOCKET_STATE));
-+      /* Generate an interrupt on card insert/remove */
-+      config_writew(socket, CB_SOCKET_MASK, CB_CSTSMASK | CB_CDMASK);
-+
-+      /* Set up Multifunction Routing Status Register */
-+      config_writew(socket, 0x8C, 0x1000 /* MFUNC3 to GPIO3 */ | 0x2 /* MFUNC0 to INTA */);
-+
-+      /* Switch interrupts to parallelized */
-+      config_writeb(socket, 0x92, 0x64);
-+
-       yenta_fixup_parent_bridge(dev->subordinate);
-       /* Register it with the pcmcia layer.. */
diff --git a/target/linux/brcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch b/target/linux/brcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch
deleted file mode 100644 (file)
index 99aa188..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/ssb/driver_pcicore.c
-+++ b/drivers/ssb/driver_pcicore.c
-@@ -390,7 +390,7 @@ static void ssb_pcicore_init_hostmode(st
-       set_io_port_base(ssb_pcicore_controller.io_map_base);
-       /* Give some time to the PCI controller to configure itself with the new
-        * values. Not waiting at this point causes crashes of the machine. */
--      mdelay(10);
-+      mdelay(300);
-       register_pci_controller(&ssb_pcicore_controller);
- }
diff --git a/target/linux/brcm47xx/patches-4.19/999-wl_exports.patch b/target/linux/brcm47xx/patches-4.19/999-wl_exports.patch
deleted file mode 100644 (file)
index 2936421..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/firmware/broadcom/bcm47xx_nvram.c
-+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
-@@ -34,7 +34,8 @@ struct nvram_header {
-       u32 config_ncdl;        /* ncdl values for memc */
- };
--static char nvram_buf[NVRAM_SPACE];
-+char nvram_buf[NVRAM_SPACE];
-+EXPORT_SYMBOL(nvram_buf);
- static size_t nvram_len;
- static const u32 nvram_sizes[] = {0x6000, 0x8000, 0xF000, 0x10000};
- static int cfe_env;
---- a/arch/mips/mm/cache.c
-+++ b/arch/mips/mm/cache.c
-@@ -64,6 +64,7 @@ void (*_dma_cache_wback)(unsigned long s
- void (*_dma_cache_inv)(unsigned long start, unsigned long size);
- EXPORT_SYMBOL(_dma_cache_wback_inv);
-+EXPORT_SYMBOL(_dma_cache_inv);
- #endif /* CONFIG_DMA_NONCOHERENT */
index 785b06f596b4df15c96e78f9fc7a7016541babe1..abb1fccf322c8f8e455bbe191c38e5a14f0cffd4 100644 (file)
@@ -15,7 +15,6 @@ CPU_SUBTYPE:=vfp
 MAINTAINER:=Felix Fietkau <nbd@nbd.name>, \
            Koen Vandeputte <koen.vandeputte@ncentric.com>
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 define Target/Description
        Build images for Cavium Networks Econa CNS3xxx based boards,
diff --git a/target/linux/cns3xxx/patches-4.19/000-cns3xxx_arch_include.patch b/target/linux/cns3xxx/patches-4.19/000-cns3xxx_arch_include.patch
deleted file mode 100644 (file)
index 3ae7590..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/arch/arm/mach-cns3xxx/Makefile
-+++ b/arch/arm/mach-cns3xxx/Makefile
-@@ -1,4 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
-+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
-+
- obj-$(CONFIG_ARCH_CNS3XXX)            += cns3xxx.o
- cns3xxx-y                             += core.o pm.o
- cns3xxx-$(CONFIG_ATAGS)                       += devices.o
diff --git a/target/linux/cns3xxx/patches-4.19/001-arm_openwrt_machtypes.patch b/target/linux/cns3xxx/patches-4.19/001-arm_openwrt_machtypes.patch
deleted file mode 100644 (file)
index f323dee..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -449,6 +449,7 @@ gplugd                     MACH_GPLUGD             GPLUGD                  2625
- qsd8x50a_st1_5                MACH_QSD8X50A_ST1_5     QSD8X50A_ST1_5          2627
- mx23evk                       MACH_MX23EVK            MX23EVK                 2629
- ap4evb                        MACH_AP4EVB             AP4EVB                  2630
-+gw2388                        MACH_GW2388             GW2388                  2635
- mityomapl138          MACH_MITYOMAPL138       MITYOMAPL138            2650
- guruplug              MACH_GURUPLUG           GURUPLUG                2659
- spear310              MACH_SPEAR310           SPEAR310                2660
diff --git a/target/linux/cns3xxx/patches-4.19/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/cns3xxx/patches-4.19/010-arm_introduce-dma-fiq-irq-broadcast.patch
deleted file mode 100644 (file)
index 45f8fee..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/arch/arm/include/asm/glue-cache.h
-+++ b/arch/arm/include/asm/glue-cache.h
-@@ -156,9 +156,15 @@ static inline void nop_dma_unmap_area(co
- #define __cpuc_flush_user_range               __glue(_CACHE,_flush_user_cache_range)
- #define __cpuc_coherent_kern_range    __glue(_CACHE,_coherent_kern_range)
- #define __cpuc_coherent_user_range    __glue(_CACHE,_coherent_user_range)
--#define __cpuc_flush_dcache_area      __glue(_CACHE,_flush_kern_dcache_area)
--#define dmac_flush_range              __glue(_CACHE,_dma_flush_range)
-+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
-+# define __cpuc_flush_dcache_area     __glue(_CACHE,_flush_kern_dcache_area)
-+# define dmac_flush_range             __glue(_CACHE,_dma_flush_range)
-+#else
-+# define __cpuc_flush_dcache_area     __glue(fiq,_flush_kern_dcache_area)
-+# define dmac_flush_range             __glue(fiq,_dma_flush_range)
-+#endif
-+
- #endif
- #endif
---- a/arch/arm/mm/Kconfig
-+++ b/arch/arm/mm/Kconfig
-@@ -916,6 +916,17 @@ config DMA_CACHE_RWFO
-         in hardware, other workarounds are needed (e.g. cache
-         maintenance broadcasting in software via FIQ).
-+config DMA_CACHE_FIQ_BROADCAST
-+      bool "Enable fiq broadcast DMA cache maintenance"
-+      depends on CPU_V6K && SMP
-+      select FIQ
-+      help
-+        The Snoop Control Unit on ARM11MPCore does not detect the
-+        cache maintenance operations and the dma_{map,unmap}_area()
-+        functions may leave stale cache entries on other CPUs. By
-+        enabling this option, fiq broadcast in the ARMv6
-+        DMA cache maintenance functions is performed.
-+
- config OUTER_CACHE
-       bool
---- a/arch/arm/mm/flush.c
-+++ b/arch/arm/mm/flush.c
-@@ -319,6 +319,7 @@ void __sync_icache_dcache(pte_t pteval)
- void flush_dcache_page(struct page *page)
- {
-       struct address_space *mapping;
-+      bool skip_broadcast = true;
-       /*
-        * The zero page is never written to, so never has any dirty
-@@ -335,7 +336,10 @@ void flush_dcache_page(struct page *page
-       mapping = page_mapping_file(page);
--      if (!cache_ops_need_broadcast() &&
-+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
-+        skip_broadcast = !cache_ops_need_broadcast();
-+#endif
-+        if (skip_broadcast &&
-           mapping && !page_mapcount(page))
-               clear_bit(PG_dcache_clean, &page->flags);
-       else {
---- a/arch/arm/mm/dma.h
-+++ b/arch/arm/mm/dma.h
-@@ -5,8 +5,13 @@
- #include <asm/glue-cache.h>
- #ifndef MULTI_CACHE
--#define dmac_map_area                 __glue(_CACHE,_dma_map_area)
--#define dmac_unmap_area               __glue(_CACHE,_dma_unmap_area)
-+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
-+# define dmac_map_area                        __glue(_CACHE,_dma_map_area)
-+# define dmac_unmap_area              __glue(_CACHE,_dma_unmap_area)
-+#else
-+# define dmac_map_area                        __glue(fiq,_dma_map_area)
-+# define dmac_unmap_area                      __glue(fiq,_dma_unmap_area)
-+#endif
- /*
-  * These are private to the dma-mapping API.  Do not use directly.
diff --git a/target/linux/cns3xxx/patches-4.19/020-watchdog_support.patch b/target/linux/cns3xxx/patches-4.19/020-watchdog_support.patch
deleted file mode 100644 (file)
index e626ff2..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-Add a watchdog driver for ARM MPcore processors.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -375,6 +375,13 @@ config KS8695_WATCHDOG
-         Watchdog timer embedded into KS8695 processor. This will reboot your
-         system when the timeout is reached.
-+config MPCORE_WATCHDOG
-+      tristate "MPcore watchdog"
-+      depends on HAVE_ARM_TWD
-+      select WATCHDOG_CORE
-+      help
-+        Watchdog timer embedded into the MPcore system
-+
- config HAVE_S3C2410_WATCHDOG
-       bool
-       help
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -49,6 +49,7 @@ obj-$(CONFIG_977_WATCHDOG) += wdt977.o
- obj-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o
- obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
- obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o
-+obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
- obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
- obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
- obj-$(CONFIG_SAMA5D4_WATCHDOG) += sama5d4_wdt.o
---- /dev/null
-+++ b/drivers/watchdog/mpcore_wdt.c
-@@ -0,0 +1,118 @@
-+/*
-+ * Watchdog driver for ARM MPcore
-+ *
-+ * Copyright (C) 2017 Felix Fietkau <nbd@nbd.name>
-+ */
-+
-+#include <linux/export.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/watchdog.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <asm/smp_twd.h>
-+
-+static void __iomem *wdt_base;
-+static int wdt_timeout = 60;
-+
-+static int mpcore_wdt_keepalive(struct watchdog_device *wdd)
-+{
-+      static int perturb;
-+      u32 count;
-+
-+      count = (twd_timer_get_rate() / 256) * wdt_timeout;
-+
-+      /* Reload register needs a different value on each refresh */
-+      count += perturb;
-+      perturb = !perturb;
-+
-+      iowrite32(count, wdt_base + TWD_WDOG_LOAD);
-+
-+      return 0;
-+}
-+
-+static int mpcore_wdt_start(struct watchdog_device *wdd)
-+{
-+      mpcore_wdt_keepalive(wdd);
-+
-+      /* prescale = 256, mode = 1, enable = 1 */
-+      iowrite32(0x0000FF09, wdt_base + TWD_WDOG_CONTROL);
-+
-+      return 0;
-+}
-+
-+static int mpcore_wdt_stop(struct watchdog_device *wdd)
-+{
-+      iowrite32(0x12345678, wdt_base + TWD_WDOG_DISABLE);
-+      iowrite32(0x87654321, wdt_base + TWD_WDOG_DISABLE);
-+      iowrite32(0x0, wdt_base + TWD_WDOG_CONTROL);
-+
-+      return 0;
-+}
-+
-+static int mpcore_wdt_set_timeout(struct watchdog_device *wdd,
-+                               unsigned int timeout)
-+{
-+      mpcore_wdt_stop(wdd);
-+      wdt_timeout = timeout;
-+      mpcore_wdt_start(wdd);
-+
-+      return 0;
-+}
-+
-+static const struct watchdog_info mpcore_wdt_info = {
-+      .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
-+      .identity = "MPcore Watchdog",
-+};
-+
-+static const struct watchdog_ops mpcore_wdt_ops = {
-+      .owner = THIS_MODULE,
-+      .start = mpcore_wdt_start,
-+      .stop  = mpcore_wdt_stop,
-+      .ping  = mpcore_wdt_keepalive,
-+      .set_timeout = mpcore_wdt_set_timeout,
-+};
-+
-+static struct watchdog_device mpcore_wdt = {
-+      .info = &mpcore_wdt_info,
-+      .ops = &mpcore_wdt_ops,
-+      .min_timeout = 1,
-+      .max_timeout = 65535,
-+};
-+
-+static int mpcore_wdt_probe(struct platform_device *pdev)
-+{
-+      struct resource *res;
-+      unsigned long rate = twd_timer_get_rate();
-+
-+      pr_info("MPCore WD init. clockrate: %lu prescaler: %u countrate: %lu timeout: %us\n", rate, 256, rate / 256, wdt_timeout);
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!res)
-+              return -ENODEV;
-+
-+      wdt_base = devm_ioremap_resource(&pdev->dev, res);
-+      if (IS_ERR(wdt_base))
-+              return PTR_ERR(wdt_base);
-+
-+      watchdog_register_device(&mpcore_wdt);
-+      return 0;
-+}
-+
-+static int mpcore_wdt_remove(struct platform_device *dev)
-+{
-+      watchdog_unregister_device(&mpcore_wdt);
-+      return 0;
-+}
-+
-+static struct platform_driver mpcore_wdt_driver = {
-+      .probe          = mpcore_wdt_probe,
-+      .remove         = mpcore_wdt_remove,
-+      .driver         = {
-+              .name   = "mpcore_wdt",
-+      },
-+};
-+
-+module_platform_driver(mpcore_wdt_driver);
-+MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
-+MODULE_LICENSE("GPL");
---- a/arch/arm/include/asm/smp_twd.h
-+++ b/arch/arm/include/asm/smp_twd.h
-@@ -34,5 +34,6 @@ struct twd_local_timer name __initdata =
- };
- int twd_local_timer_register(struct twd_local_timer *);
-+unsigned long twd_timer_get_rate(void);
- #endif
---- a/arch/arm/kernel/smp_twd.c
-+++ b/arch/arm/kernel/smp_twd.c
-@@ -15,6 +15,7 @@
- #include <linux/delay.h>
- #include <linux/device.h>
- #include <linux/err.h>
-+#include <linux/export.h>
- #include <linux/smp.h>
- #include <linux/jiffies.h>
- #include <linux/clockchips.h>
-@@ -380,6 +381,14 @@ int __init twd_local_timer_register(stru
-       return twd_local_timer_common_register(NULL);
- }
-+/* Needed by mpcore_wdt */
-+unsigned long twd_timer_get_rate(void)
-+{
-+      return twd_timer_rate;
-+}
-+EXPORT_SYMBOL_GPL(twd_timer_get_rate);
-+
-+
- #ifdef CONFIG_OF
- static int __init twd_local_timer_of_register(struct device_node *np)
- {
diff --git a/target/linux/cns3xxx/patches-4.19/025-smp_support.patch b/target/linux/cns3xxx/patches-4.19/025-smp_support.patch
deleted file mode 100644 (file)
index dc8e4b0..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/arm/mach-cns3xxx/Makefile
-+++ b/arch/arm/mach-cns3xxx/Makefile
-@@ -6,3 +6,5 @@ cns3xxx-y                              += core.o pm.o
- cns3xxx-$(CONFIG_ATAGS)                       += devices.o
- cns3xxx-$(CONFIG_PCI)                 += pcie.o
- cns3xxx-$(CONFIG_MACH_CNS3420VB)      += cns3420vb.o
-+cns3xxx-$(CONFIG_SMP)                 += platsmp.o headsmp.o
-+cns3xxx-$(CONFIG_HOTPLUG_CPU)         += hotplug.o
---- a/arch/arm/mach-cns3xxx/Kconfig
-+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -3,6 +3,9 @@ menuconfig ARCH_CNS3XXX
-       bool "Cavium Networks CNS3XXX family"
-       depends on ARCH_MULTI_V6
-       select ARM_GIC
-+      select HAVE_ARM_SCU if SMP
-+      select HAVE_ARM_TWD
-+      select HAVE_SMP
-       help
-         Support for Cavium Networks CNS3XXX platform.
---- a/arch/arm/mach-cns3xxx/core.h
-+++ b/arch/arm/mach-cns3xxx/core.h
-@@ -13,6 +13,7 @@
- #include <linux/reboot.h>
-+extern struct smp_operations cns3xxx_smp_ops;
- extern void cns3xxx_timer_init(void);
- #ifdef CONFIG_CACHE_L2X0
diff --git a/target/linux/cns3xxx/patches-4.19/030-pcie_clock.patch b/target/linux/cns3xxx/patches-4.19/030-pcie_clock.patch
deleted file mode 100644 (file)
index 66c3a99..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -281,8 +281,6 @@ void __init cns3xxx_pcie_init_late(void)
-                       "imprecise external abort");
-       for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) {
--              cns3xxx_pwr_clk_en(0x1 << PM_CLK_GATE_REG_OFFSET_PCIE(i));
--              cns3xxx_pwr_soft_rst(0x1 << PM_SOFT_RST_REG_OFFST_PCIE(i));
-               cns3xxx_pcie_check_link(&cns3xxx_pcie[i]);
-               cns3xxx_pcie_hw_init(&cns3xxx_pcie[i]);
-               private_data = &cns3xxx_pcie[i];
diff --git a/target/linux/cns3xxx/patches-4.19/040-fiq_support.patch b/target/linux/cns3xxx/patches-4.19/040-fiq_support.patch
deleted file mode 100644 (file)
index bee8c1e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/arch/arm/mach-cns3xxx/Kconfig
-+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -6,6 +6,7 @@ menuconfig ARCH_CNS3XXX
-       select HAVE_ARM_SCU if SMP
-       select HAVE_ARM_TWD
-       select HAVE_SMP
-+      select FIQ
-       help
-         Support for Cavium Networks CNS3XXX platform.
---- a/arch/arm/mach-cns3xxx/Makefile
-+++ b/arch/arm/mach-cns3xxx/Makefile
-@@ -6,5 +6,5 @@ cns3xxx-y                              += core.o pm.o
- cns3xxx-$(CONFIG_ATAGS)                       += devices.o
- cns3xxx-$(CONFIG_PCI)                 += pcie.o
- cns3xxx-$(CONFIG_MACH_CNS3420VB)      += cns3420vb.o
--cns3xxx-$(CONFIG_SMP)                 += platsmp.o headsmp.o
-+cns3xxx-$(CONFIG_SMP)                 += platsmp.o headsmp.o cns3xxx_fiq.o
- cns3xxx-$(CONFIG_HOTPLUG_CPU)         += hotplug.o
---- a/arch/arm/mach-cns3xxx/cns3xxx.h
-+++ b/arch/arm/mach-cns3xxx/cns3xxx.h
-@@ -261,6 +261,7 @@
- #define MISC_PCIE_INT_MASK(x)                 MISC_MEM_MAP(0x978 + (x) * 0x100)
- #define MISC_PCIE_INT_STATUS(x)                       MISC_MEM_MAP(0x97C + (x) * 0x100)
-+#define MISC_FIQ_CPU(x)                               MISC_MEM_MAP(0xA58 - (x) * 0x4)
- /*
-  * Power management and clock control
-  */
---- a/arch/arm/mm/Kconfig
-+++ b/arch/arm/mm/Kconfig
-@@ -899,7 +899,7 @@ config VDSO
- config DMA_CACHE_RWFO
-       bool "Enable read/write for ownership DMA cache maintenance"
--      depends on CPU_V6K && SMP
-+      depends on CPU_V6K && SMP && !ARCH_CNS3XXX
-       default y
-       help
-         The Snoop Control Unit on ARM11MPCore does not detect the
diff --git a/target/linux/cns3xxx/patches-4.19/045-twd_base.patch b/target/linux/cns3xxx/patches-4.19/045-twd_base.patch
deleted file mode 100644 (file)
index e722b01..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -17,6 +17,7 @@
- #include <linux/platform_device.h>
- #include <linux/usb/ehci_pdriver.h>
- #include <linux/usb/ohci_pdriver.h>
-+#include <asm/smp_twd.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- #include <asm/mach/time.h>
-@@ -26,6 +27,8 @@
- #include "core.h"
- #include "pm.h"
-+#define IRQ_LOCALTIMER 29
-+
- static struct map_desc cns3xxx_io_desc[] __initdata = {
-       {
-               .virtual        = CNS3XXX_TC11MP_SCU_BASE_VIRT,
-@@ -198,6 +201,15 @@ static struct irqaction cns3xxx_timer_ir
-       .handler        = cns3xxx_timer_interrupt,
- };
-+static void __init cns3xxx_init_twd(void)
-+{
-+      static DEFINE_TWD_LOCAL_TIMER(cns3xx_twd_local_timer,
-+              CNS3XXX_TC11MP_TWD_BASE,
-+              IRQ_LOCALTIMER);
-+
-+      twd_local_timer_register(&cns3xx_twd_local_timer);
-+}
-+
- /*
-  * Set up the clock source and clock events devices
-  */
-@@ -251,6 +263,7 @@ static void __init __cns3xxx_timer_init(
-       setup_irq(timer_irq, &cns3xxx_timer_irq);
-       cns3xxx_clockevents_init(timer_irq);
-+      cns3xxx_init_twd();
- }
- void __init cns3xxx_timer_init(void)
diff --git a/target/linux/cns3xxx/patches-4.19/055-pcie_io.patch b/target/linux/cns3xxx/patches-4.19/055-pcie_io.patch
deleted file mode 100644 (file)
index 4680853..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -81,6 +81,16 @@ static struct map_desc cns3xxx_io_desc[]
-               .pfn            = __phys_to_pfn(CNS3XXX_PCIE1_CFG1_BASE),
-               .length         = SZ_16M,
-               .type           = MT_DEVICE,
-+      }, {
-+              .virtual        = CNS3XXX_PCIE0_IO_BASE_VIRT,
-+              .pfn            = __phys_to_pfn(CNS3XXX_PCIE0_IO_BASE),
-+              .length         = SZ_16M,
-+              .type           = MT_DEVICE,
-+      }, {
-+              .virtual        = CNS3XXX_PCIE1_IO_BASE_VIRT,
-+              .pfn            = __phys_to_pfn(CNS3XXX_PCIE1_IO_BASE),
-+              .length         = SZ_16M,
-+              .type           = MT_DEVICE,
- #endif
-       },
- };
diff --git a/target/linux/cns3xxx/patches-4.19/060-pcie_abort.patch b/target/linux/cns3xxx/patches-4.19/060-pcie_abort.patch
deleted file mode 100644 (file)
index 87b1526..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
---- a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -86,6 +86,79 @@ static void __iomem *cns3xxx_pci_map_bus
-       return base + where + (devfn << 12);
- }
-+static inline int check_master_abort(struct pci_bus *bus, unsigned int devfn, int where)
-+{
-+      struct cns3xxx_pcie *cnspci = pbus_to_cnspci(bus);
-+
-+  /* check PCI-compatible status register after access */
-+      if (cnspci->linked) {
-+              void __iomem *host_base;
-+              u32 sreg, ereg;
-+
-+              host_base = (void __iomem *) cnspci->cfg_bases[CNS3XXX_HOST_TYPE].virtual;
-+              sreg = __raw_readw(host_base + 0x6) & 0xF900;
-+              ereg = __raw_readl(host_base + 0x104); // Uncorrectable Error Status Reg
-+
-+              if (sreg | ereg) {
-+                      /* SREG:
-+                       *  BIT15 - Detected Parity Error
-+                       *  BIT14 - Signaled System Error
-+                       *  BIT13 - Received Master Abort
-+                       *  BIT12 - Received Target Abort
-+                       *  BIT11 - Signaled Target Abort
-+                       *  BIT08 - Master Data Parity Error
-+                       *
-+                       * EREG:
-+                       *  BIT20 - Unsupported Request
-+                       *  BIT19 - ECRC
-+                       *  BIT18 - Malformed TLP
-+                       *  BIT17 - Receiver Overflow
-+                       *  BIT16 - Unexpected Completion
-+                       *  BIT15 - Completer Abort
-+                       *  BIT14 - Completion Timeout
-+                       *  BIT13 - Flow Control Protocol Error
-+                       *  BIT12 - Poisoned TLP
-+                       *  BIT04 - Data Link Protocol Error
-+                       *
-+                       * TODO: see Documentation/pci-error-recovery.txt
-+                       *    implement error_detected handler
-+                       */
-+/*
-+                      printk("pci error: %04d:%02x:%02x.%02x sreg=0x%04x ereg=0x%08x", pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), sreg, ereg);
-+                      if (sreg & BIT(15)) printk(" <PERR");
-+                      if (sreg & BIT(14)) printk(" >SERR");
-+                      if (sreg & BIT(13)) printk(" <MABRT");
-+                      if (sreg & BIT(12)) printk(" <TABRT");
-+                      if (sreg & BIT(11)) printk(" >TABRT");
-+                      if (sreg & BIT( 8)) printk(" MPERR");
-+
-+                      if (ereg & BIT(20)) printk(" Unsup");
-+                      if (ereg & BIT(19)) printk(" ECRC");
-+                      if (ereg & BIT(18)) printk(" MTLP");
-+                      if (ereg & BIT(17)) printk(" OFLOW");
-+                      if (ereg & BIT(16)) printk(" Unex");
-+                      if (ereg & BIT(15)) printk(" ABRT");
-+                      if (ereg & BIT(14)) printk(" COMPTO");
-+                      if (ereg & BIT(13)) printk(" FLOW");
-+                      if (ereg & BIT(12)) printk(" PTLP");
-+                      if (ereg & BIT( 4)) printk(" DLINK");
-+                      printk("\n");
-+*/
-+                      pr_debug("%s failed port%d sreg=0x%04x\n", __func__,
-+                              pci_domain_nr(bus), sreg);
-+
-+                      /* make sure the status bits are reset */
-+                      __raw_writew(sreg, host_base + 6);
-+                      __raw_writel(ereg, host_base + 0x104);
-+                      return 1;
-+              }
-+      }
-+      else
-+              return 1;
-+
-+  return 0;
-+}
-+
- static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
-                                  int where, int size, u32 *val)
- {
-@@ -95,6 +168,11 @@ static int cns3xxx_pci_read_config(struc
-       ret = pci_generic_config_read(bus, devfn, where, size, val);
-+      if (check_master_abort(bus, devfn, where)) {
-+              printk(KERN_ERR "pci error: %04d:%02x:%02x.%02x %02x(%d)= master_abort on read\n", pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), where, size);
-+              return PCIBIOS_DEVICE_NOT_FOUND;
-+      }
-+
-       if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn &&
-           (where & 0xffc) == PCI_CLASS_REVISION)
-               /*
-@@ -257,8 +335,14 @@ static void __init cns3xxx_pcie_hw_init(
- static int cns3xxx_pcie_abort_handler(unsigned long addr, unsigned int fsr,
-                                     struct pt_regs *regs)
- {
-+#if 0
-+/* R14_ABORT = PC+4 for XSCALE but not ARM11MPCORE
-+ * ignore imprecise aborts and use PCI-compatible Status register to
-+ * determine errors instead
-+ */
-       if (fsr & (1 << 10))
-               regs->ARM_pc += 4;
-+#endif
-       return 0;
- }
diff --git a/target/linux/cns3xxx/patches-4.19/065-pcie_skip_inactive.patch b/target/linux/cns3xxx/patches-4.19/065-pcie_skip_inactive.patch
deleted file mode 100644 (file)
index b8b5f27..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -366,6 +366,8 @@ void __init cns3xxx_pcie_init_late(void)
-       for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) {
-               cns3xxx_pcie_check_link(&cns3xxx_pcie[i]);
-+              if (!cns3xxx_pcie[i].linked)
-+                      continue;
-               cns3xxx_pcie_hw_init(&cns3xxx_pcie[i]);
-               private_data = &cns3xxx_pcie[i];
-               pci_common_init(&hw_pci);
diff --git a/target/linux/cns3xxx/patches-4.19/070-i2c_support.patch b/target/linux/cns3xxx/patches-4.19/070-i2c_support.patch
deleted file mode 100644 (file)
index 9bfb844..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -459,6 +459,18 @@ config I2C_CBUS_GPIO
-         This driver can also be built as a module.  If so, the module
-         will be called i2c-cbus-gpio.
-+config I2C_CNS3XXX
-+      tristate "Cavium CNS3xxx I2C driver"
-+      depends on ARCH_CNS3XXX
-+      help
-+        Support for Cavium CNS3xxx I2C controller driver.
-+
-+        This driver can also be built as a module.  If so, the module
-+        will be called i2c-cns3xxx.
-+
-+        Please note that this driver might be needed to bring up other
-+        devices such as Cavium CNS3xxx Ethernet.
-+
- config I2C_CPM
-       tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)"
-       depends on CPM1 || CPM2
---- a/drivers/i2c/busses/Makefile
-+++ b/drivers/i2c/busses/Makefile
-@@ -131,6 +131,7 @@ obj-$(CONFIG_I2C_VIPERBOARD)       += i2c-vipe
- obj-$(CONFIG_I2C_ACORN)               += i2c-acorn.o
- obj-$(CONFIG_I2C_BCM_KONA)    += i2c-bcm-kona.o
- obj-$(CONFIG_I2C_BRCMSTB)     += i2c-brcmstb.o
-+obj-$(CONFIG_I2C_CNS3XXX)     += i2c-cns3xxx.o
- obj-$(CONFIG_I2C_CROS_EC_TUNNEL)      += i2c-cros-ec-tunnel.o
- obj-$(CONFIG_I2C_ELEKTOR)     += i2c-elektor.o
- obj-$(CONFIG_I2C_MLXCPLD)     += i2c-mlxcpld.o
diff --git a/target/linux/cns3xxx/patches-4.19/075-spi_support.patch b/target/linux/cns3xxx/patches-4.19/075-spi_support.patch
deleted file mode 100644 (file)
index afa6d86..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -181,6 +181,13 @@ config SPI_CLPS711X
-         This enables dedicated general purpose SPI/Microwire1-compatible
-         master mode interface (SSI1) for CLPS711X-based CPUs.
-+config SPI_CNS3XXX
-+      tristate "CNS3XXX SPI controller"
-+      depends on ARCH_CNS3XXX && SPI_MASTER
-+      select SPI_BITBANG
-+      help
-+        This enables using the CNS3XXX SPI controller in master mode.
-+
- config SPI_COLDFIRE_QSPI
-       tristate "Freescale Coldfire QSPI controller"
-       depends on (M520x || M523x || M5249 || M525x || M527x || M528x || M532x)
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_SPI_BITBANG)            += spi-bitban
- obj-$(CONFIG_SPI_BUTTERFLY)           += spi-butterfly.o
- obj-$(CONFIG_SPI_CADENCE)             += spi-cadence.o
- obj-$(CONFIG_SPI_CLPS711X)            += spi-clps711x.o
-+obj-$(CONFIG_SPI_CNS3XXX)             += spi-cns3xxx.o
- obj-$(CONFIG_SPI_COLDFIRE_QSPI)               += spi-coldfire-qspi.o
- obj-$(CONFIG_SPI_DAVINCI)             += spi-davinci.o
- obj-$(CONFIG_SPI_DLN2)                        += spi-dln2.o
---- a/include/linux/spi/spi.h
-+++ b/include/linux/spi/spi.h
-@@ -795,6 +795,10 @@ struct spi_transfer {
-       u32             speed_hz;
-       struct list_head transfer_list;
-+
-+#ifdef CONFIG_ARCH_CNS3XXX
-+      unsigned        last_in_message_list;
-+#endif
- };
- /**
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -1020,6 +1020,9 @@ static int spi_transfer_one_message(stru
-       list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-               trace_spi_transfer_start(msg, xfer);
-+              xfer->last_in_message_list =
-+                      list_is_last(&xfer->transfer_list, &msg->transfers);
-+
-               spi_statistics_add_transfer_stats(statm, xfer, ctlr);
-               spi_statistics_add_transfer_stats(stats, xfer, ctlr);
diff --git a/target/linux/cns3xxx/patches-4.19/080-sata_support.patch b/target/linux/cns3xxx/patches-4.19/080-sata_support.patch
deleted file mode 100644 (file)
index 2087191..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/ata/ahci_platform.c
-+++ b/drivers/ata/ahci_platform.c
-@@ -37,12 +37,23 @@ static struct scsi_host_template ahci_pl
-       AHCI_SHT(DRV_NAME),
- };
-+static const struct ata_port_info cns3xxx_port_info = {
-+      .flags          = AHCI_FLAG_COMMON,
-+      .pio_mask       = ATA_PIO4,
-+      .udma_mask      = ATA_UDMA6,
-+      .port_ops       = &ahci_pmp_retry_srst_ops,
-+};
-+
- static int ahci_probe(struct platform_device *pdev)
- {
-       struct device *dev = &pdev->dev;
-       struct ahci_host_priv *hpriv;
-+      const struct ata_port_info *info = &ahci_port_info;
-       int rc;
-+      if (IS_ENABLED(CONFIG_ARCH_CNS3XXX))
-+              info = &cns3xxx_port_info;
-+
-       hpriv = ahci_platform_get_resources(pdev,
-                                           AHCI_PLATFORM_GET_RESETS);
-       if (IS_ERR(hpriv))
diff --git a/target/linux/cns3xxx/patches-4.19/090-timers.patch b/target/linux/cns3xxx/patches-4.19/090-timers.patch
deleted file mode 100644 (file)
index b3810f8..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -138,6 +138,7 @@ static int cns3xxx_set_oneshot(struct cl
-       /* period set, and timer enabled in 'next_event' hook */
-       ctrl |= (1 << 2) | (1 << 9);
-+      writel(0, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET);
-       writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
-       return 0;
- }
-@@ -148,7 +149,7 @@ static int cns3xxx_set_periodic(struct c
-       int pclk = cns3xxx_cpu_clock() / 8;
-       int reload;
--      reload = pclk * 20 / (3 * HZ) * 0x25000;
-+      reload = pclk * 1000000 / HZ;
-       writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET);
-       ctrl |= (1 << 0) | (1 << 2) | (1 << 9);
-       writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
-@@ -175,8 +176,8 @@ static struct clock_event_device cns3xxx
-       .set_state_oneshot      = cns3xxx_set_oneshot,
-       .tick_resume            = cns3xxx_shutdown,
-       .set_next_event         = cns3xxx_timer_set_next_event,
--      .rating                 = 350,
--      .cpumask                = cpu_all_mask,
-+      .rating                 = 300,
-+      .cpumask                = cpu_possible_mask,
- };
- static void __init cns3xxx_clockevents_init(unsigned int timer_irq)
-@@ -220,6 +221,32 @@ static void __init cns3xxx_init_twd(void
-       twd_local_timer_register(&cns3xx_twd_local_timer);
- }
-+static u64 cns3xxx_get_cycles(struct clocksource *cs)
-+{
-+  u64 val;
-+
-+  val = readl(cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET);
-+  val &= 0xffff;
-+
-+  return ((val << 32) | readl(cns3xxx_tmr1 + TIMER_FREERUN_OFFSET));
-+}
-+
-+static struct clocksource clocksource_cns3xxx = {
-+      .name = "freerun",
-+      .rating = 200,
-+      .read = cns3xxx_get_cycles,
-+      .mask = CLOCKSOURCE_MASK(48),
-+      .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
-+};
-+
-+static void __init cns3xxx_clocksource_init(void)
-+{
-+      /* Reset the FreeRunning counter */
-+      writel((1 << 16), cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET);
-+
-+      clocksource_register_khz(&clocksource_cns3xxx, 100);
-+}
-+
- /*
-  * Set up the clock source and clock events devices
-  */
-@@ -237,13 +264,12 @@ static void __init __cns3xxx_timer_init(
-       /* stop free running timer3 */
-       writel(0, cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET);
--      /* timer1 */
--      writel(0x5C800, cns3xxx_tmr1 + TIMER1_COUNTER_OFFSET);
--      writel(0x5C800, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET);
--
-       writel(0, cns3xxx_tmr1 + TIMER1_MATCH_V1_OFFSET);
-       writel(0, cns3xxx_tmr1 + TIMER1_MATCH_V2_OFFSET);
-+      val = (cns3xxx_cpu_clock() >> 3) * 1000000 / HZ;
-+      writel(val, cns3xxx_tmr1 + TIMER1_COUNTER_OFFSET);
-+
-       /* mask irq, non-mask timer1 overflow */
-       irq_mask = readl(cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET);
-       irq_mask &= ~(1 << 2);
-@@ -255,23 +281,9 @@ static void __init __cns3xxx_timer_init(
-       val |= (1 << 9);
-       writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
--      /* timer2 */
--      writel(0, cns3xxx_tmr1 + TIMER2_MATCH_V1_OFFSET);
--      writel(0, cns3xxx_tmr1 + TIMER2_MATCH_V2_OFFSET);
--
--      /* mask irq */
--      irq_mask = readl(cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET);
--      irq_mask |= ((1 << 3) | (1 << 4) | (1 << 5));
--      writel(irq_mask, cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET);
--
--      /* down counter */
--      val = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
--      val |= (1 << 10);
--      writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
--
--      /* Make irqs happen for the system timer */
-       setup_irq(timer_irq, &cns3xxx_timer_irq);
-+      cns3xxx_clocksource_init();
-       cns3xxx_clockevents_init(timer_irq);
-       cns3xxx_init_twd();
- }
diff --git a/target/linux/cns3xxx/patches-4.19/093-add-virt-pci-io-mapping.patch b/target/linux/cns3xxx/patches-4.19/093-add-virt-pci-io-mapping.patch
deleted file mode 100644 (file)
index 0fa7ed4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/arch/arm/mach-cns3xxx/cns3xxx.h
-+++ b/arch/arm/mach-cns3xxx/cns3xxx.h
-@@ -162,11 +162,13 @@
- #define CNS3XXX_L2C_BASE                      0x92000000      /* L2 Cache Control */
- #define CNS3XXX_PCIE0_MEM_BASE                        0xA0000000      /* PCIe Port 0 IO/Memory Space */
-+#define CNS3XXX_PCIE0_MEM_BASE_VIRT           0xE0000000
- #define CNS3XXX_PCIE0_HOST_BASE                       0xAB000000      /* PCIe Port 0 RC Base */
- #define CNS3XXX_PCIE0_HOST_BASE_VIRT          0xE1000000
- #define CNS3XXX_PCIE0_IO_BASE                 0xAC000000      /* PCIe Port 0 */
-+#define CNS3XXX_PCIE0_IO_BASE_VIRT            0xE2000000
- #define CNS3XXX_PCIE0_CFG0_BASE                       0xAD000000      /* PCIe Port 0 CFG Type 0 */
- #define CNS3XXX_PCIE0_CFG0_BASE_VIRT          0xE3000000
-@@ -175,13 +177,16 @@
- #define CNS3XXX_PCIE0_CFG1_BASE_VIRT          0xE4000000
- #define CNS3XXX_PCIE0_MSG_BASE                        0xAF000000      /* PCIe Port 0 Message Space */
-+#define CNS3XXX_PCIE0_MSG_BASE_VIRT           0xE5000000
- #define CNS3XXX_PCIE1_MEM_BASE                        0xB0000000      /* PCIe Port 1 IO/Memory Space */
-+#define CNS3XXX_PCIE1_MEM_BASE_VIRT           0xE8000000
- #define CNS3XXX_PCIE1_HOST_BASE                       0xBB000000      /* PCIe Port 1 RC Base */
- #define CNS3XXX_PCIE1_HOST_BASE_VIRT          0xE9000000
- #define CNS3XXX_PCIE1_IO_BASE                 0xBC000000      /* PCIe Port 1 */
-+#define CNS3XXX_PCIE1_IO_BASE_VIRT            0xEA000000
- #define CNS3XXX_PCIE1_CFG0_BASE                       0xBD000000      /* PCIe Port 1 CFG Type 0 */
- #define CNS3XXX_PCIE1_CFG0_BASE_VIRT          0xEB000000
-@@ -190,6 +195,7 @@
- #define CNS3XXX_PCIE1_CFG1_BASE_VIRT          0xEC000000
- #define CNS3XXX_PCIE1_MSG_BASE                        0xBF000000      /* PCIe Port 1 Message Space */
-+#define CNS3XXX_PCIE1_MSG_BASE_VIRT           0xED000000
- /*
-  * Testchip peripheral and fpga gic regions
diff --git a/target/linux/cns3xxx/patches-4.19/095-gpio_support.patch b/target/linux/cns3xxx/patches-4.19/095-gpio_support.patch
deleted file mode 100644 (file)
index 8345f2f..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/arch/arm/mach-cns3xxx/cns3420vb.c
-+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
-@@ -223,6 +223,10 @@ static void __init cns3420_init(void)
-       cns3xxx_ahci_init();
-       cns3xxx_sdhci_init();
-+      cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA,
-+              NR_IRQS_CNS3XXX);
-+      cns3xxx_gpio_init(32, 32, CNS3XXX_GPIOB_BASE_VIRT, IRQ_CNS3XXX_GPIOB,
-+              NR_IRQS_CNS3XXX + 32);
-       pm_power_off = cns3xxx_power_off;
- }
---- a/arch/arm/mach-cns3xxx/Kconfig
-+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -3,6 +3,8 @@ menuconfig ARCH_CNS3XXX
-       bool "Cavium Networks CNS3XXX family"
-       depends on ARCH_MULTI_V6
-       select ARM_GIC
-+      select ARCH_REQUIRE_GPIOLIB
-+      select GENERIC_IRQ_CHIP
-       select HAVE_ARM_SCU if SMP
-       select HAVE_ARM_TWD
-       select HAVE_SMP
---- a/arch/arm/mach-cns3xxx/Makefile
-+++ b/arch/arm/mach-cns3xxx/Makefile
-@@ -2,7 +2,7 @@
- ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
- obj-$(CONFIG_ARCH_CNS3XXX)            += cns3xxx.o
--cns3xxx-y                             += core.o pm.o
-+cns3xxx-y                             += core.o pm.o gpio.o
- cns3xxx-$(CONFIG_ATAGS)                       += devices.o
- cns3xxx-$(CONFIG_PCI)                 += pcie.o
- cns3xxx-$(CONFIG_MACH_CNS3420VB)      += cns3420vb.o
---- a/arch/arm/mach-cns3xxx/cns3xxx.h
-+++ b/arch/arm/mach-cns3xxx/cns3xxx.h
-@@ -68,8 +68,10 @@
- #define SMC_PCELL_ID_3_OFFSET                 0xFFC
- #define CNS3XXX_GPIOA_BASE                    0x74000000      /* GPIO port A */
-+#define CNS3XXX_GPIOA_BASE_VIRT                       0xFB006000
- #define CNS3XXX_GPIOB_BASE                    0x74800000      /* GPIO port B */
-+#define CNS3XXX_GPIOB_BASE_VIRT                       0xFB007000
- #define CNS3XXX_RTC_BASE                      0x75000000      /* Real Time Clock */
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -50,6 +50,16 @@ static struct map_desc cns3xxx_io_desc[]
-               .pfn            = __phys_to_pfn(CNS3XXX_PM_BASE),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-+      }, {
-+              .virtual        = CNS3XXX_GPIOA_BASE_VIRT,
-+              .pfn            = __phys_to_pfn(CNS3XXX_GPIOA_BASE),
-+              .length         = SZ_4K,
-+              .type           = MT_DEVICE,
-+      }, {
-+              .virtual        = CNS3XXX_GPIOB_BASE_VIRT,
-+              .pfn            = __phys_to_pfn(CNS3XXX_GPIOB_BASE),
-+              .length         = SZ_4K,
-+              .type           = MT_DEVICE,
- #ifdef CONFIG_PCI
-       }, {
-               .virtual        = CNS3XXX_PCIE0_HOST_BASE_VIRT,
diff --git a/target/linux/cns3xxx/patches-4.19/097-l2x0_cmdline_disable.patch b/target/linux/cns3xxx/patches-4.19/097-l2x0_cmdline_disable.patch
deleted file mode 100644 (file)
index b4720b1..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -307,13 +307,26 @@ void __init cns3xxx_timer_init(void)
- #ifdef CONFIG_CACHE_L2X0
--void __init cns3xxx_l2x0_init(void)
-+static int cns3xxx_l2x0_enable = 1;
-+
-+static int __init cns3xxx_l2x0_disable(char *s)
-+{
-+      cns3xxx_l2x0_enable = 0;
-+      return 1;
-+}
-+__setup("nol2x0", cns3xxx_l2x0_disable);
-+
-+static int __init cns3xxx_l2x0_init(void)
- {
--      void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
-+      void __iomem *base;
-       u32 val;
-+      if (!cns3xxx_l2x0_enable)
-+              return 0;
-+
-+      base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
-       if (WARN_ON(!base))
--              return;
-+              return 0;
-       /*
-        * Tag RAM Control register
-@@ -343,7 +356,10 @@ void __init cns3xxx_l2x0_init(void)
-       /* 32 KiB, 8-way, parity disable */
-       l2x0_init(base, 0x00500000, 0xfe0f0fff);
-+
-+      return 0;
- }
-+arch_initcall(cns3xxx_l2x0_init);
- #endif /* CONFIG_CACHE_L2X0 */
---- a/arch/arm/mach-cns3xxx/cns3420vb.c
-+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
-@@ -217,8 +217,6 @@ static struct platform_device *cns3420_p
- static void __init cns3420_init(void)
- {
--      cns3xxx_l2x0_init();
--
-       platform_add_devices(cns3420_pdevs, ARRAY_SIZE(cns3420_pdevs));
-       cns3xxx_ahci_init();
---- a/arch/arm/mach-cns3xxx/core.h
-+++ b/arch/arm/mach-cns3xxx/core.h
-@@ -16,12 +16,6 @@
- extern struct smp_operations cns3xxx_smp_ops;
- extern void cns3xxx_timer_init(void);
--#ifdef CONFIG_CACHE_L2X0
--void __init cns3xxx_l2x0_init(void);
--#else
--static inline void cns3xxx_l2x0_init(void) {}
--#endif /* CONFIG_CACHE_L2X0 */
--
- #ifdef CONFIG_PCI
- extern void __init cns3xxx_pcie_init_late(void);
- #else
diff --git a/target/linux/cns3xxx/patches-4.19/100-laguna_support.patch b/target/linux/cns3xxx/patches-4.19/100-laguna_support.patch
deleted file mode 100644 (file)
index c0160d8..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/arch/arm/mach-cns3xxx/Kconfig
-+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -23,4 +23,12 @@ config MACH_CNS3420VB
-         This is a platform with an on-board ARM11 MPCore and has support
-         for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
-+config MACH_GW2388
-+      bool "Support for Gateworks Laguna Platform"
-+      help
-+        Include support for the Gateworks Laguna Platform
-+
-+        This is a platform with an on-board ARM11 MPCore and has support
-+        for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, I2C, GIG, etc.
-+
- endif
---- a/arch/arm/mach-cns3xxx/Makefile
-+++ b/arch/arm/mach-cns3xxx/Makefile
-@@ -8,3 +8,5 @@ cns3xxx-$(CONFIG_PCI)                  += pcie.o
- cns3xxx-$(CONFIG_MACH_CNS3420VB)      += cns3420vb.o
- cns3xxx-$(CONFIG_SMP)                 += platsmp.o headsmp.o cns3xxx_fiq.o
- cns3xxx-$(CONFIG_HOTPLUG_CPU)         += hotplug.o
-+cns3xxx-$(CONFIG_MACH_GW2388)         += laguna.o
-+
---- a/arch/arm/mach-cns3xxx/devices.c
-+++ b/arch/arm/mach-cns3xxx/devices.c
-@@ -16,6 +16,7 @@
- #include <linux/compiler.h>
- #include <linux/dma-mapping.h>
- #include <linux/platform_device.h>
-+#include <asm/mach-types.h>
- #include "cns3xxx.h"
- #include "pm.h"
- #include "core.h"
-@@ -101,7 +102,11 @@ void __init cns3xxx_sdhci_init(void)
-       u32 gpioa_pins = __raw_readl(gpioa);
-       /* MMC/SD pins share with GPIOA */
--      gpioa_pins |= 0x1fff0004;
-+      if (machine_is_gw2388()) {
-+              gpioa_pins |= 0x1fff0000;
-+      } else {
-+              gpioa_pins |= 0x1fff0004;
-+      }
-       __raw_writel(gpioa_pins, gpioa);
-       cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO));
diff --git a/target/linux/cns3xxx/patches-4.19/101-laguna_sdhci_card_detect.patch b/target/linux/cns3xxx/patches-4.19/101-laguna_sdhci_card_detect.patch
deleted file mode 100644 (file)
index 72648a5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/drivers/mmc/host/sdhci-cns3xxx.c
-+++ b/drivers/mmc/host/sdhci-cns3xxx.c
-@@ -88,9 +88,9 @@ static const struct sdhci_pltfm_data sdh
-       .ops = &sdhci_cns3xxx_ops,
-       .quirks = SDHCI_QUIRK_BROKEN_DMA |
-                 SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
--                SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
-                 SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
--                SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
-+                SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
-+                SDHCI_QUIRK_BROKEN_CARD_DETECTION,
- };
- static int sdhci_cns3xxx_probe(struct platform_device *pdev)
diff --git a/target/linux/cns3xxx/patches-4.19/110-pci_isolated_interrupts.patch b/target/linux/cns3xxx/patches-4.19/110-pci_isolated_interrupts.patch
deleted file mode 100644 (file)
index 800be81..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -18,6 +18,7 @@
- #include <linux/io.h>
- #include <linux/ioport.h>
- #include <linux/interrupt.h>
-+#include <linux/irq.h>
- #include <linux/ptrace.h>
- #include <asm/mach/map.h>
- #include "cns3xxx.h"
-@@ -27,7 +28,7 @@ struct cns3xxx_pcie {
-       void __iomem *host_regs; /* PCI config registers for host bridge */
-       void __iomem *cfg0_regs; /* PCI Type 0 config registers */
-       void __iomem *cfg1_regs; /* PCI Type 1 config registers */
--      unsigned int irqs[2];
-+      unsigned int irqs[5];
-       struct resource res_io;
-       struct resource res_mem;
-       int port;
-@@ -95,7 +96,7 @@ static inline int check_master_abort(str
-               void __iomem *host_base;
-               u32 sreg, ereg;
--              host_base = (void __iomem *) cnspci->cfg_bases[CNS3XXX_HOST_TYPE].virtual;
-+              host_base = (void __iomem *) cnspci->host_regs;
-               sreg = __raw_readw(host_base + 0x6) & 0xF900;
-               ereg = __raw_readl(host_base + 0x104); // Uncorrectable Error Status Reg
-@@ -209,7 +210,7 @@ static struct pci_ops cns3xxx_pcie_ops =
- static int cns3xxx_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
- {
-       struct cns3xxx_pcie *cnspci = pdev_to_cnspci(dev);
--      int irq = cnspci->irqs[!!dev->bus->number];
-+      int irq = cnspci->irqs[!!dev->bus->number + pin - 1];
-       pr_info("PCIe map irq: %04d:%02x:%02x.%02x slot %d, pin %d, irq: %d\n",
-               pci_domain_nr(dev->bus), dev->bus->number, PCI_SLOT(dev->devfn),
-@@ -235,7 +236,13 @@ static struct cns3xxx_pcie cns3xxx_pcie[
-                       .end = CNS3XXX_PCIE0_HOST_BASE - 1, /* 176 MiB */
-                       .flags = IORESOURCE_MEM,
-               },
--              .irqs = { IRQ_CNS3XXX_PCIE0_RC, IRQ_CNS3XXX_PCIE0_DEVICE, },
-+              .irqs = {
-+                      IRQ_CNS3XXX_PCIE0_RC,
-+                      IRQ_CNS3XXX_PCIE0_DEVICE,
-+                      IRQ_CNS3XXX_PCIE0_DEVICE,
-+                      IRQ_CNS3XXX_PCIE0_DEVICE,
-+                      IRQ_CNS3XXX_PCIE0_DEVICE,
-+              },
-               .port = 0,
-       },
-       [1] = {
-@@ -254,7 +261,13 @@ static struct cns3xxx_pcie cns3xxx_pcie[
-                       .end = CNS3XXX_PCIE1_HOST_BASE - 1, /* 176 MiB */
-                       .flags = IORESOURCE_MEM,
-               },
--              .irqs = { IRQ_CNS3XXX_PCIE1_RC, IRQ_CNS3XXX_PCIE1_DEVICE, },
-+              .irqs = {
-+                      IRQ_CNS3XXX_PCIE1_RC,
-+                      IRQ_CNS3XXX_PCIE1_DEVICE,
-+                      IRQ_CNS3XXX_PCIE1_DEVICE,
-+                      IRQ_CNS3XXX_PCIE1_DEVICE,
-+                      IRQ_CNS3XXX_PCIE1_DEVICE,
-+              },
-               .port = 1,
-       },
- };
-@@ -346,6 +359,14 @@ static int cns3xxx_pcie_abort_handler(un
-       return 0;
- }
-+void __init cns3xxx_pcie_set_irqs(int bus, int *irqs)
-+{
-+      int i;
-+
-+      for (i = 0; i < 4; i++)
-+              cns3xxx_pcie[bus].irqs[i + 1] = irqs[i];
-+}
-+
- void __init cns3xxx_pcie_init_late(void)
- {
-       int i;
---- a/arch/arm/mach-cns3xxx/core.h
-+++ b/arch/arm/mach-cns3xxx/core.h
-@@ -18,8 +18,10 @@ extern void cns3xxx_timer_init(void);
- #ifdef CONFIG_PCI
- extern void __init cns3xxx_pcie_init_late(void);
-+extern void __init cns3xxx_pcie_set_irqs(int bus, int *irqs);
- #else
- static inline void __init cns3xxx_pcie_init_late(void) {}
-+static inline void cns3xxx_pcie_set_irqs(int bus, int *irqs) {}
- #endif
- void __init cns3xxx_map_io(void);
diff --git a/target/linux/cns3xxx/patches-4.19/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch b/target/linux/cns3xxx/patches-4.19/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
deleted file mode 100644 (file)
index 3276000..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/pci/probe.c
-+++ b/drivers/pci/probe.c
-@@ -2634,7 +2634,8 @@ static void pcie_write_mrrs(struct pci_d
-        * In the "safe" case, do not configure the MRRS.  There appear to be
-        * issues with setting MRRS to 0 on a number of devices.
-        */
--      if (pcie_bus_config != PCIE_BUS_PERFORMANCE)
-+      if (pcie_bus_config != PCIE_BUS_PERFORMANCE &&
-+          pcie_bus_config != PCIE_BUS_PEER2PEER)
-               return;
-       /*
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -868,7 +868,7 @@ enum pcie_bus_config_types {
-       PCIE_BUS_DEFAULT,       /* Ensure MPS matches upstream bridge */
-       PCIE_BUS_SAFE,          /* Use largest MPS boot-time devices support */
-       PCIE_BUS_PERFORMANCE,   /* Use MPS and MRRS for best performance */
--      PCIE_BUS_PEER2PEER,     /* Set MPS = 128 for all devices */
-+      PCIE_BUS_PEER2PEER,     /* set MPS and MRSS to 128 for all devices */
- };
- extern enum pcie_bus_config_types pcie_bus_config;
diff --git a/target/linux/cns3xxx/patches-4.19/200-broadcom_phy_reinit.patch b/target/linux/cns3xxx/patches-4.19/200-broadcom_phy_reinit.patch
deleted file mode 100644 (file)
index b0c3299..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -429,7 +429,11 @@ static int bcm5481_config_aneg(struct ph
-       ret = genphy_config_aneg(phydev);
-       /* Then we can set up the delay. */
--      bcm5481x_config(phydev);
-+      //bcm5481x_config(phydev);
-+
-+      phy_write(phydev, 0x18, 0xf1e7);
-+      phy_write(phydev, 0x1c, 0x8e00);
-+      phy_write(phydev, 0x1c, 0xa41f);
-       if (of_property_read_bool(np, "enet-phy-lane-swap")) {
-               /* Lane Swap - Undocumented register...magic! */
diff --git a/target/linux/cns3xxx/patches-4.19/210-dwc2_defaults.patch b/target/linux/cns3xxx/patches-4.19/210-dwc2_defaults.patch
deleted file mode 100644 (file)
index 5a5b17d..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/usb/dwc2/params.c
-+++ b/drivers/usb/dwc2/params.c
-@@ -151,6 +151,36 @@ static void dwc2_set_stm32f7_hsotg_param
-       p->host_perio_tx_fifo_size = 256;
- }
-+static void dwc2_set_cns3xxx_params(struct dwc2_hsotg *hsotg)
-+{
-+      struct dwc2_core_params *p = &hsotg->params;
-+
-+      p->otg_cap                      = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;    /* non-HNP/non-SRP capable */
-+      p->host_dma                     = 1;
-+      p->dma_desc_enable              = 0;
-+      p->speed                        = DWC2_SPEED_PARAM_HIGH;        /* High Speed */
-+      p->enable_dynamic_fifo          = 1;
-+      p->en_multiple_tx_fifo          = 1;
-+      p->host_rx_fifo_size            = 658;  /* 774 DWORDs */
-+      p->host_nperio_tx_fifo_size     = 128;  /* 256 DWORDs */
-+      p->host_perio_tx_fifo_size      = 658;  /* 512 DWORDs */
-+      p->max_transfer_size            = 65535,
-+      p->max_packet_count             = 511;
-+      p->host_channels                = 16;
-+      p->phy_type                     = DWC2_PHY_TYPE_PARAM_UTMI;     /* UTMI */
-+      p->phy_utmi_width               = 16;   /* 8 bits */
-+      p->phy_ulpi_ddr                 = 0;    /* Single */
-+      p->phy_ulpi_ext_vbus            = 0;
-+      p->i2c_enable                   = 0;
-+      p->ulpi_fs_ls                   = 0;
-+      p->host_support_fs_ls_low_power = 0;
-+      p->host_ls_low_power_phy_clk    = 0;    /* 48 MHz */
-+      p->ts_dline                     = 0;
-+      p->reload_ctl                   = 0;
-+      p->ahbcfg                       = 0x10;
-+      p->uframe_sched                 = false;
-+}
-+
- const struct of_device_id dwc2_of_match_table[] = {
-       { .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
-       { .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params  },
-@@ -806,17 +836,23 @@ int dwc2_get_hwparams(struct dwc2_hsotg
- int dwc2_init_params(struct dwc2_hsotg *hsotg)
- {
-+      /*
-       const struct of_device_id *match;
-       void (*set_params)(void *data);
-+      */
-       dwc2_set_default_params(hsotg);
-       dwc2_get_device_properties(hsotg);
-+      /*
-       match = of_match_device(dwc2_of_match_table, hsotg->dev);
-       if (match && match->data) {
-               set_params = match->data;
-               set_params(hsotg);
-       }
-+      */
-+
-+      dwc2_set_cns3xxx_params(hsotg);
-       dwc2_check_params(hsotg);
index 867e284714a995be38143ce32eac0775dc046643..304e515980a5181cc5b8ffd708273c7a11ff7ec1 100644 (file)
@@ -14,7 +14,6 @@ CPU_TYPE:=fa526
 MAINTAINER:=Roman Yeryomin <roman@advem.lv>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 define Target/Description
        Build firmware images for the StorLink/Cortina Gemini CS351x ARM FA526 CPU
diff --git a/target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch b/target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch
deleted file mode 100644 (file)
index 3bf9341..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From f8ac3d3472a8dc99c8647a637611d146d88be8cb Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Tue, 9 Oct 2018 10:09:14 +0200
-Subject: [PATCH 01/18] pinctrl: gemini: Mask and set properly
-
-The code was written under the assumption that the
-regmap_update_bits() would mask the bits in the mask and
-set the bits in the value.
-
-It missed the points that it will not set bits in the value
-unless these are also masked in the mask. Set value bits
-that are not in the mask will simply be ignored.
-
-Fixes: 06351d133dea ("pinctrl: add a Gemini SoC pin controller")
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/pinctrl-gemini.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/pinctrl/pinctrl-gemini.c
-+++ b/drivers/pinctrl/pinctrl-gemini.c
-@@ -2184,7 +2184,8 @@ static int gemini_pmx_set_mux(struct pin
-                func->name, grp->name);
-       regmap_read(pmx->map, GLOBAL_MISC_CTRL, &before);
--      regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL, grp->mask,
-+      regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL,
-+                         grp->mask | grp->value,
-                          grp->value);
-       regmap_read(pmx->map, GLOBAL_MISC_CTRL, &after);
diff --git a/target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch b/target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch
deleted file mode 100644 (file)
index 64172ac..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-From ce81398dccb984855de606b75db25eddecdaa9e5 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Wed, 10 Oct 2018 20:25:39 +0200
-Subject: [PATCH 02/18] pinctrl: gemini: Fix up TVC clock group
-
-The previous fix made the TVC clock get muxed in on the
-D-Link DIR-685 instead of giving nagging warnings of this
-not working. Not good. We didn't want that, as it breaks
-video.
-
-Create a specific group for the TVC CLK, and break out
-a specific GPIO group for it on the SL3516 so we can use
-that line as GPIO if we don't need the TVC CLK.
-
-Fixes: d17f477c5bc6 ("pinctrl: gemini: Mask and set properly")
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/pinctrl-gemini.c | 44 ++++++++++++++++++++++++++------
- 1 file changed, 36 insertions(+), 8 deletions(-)
-
---- a/drivers/pinctrl/pinctrl-gemini.c
-+++ b/drivers/pinctrl/pinctrl-gemini.c
-@@ -591,13 +591,16 @@ static const unsigned int tvc_3512_pins[
-       319, /* TVC_DATA[1] */
-       301, /* TVC_DATA[2] */
-       283, /* TVC_DATA[3] */
--      265, /* TVC_CLK */
-       320, /* TVC_DATA[4] */
-       302, /* TVC_DATA[5] */
-       284, /* TVC_DATA[6] */
-       266, /* TVC_DATA[7] */
- };
-+static const unsigned int tvc_clk_3512_pins[] = {
-+      265, /* TVC_CLK */
-+};
-+
- /* NAND flash pins */
- static const unsigned int nflash_3512_pins[] = {
-       199, 200, 201, 202, 216, 217, 218, 219, 220, 234, 235, 236, 237, 252,
-@@ -629,7 +632,7 @@ static const unsigned int pflash_3512_pi
- /* Serial flash pins CE0, CE1, DI, DO, CK */
- static const unsigned int sflash_3512_pins[] = { 230, 231, 232, 233, 211 };
--/* The GPIO0A (0) pin overlap with TVC and extended parallel flash */
-+/* The GPIO0A (0) pin overlap with TVC CLK and extended parallel flash */
- static const unsigned int gpio0a_3512_pins[] = { 265 };
- /* The GPIO0B (1-4) pins overlap with TVC and ICE */
-@@ -823,7 +826,13 @@ static const struct gemini_pin_group gem
-               .num_pins = ARRAY_SIZE(tvc_3512_pins),
-               /* Conflict with character LCD and ICE */
-               .mask = LCD_PADS_ENABLE,
--              .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE,
-+              .value = TVC_PADS_ENABLE,
-+      },
-+      {
-+              .name = "tvcclkgrp",
-+              .pins = tvc_clk_3512_pins,
-+              .num_pins = ARRAY_SIZE(tvc_clk_3512_pins),
-+              .value = TVC_CLK_PAD_ENABLE,
-       },
-       /*
-        * The construction is done such that it is possible to use a serial
-@@ -860,8 +869,8 @@ static const struct gemini_pin_group gem
-               .name = "gpio0agrp",
-               .pins = gpio0a_3512_pins,
-               .num_pins = ARRAY_SIZE(gpio0a_3512_pins),
--              /* Conflict with TVC */
--              .mask = TVC_PADS_ENABLE,
-+              /* Conflict with TVC CLK */
-+              .mask = TVC_CLK_PAD_ENABLE,
-       },
-       {
-               .name = "gpio0bgrp",
-@@ -1531,13 +1540,16 @@ static const unsigned int tvc_3516_pins[
-       311, /* TVC_DATA[1] */
-       394, /* TVC_DATA[2] */
-       374, /* TVC_DATA[3] */
--      333, /* TVC_CLK */
-       354, /* TVC_DATA[4] */
-       395, /* TVC_DATA[5] */
-       312, /* TVC_DATA[6] */
-       334, /* TVC_DATA[7] */
- };
-+static const unsigned int tvc_clk_3516_pins[] = {
-+      333, /* TVC_CLK */
-+};
-+
- /* NAND flash pins */
- static const unsigned int nflash_3516_pins[] = {
-       243, 260, 261, 224, 280, 262, 281, 264, 300, 263, 282, 301, 320, 283,
-@@ -1570,7 +1582,7 @@ static const unsigned int pflash_3516_pi
- static const unsigned int sflash_3516_pins[] = { 296, 338, 295, 359, 339 };
- /* The GPIO0A (0-4) pins overlap with TVC and extended parallel flash */
--static const unsigned int gpio0a_3516_pins[] = { 333, 354, 395, 312, 334 };
-+static const unsigned int gpio0a_3516_pins[] = { 354, 395, 312, 334 };
- /* The GPIO0B (5-7) pins overlap with ICE */
- static const unsigned int gpio0b_3516_pins[] = { 375, 396, 376 };
-@@ -1602,6 +1614,9 @@ static const unsigned int gpio0j_3516_pi
- /* The GPIO0K (30,31) pins overlap with NAND flash */
- static const unsigned int gpio0k_3516_pins[] = { 275, 298 };
-+/* The GPIO0L (0) pins overlap with TVC_CLK */
-+static const unsigned int gpio0l_3516_pins[] = { 333 };
-+
- /* The GPIO1A (0-4) pins that overlap with IDE and parallel flash */
- static const unsigned int gpio1a_3516_pins[] = { 221, 200, 222, 201, 220 };
-@@ -1761,7 +1776,13 @@ static const struct gemini_pin_group gem
-               .num_pins = ARRAY_SIZE(tvc_3516_pins),
-               /* Conflict with character LCD */
-               .mask = LCD_PADS_ENABLE,
--              .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE,
-+              .value = TVC_PADS_ENABLE,
-+      },
-+      {
-+              .name = "tvcclkgrp",
-+              .pins = tvc_clk_3516_pins,
-+              .num_pins = ARRAY_SIZE(tvc_clk_3516_pins),
-+              .value = TVC_CLK_PAD_ENABLE,
-       },
-       /*
-        * The construction is done such that it is possible to use a serial
-@@ -1873,6 +1894,13 @@ static const struct gemini_pin_group gem
-               .value = PFLASH_PADS_DISABLE | NAND_PADS_DISABLE,
-       },
-       {
-+              .name = "gpio0lgrp",
-+              .pins = gpio0l_3516_pins,
-+              .num_pins = ARRAY_SIZE(gpio0l_3516_pins),
-+              /* Conflict with TVE CLK */
-+              .mask = TVC_CLK_PAD_ENABLE,
-+      },
-+      {
-               .name = "gpio1agrp",
-               .pins = gpio1a_3516_pins,
-               .num_pins = ARRAY_SIZE(gpio1a_3516_pins),
diff --git a/target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch b/target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch
deleted file mode 100644 (file)
index d3383b3..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 5d1bd9669ddcd26384672891c37110046e1ac8e8 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Tue, 9 Oct 2018 10:12:24 +0200
-Subject: [PATCH 03/18] pinctrl: gemini: Drop noisy debug prints
-
-The dev_info() in the pin control driver is really just good
-for debug, so drop it.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/pinctrl-gemini.c | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
---- a/drivers/pinctrl/pinctrl-gemini.c
-+++ b/drivers/pinctrl/pinctrl-gemini.c
-@@ -2207,9 +2207,9 @@ static int gemini_pmx_set_mux(struct pin
-               return -ENODEV;
-       }
--      dev_info(pmx->dev,
--               "ACTIVATE function \"%s\" with group \"%s\"\n",
--               func->name, grp->name);
-+      dev_dbg(pmx->dev,
-+              "ACTIVATE function \"%s\" with group \"%s\"\n",
-+              func->name, grp->name);
-       regmap_read(pmx->map, GLOBAL_MISC_CTRL, &before);
-       regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL,
-@@ -2240,10 +2240,10 @@ static int gemini_pmx_set_mux(struct pin
-                               "GLOBAL MISC CTRL before: %08x, after %08x, expected %08x\n",
-                               before, after, expected);
-               } else {
--                      dev_info(pmx->dev,
--                               "padgroup %s %s\n",
--                               gemini_padgroups[i],
--                               enabled ? "enabled" : "disabled");
-+                      dev_dbg(pmx->dev,
-+                              "padgroup %s %s\n",
-+                              gemini_padgroups[i],
-+                              enabled ? "enabled" : "disabled");
-               }
-       }
-@@ -2262,10 +2262,10 @@ static int gemini_pmx_set_mux(struct pin
-                               "GLOBAL MISC CTRL before: %08x, after %08x, expected %08x\n",
-                               before, after, expected);
-               } else {
--                      dev_info(pmx->dev,
--                               "padgroup %s %s\n",
--                               gemini_padgroups[i],
--                               enabled ? "enabled" : "disabled");
-+                      dev_dbg(pmx->dev,
-+                              "padgroup %s %s\n",
-+                              gemini_padgroups[i],
-+                              enabled ? "enabled" : "disabled");
-               }
-       }
-@@ -2492,9 +2492,9 @@ static int gemini_pinconf_group_set(stru
-                       regmap_update_bits(pmx->map, GLOBAL_IODRIVE,
-                                          grp->driving_mask,
-                                          val);
--                      dev_info(pmx->dev,
--                               "set group %s to %d mA drive strength mask %08x val %08x\n",
--                               grp->name, arg, grp->driving_mask, val);
-+                      dev_dbg(pmx->dev,
-+                              "set group %s to %d mA drive strength mask %08x val %08x\n",
-+                              grp->name, arg, grp->driving_mask, val);
-                       break;
-               default:
-                       dev_err(pmx->dev, "invalid config param %04x\n", param);
-@@ -2585,8 +2585,8 @@ static int gemini_pmx_probe(struct platf
-       /* Print initial state */
-       tmp = val;
-       for_each_set_bit(i, &tmp, PADS_MAXBIT) {
--              dev_info(dev, "pad group %s %s\n", gemini_padgroups[i],
--                       (val & BIT(i)) ? "enabled" : "disabled");
-+              dev_dbg(dev, "pad group %s %s\n", gemini_padgroups[i],
-+                      (val & BIT(i)) ? "enabled" : "disabled");
-       }
-       /* Check if flash pin is set */
diff --git a/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch b/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch
deleted file mode 100644 (file)
index d2fa02a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From 95be54e285767c5209bb51df923373f78b8c4099 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Mon, 16 Jul 2018 23:36:30 +0200
-Subject: [PATCH 04/18] boot sq201 from sda1
-
----
- arch/arm/boot/dts/gemini-sq201.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/gemini-sq201.dts
-+++ b/arch/arm/boot/dts/gemini-sq201.dts
-@@ -20,7 +20,7 @@
-       };
-       chosen {
--              bootargs = "console=ttyS0,115200n8";
-+              bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait";
-               stdout-path = &uart0;
-       };
diff --git a/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch b/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch
deleted file mode 100644 (file)
index 5462844..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 58ecb60d53d43e8d584708722a2cf851ba88f9e1 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Thu, 11 Oct 2018 19:53:40 +0200
-Subject: [PATCH 05/18] mtd: physmap_of: Move custom initialization
-
-In order to be able to assign custom complex mappings
-to the physmap_of plugin for Gemini, move the initialization
-so that the simple map is initialized before we enter the
-platform-specific functions so the latter can override
-them.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/mtd/maps/physmap_of_core.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
---- a/drivers/mtd/maps/physmap_of_core.c
-+++ b/drivers/mtd/maps/physmap_of_core.c
-@@ -239,13 +239,6 @@ static int of_flash_probe(struct platfor
-               else if (of_property_read_bool(dp, "little-endian"))
-                       info->list[i].map.swap = CFI_LITTLE_ENDIAN;
--              err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
--              if (err)
--                      goto err_out;
--              err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
--              if (err)
--                      goto err_out;
--
-               err = -ENOMEM;
-               info->list[i].map.virt = ioremap(info->list[i].map.phys,
-                                                info->list[i].map.size);
-@@ -257,6 +250,14 @@ static int of_flash_probe(struct platfor
-               simple_map_init(&info->list[i].map);
-+              /* Variants can override map accessors */
-+              err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
-+              if (err)
-+                      goto err_out;
-+              err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
-+              if (err)
-+                      goto err_out;
-+
-               /*
-                * On some platforms (e.g. MPC5200) a direct 1:1 mapping
-                * may cause problems with JFFS2 usage, as the local bus (LPB)
diff --git a/target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch b/target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch
deleted file mode 100644 (file)
index 128760d..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-From 8e5e628a9de439d02914b85a48e1ac3e04ea486a Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Thu, 11 Oct 2018 20:03:49 +0200
-Subject: [PATCH 06/18] mtd: physmap_of_gemini: Handle pin control
-
-This enables the complex mapping for the Gemini and kicks in
-custom read/write functions that will wrap the existing
-simple functions in calls to enable/disable the parallel
-flash pins using pin controls.
-
-This is necessary on some hardware such as the D-Link
-DIR-685 where all flash pins are patched in/out at the same
-time, but some of the flash pins are in practice unused by
-the flash and have anyway been reused as GPIO.
-
-This concerns specifically CE1 on the Gemini. There is only
-one flash chip, so only CE0 is used, and the line for CE1
-has been reused as chip select for the emulated SPI port
-connected to the display. If we try to use the same lines
-for flash and GPIO at the same time, one of them will loose:
-the GPIO line will disappear because it gets disconnected
-from the pin when the flash group is muxed out.
-
-Fix this by introducing two pin control states named simply
-"enabled" and "disabled" and only enable the flash lines
-when absolutely necessary (during read/write/copy). This
-way, they are available for GPIO at all other times and
-the display works.
-
-Collect all the state variables in a struct named
-struct gemini_flash and allocate this struct at probe
-time.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/mtd/maps/Kconfig             |   1 +
- drivers/mtd/maps/physmap_of_gemini.c | 105 ++++++++++++++++++++++++++-
- 2 files changed, 105 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/maps/Kconfig
-+++ b/drivers/mtd/maps/Kconfig
-@@ -89,6 +89,7 @@ config MTD_PHYSMAP_OF_GEMINI
-       depends on MTD_PHYSMAP_OF
-       depends on MFD_SYSCON
-       default ARCH_GEMINI
-+      select MTD_COMPLEX_MAPPINGS
-       help
-         This provides some extra DT physmap parsing for the Gemini
-         platforms, some detection and setting up parallel mode on the
---- a/drivers/mtd/maps/physmap_of_gemini.c
-+++ b/drivers/mtd/maps/physmap_of_gemini.c
-@@ -10,9 +10,11 @@
- #include <linux/of.h>
- #include <linux/of_device.h>
- #include <linux/mtd/map.h>
-+#include <linux/mtd/xip.h>
- #include <linux/mfd/syscon.h>
- #include <linux/regmap.h>
- #include <linux/bitops.h>
-+#include <linux/pinctrl/consumer.h>
- #include "physmap_of_gemini.h"
- /*
-@@ -49,6 +51,77 @@ static const struct of_device_id syscon_
-       { },
- };
-+struct gemini_flash {
-+      struct device *dev;
-+      struct pinctrl *p;
-+      struct pinctrl_state *enabled_state;
-+      struct pinctrl_state *disabled_state;
-+};
-+
-+/* Static local state */
-+static struct gemini_flash *gf;
-+
-+static void gemini_flash_enable_pins(void)
-+{
-+      int ret;
-+
-+      if (IS_ERR(gf->enabled_state))
-+              return;
-+      ret = pinctrl_select_state(gf->p, gf->enabled_state);
-+      if (ret)
-+              dev_err(gf->dev, "failed to enable pins\n");
-+}
-+
-+static void gemini_flash_disable_pins(void)
-+{
-+      int ret;
-+
-+      if (IS_ERR(gf->disabled_state))
-+              return;
-+      ret = pinctrl_select_state(gf->p, gf->disabled_state);
-+      if (ret)
-+              dev_err(gf->dev, "failed to disable pins\n");
-+}
-+
-+static map_word __xipram gemini_flash_map_read(struct map_info *map,
-+                                             unsigned long ofs)
-+{
-+      map_word __xipram ret;
-+
-+      gemini_flash_enable_pins();
-+      ret = inline_map_read(map, ofs);
-+      gemini_flash_disable_pins();
-+
-+      return ret;
-+}
-+
-+static void __xipram gemini_flash_map_write(struct map_info *map,
-+                                          const map_word datum,
-+                                          unsigned long ofs)
-+{
-+      gemini_flash_enable_pins();
-+      inline_map_write(map, datum, ofs);
-+      gemini_flash_disable_pins();
-+}
-+
-+static void __xipram gemini_flash_map_copy_from(struct map_info *map,
-+                                              void *to, unsigned long from,
-+                                              ssize_t len)
-+{
-+      gemini_flash_enable_pins();
-+      inline_map_copy_from(map, to, from, len);
-+      gemini_flash_disable_pins();
-+}
-+
-+static void __xipram gemini_flash_map_copy_to(struct map_info *map,
-+                                            unsigned long to,
-+                                            const void *from, ssize_t len)
-+{
-+      gemini_flash_enable_pins();
-+      inline_map_copy_to(map, to, from, len);
-+      gemini_flash_disable_pins();
-+}
-+
- int of_flash_probe_gemini(struct platform_device *pdev,
-                         struct device_node *np,
-                         struct map_info *map)
-@@ -62,6 +135,11 @@ int of_flash_probe_gemini(struct platfor
-       if (!of_device_is_compatible(np, "cortina,gemini-flash"))
-               return 0;
-+      gf = devm_kzalloc(dev, sizeof(*gf), GFP_KERNEL);
-+      if (!gf)
-+              return -ENOMEM;
-+      gf->dev = dev;
-+
-       rmap = syscon_regmap_lookup_by_phandle(np, "syscon");
-       if (IS_ERR(rmap)) {
-               dev_err(dev, "no syscon\n");
-@@ -96,7 +174,32 @@ int of_flash_probe_gemini(struct platfor
-                                map->bankwidth * 8);
-       }
--      dev_info(&pdev->dev, "initialized Gemini-specific physmap control\n");
-+      gf->p = devm_pinctrl_get(dev);
-+      if (IS_ERR(gf->p)) {
-+              dev_err(dev, "no pinctrl handle\n");
-+              ret = PTR_ERR(gf->p);
-+              return ret;
-+      }
-+
-+      gf->enabled_state = pinctrl_lookup_state(gf->p, "enabled");
-+      if (IS_ERR(gf->enabled_state))
-+              dev_err(dev, "no enabled pin control state\n");
-+
-+      gf->disabled_state = pinctrl_lookup_state(gf->p, "disabled");
-+      if (IS_ERR(gf->enabled_state)) {
-+              dev_err(dev, "no disabled pin control state\n");
-+      } else {
-+              ret = pinctrl_select_state(gf->p, gf->disabled_state);
-+              if (ret)
-+                      dev_err(gf->dev, "failed to disable pins\n");
-+      }
-+
-+      map->read = gemini_flash_map_read;
-+      map->write = gemini_flash_map_write;
-+      map->copy_from = gemini_flash_map_copy_from;
-+      map->copy_to = gemini_flash_map_copy_to;
-+
-+      dev_info(dev, "initialized Gemini-specific physmap control\n");
-       return 0;
- }
diff --git a/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch b/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch
deleted file mode 100644 (file)
index 372242c..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-From 74631102645df8984acbdf67b731e4d437f27fed Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Thu, 11 Oct 2018 20:06:23 +0200
-Subject: [PATCH 08/18] ARM: dts: Enable Gemini flash access
-
-Some Gemini platforms have a parallel NOR flash which conflicts
-with use cases reusing some of the flash lines (such as CE1)
-for GPIO.
-
-Fix this on the D-Link DIR-685 and Itian SQ201 by creating
-"enabled" and "disabled" states for the flash pin control
-handle, and rely on the flash handling code to switch this
-in and out when accessed so these lines can be used
-for GPIO when flash is not accessed, and enable flash
-access.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 35 +++++++++++++++-------
- arch/arm/boot/dts/gemini-sq201.dts         | 31 ++++++++++---------
- 2 files changed, 41 insertions(+), 25 deletions(-)
-
---- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-@@ -64,7 +64,6 @@
-               gpio-sck = <&gpio1 5 GPIO_ACTIVE_HIGH>;
-               gpio-miso = <&gpio1 8 GPIO_ACTIVE_HIGH>;
-               gpio-mosi = <&gpio1 7 GPIO_ACTIVE_HIGH>;
--              /* Collides with pflash CE1, not so cool */
-               cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
-               num-chipselects = <1>;
-@@ -253,15 +252,18 @@
-       soc {
-               flash@30000000 {
-                       /*
--                       * Flash access is by default disabled, because it
--                       * collides with the Chip Enable signal for the display
--                       * panel, that reuse the parallel flash Chip Select 1
--                       * (CS1). Enabling flash makes graphics stop working.
--                       *
--                       * We might be able to hack around this by letting
--                       * GPIO poke around in the flash controller registers.
-+                       * Flash access collides with the Chip Enable signal for
-+                       * the display panel, that reuse the parallel flash Chip
-+                       * Select 1 (CS1). We switch the pin control state so we
-+                       * enable these pins for flash access only when we need
-+                       * then, and when disabled they can be used for GPIO which
-+                       * is what the display panel needs.
-                        */
--                      /* status = "okay"; */
-+                      status = "okay";
-+                      pinctrl-names = "enabled", "disabled";
-+                      pinctrl-0 = <&pflash_default_pins>;
-+                      pinctrl-1 = <&pflash_disabled_pins>;
-+
-                       /* 32MB of flash */
-                       reg = <0x30000000 0x02000000>;
-@@ -327,7 +329,6 @@
-                                               "gpio0cgrp",
-                                               "gpio0egrp",
-                                               "gpio0fgrp",
--                                              "gpio0ggrp",
-                                               "gpio0hgrp";
-                                       };
-                               };
-@@ -342,6 +343,18 @@
-                                               groups = "gpio1bgrp";
-                                       };
-                               };
-+                              /*
-+                               * These GPIO groups will be mapped in over some
-+                               * of the flash pins when the flash is not in
-+                               * active use.
-+                               */
-+                              pflash_disabled_pins: pinctrl-pflash-disabled {
-+                                      mux {
-+                                              function = "gpio0";
-+                                              groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp",
-+                                                       "gpio0kgrp";
-+                                      };
-+                              };
-                               pinctrl-gmii {
-                                       mux {
-                                               function = "gmii";
-@@ -430,7 +443,7 @@
-               };
-               display-controller@6a000000 {
--                      status = "okay";
-+                      status = "disabled";
-                       port@0 {
-                               reg = <0>;
---- a/arch/arm/boot/dts/gemini-sq201.dts
-+++ b/arch/arm/boot/dts/gemini-sq201.dts
-@@ -41,14 +41,12 @@
-               compatible = "gpio-leds";
-               led-green-info {
-                       label = "sq201:green:info";
--                      /* Conflict with parallel flash */
-                       gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
-                       default-state = "on";
-                       linux,default-trigger = "heartbeat";
-               };
-               led-green-usb {
-                       label = "sq201:green:usb";
--                      /* Conflict with parallel and NAND flash */
-                       gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
-                       default-state = "off";
-                       linux,default-trigger = "usb-host";
-@@ -126,15 +124,10 @@
-       soc {
-               flash@30000000 {
--                      /*
--                       * Flash access can be enabled, with the side effect
--                       * of disabling access to GPIO LED on GPIO0[20] which
--                       * reuse one of the parallel flash chip select lines.
--                       * Also the default firmware on the machine has the
--                       * problem that since it uses the flash, the two LEDS
--                       * on the right become numb.
--                       */
--                      /* status = "okay"; */
-+                      status = "okay";
-+                      pinctrl-names = "enabled", "disabled";
-+                      pinctrl-0 = <&pflash_default_pins>;
-+                      pinctrl-1 = <&pflash_disabled_pins>;
-                       /* 16MB of flash */
-                       reg = <0x30000000 0x01000000>;
-@@ -184,9 +177,7 @@
-                                       mux {
-                                               function = "gpio0";
-                                               groups = "gpio0fgrp",
--                                              "gpio0ggrp",
--                                              "gpio0hgrp",
--                                              "gpio0kgrp";
-+                                              "gpio0hgrp";
-                                       };
-                               };
-                               /*
-@@ -199,6 +190,18 @@
-                                               groups = "gpio1dgrp";
-                                       };
-                               };
-+                              /*
-+                               * These GPIO groups will be mapped in over some
-+                               * of the flash pins when the flash is not in
-+                               * active use.
-+                               */
-+                              pflash_disabled_pins: pinctrl-pflash-disabled {
-+                                      mux {
-+                                              function = "gpio0";
-+                                              groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp",
-+                                                       "gpio0kgrp";
-+                                      };
-+                              };
-                               pinctrl-gmii {
-                                       mux {
-                                               function = "gmii";
diff --git a/target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch b/target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch
deleted file mode 100644 (file)
index bc3c927..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3dfe7ff875a64b83de21dad6365225f41f3cdb17 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 19 Oct 2018 08:22:18 +0200
-Subject: [PATCH 09/18] mtd: partitions: Add RedBoot FIS DT bindings
-
-This adds device tree bindings for the RedBoot FIS partition
-format.
-
-Cc: devicetree@vger.kernel.org
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- .../bindings/mtd/partitions/redboot-fis.txt   | 27 +++++++++++++++++++
- 1 file changed, 27 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt
-@@ -0,0 +1,27 @@
-+RedBoot FLASH Image System (FIS) Partitions
-+===========================================
-+
-+The FLASH Image System (FIS) directory is a flash description
-+format closely associated with the RedBoot boot loader.
-+
-+It uses one single flash eraseblock in the flash to store an index of
-+all images in the flash.
-+
-+This block size will vary depending on flash but is typically
-+32 KB in size.
-+
-+Required properties:
-+- compatible : (required) must be "redboot-fis"
-+- fis-index-block : (required) a index to the eraseblock containing
-+  the FIS directory on this device. On a flash memory with 32KB
-+  eraseblocks, 0 means the first eraseblock at 0x00000000, 1 means the
-+  second eraseblock at 0x00008000 and so on.
-+
-+Example:
-+
-+flash@0 {
-+      partitions {
-+              compatible = "redboot-fis";
-+              fis-index-block = <0>;
-+      };
-+};
diff --git a/target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch b/target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch
deleted file mode 100644 (file)
index d888e78..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From e1b9d122030220d8b8176d9e23568e26fa2f9d23 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 19 Oct 2018 08:56:41 +0200
-Subject: [PATCH 10/18] mtd: partitions: Add second compatible for redboot
-
-Simple backport of the upstream redboot partition table
-bindings that are used in the mainline Linux kernel.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/mtd/redboot.c | 29 ++++++++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -25,7 +25,7 @@
- #include <linux/slab.h>
- #include <linux/init.h>
- #include <linux/vmalloc.h>
--
-+#include <linux/of.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/module.h>
-@@ -56,6 +56,31 @@ static inline int redboot_checksum(struc
-       return 1;
- }
-+#ifdef CONFIG_OF
-+static void parse_redboot_of(struct mtd_info *master)
-+{
-+      struct device_node *np;
-+      u32 dirblock;
-+      int ret;
-+
-+      np = mtd_get_of_node(master);
-+      if (!np)
-+              return;
-+      ret = of_property_read_u32(np, "fis-index-block", &dirblock);
-+      if (ret)
-+              return;
-+      /*
-+       * Assign the block found in the device tree to the local
-+       * directory block pointer.
-+       */
-+      directory = dirblock;
-+}
-+#else
-+static void parse_redboot_of(struct mtd_info *master)
-+{
-+}
-+#endif
-+
- static int parse_redboot_partitions(struct mtd_info *master,
-                                   const struct mtd_partition **pparts,
-                                   struct mtd_part_parser_data *data)
-@@ -75,6 +100,7 @@ static int parse_redboot_partitions(stru
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-       static char nullstring[] = "unallocated";
- #endif
-+      parse_redboot_of(master);
-       if ( directory < 0 ) {
-               offset = master->size + directory * master->erasesize;
-@@ -298,6 +324,7 @@ static int parse_redboot_partitions(stru
- static const struct of_device_id redboot_parser_of_match_table[] = {
-       { .compatible = "ecoscentric,redboot-fis-partitions" },
-+      { .compatible = "redboot-fis" },
-       {},
- };
- MODULE_DEVICE_TABLE(of, redboot_parser_of_match_table);
diff --git a/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch b/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch
deleted file mode 100644 (file)
index 7517d62..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From 186692e51e6c40d8ebd05d25f009098eb00f8110 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 19 Oct 2018 09:00:51 +0200
-Subject: [PATCH 11/18] ARM: dts: Fix up SQ201 flash access
-
-This sets the partition information on the SQ201 to be read
-out from the RedBoot partition table, removes the static
-partition table and sets our boot options to mount root from
-/dev/mtdblock2 where the initramfs resides.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- arch/arm/boot/dts/gemini-sq201.dts | 37 ++++--------------------------
- 1 file changed, 5 insertions(+), 32 deletions(-)
-
---- a/arch/arm/boot/dts/gemini-sq201.dts
-+++ b/arch/arm/boot/dts/gemini-sq201.dts
-@@ -20,7 +20,7 @@
-       };
-       chosen {
--              bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait";
-+              bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait";
-               stdout-path = &uart0;
-       };
-@@ -131,37 +131,10 @@
-                       /* 16MB of flash */
-                       reg = <0x30000000 0x01000000>;
--                      partition@0 {
--                              label = "RedBoot";
--                              reg = <0x00000000 0x00120000>;
--                              read-only;
--                      };
--                      partition@120000 {
--                              label = "Kernel";
--                              reg = <0x00120000 0x00200000>;
--                      };
--                      partition@320000 {
--                              label = "Ramdisk";
--                              reg = <0x00320000 0x00600000>;
--                      };
--                      partition@920000 {
--                              label = "Application";
--                              reg = <0x00920000 0x00600000>;
--                      };
--                      partition@f20000 {
--                              label = "VCTL";
--                              reg = <0x00f20000 0x00020000>;
--                              read-only;
--                      };
--                      partition@f40000 {
--                              label = "CurConf";
--                              reg = <0x00f40000 0x000a0000>;
--                              read-only;
--                      };
--                      partition@fe0000 {
--                              label = "FIS directory";
--                              reg = <0x00fe0000 0x00020000>;
--                              read-only;
-+                      partitions {
-+                              compatible = "redboot-fis";
-+                              /* Eraseblock at 0xfe0000 */
-+                              fis-index-block = <0x1fc>;
-                       };
-               };
diff --git a/target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch b/target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch
deleted file mode 100644 (file)
index ebddc3a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From ec8b953c92c1dd0e0f1450f4b9a32c60125d4510 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Mon, 27 Aug 2018 00:10:39 +0200
-Subject: [PATCH 12/18] ARM: dts: Blank D-Link DIR-685 console
-
-Leaving this NAS with display and backlight on heats it up
-and dissipates power. Turn off the screen after 4 minutes,
-it comes back on when a user touches the keys.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-@@ -20,7 +20,7 @@
-       };
-       chosen {
--              bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";
-+              bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait consoleblank=300";
-               stdout-path = "uart0:19200n8";
-       };
diff --git a/target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch b/target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch
deleted file mode 100644 (file)
index b28454e..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-From e76906e8e9dfaeeb22a37706aca493b86e4367bd Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 21 Apr 2017 20:46:12 +0200
-Subject: [PATCH 13/18] usb: host: fotg2: add silicon clock handling
-
-When used in a system with software-controlled silicon clocks,
-the FOTG210 needs to grab, prepare and enable the clock.
-
-This is needed on for example the Cortina Gemini, where the
-platform will by default gate off the clock unless the
-peripheral (in this case the USB driver) grabs and enables
-the clock.
-
-If there is no clock available on the platform, we live
-without it. Make sure to percolate probe deferrals.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
-ChangeLog v1->v2:
-- Handle probe deferrals on the clock controller, no matter
-  how unlikely they are.
-- Send the patch to get Gemini USB rolling and try to get some
-  stuff upstream, this patch should be fine on its own.
----
- drivers/usb/host/fotg210-hcd.c | 33 +++++++++++++++++++++++++++++----
- drivers/usb/host/fotg210.h     |  3 +++
- 2 files changed, 32 insertions(+), 4 deletions(-)
-
---- a/drivers/usb/host/fotg210-hcd.c
-+++ b/drivers/usb/host/fotg210-hcd.c
-@@ -31,6 +31,7 @@
- #include <linux/uaccess.h>
- #include <linux/platform_device.h>
- #include <linux/io.h>
-+#include <linux/clk.h>
- #include <asm/byteorder.h>
- #include <asm/irq.h>
-@@ -5596,7 +5597,7 @@ static int fotg210_hcd_probe(struct plat
-       hcd->regs = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(hcd->regs)) {
-               retval = PTR_ERR(hcd->regs);
--              goto failed;
-+              goto failed_put_hcd;
-       }
-       hcd->rsrc_start = res->start;
-@@ -5606,22 +5607,42 @@ static int fotg210_hcd_probe(struct plat
-       fotg210->caps = hcd->regs;
-+      /* It's OK not to supply this clock */
-+      fotg210->pclk = clk_get(dev, "PCLK");
-+      if (!IS_ERR(fotg210->pclk)) {
-+              retval = clk_prepare_enable(fotg210->pclk);
-+              if (retval) {
-+                      dev_err(dev, "failed to enable PCLK\n");
-+                      goto failed_put_hcd;
-+              }
-+      } else if (PTR_ERR(fotg210->pclk) == -EPROBE_DEFER) {
-+              /*
-+               * Percolate deferrals, for anything else,
-+               * just live without the clocking.
-+               */
-+              retval = PTR_ERR(fotg210->pclk);
-+              goto failed_dis_clk;
-+      }
-+
-       retval = fotg210_setup(hcd);
-       if (retval)
--              goto failed;
-+              goto failed_dis_clk;
-       fotg210_init(fotg210);
-       retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
-       if (retval) {
-               dev_err(dev, "failed to add hcd with err %d\n", retval);
--              goto failed;
-+              goto failed_dis_clk;
-       }
-       device_wakeup_enable(hcd->self.controller);
-       return retval;
--failed:
-+failed_dis_clk:
-+      if (!IS_ERR(fotg210->pclk))
-+              clk_disable_unprepare(fotg210->pclk);
-+failed_put_hcd:
-       usb_put_hcd(hcd);
- fail_create_hcd:
-       dev_err(dev, "init %s fail, %d\n", dev_name(dev), retval);
-@@ -5637,6 +5658,10 @@ static int fotg210_hcd_remove(struct pla
- {
-       struct device *dev = &pdev->dev;
-       struct usb_hcd *hcd = dev_get_drvdata(dev);
-+      struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
-+
-+      if (!IS_ERR(fotg210->pclk))
-+              clk_disable_unprepare(fotg210->pclk);
-       if (!hcd)
-               return 0;
---- a/drivers/usb/host/fotg210.h
-+++ b/drivers/usb/host/fotg210.h
-@@ -182,6 +182,9 @@ struct fotg210_hcd {                       /* one per contro
- #     define COUNT(x)
- #endif
-+      /* silicon clock */
-+      struct clk              *pclk;
-+
-       /* debug files */
-       struct dentry           *debug_dir;
- };
diff --git a/target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch b/target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch
deleted file mode 100644 (file)
index 4bac72a..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From f9cfc45c57227448d4239e9582258587aacf34e7 Mon Sep 17 00:00:00 2001
-From: Hans Ulli Kroll <ulli.kroll@googlemail.com>
-Date: Wed, 8 Feb 2017 21:00:09 +0100
-Subject: [PATCH 14/18] usb: host: add DT bindings for faraday fotg2
-
-This adds device tree bindings for the Faraday FOTG2
-dual-mode host controller.
-
-Cc: devicetree@vger.kernel.org
-Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
-ChangeLog v1->v2:
-- Changed "OTH" to "OTG"
-- Collected Rob's ACK.
-- I don't see any problem with these bindings, but IIRC Hans
-  had some reservations for the OTG mode, maybe we can strip
-  some properties like the mini-usb thing and use as a starter
-  so we can add host mode at least?
----
- .../bindings/usb/faraday,fotg210.txt          | 35 +++++++++++++++++++
- 1 file changed, 35 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/usb/faraday,fotg210.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/usb/faraday,fotg210.txt
-@@ -0,0 +1,35 @@
-+Faraday FOTG Host controller
-+
-+This OTG-capable USB host controller is found in Cortina Systems
-+Gemini and other SoC products.
-+
-+Required properties:
-+- compatible: should be one of:
-+  "faraday,fotg210"
-+  "cortina,gemini-usb", "faraday,fotg210"
-+- reg: should contain one register range i.e. start and length
-+- interrupts: description of the interrupt line
-+
-+Optional properties:
-+- clocks: should contain the IP block clock
-+- clock-names: should be "PCLK" for the IP block clock
-+
-+Required properties for "cortina,gemini-usb" compatible:
-+- syscon: a phandle to the system controller to access PHY registers
-+
-+Optional properties for "cortina,gemini-usb" compatible:
-+- cortina,gemini-mini-b: boolean property that indicates that a Mini-B
-+  OTG connector is in use
-+- wakeup-source: see power/wakeup-source.txt
-+
-+Example for Gemini:
-+
-+usb@68000000 {
-+      compatible = "cortina,gemini-usb", "faraday,fotg210";
-+      reg = <0x68000000 0x1000>;
-+      interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
-+      clocks = <&cc 12>;
-+      clock-names = "PCLK";
-+      syscon = <&syscon>;
-+      wakeup-source;
-+};
diff --git a/target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch b/target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch
deleted file mode 100644 (file)
index 8950ef0..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8f45c69ba80a993a6dba2397825b27e11fa9dea7 Mon Sep 17 00:00:00 2001
-From: Hans Ulli Kroll <ulli.kroll@googlemail.com>
-Date: Thu, 9 Feb 2017 15:20:49 +0100
-Subject: [PATCH 15/18] usb: host: fotg2: add device tree probing
-
-Add device tree probing to the fotg2 driver.
-
-Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
-[Drop DMA mask coercion, drivers/of/platform.c does the job]
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/usb/host/fotg210-hcd.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/usb/host/fotg210-hcd.c
-+++ b/drivers/usb/host/fotg210-hcd.c
-@@ -10,6 +10,7 @@
-  * Most of code borrowed from the Linux-3.7 EHCI driver
-  */
- #include <linux/module.h>
-+#include <linux/of.h>
- #include <linux/device.h>
- #include <linux/dmapool.h>
- #include <linux/kernel.h>
-@@ -5672,9 +5673,18 @@ static int fotg210_hcd_remove(struct pla
-       return 0;
- }
-+#ifdef CONFIG_OF
-+static const struct of_device_id fotg210_of_match[] = {
-+      { .compatible = "faraday,fotg210" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, fotg210_of_match);
-+#endif
-+
- static struct platform_driver fotg210_hcd_driver = {
-       .driver = {
-               .name   = "fotg210-hcd",
-+              .of_match_table = of_match_ptr(fotg210_of_match),
-       },
-       .probe  = fotg210_hcd_probe,
-       .remove = fotg210_hcd_remove,
diff --git a/target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch b/target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch
deleted file mode 100644 (file)
index 51bd0e7..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-From b331ae758123ba20ba41199e007ac33fc0f242e3 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 21 Apr 2017 22:19:00 +0200
-Subject: [PATCH 16/18] usb: host: fotg2: add Gemini-specific handling
-
-The Cortina Systems Gemini has bolted on a PHY inside the
-silicon that can be handled by six bits in a MISC register in
-the system controller.
-
-If we are running on Gemini, look up a syscon regmap through
-a phandle and enable VBUS and optionally the Mini-B connector.
-
-If the device is flagged as "wakeup-source" using the standard
-DT bindings, we also enable this in the global controller for
-respective port.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/usb/host/Kconfig       |  1 +
- drivers/usb/host/fotg210-hcd.c | 76 ++++++++++++++++++++++++++++++++++
- 2 files changed, 77 insertions(+)
-
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -372,6 +372,7 @@ config USB_ISP1362_HCD
- config USB_FOTG210_HCD
-       tristate "FOTG210 HCD support"
-       depends on USB && HAS_DMA && HAS_IOMEM
-+      select MFD_SYSCON
-       ---help---
-         Faraday FOTG210 is an OTG controller which can be configured as
-         an USB2.0 host. It is designed to meet USB2.0 EHCI specification
---- a/drivers/usb/host/fotg210-hcd.c
-+++ b/drivers/usb/host/fotg210-hcd.c
-@@ -33,6 +33,10 @@
- #include <linux/platform_device.h>
- #include <linux/io.h>
- #include <linux/clk.h>
-+#include <linux/bitops.h>
-+/* For Cortina Gemini */
-+#include <linux/mfd/syscon.h>
-+#include <linux/regmap.h>
- #include <asm/byteorder.h>
- #include <asm/irq.h>
-@@ -5554,6 +5558,72 @@ static void fotg210_init(struct fotg210_
-       iowrite32(value, &fotg210->regs->otgcsr);
- }
-+/*
-+ * Gemini-specific initialization function, only executed on the
-+ * Gemini SoC using the global misc control register.
-+ */
-+#define GEMINI_GLOBAL_MISC_CTRL               0x30
-+#define GEMINI_MISC_USB0_WAKEUP               BIT(14)
-+#define GEMINI_MISC_USB1_WAKEUP               BIT(15)
-+#define GEMINI_MISC_USB0_VBUS_ON      BIT(22)
-+#define GEMINI_MISC_USB1_VBUS_ON      BIT(23)
-+#define GEMINI_MISC_USB0_MINI_B               BIT(29)
-+#define GEMINI_MISC_USB1_MINI_B               BIT(30)
-+
-+static int fotg210_gemini_init(struct device *dev, struct usb_hcd *hcd)
-+{
-+      struct device_node *np = dev->of_node;
-+      struct regmap *map;
-+      bool mini_b;
-+      bool wakeup;
-+      u32 mask, val;
-+      int ret;
-+
-+      map = syscon_regmap_lookup_by_phandle(np, "syscon");
-+      if (IS_ERR(map)) {
-+              dev_err(dev, "no syscon\n");
-+              return PTR_ERR(map);
-+      }
-+      mini_b = of_property_read_bool(np, "cortina,gemini-mini-b");
-+      wakeup = of_property_read_bool(np, "wakeup-source");
-+
-+      /*
-+       * Figure out if this is USB0 or USB1 by simply checking the
-+       * physical base address.
-+       */
-+      mask = 0;
-+      if (hcd->rsrc_start == 0x69000000) {
-+              val = GEMINI_MISC_USB1_VBUS_ON;
-+              if (mini_b)
-+                      val |= GEMINI_MISC_USB1_MINI_B;
-+              else
-+                      mask |= GEMINI_MISC_USB1_MINI_B;
-+              if (wakeup)
-+                      val |= GEMINI_MISC_USB1_WAKEUP;
-+              else
-+                      mask |= GEMINI_MISC_USB1_WAKEUP;
-+      } else {
-+              val = GEMINI_MISC_USB0_VBUS_ON;
-+              if (mini_b)
-+                      val |= GEMINI_MISC_USB0_MINI_B;
-+              else
-+                      mask |= GEMINI_MISC_USB0_MINI_B;
-+              if (wakeup)
-+                      val |= GEMINI_MISC_USB0_WAKEUP;
-+              else
-+                      mask |= GEMINI_MISC_USB0_WAKEUP;
-+      }
-+
-+      ret = regmap_update_bits(map, GEMINI_GLOBAL_MISC_CTRL, mask, val);
-+      if (ret) {
-+              dev_err(dev, "failed to initialize Gemini PHY\n");
-+              return ret;
-+      }
-+
-+      dev_info(dev, "initialized Gemini PHY\n");
-+      return 0;
-+}
-+
- /**
-  * fotg210_hcd_probe - initialize faraday FOTG210 HCDs
-  *
-@@ -5631,6 +5701,12 @@ static int fotg210_hcd_probe(struct plat
-       fotg210_init(fotg210);
-+      if (of_device_is_compatible(dev->of_node, "cortina,gemini-usb")) {
-+              retval = fotg210_gemini_init(dev, hcd);
-+              if (retval)
-+                      goto failed_dis_clk;
-+      }
-+
-       retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
-       if (retval) {
-               dev_err(dev, "failed to add hcd with err %d\n", retval);
diff --git a/target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch b/target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch
deleted file mode 100644 (file)
index 0b5e81c..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From b9d300b5aea18f2e992201d182d939030130aab2 Mon Sep 17 00:00:00 2001
-From: Hans Ulli Kroll <ulli.kroll@googlemail.com>
-Date: Sat, 14 Apr 2018 18:49:57 +0200
-Subject: [PATCH 17/18] usb: host: fotg2: restart hcd after port reset
-
-on Gemini SoC FOTG2 stalls after port reset
-rerstart the hcd.
-
-Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/usb/host/fotg210-hcd.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/usb/host/fotg210-hcd.c
-+++ b/drivers/usb/host/fotg210-hcd.c
-@@ -1633,6 +1633,10 @@ static int fotg210_hub_control(struct us
-                       /* see what we found out */
-                       temp = check_reset_complete(fotg210, wIndex, status_reg,
-                                       fotg210_readl(fotg210, status_reg));
-+
-+                      /* restart schedule */
-+                      fotg210->command |= CMD_RUN;
-+                      fotg210_writel(fotg210, fotg210->command, &fotg210->regs->command);
-               }
-               if (!(temp & (PORT_RESUME|PORT_RESET))) {
diff --git a/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch b/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch
deleted file mode 100644 (file)
index 83d993b..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-From 1ff9a279dbeb0034929042faef186ce934474c2b Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 21 Apr 2017 20:50:22 +0200
-Subject: [PATCH 18/18] ARM: dts: Add the FOTG210 USB host to Gemini boards
-
-This adds the FOTG210 USB host controller to the Gemini
-device trees. In the main SoC DTSI it is flagged as disabled
-and then it is selectively enabled on the devices that utilize
-it.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
-ChangeLog v1->v2:
-- Rebased to kernel v4.19-rc1
-- Drop pinctrl-0 handle from the second USB port
-- Add comment on how to deal with the USB pin control
----
- arch/arm/boot/dts/gemini-dlink-dir-685.dts |  8 ++++++
- arch/arm/boot/dts/gemini-nas4220b.dts      |  8 ++++++
- arch/arm/boot/dts/gemini-rut1xx.dts        | 20 ++++++++++++++
- arch/arm/boot/dts/gemini-sl93512r.dts      |  8 ++++++
- arch/arm/boot/dts/gemini-sq201.dts         |  8 ++++++
- arch/arm/boot/dts/gemini-wbd111.dts        |  8 ++++++
- arch/arm/boot/dts/gemini-wbd222.dts        |  8 ++++++
- arch/arm/boot/dts/gemini.dtsi              | 32 ++++++++++++++++++++++
- 8 files changed, 100 insertions(+)
-
---- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-@@ -452,5 +452,13 @@
-                               };
-                       };
-               };
-+
-+              usb@68000000 {
-+                      status = "okay";
-+              };
-+
-+              usb@69000000 {
-+                      status = "okay";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/gemini-nas4220b.dts
-+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
-@@ -204,5 +204,13 @@
-               ata@63400000 {
-                       status = "okay";
-               };
-+
-+              usb@68000000 {
-+                      status = "okay";
-+              };
-+
-+              usb@69000000 {
-+                      status = "okay";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/gemini-rut1xx.dts
-+++ b/arch/arm/boot/dts/gemini-rut1xx.dts
-@@ -124,5 +124,25 @@
-                               /* Not used in this platform */
-                       };
-               };
-+
-+              ethernet@60000000 {
-+                      status = "okay";
-+
-+                      ethernet-port@0 {
-+                              phy-mode = "rgmii";
-+                              phy-handle = <&phy0>;
-+                      };
-+                      ethernet-port@1 {
-+                              /* Not used in this platform */
-+                      };
-+              };
-+
-+              usb@68000000 {
-+                      status = "okay";
-+              };
-+
-+              usb@69000000 {
-+                      status = "okay";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/gemini-sl93512r.dts
-+++ b/arch/arm/boot/dts/gemini-sl93512r.dts
-@@ -324,5 +324,13 @@
-               ata@63400000 {
-                       status = "okay";
-               };
-+
-+              usb@68000000 {
-+                      status = "okay";
-+              };
-+
-+              usb@69000000 {
-+                      status = "okay";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/gemini-sq201.dts
-+++ b/arch/arm/boot/dts/gemini-sq201.dts
-@@ -292,5 +292,13 @@
-               ata@63000000 {
-                       status = "okay";
-               };
-+
-+              usb@68000000 {
-+                      status = "okay";
-+              };
-+
-+              usb@69000000 {
-+                      status = "okay";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/gemini-wbd111.dts
-+++ b/arch/arm/boot/dts/gemini-wbd111.dts
-@@ -171,5 +171,13 @@
-                               /* Not used in this platform */
-                       };
-               };
-+
-+              usb@68000000 {
-+                      status = "okay";
-+              };
-+
-+              usb@69000000 {
-+                      status = "okay";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/gemini-wbd222.dts
-+++ b/arch/arm/boot/dts/gemini-wbd222.dts
-@@ -183,5 +183,13 @@
-                               phy-handle = <&phy1>;
-                       };
-               };
-+
-+              usb@68000000 {
-+                      status = "okay";
-+              };
-+
-+              usb@69000000 {
-+                      status = "okay";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/gemini.dtsi
-+++ b/arch/arm/boot/dts/gemini.dtsi
-@@ -409,5 +409,37 @@
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-+
-+              usb@68000000 {
-+                      compatible = "cortina,gemini-usb", "faraday,fotg210";
-+                      reg = <0x68000000 0x1000>;
-+                      interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
-+                      resets = <&syscon GEMINI_RESET_USB0>;
-+                      clocks = <&syscon GEMINI_CLK_GATE_USB0>;
-+                      clock-names = "PCLK";
-+                      /*
-+                       * This will claim pins for USB0 and USB1 at the same
-+                       * time as they are using some common pins. If you for
-+                       * some reason have a system using USB1 at 96000000 but
-+                       * NOT using USB0 at 68000000 you wll have to add the
-+                       * usb_default_pins to the USB controller at 96000000
-+                       * in your .dts for the board.
-+                       */
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&usb_default_pins>;
-+                      syscon = <&syscon>;
-+                      status = "disabled";
-+              };
-+
-+              usb@69000000 {
-+                      compatible = "cortina,gemini-usb", "faraday,fotg210";
-+                      reg = <0x69000000 0x1000>;
-+                      interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
-+                      resets = <&syscon GEMINI_RESET_USB1>;
-+                      clocks = <&syscon GEMINI_CLK_GATE_USB1>;
-+                      clock-names = "PCLK";
-+                      syscon = <&syscon>;
-+                      status = "disabled";
-+              };
-       };
- };
diff --git a/target/linux/gemini/patches-4.19/0019-ARM-dts-gemini-Indent-DIR-685-partition-table.patch b/target/linux/gemini/patches-4.19/0019-ARM-dts-gemini-Indent-DIR-685-partition-table.patch
deleted file mode 100644 (file)
index c205b5f..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-From 4a228ecf553e879bae384e634bb6413438e81a0e Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Mon, 11 Mar 2019 15:43:05 +0100
-Subject: [PATCH 1/2] ARM: dts: gemini: Indent DIR-685 partition table
-
-It is discouraged to have OF partitions as subnodes directly
-under the device, create a "partitions" subnode and put the
-partitions inside it.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 82 ++++++++++++----------
- 1 file changed, 44 insertions(+), 38 deletions(-)
-
---- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-@@ -267,44 +267,50 @@
-                       /* 32MB of flash */
-                       reg = <0x30000000 0x02000000>;
--                      /*
--                       * This "RedBoot" is the Storlink derivative.
--                       */
--                      partition@0 {
--                              label = "RedBoot";
--                              reg = <0x00000000 0x00040000>;
--                              read-only;
--                      };
--                      /*
--                       * This firmware image contains the kernel catenated
--                       * with the squashfs root filesystem. For some reason
--                       * this is called "upgrade" on the vendor system.
--                       */
--                      partition@40000 {
--                              label = "upgrade";
--                              reg = <0x00040000 0x01f40000>;
--                              read-only;
--                      };
--                      /* RGDB, Residental Gateway Database? */
--                      partition@1f80000 {
--                              label = "rgdb";
--                              reg = <0x01f80000 0x00040000>;
--                              read-only;
--                      };
--                      /*
--                       * This partition contains MAC addresses for WAN,
--                       * WLAN and LAN, and the country code (for wireless
--                       * I guess).
--                       */
--                      partition@1fc0000 {
--                              label = "nvram";
--                              reg = <0x01fc0000 0x00020000>;
--                              read-only;
--                      };
--                      partition@1fe0000 {
--                              label = "LangPack";
--                              reg = <0x01fe0000 0x00020000>;
--                              read-only;
-+                      partitions {
-+                              compatible = "fixed-partitions";
-+                              #address-cells = <1>;
-+                              #size-cells = <1>;
-+
-+                              /*
-+                               * This "RedBoot" is the Storlink derivative.
-+                               */
-+                              partition@0 {
-+                                      label = "RedBoot";
-+                                      reg = <0x00000000 0x00040000>;
-+                                      read-only;
-+                              };
-+                              /*
-+                               * This firmware image contains the kernel catenated
-+                               * with the squashfs root filesystem. For some reason
-+                               * this is called "upgrade" on the vendor system.
-+                               */
-+                              partition@40000 {
-+                                      label = "upgrade";
-+                                      reg = <0x00040000 0x01f40000>;
-+                                      read-only;
-+                              };
-+                              /* RGDB, Residental Gateway Database? */
-+                              partition@1f80000 {
-+                                      label = "rgdb";
-+                                      reg = <0x01f80000 0x00040000>;
-+                                      read-only;
-+                              };
-+                              /*
-+                               * This partition contains MAC addresses for WAN,
-+                               * WLAN and LAN, and the country code (for wireless
-+                               * I guess).
-+                               */
-+                              partition@1fc0000 {
-+                                      label = "nvram";
-+                                      reg = <0x01fc0000 0x00020000>;
-+                                      read-only;
-+                              };
-+                              partition@1fe0000 {
-+                                      label = "LangPack";
-+                                      reg = <0x01fe0000 0x00020000>;
-+                                      read-only;
-+                              };
-                       };
-               };
diff --git a/target/linux/gemini/patches-4.19/0020-ARM-dts-Augment-DIR-685-partition-table-for-OpenWrt.patch b/target/linux/gemini/patches-4.19/0020-ARM-dts-Augment-DIR-685-partition-table-for-OpenWrt.patch
deleted file mode 100644 (file)
index bb40765..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 854934b0ce8e758ce581f5ddbc30e618ab46fbdb Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Mon, 11 Mar 2019 15:44:29 +0100
-Subject: [PATCH 2/2] ARM: dts: Augment DIR-685 partition table for OpenWrt
-
-Rename the firmware partition so that the firmware MTD
-splitter will do its job, drop the rootfs arguments as
-the MTD splitter will set this up automatically.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
-@@ -20,7 +20,7 @@
-       };
-       chosen {
--              bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait consoleblank=300";
-+              bootargs = "console=ttyS0,19200n8 consoleblank=300";
-               stdout-path = "uart0:19200n8";
-       };
-@@ -286,7 +286,8 @@
-                                * this is called "upgrade" on the vendor system.
-                                */
-                               partition@40000 {
--                                      label = "upgrade";
-+                                      compatible = "wrg";
-+                                      label = "firmware";
-                                       reg = <0x00040000 0x01f40000>;
-                                       read-only;
-                               };
diff --git a/target/linux/generic/backport-4.19/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch b/target/linux/generic/backport-4.19/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
deleted file mode 100644 (file)
index 7ac4f9d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 13b1ecc3401653a355798eb1dee10cc1608202f4 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 18 Jan 2016 12:27:49 +0100
-Subject: [PATCH 33/34] Kbuild: don't hardcode path to awk in
- scripts/ld-version.sh
-
-On some systems /usr/bin/awk does not exist, or is broken. Find it via
-$PATH instead.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- scripts/ld-version.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/scripts/ld-version.sh
-+++ b/scripts/ld-version.sh
-@@ -1,6 +1,7 @@
--#!/usr/bin/awk -f
-+#!/bin/sh
- # SPDX-License-Identifier: GPL-2.0
- # extract linker version number from stdin and turn into single number
-+exec awk '
-       {
-       gsub(".*\\)", "");
-       gsub(".*version ", "");
-@@ -9,3 +10,4 @@
-       print a[1]*100000000 + a[2]*1000000 + a[3]*10000;
-       exit
-       }
-+'
diff --git a/target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch
deleted file mode 100644 (file)
index b5f6549..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From 173019b66dcc9d68ad9333aa744dad1e369b5aa8 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 9 Jul 2017 00:26:53 +0200
-Subject: [PATCH 34/34] kernel: add compile fix for linux 4.9 on x86
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -431,8 +431,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s
- KBUILD_LDFLAGS :=
- GCC_PLUGINS_CFLAGS :=
--export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
--export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS
-+export ARCH SRCARCH SUBARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD
-+export CC CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS
- export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
- export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
diff --git a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch
deleted file mode 100644 (file)
index 3a35381..0000000
+++ /dev/null
@@ -1,558 +0,0 @@
-From 1bb0c3ec899827cfa4668bb63a08713a40744d21 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Sun, 9 Jul 2017 08:58:30 +0200
-Subject: [PATCH] netfilter: conntrack: cache route for forwarded connections
-
-... to avoid per-packet FIB lookup if possible.
-
-The cached dst is re-used provided the input interface
-is the same as that of the previous packet in the same direction.
-
-If not, the cached dst is invalidated.
-
-For ipv6 we also need to store sernum, else dst_check doesn't work,
-pointed out by Eric Dumazet.
-
-This should speed up forwarding when conntrack is already in use
-anyway, especially when using reverse path filtering -- active RPF
-enforces two FIB lookups for each packet.
-
-Before the routing cache removal this didn't matter since RPF was performed
-only when route cache didn't yield a result; but without route cache it
-comes at higher price.
-
-Julian Anastasov suggested to add NETDEV_UNREGISTER handler to
-avoid holding on to dsts of 'frozen' conntracks.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- include/net/netfilter/nf_conntrack_extend.h  |   4 +
- include/net/netfilter/nf_conntrack_rtcache.h |  34 +++
- net/netfilter/Kconfig                        |  12 +
- net/netfilter/Makefile                       |   3 +
- net/netfilter/nf_conntrack_rtcache.c         | 428 +++++++++++++++++++++++++++
- 5 files changed, 481 insertions(+)
- create mode 100644 include/net/netfilter/nf_conntrack_rtcache.h
- create mode 100644 net/netfilter/nf_conntrack_rtcache.c
-
---- a/include/net/netfilter/nf_conntrack_extend.h
-+++ b/include/net/netfilter/nf_conntrack_extend.h
-@@ -28,6 +28,9 @@ enum nf_ct_ext_id {
- #if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
-       NF_CT_EXT_SYNPROXY,
- #endif
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
-+      NF_CT_EXT_RTCACHE,
-+#endif
-       NF_CT_EXT_NUM,
- };
-@@ -40,6 +43,7 @@ enum nf_ct_ext_id {
- #define NF_CT_EXT_TIMEOUT_TYPE struct nf_conn_timeout
- #define NF_CT_EXT_LABELS_TYPE struct nf_conn_labels
- #define NF_CT_EXT_SYNPROXY_TYPE struct nf_conn_synproxy
-+#define NF_CT_EXT_RTCACHE_TYPE struct nf_conn_rtcache
- /* Extensions: optional stuff which isn't permanently in struct. */
- struct nf_ct_ext {
---- /dev/null
-+++ b/include/net/netfilter/nf_conntrack_rtcache.h
-@@ -0,0 +1,34 @@
-+#include <linux/gfp.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_extend.h>
-+
-+struct dst_entry;
-+
-+struct nf_conn_dst_cache {
-+      struct dst_entry *dst;
-+      int iif;
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      u32 cookie;
-+#endif
-+
-+};
-+
-+struct nf_conn_rtcache {
-+      struct nf_conn_dst_cache cached_dst[IP_CT_DIR_MAX];
-+};
-+
-+static inline
-+struct nf_conn_rtcache *nf_ct_rtcache_find(const struct nf_conn *ct)
-+{
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
-+      return nf_ct_ext_find(ct, NF_CT_EXT_RTCACHE);
-+#else
-+      return NULL;
-+#endif
-+}
-+
-+static inline int nf_conn_rtcache_iif_get(const struct nf_conn_rtcache *rtc,
-+                                        enum ip_conntrack_dir dir)
-+{
-+      return rtc->cached_dst[dir].iif;
-+}
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -135,6 +135,18 @@ config NF_CONNTRACK_EVENTS
-         If unsure, say `N'.
-+config NF_CONNTRACK_RTCACHE
-+      tristate "Cache route entries in conntrack objects"
-+      depends on NETFILTER_ADVANCED
-+      depends on NF_CONNTRACK
-+      help
-+        If this option is enabled, the connection tracking code will
-+        cache routing information for each connection that is being
-+        forwarded, at a cost of 32 bytes per conntrack object.
-+
-+        To compile it as a module, choose M here.  If unsure, say N.
-+        The module will be called nf_conntrack_rtcache.
-+
- config NF_CONNTRACK_TIMEOUT
-       bool  'Connection tracking timeout'
-       depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -25,6 +25,9 @@ obj-$(CONFIG_NETFILTER_NETLINK_OSF) += n
- # connection tracking
- obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o
-+# optional conntrack route cache extension
-+obj-$(CONFIG_NF_CONNTRACK_RTCACHE) += nf_conntrack_rtcache.o
-+
- obj-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o
- # netlink interface for nf_conntrack
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtcache.c
-@@ -0,0 +1,428 @@
-+/* route cache for netfilter.
-+ *
-+ * (C) 2014 Red Hat GmbH
-+ *
-+ * 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.
-+ */
-+
-+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-+
-+#include <linux/types.h>
-+#include <linux/netfilter.h>
-+#include <linux/skbuff.h>
-+#include <linux/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/netdevice.h>
-+#include <linux/export.h>
-+#include <linux/module.h>
-+
-+#include <net/dst.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_rtcache.h>
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+#include <net/ip6_fib.h>
-+#endif
-+
-+static void __nf_conn_rtcache_destroy(struct nf_conn_rtcache *rtc,
-+                                    enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *dst = rtc->cached_dst[dir].dst;
-+
-+      dst_release(dst);
-+}
-+
-+static void nf_conn_rtcache_destroy(struct nf_conn *ct)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+
-+      if (!rtc)
-+              return;
-+
-+      __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_ORIGINAL);
-+      __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_REPLY);
-+}
-+
-+static void nf_ct_rtcache_ext_add(struct nf_conn *ct)
-+{
-+      struct nf_conn_rtcache *rtc;
-+
-+      rtc = nf_ct_ext_add(ct, NF_CT_EXT_RTCACHE, GFP_ATOMIC);
-+      if (rtc) {
-+              rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif = -1;
-+              rtc->cached_dst[IP_CT_DIR_ORIGINAL].dst = NULL;
-+              rtc->cached_dst[IP_CT_DIR_REPLY].iif = -1;
-+              rtc->cached_dst[IP_CT_DIR_REPLY].dst = NULL;
-+      }
-+}
-+
-+static struct nf_conn_rtcache *nf_ct_rtcache_find_usable(struct nf_conn *ct)
-+{
-+      return nf_ct_rtcache_find(ct);
-+}
-+
-+static struct dst_entry *
-+nf_conn_rtcache_dst_get(const struct nf_conn_rtcache *rtc,
-+                      enum ip_conntrack_dir dir)
-+{
-+      return rtc->cached_dst[dir].dst;
-+}
-+
-+static u32 nf_rtcache_get_cookie(int pf, const struct dst_entry *dst)
-+{
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      if (pf == NFPROTO_IPV6) {
-+              const struct rt6_info *rt = (const struct rt6_info *)dst;
-+
-+              if (rt->from && rt->from->fib6_node)
-+                      return (u32)rt->from->fib6_node->fn_sernum;
-+      }
-+#endif
-+      return 0;
-+}
-+
-+static void nf_conn_rtcache_dst_set(int pf,
-+                                  struct nf_conn_rtcache *rtc,
-+                                  struct dst_entry *dst,
-+                                  enum ip_conntrack_dir dir, int iif)
-+{
-+      if (rtc->cached_dst[dir].iif != iif)
-+              rtc->cached_dst[dir].iif = iif;
-+
-+      if (rtc->cached_dst[dir].dst != dst) {
-+              struct dst_entry *old;
-+
-+              dst_hold(dst);
-+
-+              old = xchg(&rtc->cached_dst[dir].dst, dst);
-+              dst_release(old);
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+              if (pf == NFPROTO_IPV6)
-+                      rtc->cached_dst[dir].cookie =
-+                              nf_rtcache_get_cookie(pf, dst);
-+#endif
-+      }
-+}
-+
-+static void nf_conn_rtcache_dst_obsolete(struct nf_conn_rtcache *rtc,
-+                                       enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *old;
-+
-+      pr_debug("Invalidate iif %d for dir %d on cache %p\n",
-+               rtc->cached_dst[dir].iif, dir, rtc);
-+
-+      old = xchg(&rtc->cached_dst[dir].dst, NULL);
-+      dst_release(old);
-+      rtc->cached_dst[dir].iif = -1;
-+}
-+
-+static unsigned int nf_rtcache_in(u_int8_t pf,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      struct nf_conn_rtcache *rtc;
-+      enum ip_conntrack_info ctinfo;
-+      enum ip_conntrack_dir dir;
-+      struct dst_entry *dst;
-+      struct nf_conn *ct;
-+      int iif;
-+      u32 cookie;
-+
-+      if (skb_dst(skb) || skb->sk)
-+              return NF_ACCEPT;
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (!ct)
-+              return NF_ACCEPT;
-+
-+      rtc = nf_ct_rtcache_find_usable(ct);
-+      if (!rtc)
-+              return NF_ACCEPT;
-+
-+      /* if iif changes, don't use cache and let ip stack
-+       * do route lookup.
-+       *
-+       * If rp_filter is enabled it might toss skb, so
-+       * we don't want to avoid these checks.
-+       */
-+      dir = CTINFO2DIR(ctinfo);
-+      iif = nf_conn_rtcache_iif_get(rtc, dir);
-+      if (state->in->ifindex != iif) {
-+              pr_debug("ct %p, iif %d, cached iif %d, skip cached entry\n",
-+                       ct, iif, state->in->ifindex);
-+              return NF_ACCEPT;
-+      }
-+      dst = nf_conn_rtcache_dst_get(rtc, dir);
-+      if (dst == NULL)
-+              return NF_ACCEPT;
-+
-+      cookie = nf_rtcache_get_cookie(pf, dst);
-+
-+      dst = dst_check(dst, cookie);
-+      pr_debug("obtained dst %p for skb %p, cookie %d\n", dst, skb, cookie);
-+      if (likely(dst))
-+              skb_dst_set_noref(skb, dst);
-+      else
-+              nf_conn_rtcache_dst_obsolete(rtc, dir);
-+
-+      return NF_ACCEPT;
-+}
-+
-+static unsigned int nf_rtcache_forward(u_int8_t pf,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      struct nf_conn_rtcache *rtc;
-+      enum ip_conntrack_info ctinfo;
-+      enum ip_conntrack_dir dir;
-+      struct nf_conn *ct;
-+      struct dst_entry *dst = skb_dst(skb);
-+      int iif;
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (!ct)
-+              return NF_ACCEPT;
-+
-+      if (dst && dst_xfrm(dst))
-+              return NF_ACCEPT;
-+
-+      if (!nf_ct_is_confirmed(ct)) {
-+              if (WARN_ON(nf_ct_rtcache_find(ct)))
-+                      return NF_ACCEPT;
-+              nf_ct_rtcache_ext_add(ct);
-+              return NF_ACCEPT;
-+      }
-+
-+      rtc = nf_ct_rtcache_find_usable(ct);
-+      if (!rtc)
-+              return NF_ACCEPT;
-+
-+      dir = CTINFO2DIR(ctinfo);
-+      iif = nf_conn_rtcache_iif_get(rtc, dir);
-+      pr_debug("ct %p, skb %p, dir %d, iif %d, cached iif %d\n",
-+               ct, skb, dir, iif, state->in->ifindex);
-+      if (likely(state->in->ifindex == iif))
-+              return NF_ACCEPT;
-+
-+      nf_conn_rtcache_dst_set(pf, rtc, skb_dst(skb), dir, state->in->ifindex);
-+      return NF_ACCEPT;
-+}
-+
-+static unsigned int nf_rtcache_in4(void *priv,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_in(NFPROTO_IPV4, skb, state);
-+}
-+
-+static unsigned int nf_rtcache_forward4(void *priv,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_forward(NFPROTO_IPV4, skb, state);
-+}
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+static unsigned int nf_rtcache_in6(void *priv,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_in(NFPROTO_IPV6, skb, state);
-+}
-+
-+static unsigned int nf_rtcache_forward6(void *priv,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_forward(NFPROTO_IPV6, skb, state);
-+}
-+#endif
-+
-+static int nf_rtcache_dst_remove(struct nf_conn *ct, void *data)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+      struct net_device *dev = data;
-+
-+      if (!rtc)
-+              return 0;
-+
-+      if (dev->ifindex == rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif ||
-+          dev->ifindex == rtc->cached_dst[IP_CT_DIR_REPLY].iif) {
-+              nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_ORIGINAL);
-+              nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_REPLY);
-+      }
-+
-+      return 0;
-+}
-+
-+static int nf_rtcache_netdev_event(struct notifier_block *this,
-+                                 unsigned long event, void *ptr)
-+{
-+      struct net_device *dev = netdev_notifier_info_to_dev(ptr);
-+      struct net *net = dev_net(dev);
-+
-+      if (event == NETDEV_DOWN)
-+              nf_ct_iterate_cleanup_net(net, nf_rtcache_dst_remove, dev, 0, 0);
-+
-+      return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block nf_rtcache_notifier = {
-+      .notifier_call = nf_rtcache_netdev_event,
-+};
-+
-+static struct nf_hook_ops rtcache_ops[] = {
-+      {
-+              .hook           = nf_rtcache_in4,
-+              .pf             = NFPROTO_IPV4,
-+              .hooknum        = NF_INET_PRE_ROUTING,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+      {
-+              .hook           = nf_rtcache_forward4,
-+              .pf             = NFPROTO_IPV4,
-+              .hooknum        = NF_INET_FORWARD,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      {
-+              .hook           = nf_rtcache_in6,
-+              .pf             = NFPROTO_IPV6,
-+              .hooknum        = NF_INET_PRE_ROUTING,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+      {
-+              .hook           = nf_rtcache_forward6,
-+              .pf             = NFPROTO_IPV6,
-+              .hooknum        = NF_INET_FORWARD,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+#endif
-+};
-+
-+static struct nf_ct_ext_type rtcache_extend __read_mostly = {
-+      .len    = sizeof(struct nf_conn_rtcache),
-+      .align  = __alignof__(struct nf_conn_rtcache),
-+      .id     = NF_CT_EXT_RTCACHE,
-+      .destroy = nf_conn_rtcache_destroy,
-+};
-+
-+static void __net_exit rtcache_net_exit(struct net *net)
-+{
-+      /* remove hooks so no new connections get rtcache extension */
-+      nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
-+}
-+
-+static struct pernet_operations rtcache_ops_net_ops = {
-+      .exit   = rtcache_net_exit,
-+};
-+
-+static int __init nf_conntrack_rtcache_init(void)
-+{
-+      int ret = nf_ct_extend_register(&rtcache_extend);
-+
-+      if (ret < 0) {
-+              pr_err("nf_conntrack_rtcache: Unable to register extension\n");
-+              return ret;
-+      }
-+
-+      ret = register_pernet_subsys(&rtcache_ops_net_ops);
-+      if (ret) {
-+              nf_ct_extend_unregister(&rtcache_extend);
-+              return ret;
-+      }
-+
-+      ret = nf_register_net_hooks(&init_net, rtcache_ops,
-+                                  ARRAY_SIZE(rtcache_ops));
-+      if (ret < 0) {
-+              nf_ct_extend_unregister(&rtcache_extend);
-+              unregister_pernet_subsys(&rtcache_ops_net_ops);
-+              return ret;
-+      }
-+
-+      ret = register_netdevice_notifier(&nf_rtcache_notifier);
-+      if (ret) {
-+              nf_unregister_net_hooks(&init_net, rtcache_ops,
-+                                      ARRAY_SIZE(rtcache_ops));
-+              nf_ct_extend_unregister(&rtcache_extend);
-+              unregister_pernet_subsys(&rtcache_ops_net_ops);
-+      }
-+
-+      return ret;
-+}
-+
-+static int nf_rtcache_ext_remove(struct nf_conn *ct, void *data)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+
-+      return rtc != NULL;
-+}
-+
-+static bool __exit nf_conntrack_rtcache_wait_for_dying(struct net *net)
-+{
-+      bool wait = false;
-+      int cpu;
-+
-+      for_each_possible_cpu(cpu) {
-+              struct nf_conntrack_tuple_hash *h;
-+              struct hlist_nulls_node *n;
-+              struct nf_conn *ct;
-+              struct ct_pcpu *pcpu = per_cpu_ptr(net->ct.pcpu_lists, cpu);
-+
-+              rcu_read_lock();
-+              spin_lock_bh(&pcpu->lock);
-+
-+              hlist_nulls_for_each_entry(h, n, &pcpu->dying, hnnode) {
-+                      ct = nf_ct_tuplehash_to_ctrack(h);
-+                      if (nf_ct_rtcache_find(ct) != NULL) {
-+                              wait = true;
-+                              break;
-+                      }
-+              }
-+              spin_unlock_bh(&pcpu->lock);
-+              rcu_read_unlock();
-+      }
-+
-+      return wait;
-+}
-+
-+static void __exit nf_conntrack_rtcache_fini(void)
-+{
-+      struct net *net;
-+      int count = 0;
-+
-+      synchronize_net();
-+
-+      unregister_netdevice_notifier(&nf_rtcache_notifier);
-+
-+      rtnl_lock();
-+
-+      /* zap all conntracks with rtcache extension */
-+      for_each_net(net)
-+              nf_ct_iterate_cleanup_net(net, nf_rtcache_ext_remove, NULL, 0, 0);
-+
-+      for_each_net(net) {
-+              /* .. and make sure they're gone from dying list, too */
-+              while (nf_conntrack_rtcache_wait_for_dying(net)) {
-+                      msleep(200);
-+                      WARN_ONCE(++count > 25, "Waiting for all rtcache conntracks to go away\n");
-+              }
-+      }
-+
-+      rtnl_unlock();
-+      synchronize_net();
-+      nf_ct_extend_unregister(&rtcache_extend);
-+}
-+module_init(nf_conntrack_rtcache_init);
-+module_exit(nf_conntrack_rtcache_fini);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Florian Westphal <fw@strlen.de>");
-+MODULE_DESCRIPTION("Conntrack route cache extension");
diff --git a/target/linux/generic/backport-4.19/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch b/target/linux/generic/backport-4.19/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch
deleted file mode 100644 (file)
index d587c9e..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1186af457cc186c5ed01708da71b1ffbdf0a2638 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 20 Nov 2018 09:55:45 +0100
-Subject: [PATCH] mtd: keep original flags for every struct mtd_info
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When allocating a new partition mtd subsystem runs internal tests in the
-allocate_partition(). They may result in modifying specified flags (e.g.
-dropping some /features/ like write access).
-
-Those constraints don't have to be necessary true for subpartitions. It
-may happen parent partition isn't block aligned (effectively disabling
-write access) while subpartition may fit blocks nicely. In such case all
-checks should be run again (starting with original flags value).
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c   | 2 ++
- drivers/mtd/mtdpart.c   | 3 ++-
- include/linux/mtd/mtd.h | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -665,6 +665,8 @@ static void mtd_set_dev_defaults(struct
-       } else {
-               pr_debug("mtd device won't show a device symlink in sysfs\n");
-       }
-+
-+      mtd->orig_flags = mtd->flags;
- }
- /**
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -346,7 +346,8 @@ static struct mtd_part *allocate_partiti
-       /* set up the MTD object for this partition */
-       slave->mtd.type = parent->type;
--      slave->mtd.flags = parent->flags & ~part->mask_flags;
-+      slave->mtd.flags = parent->orig_flags & ~part->mask_flags;
-+      slave->mtd.orig_flags = slave->mtd.flags;
-       slave->mtd.size = part->size;
-       slave->mtd.writesize = parent->writesize;
-       slave->mtd.writebufsize = parent->writebufsize;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -207,6 +207,7 @@ struct mtd_debug_info {
- struct mtd_info {
-       u_char type;
-       uint32_t flags;
-+      uint32_t orig_flags; /* Flags as before running mtd checks */
-       uint64_t size;   // Total size of the MTD
-       /* "Major" erase size for the device. Naïve users may take this
diff --git a/target/linux/generic/backport-4.19/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch b/target/linux/generic/backport-4.19/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch
deleted file mode 100644 (file)
index 0229627..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6750f61a13a0197c40e4a40739117493b15f19e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 20 Nov 2018 10:24:09 +0100
-Subject: [PATCH] mtd: improve calculating partition boundaries when checking
- for alignment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When checking for alignment mtd should check absolute offsets. It's
-important for subpartitions as it doesn't make sense to check their
-relative addresses.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -61,6 +61,15 @@ static inline struct mtd_part *mtd_to_pa
-       return container_of(mtd, struct mtd_part, mtd);
- }
-+static u64 part_absolute_offset(struct mtd_info *mtd)
-+{
-+      struct mtd_part *part = mtd_to_part(mtd);
-+
-+      if (!mtd_is_partition(mtd))
-+              return 0;
-+
-+      return part_absolute_offset(part->parent) + part->offset;
-+}
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -518,7 +527,7 @@ static struct mtd_part *allocate_partiti
-       if (!(slave->mtd.flags & MTD_NO_ERASE))
-               wr_alignment = slave->mtd.erasesize;
--      tmp = slave->offset;
-+      tmp = part_absolute_offset(parent) + slave->offset;
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               /* Doesn't start on a boundary of major erase size */
-@@ -529,7 +538,7 @@ static struct mtd_part *allocate_partiti
-                       part->name);
-       }
--      tmp = slave->mtd.size;
-+      tmp = part_absolute_offset(parent) + slave->mtd.size;
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               slave->mtd.flags &= ~MTD_WRITEABLE;
diff --git a/target/linux/generic/backport-4.19/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch b/target/linux/generic/backport-4.19/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
deleted file mode 100644 (file)
index cc32aee..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-From 5a1c18b761ddb299a06746948b9ec2814b04fa92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 2 Jan 2019 00:00:01 +0100
-Subject: [PATCH] bcma: keep a direct pointer to the struct device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Accessing struct device is pretty useful/common so having a direct
-pointer:
-1) Simplifies some code
-2) Makes bcma_bus_get_host_dev() unneeded
-3) Allows further improvements like using dev_* printing helpers
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/bcma/bcma_private.h |  1 -
- drivers/bcma/driver_gpio.c  |  2 +-
- drivers/bcma/host_pci.c     |  2 ++
- drivers/bcma/host_soc.c     |  4 ++--
- drivers/bcma/main.c         | 45 +++++++++----------------------------
- include/linux/bcma/bcma.h   | 11 +++------
- 6 files changed, 18 insertions(+), 47 deletions(-)
-
---- a/drivers/bcma/bcma_private.h
-+++ b/drivers/bcma/bcma_private.h
-@@ -33,7 +33,6 @@ int __init bcma_bus_early_register(struc
- int bcma_bus_suspend(struct bcma_bus *bus);
- int bcma_bus_resume(struct bcma_bus *bus);
- #endif
--struct device *bcma_bus_get_host_dev(struct bcma_bus *bus);
- /* scan.c */
- void bcma_detect_chip(struct bcma_bus *bus);
---- a/drivers/bcma/driver_gpio.c
-+++ b/drivers/bcma/driver_gpio.c
-@@ -183,7 +183,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
-       chip->direction_input   = bcma_gpio_direction_input;
-       chip->direction_output  = bcma_gpio_direction_output;
-       chip->owner             = THIS_MODULE;
--      chip->parent            = bcma_bus_get_host_dev(bus);
-+      chip->parent            = bus->dev;
- #if IS_BUILTIN(CONFIG_OF)
-       chip->of_node           = cc->core->dev.of_node;
- #endif
---- a/drivers/bcma/host_pci.c
-+++ b/drivers/bcma/host_pci.c
-@@ -196,6 +196,8 @@ static int bcma_host_pci_probe(struct pc
-               goto err_pci_release_regions;
-       }
-+      bus->dev = &dev->dev;
-+
-       /* Map MMIO */
-       err = -ENOMEM;
-       bus->mmio = pci_iomap(dev, 0, ~0UL);
---- a/drivers/bcma/host_soc.c
-+++ b/drivers/bcma/host_soc.c
-@@ -179,7 +179,6 @@ int __init bcma_host_soc_register(struct
-       /* Host specific */
-       bus->hosttype = BCMA_HOSTTYPE_SOC;
-       bus->ops = &bcma_host_soc_ops;
--      bus->host_pdev = NULL;
-       /* Initialize struct, detect chip */
-       bcma_init_bus(bus);
-@@ -213,6 +212,8 @@ static int bcma_host_soc_probe(struct pl
-       if (!bus)
-               return -ENOMEM;
-+      bus->dev = dev;
-+
-       /* Map MMIO */
-       bus->mmio = of_iomap(np, 0);
-       if (!bus->mmio)
-@@ -221,7 +222,6 @@ static int bcma_host_soc_probe(struct pl
-       /* Host specific */
-       bus->hosttype = BCMA_HOSTTYPE_SOC;
-       bus->ops = &bcma_host_soc_ops;
--      bus->host_pdev = pdev;
-       /* Initialize struct, detect chip */
-       bcma_init_bus(bus);
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -223,8 +223,8 @@ unsigned int bcma_core_irq(struct bcma_d
-                       mips_irq = bcma_core_mips_irq(core);
-                       return mips_irq <= 4 ? mips_irq + 2 : 0;
-               }
--              if (bus->host_pdev)
--                      return bcma_of_get_irq(&bus->host_pdev->dev, core, num);
-+              if (bus->dev)
-+                      return bcma_of_get_irq(bus->dev, core, num);
-               return 0;
-       case BCMA_HOSTTYPE_SDIO:
-               return 0;
-@@ -239,18 +239,18 @@ void bcma_prepare_core(struct bcma_bus *
-       core->dev.release = bcma_release_core_dev;
-       core->dev.bus = &bcma_bus_type;
-       dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
--      core->dev.parent = bcma_bus_get_host_dev(bus);
--      if (core->dev.parent)
--              bcma_of_fill_device(core->dev.parent, core);
-+      core->dev.parent = bus->dev;
-+      if (bus->dev)
-+              bcma_of_fill_device(bus->dev, core);
-       switch (bus->hosttype) {
-       case BCMA_HOSTTYPE_PCI:
--              core->dma_dev = &bus->host_pci->dev;
-+              core->dma_dev = bus->dev;
-               core->irq = bus->host_pci->irq;
-               break;
-       case BCMA_HOSTTYPE_SOC:
--              if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {
--                      core->dma_dev = &bus->host_pdev->dev;
-+              if (IS_ENABLED(CONFIG_OF) && bus->dev) {
-+                      core->dma_dev = bus->dev;
-               } else {
-                       core->dev.dma_mask = &core->dev.coherent_dma_mask;
-                       core->dma_dev = &core->dev;
-@@ -261,28 +261,6 @@ void bcma_prepare_core(struct bcma_bus *
-       }
- }
--struct device *bcma_bus_get_host_dev(struct bcma_bus *bus)
--{
--      switch (bus->hosttype) {
--      case BCMA_HOSTTYPE_PCI:
--              if (bus->host_pci)
--                      return &bus->host_pci->dev;
--              else
--                      return NULL;
--      case BCMA_HOSTTYPE_SOC:
--              if (bus->host_pdev)
--                      return &bus->host_pdev->dev;
--              else
--                      return NULL;
--      case BCMA_HOSTTYPE_SDIO:
--              if (bus->host_sdio)
--                      return &bus->host_sdio->dev;
--              else
--                      return NULL;
--      }
--      return NULL;
--}
--
- void bcma_init_bus(struct bcma_bus *bus)
- {
-       mutex_lock(&bcma_buses_mutex);
-@@ -402,7 +380,6 @@ int bcma_bus_register(struct bcma_bus *b
- {
-       int err;
-       struct bcma_device *core;
--      struct device *dev;
-       /* Scan for devices (cores) */
-       err = bcma_bus_scan(bus);
-@@ -425,10 +402,8 @@ int bcma_bus_register(struct bcma_bus *b
-               bcma_core_pci_early_init(&bus->drv_pci[0]);
-       }
--      dev = bcma_bus_get_host_dev(bus);
--      if (dev) {
--              of_platform_default_populate(dev->of_node, NULL, dev);
--      }
-+      if (bus->dev)
-+              of_platform_default_populate(bus->dev->of_node, NULL, bus->dev);
-       /* Cores providing flash access go before SPROM init */
-       list_for_each_entry(core, &bus->cores, list) {
---- a/include/linux/bcma/bcma.h
-+++ b/include/linux/bcma/bcma.h
-@@ -332,6 +332,8 @@ extern int bcma_arch_register_fallback_s
-               struct ssb_sprom *out));
- struct bcma_bus {
-+      struct device *dev;
-+
-       /* The MMIO area. */
-       void __iomem *mmio;
-@@ -339,14 +341,7 @@ struct bcma_bus {
-       enum bcma_hosttype hosttype;
-       bool host_is_pcie2; /* Used for BCMA_HOSTTYPE_PCI only */
--      union {
--              /* Pointer to the PCI bus (only for BCMA_HOSTTYPE_PCI) */
--              struct pci_dev *host_pci;
--              /* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
--              struct sdio_func *host_sdio;
--              /* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
--              struct platform_device *host_pdev;
--      };
-+      struct pci_dev *host_pci; /* PCI bus pointer (BCMA_HOSTTYPE_PCI only) */
-       struct bcma_chipinfo chipinfo;
diff --git a/target/linux/generic/backport-4.19/080-v5.1-0002-bcma-use-dev_-printing-functions.patch b/target/linux/generic/backport-4.19/080-v5.1-0002-bcma-use-dev_-printing-functions.patch
deleted file mode 100644 (file)
index 7ce8ba8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 777bc4801a6868fcbff09ffb6e30f023e7c5ed38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 2 Jan 2019 00:00:02 +0100
-Subject: [PATCH] bcma: use dev_* printing functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It provides more meaningful messages.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/bcma/bcma_private.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/bcma/bcma_private.h
-+++ b/drivers/bcma/bcma_private.h
-@@ -10,13 +10,13 @@
- #include <linux/delay.h>
- #define bcma_err(bus, fmt, ...) \
--      pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_err((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- #define bcma_warn(bus, fmt, ...) \
--      pr_warn("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_warn((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- #define bcma_info(bus, fmt, ...) \
--      pr_info("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_info((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- #define bcma_debug(bus, fmt, ...) \
--      pr_debug("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_dbg((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- struct bcma_bus;
diff --git a/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch
deleted file mode 100644 (file)
index 5d49a40..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-From 46bf067870156abd61fe24d14c2486d15b8b502c Mon Sep 17 00:00:00 2001
-From: Dave Taht <dave@taht.net>
-Date: Fri, 14 Dec 2018 18:38:40 +0000
-Subject: [PATCH 1/1] Allow class-e address assignment in ifconfig and early
- boot
-
-While the linux kernel became mostly "class-e clean" a decade ago,
-and most distributions long ago switched to the iproute2 suite
-of utilities, which allow class-e (240.0.0.0/4) address assignment,
-distributions relying on busybox, toybox and other forms of
-ifconfig cannot assign class-e addresses without this kernel patch.
-
-With this patch, also, a boot command line on these addresses is feasible:
-(ip=248.0.1.2::248.0.1.1:255.255.255.0).
-
-While CIDR has been obsolete for 2 decades, and a survey of all the
-userspace open source code in the world shows most IN_whatever macros
-are also obsolete... rather than obsolete CIDR from this ioctl entirely,
-this patch merely enables class-e assignment, sanely.
-
-H/T to Vince Fuller and his original patch here:
-    https://lkml.org/lkml/2008/1/7/370
-
-Signed-off-by: Dave Taht <dave.taht@gmail.com>
-Reviewed-by: John Gilmore <gnu@toad.com>
----
- include/uapi/linux/in.h | 8 ++++++--
- net/ipv4/devinet.c      | 4 +++-
- net/ipv4/ipconfig.c     | 2 ++
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
---- a/include/uapi/linux/in.h
-+++ b/include/uapi/linux/in.h
-@@ -268,8 +268,12 @@ struct sockaddr_in {
- #define       IN_MULTICAST(a)         IN_CLASSD(a)
- #define IN_MULTICAST_NET      0xF0000000
--#define       IN_EXPERIMENTAL(a)      ((((long int) (a)) & 0xf0000000) == 0xf0000000)
--#define       IN_BADCLASS(a)          IN_EXPERIMENTAL((a))
-+#define       IN_BADCLASS(a)          (((long int) (a) ) == (long int)0xffffffff)
-+#define       IN_EXPERIMENTAL(a)      IN_BADCLASS((a))
-+
-+#define       IN_CLASSE(a)            ((((long int) (a)) & 0xf0000000) == 0xf0000000)
-+#define       IN_CLASSE_NET           0xffffffff
-+#define       IN_CLASSE_NSHIFT        0
- /* Address to accept any incoming messages. */
- #define       INADDR_ANY              ((unsigned long int) 0x00000000)
---- a/net/ipv4/devinet.c
-+++ b/net/ipv4/devinet.c
-@@ -941,7 +941,7 @@ static int inet_abc_len(__be32 addr)
- {
-       int rc = -1;    /* Something else, probably a multicast. */
--      if (ipv4_is_zeronet(addr))
-+      if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr))
-               rc = 0;
-       else {
-               __u32 haddr = ntohl(addr);
-@@ -952,6 +952,8 @@ static int inet_abc_len(__be32 addr)
-                       rc = 16;
-               else if (IN_CLASSC(haddr))
-                       rc = 24;
-+              else if (IN_CLASSE(haddr))
-+                      rc = 32;
-       }
-       return rc;
---- a/net/ipv4/ipconfig.c
-+++ b/net/ipv4/ipconfig.c
-@@ -429,6 +429,8 @@ static int __init ic_defaults(void)
-                       ic_netmask = htonl(IN_CLASSB_NET);
-               else if (IN_CLASSC(ntohl(ic_myaddr)))
-                       ic_netmask = htonl(IN_CLASSC_NET);
-+              else if (IN_CLASSE(ntohl(ic_myaddr)))
-+                      ic_netmask = htonl(IN_CLASSE_NET);
-               else {
-                       pr_err("IP-Config: Unable to guess netmask for address %pI4\n",
-                              &ic_myaddr);
diff --git a/target/linux/generic/backport-4.19/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch b/target/linux/generic/backport-4.19/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch
deleted file mode 100644 (file)
index 2b33843..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4cc30de79d293f1e8c5f50ae3a9c005def9564a0 Mon Sep 17 00:00:00 2001
-From: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Date: Mon, 7 Jan 2019 14:14:27 +0100
-Subject: [PATCH 2/2] arm: cns3xxx: use actual size reads for PCIe
-
-commit 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
-reimplemented cns3xxx_pci_read_config() using pci_generic_config_read32(),
-which preserved the property of only doing 32-bit reads.
-
-It also replaced cns3xxx_pci_write_config() with pci_generic_config_write(),
-so it changed writes from always being 32 bits to being the actual size,
-which works just fine.
-
-Due to:
-- The documentation does not mention that only 32 bit access is allowed.
-- Writes are already executed using the actual size
-- Extensive testing shows that 8b, 16b and 32b reads work as intended
-
-It makes perfectly sense to also swap 32 bit reading in favor of actual size.
-
-Fixes: 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
-Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-CC: Arnd Bergmann <arnd@arndb.de>
-CC: Krzysztof Halasa <khalasa@piap.pl>
-CC: Olof Johansson <olof@lixom.net>
-CC: Robin Leblon <robin.leblon@ncentric.com>
-CC: Rob Herring <robh@kernel.org>
-CC: Russell King <linux@armlinux.org.uk>
-CC: Tim Harvey <tharvey@gateworks.com>
-CC: stable@vger.kernel.org # v4.0+
----
- arch/arm/mach-cns3xxx/pcie.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -93,7 +93,7 @@ static int cns3xxx_pci_read_config(struc
-       u32 mask = (0x1ull << (size * 8)) - 1;
-       int shift = (where % 4) * 8;
--      ret = pci_generic_config_read32(bus, devfn, where, size, val);
-+      ret = pci_generic_config_read(bus, devfn, where, size, val);
-       if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn &&
-           (where & 0xffc) == PCI_CLASS_REVISION)
diff --git a/target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch b/target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
deleted file mode 100644 (file)
index f8ccfcc..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Thu, 25 Jan 2018 12:58:55 +0100
-Subject: [PATCH] netfilter: nft_flow_offload: handle netdevice events from
- nf_flow_table
-
-Move the code that deals with device events to the core.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
-
---- a/net/netfilter/nf_flow_table_core.c
-+++ b/net/netfilter/nf_flow_table_core.c
-@@ -520,5 +520,35 @@ void nf_flow_table_free(struct nf_flowta
- }
- EXPORT_SYMBOL_GPL(nf_flow_table_free);
-+static int nf_flow_table_netdev_event(struct notifier_block *this,
-+                                    unsigned long event, void *ptr)
-+{
-+      struct net_device *dev = netdev_notifier_info_to_dev(ptr);
-+
-+      if (event != NETDEV_DOWN)
-+              return NOTIFY_DONE;
-+
-+      nf_flow_table_cleanup(dev_net(dev), dev);
-+
-+      return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block flow_offload_netdev_notifier = {
-+      .notifier_call  = nf_flow_table_netdev_event,
-+};
-+
-+static int __init nf_flow_table_module_init(void)
-+{
-+      return register_netdevice_notifier(&flow_offload_netdev_notifier);
-+}
-+
-+static void __exit nf_flow_table_module_exit(void)
-+{
-+      unregister_netdevice_notifier(&flow_offload_netdev_notifier);
-+}
-+
-+module_init(nf_flow_table_module_init);
-+module_exit(nf_flow_table_module_exit);
-+
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
---- a/net/netfilter/nft_flow_offload.c
-+++ b/net/netfilter/nft_flow_offload.c
-@@ -196,47 +196,14 @@ static struct nft_expr_type nft_flow_off
-       .owner          = THIS_MODULE,
- };
--static int flow_offload_netdev_event(struct notifier_block *this,
--                                   unsigned long event, void *ptr)
--{
--      struct net_device *dev = netdev_notifier_info_to_dev(ptr);
--
--      if (event != NETDEV_DOWN)
--              return NOTIFY_DONE;
--
--      nf_flow_table_cleanup(dev_net(dev), dev);
--
--      return NOTIFY_DONE;
--}
--
--static struct notifier_block flow_offload_netdev_notifier = {
--      .notifier_call  = flow_offload_netdev_event,
--};
--
- static int __init nft_flow_offload_module_init(void)
- {
--      int err;
--
--      err = register_netdevice_notifier(&flow_offload_netdev_notifier);
--      if (err)
--              goto err;
--
--      err = nft_register_expr(&nft_flow_offload_type);
--      if (err < 0)
--              goto register_expr;
--
--      return 0;
--
--register_expr:
--      unregister_netdevice_notifier(&flow_offload_netdev_notifier);
--err:
--      return err;
-+      return nft_register_expr(&nft_flow_offload_type);
- }
- static void __exit nft_flow_offload_module_exit(void)
- {
-       nft_unregister_expr(&nft_flow_offload_type);
--      unregister_netdevice_notifier(&flow_offload_netdev_notifier);
- }
- module_init(nft_flow_offload_module_init);
diff --git a/target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch b/target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch
deleted file mode 100644 (file)
index ac7a73b..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 15 Mar 2018 18:21:43 +0100
-Subject: [PATCH] netfilter: nf_flow_table: clean up and fix dst handling
-
-dst handling in the code is inconsistent and possibly wrong. In my test,
-skb_dst(skb) holds the dst entry after routing but before NAT, so the
-code could possibly return the same dst entry for both directions of a
-connection.
-Additionally, there was some confusion over the dst entry vs the address
-passed as parameter to rt_nexthop/rt6_nexthop.
-
-Do an explicit dst lookup for both ends of the connection and always use
-the source address for it. When running the IP hook, use the dst entry
-for the opposite direction for determining the route.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/net/netfilter/nf_flow_table_ip.c
-+++ b/net/netfilter/nf_flow_table_ip.c
-@@ -241,7 +241,7 @@ nf_flow_offload_ip_hook(void *priv, stru
-       dir = tuplehash->tuple.dir;
-       flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]);
--      rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache;
-+      rt = (struct rtable *)flow->tuplehash[!dir].tuple.dst_cache;
-       if (unlikely(nf_flow_exceeds_mtu(skb, flow->tuplehash[dir].tuple.mtu)) &&
-           (ip_hdr(skb)->frag_off & htons(IP_DF)) != 0)
-@@ -459,7 +459,7 @@ nf_flow_offload_ipv6_hook(void *priv, st
-       dir = tuplehash->tuple.dir;
-       flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]);
--      rt = (struct rt6_info *)flow->tuplehash[dir].tuple.dst_cache;
-+      rt = (struct rt6_info *)flow->tuplehash[!dir].tuple.dst_cache;
-       if (unlikely(nf_flow_exceeds_mtu(skb, flow->tuplehash[dir].tuple.mtu)))
-               return NF_ACCEPT;
---- a/net/netfilter/nft_flow_offload.c
-+++ b/net/netfilter/nft_flow_offload.c
-@@ -18,13 +18,11 @@ struct nft_flow_offload {
-       struct nft_flowtable    *flowtable;
- };
--static int nft_flow_route(const struct nft_pktinfo *pkt,
--                        const struct nf_conn *ct,
--                        struct nf_flow_route *route,
--                        enum ip_conntrack_dir dir)
-+static struct dst_entry *
-+nft_flow_dst(const struct nf_conn *ct, enum ip_conntrack_dir dir,
-+           const struct nft_pktinfo *pkt)
- {
--      struct dst_entry *this_dst = skb_dst(pkt->skb);
--      struct dst_entry *other_dst = NULL;
-+      struct dst_entry *dst;
-       struct flowi fl;
-       memset(&fl, 0, sizeof(fl));
-@@ -39,8 +37,21 @@ static int nft_flow_route(const struct n
-               break;
-       }
--      nf_route(nft_net(pkt), &other_dst, &fl, false, nft_pf(pkt));
--      if (!other_dst)
-+      nf_route(nft_net(pkt), &dst, &fl, false, nft_pf(pkt));
-+
-+      return dst;
-+}
-+
-+static int nft_flow_route(const struct nft_pktinfo *pkt,
-+                        const struct nf_conn *ct,
-+                        struct nf_flow_route *route,
-+                        enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *this_dst, *other_dst;
-+
-+      this_dst = nft_flow_dst(ct, dir, pkt);
-+      other_dst = nft_flow_dst(ct, !dir, pkt);
-+      if (!this_dst || !other_dst)
-               return -ENOENT;
-       route->tuple[dir].dst           = this_dst;
diff --git a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
deleted file mode 100644 (file)
index cc8e003..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Wed, 13 Jun 2018 12:33:39 +0200
-Subject: [PATCH] netfilter: nf_flow_table: fix offloaded connection timeout
- corner case
-
-The full teardown of offloaded flows is deferred to a gc work item,
-however processing of packets by netfilter needs to happen immediately
-after a teardown is requested, because the conntrack state needs to be
-fixed up.
-
-Since the IPS_OFFLOAD_BIT is still kept until the teardown is complete,
-the netfilter conntrack gc can accidentally bump the timeout of a
-connection where offload was just stopped, causing a conntrack entry
-leak.
-
-Fix this by moving the conntrack timeout bumping from conntrack core to
-the nf_flow_offload and add a check to prevent bogus timeout bumps.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -1178,18 +1178,6 @@ static bool gc_worker_can_early_drop(con
-       return false;
- }
--#define       DAY     (86400 * HZ)
--
--/* Set an arbitrary timeout large enough not to ever expire, this save
-- * us a check for the IPS_OFFLOAD_BIT from the packet path via
-- * nf_ct_is_expired().
-- */
--static void nf_ct_offload_timeout(struct nf_conn *ct)
--{
--      if (nf_ct_expires(ct) < DAY / 2)
--              ct->timeout = nfct_time_stamp + DAY;
--}
--
- static void gc_worker(struct work_struct *work)
- {
-       unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
-@@ -1226,10 +1214,8 @@ static void gc_worker(struct work_struct
-                       tmp = nf_ct_tuplehash_to_ctrack(h);
-                       scanned++;
--                      if (test_bit(IPS_OFFLOAD_BIT, &tmp->status)) {
--                              nf_ct_offload_timeout(tmp);
-+                      if (test_bit(IPS_OFFLOAD_BIT, &tmp->status))
-                               continue;
--                      }
-                       if (nf_ct_is_expired(tmp)) {
-                               nf_ct_gc_expired(tmp);
---- a/net/netfilter/nf_flow_table_core.c
-+++ b/net/netfilter/nf_flow_table_core.c
-@@ -183,8 +183,27 @@ static const struct rhashtable_params nf
-       .automatic_shrinking    = true,
- };
-+#define       DAY     (86400 * HZ)
-+
-+/* Set an arbitrary timeout large enough not to ever expire, this save
-+ * us a check for the IPS_OFFLOAD_BIT from the packet path via
-+ * nf_ct_is_expired().
-+ */
-+static void nf_ct_offload_timeout(struct flow_offload *flow)
-+{
-+      struct flow_offload_entry *entry;
-+      struct nf_conn *ct;
-+
-+      entry = container_of(flow, struct flow_offload_entry, flow);
-+      ct = entry->ct;
-+
-+      if (nf_ct_expires(ct) < DAY / 2)
-+              ct->timeout = nfct_time_stamp + DAY;
-+}
-+
- int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)
- {
-+      nf_ct_offload_timeout(flow);
-       flow->timeout = (u32)jiffies;
-       rhashtable_insert_fast(&flow_table->rhashtable,
-@@ -305,6 +324,8 @@ static int nf_flow_offload_gc_step(struc
-       rhashtable_walk_start(&hti);
-       while ((tuplehash = rhashtable_walk_next(&hti))) {
-+              bool teardown;
-+
-               if (IS_ERR(tuplehash)) {
-                       err = PTR_ERR(tuplehash);
-                       if (err != -EAGAIN)
-@@ -317,9 +338,13 @@ static int nf_flow_offload_gc_step(struc
-               flow = container_of(tuplehash, struct flow_offload, tuplehash[0]);
--              if (nf_flow_has_expired(flow) ||
--                  (flow->flags & (FLOW_OFFLOAD_DYING |
--                                  FLOW_OFFLOAD_TEARDOWN)))
-+              teardown = flow->flags & (FLOW_OFFLOAD_DYING |
-+                                        FLOW_OFFLOAD_TEARDOWN);
-+
-+              if (!teardown)
-+                      nf_ct_offload_timeout(flow);
-+
-+              if (nf_flow_has_expired(flow) || teardown)
-                       flow_offload_del(flow_table, flow);
-       }
- out:
diff --git a/target/linux/generic/backport-4.19/371-netfilter-nf_flow_table-fix-up-ct-state-of-flows-aft.patch b/target/linux/generic/backport-4.19/371-netfilter-nf_flow_table-fix-up-ct-state-of-flows-aft.patch
deleted file mode 100644 (file)
index 5ee55b8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 14 Jun 2018 11:20:09 +0200
-Subject: [PATCH] netfilter: nf_flow_table: fix up ct state of flows after
- timeout
-
-If a connection simply times out instead of being torn down, it is left
-active with a long timeout. Fix this by calling flow_offload_fixup_ct_state
-here as well.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/net/netfilter/nf_flow_table_core.c
-+++ b/net/netfilter/nf_flow_table_core.c
-@@ -231,6 +231,9 @@ static void flow_offload_del(struct nf_f
-       e = container_of(flow, struct flow_offload_entry, flow);
-       clear_bit(IPS_OFFLOAD_BIT, &e->ct->status);
-+      if (!(flow->flags & FLOW_OFFLOAD_TEARDOWN))
-+              flow_offload_fixup_ct_state(e->ct);
-+
-       flow_offload_free(flow);
- }
diff --git a/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch
deleted file mode 100644 (file)
index 632f41e..0000000
+++ /dev/null
@@ -1,617 +0,0 @@
-From 402c8d61d2f27060be14849fcb30682f75f3bf3b Mon Sep 17 00:00:00 2001
-From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
-Date: Wed, 13 Mar 2019 20:54:49 +0000
-Subject: [PATCH] net: sched: Introduce act_ctinfo action
-
-ctinfo is a new tc filter action module.  It is designed to restore DSCPs
-stored in conntrack marks into the ipv4/v6 diffserv field.
-
-The feature is intended for use and has been found useful for restoring
-ingress classifications based on egress classifications across links
-that bleach or otherwise change DSCP, typically home ISP Internet links.
-Restoring DSCP on ingress on the WAN link allows qdiscs such as CAKE to
-shape inbound packets according to policies that are easier to indicate
-on egress.
-
-Ingress classification is traditionally a challenging task since
-iptables rules haven't yet run and tc filter/eBPF programs are pre-NAT
-lookups, hence are unable to see internal IPv4 addresses as used on the
-typical home masquerading gateway.
-
-ctinfo understands the following parameters:
-
-dscp dscpmask[/statemask]
-
-dscpmask - a 32 bit mask of at least 6 contiguous bits and indicates
-where ctinfo will find the DSCP bits stored in the conntrack mark.
-
-statemask - a 32 bit mask of (usually) 1 bit length, outside the area
-specified by dscpmask.  This represents a conditional operation flag
-whereby the DSCP is only restored if the flag is set.  This is useful to
-implement a 'one shot' iptables based classification where the
-'complicated' iptables rules are only run once to classify the
-connection on initial (egress) packet and subsequent packets are all
-marked/restored with the same DSCP.  A mask of zero disables the
-conditional behaviour ie. the conntrack mark DSCP bits are always
-restored to the ip diffserv field (assuming the conntrack entry is found
-& the skb is an ipv4/ipv6 type)
-
-optional parameters:
-
-zone - conntrack zone
-
-control - action related control (reclassify | pipe | drop | continue |
-ok | goto chain <CHAIN_INDEX>)
-
-e.g. dscp 0xfc000000/0x01000000
-
-|----0xFC----conntrack mark----000000---|
-| Bits 31-26 | bit 25 | bit24 |~~~ Bit 0|
-| DSCP       | unused | flag  |unused   |
-|-----------------------0x01---000000---|
-      |                   |
-      |                   |
-      ---|             Conditional flag
-         v             only restore if set
-|-ip diffserv-|
-| 6 bits      |
-|-------------|
-
-Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
----
- include/net/tc_act/tc_ctinfo.h            |  28 ++
- include/uapi/linux/pkt_cls.h              |   3 +-
- include/uapi/linux/tc_act/tc_ctinfo.h     |  34 ++
- net/sched/Kconfig                         |  17 +
- net/sched/Makefile                        |   1 +
- net/sched/act_ctinfo.c                    | 395 ++++++++++++++++++++++
- tools/testing/selftests/tc-testing/config |   1 +
- 7 files changed, 478 insertions(+), 1 deletion(-)
- create mode 100644 include/net/tc_act/tc_ctinfo.h
- create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h
- create mode 100644 net/sched/act_ctinfo.c
-
-diff --git a/include/net/tc_act/tc_ctinfo.h b/include/net/tc_act/tc_ctinfo.h
-new file mode 100644
-index 000000000000..d6a688571672
---- /dev/null
-+++ b/include/net/tc_act/tc_ctinfo.h
-@@ -0,0 +1,28 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+#ifndef __NET_TC_CTINFO_H
-+#define __NET_TC_CTINFO_H
-+
-+#include <net/act_api.h>
-+
-+struct tcf_ctinfo_params {
-+      struct rcu_head rcu;
-+      struct net *net;
-+      u32 dscpmask;
-+      u32 dscpstatemask;
-+      u32 cpmarkmask;
-+      u16 zone;
-+      u8 mode;
-+      u8 dscpmaskshift;
-+};
-+
-+struct tcf_ctinfo {
-+      struct tc_action common;
-+      struct tcf_ctinfo_params __rcu *params;
-+      u64 stats_dscp_set;
-+      u64 stats_dscp_error;
-+      u64 stats_cpmark_set;
-+};
-+
-+#define to_ctinfo(a) ((struct tcf_ctinfo *)a)
-+
-+#endif /* __NET_TC_CTINFO_H */
-diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
-index be382fb0592d..71e10c5a96a0 100644
---- a/include/uapi/linux/pkt_cls.h
-+++ b/include/uapi/linux/pkt_cls.h
-@@ -68,7 +68,8 @@ enum {
-       TCA_ID_UNSPEC=0,
-       TCA_ID_POLICE=1,
-       /* other actions go here */
--      __TCA_ID_MAX=255
-+      TCA_ID_CTINFO,
-+      __TCA_ID_MAX = 255
- };
- #define TCA_ID_MAX __TCA_ID_MAX
-diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
-new file mode 100644
-index 000000000000..da803e05a89b
---- /dev/null
-+++ b/include/uapi/linux/tc_act/tc_ctinfo.h
-@@ -0,0 +1,34 @@
-+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-+#ifndef __UAPI_TC_CTINFO_H
-+#define __UAPI_TC_CTINFO_H
-+
-+#include <linux/types.h>
-+#include <linux/pkt_cls.h>
-+
-+struct tc_ctinfo {
-+      tc_gen;
-+};
-+
-+enum {
-+      TCA_CTINFO_UNSPEC,
-+      TCA_CTINFO_PAD,
-+      TCA_CTINFO_TM,
-+      TCA_CTINFO_ACT,
-+      TCA_CTINFO_ZONE,
-+      TCA_CTINFO_PARMS_DSCP_MASK,
-+      TCA_CTINFO_PARMS_DSCP_STATEMASK,
-+      TCA_CTINFO_PARMS_CPMARK_MASK,
-+      TCA_CTINFO_STATS_DSCP_SET,
-+      TCA_CTINFO_STATS_DSCP_ERROR,
-+      TCA_CTINFO_STATS_CPMARK_SET,
-+      __TCA_CTINFO_MAX
-+};
-+
-+#define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
-+
-+enum {
-+      CTINFO_MODE_DSCP        = BIT(0),
-+      CTINFO_MODE_CPMARK      = BIT(1)
-+};
-+
-+#endif
-diff --git a/net/sched/Kconfig b/net/sched/Kconfig
-index e95741388311..1d79d5dba6e4 100644
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -866,6 +866,23 @@ config NET_ACT_CONNMARK
-         To compile this code as a module, choose M here: the
-         module will be called act_connmark.
-+config NET_ACT_CTINFO
-+        tristate "Netfilter Connection Mark Actions"
-+        depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
-+        depends on NF_CONNTRACK && NF_CONNTRACK_MARK
-+        help
-+        Say Y here to allow transfer of a connmark stored information.
-+        Current actions transfer connmark stored DSCP into
-+        ipv4/v6 diffserv and/or to transfer connmark to packet
-+        mark.  Both are useful for restoring egress based marks
-+        back onto ingress connections for qdisc priority mapping
-+        purposes.
-+
-+        If unsure, say N.
-+
-+        To compile this code as a module, choose M here: the
-+        module will be called act_ctinfo.
-+
- config NET_ACT_SKBMOD
-         tristate "skb data modification action"
-         depends on NET_CLS_ACT
-diff --git a/net/sched/Makefile b/net/sched/Makefile
-index f0403f49edcb..bb3c2bc44af7 100644
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_ACT_CSUM)   += act_csum.o
- obj-$(CONFIG_NET_ACT_VLAN)    += act_vlan.o
- obj-$(CONFIG_NET_ACT_BPF)     += act_bpf.o
- obj-$(CONFIG_NET_ACT_CONNMARK)        += act_connmark.o
-+obj-$(CONFIG_NET_ACT_CTINFO)  += act_ctinfo.o
- obj-$(CONFIG_NET_ACT_SKBMOD)  += act_skbmod.o
- obj-$(CONFIG_NET_ACT_IFE)     += act_ife.o
- obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o
-diff --git a/net/sched/act_ctinfo.c b/net/sched/act_ctinfo.c
-new file mode 100644
-index 000000000000..8975cb4976aa
---- /dev/null
-+++ b/net/sched/act_ctinfo.c
-@@ -0,0 +1,395 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/* net/sched/act_ctinfo.c  netfilter ctinfo connmark actions
-+ *
-+ * Copyright (c) 2019 Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/skbuff.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/pkt_cls.h>
-+#include <linux/ip.h>
-+#include <linux/ipv6.h>
-+#include <net/netlink.h>
-+#include <net/pkt_sched.h>
-+#include <net/act_api.h>
-+#include <net/pkt_cls.h>
-+#include <uapi/linux/tc_act/tc_ctinfo.h>
-+#include <net/tc_act/tc_ctinfo.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#include <net/netfilter/nf_conntrack_ecache.h>
-+#include <net/netfilter/nf_conntrack_zones.h>
-+
-+static struct tc_action_ops act_ctinfo_ops;
-+static unsigned int ctinfo_net_id;
-+
-+static void tcf_ctinfo_dscp_set(struct nf_conn *ct, struct tcf_ctinfo *ca,
-+                              struct tcf_ctinfo_params *cp,
-+                              struct sk_buff *skb, int wlen, int proto)
-+{
-+      u8 dscp, newdscp;
-+
-+      newdscp = (((ct->mark & cp->dscpmask) >> cp->dscpmaskshift) << 2) &
-+                   ~INET_ECN_MASK;
-+
-+      switch (proto) {
-+      case NFPROTO_IPV4:
-+              dscp = ipv4_get_dsfield(ip_hdr(skb)) & ~INET_ECN_MASK;
-+              if (dscp != newdscp) {
-+                      if (likely(!skb_try_make_writable(skb, wlen))) {
-+                              ipv4_change_dsfield(ip_hdr(skb),
-+                                                  INET_ECN_MASK,
-+                                                  newdscp);
-+                              ca->stats_dscp_set++;
-+                      } else {
-+                              ca->stats_dscp_error++;
-+                      }
-+              }
-+              break;
-+      case NFPROTO_IPV6:
-+              dscp = ipv6_get_dsfield(ipv6_hdr(skb)) & ~INET_ECN_MASK;
-+              if (dscp != newdscp) {
-+                      if (likely(!skb_try_make_writable(skb, wlen))) {
-+                              ipv6_change_dsfield(ipv6_hdr(skb),
-+                                                  INET_ECN_MASK,
-+                                                  newdscp);
-+                              ca->stats_dscp_set++;
-+                      } else {
-+                              ca->stats_dscp_error++;
-+                      }
-+              }
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+static void tcf_ctinfo_cpmark_set(struct nf_conn *ct, struct tcf_ctinfo *ca,
-+                                struct tcf_ctinfo_params *cp,
-+                                struct sk_buff *skb)
-+{
-+      ca->stats_cpmark_set++;
-+      skb->mark = ct->mark & cp->cpmarkmask;
-+}
-+
-+static int tcf_ctinfo_act(struct sk_buff *skb, const struct tc_action *a,
-+                        struct tcf_result *res)
-+{
-+      const struct nf_conntrack_tuple_hash *thash = NULL;
-+      struct tcf_ctinfo *ca = to_ctinfo(a);
-+      struct nf_conntrack_tuple tuple;
-+      struct nf_conntrack_zone zone;
-+      enum ip_conntrack_info ctinfo;
-+      struct tcf_ctinfo_params *cp;
-+      struct nf_conn *ct;
-+      int proto, wlen;
-+      int action;
-+
-+      cp = rcu_dereference_bh(ca->params);
-+
-+      tcf_lastuse_update(&ca->tcf_tm);
-+      bstats_update(&ca->tcf_bstats, skb);
-+      action = READ_ONCE(ca->tcf_action);
-+
-+      wlen = skb_network_offset(skb);
-+      if (tc_skb_protocol(skb) == htons(ETH_P_IP)) {
-+              wlen += sizeof(struct iphdr);
-+              if (!pskb_may_pull(skb, wlen))
-+                      goto out;
-+
-+              proto = NFPROTO_IPV4;
-+      } else if (tc_skb_protocol(skb) == htons(ETH_P_IPV6)) {
-+              wlen += sizeof(struct ipv6hdr);
-+              if (!pskb_may_pull(skb, wlen))
-+                      goto out;
-+
-+              proto = NFPROTO_IPV6;
-+      } else {
-+              goto out;
-+      }
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (!ct) { /* look harder, usually ingress */
-+              if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),
-+                                     proto, cp->net, &tuple))
-+                      goto out;
-+              zone.id = cp->zone;
-+              zone.dir = NF_CT_DEFAULT_ZONE_DIR;
-+
-+              thash = nf_conntrack_find_get(cp->net, &zone, &tuple);
-+              if (!thash)
-+                      goto out;
-+
-+              ct = nf_ct_tuplehash_to_ctrack(thash);
-+      }
-+
-+      if (cp->mode & CTINFO_MODE_DSCP)
-+              if (!cp->dscpstatemask || (ct->mark & cp->dscpstatemask))
-+                      tcf_ctinfo_dscp_set(ct, ca, cp, skb, wlen, proto);
-+
-+      if (cp->mode & CTINFO_MODE_CPMARK)
-+              tcf_ctinfo_cpmark_set(ct, ca, cp, skb);
-+
-+      if (thash)
-+              nf_ct_put(ct);
-+out:
-+      return action;
-+}
-+
-+static const struct nla_policy ctinfo_policy[TCA_CTINFO_MAX + 1] = {
-+      [TCA_CTINFO_ACT]                  = { .len = sizeof(struct
-+                                                          tc_ctinfo) },
-+      [TCA_CTINFO_ZONE]                 = { .type = NLA_U16 },
-+      [TCA_CTINFO_PARMS_DSCP_MASK]      = { .type = NLA_U32 },
-+      [TCA_CTINFO_PARMS_DSCP_STATEMASK] = { .type = NLA_U32 },
-+      [TCA_CTINFO_PARMS_CPMARK_MASK]    = { .type = NLA_U32 },
-+};
-+
-+static int tcf_ctinfo_init(struct net *net, struct nlattr *nla,
-+                         struct nlattr *est, struct tc_action **a,
-+                         int ovr, int bind, bool rtnl_held,
-+                         struct netlink_ext_ack *extack)
-+{
-+      struct tc_action_net *tn = net_generic(net, ctinfo_net_id);
-+      struct nlattr *tb[TCA_CTINFO_MAX + 1];
-+      struct tcf_ctinfo_params *cp_new;
-+/*    struct tcf_chain *goto_ch = NULL; */
-+      u32 dscpmask = 0, dscpstatemask;
-+      struct tc_ctinfo *actparm;
-+      struct tcf_ctinfo *ci;
-+      u8 dscpmaskshift;
-+      int ret = 0, err;
-+
-+      if (!nla)
-+              return -EINVAL;
-+
-+      err = nla_parse_nested(tb, TCA_CTINFO_MAX, nla, ctinfo_policy, NULL);
-+      if (err < 0)
-+              return err;
-+
-+      if (!tb[TCA_CTINFO_ACT])
-+              return -EINVAL;
-+      actparm = nla_data(tb[TCA_CTINFO_ACT]);
-+
-+      /* do some basic validation here before dynamically allocating things */
-+      /* that we would otherwise have to clean up.                          */
-+      if (tb[TCA_CTINFO_PARMS_DSCP_MASK]) {
-+              dscpmask = nla_get_u32(tb[TCA_CTINFO_PARMS_DSCP_MASK]);
-+              /* need contiguous 6 bit mask */
-+              dscpmaskshift = dscpmask ? __ffs(dscpmask) : 0;
-+              if ((~0 & (dscpmask >> dscpmaskshift)) != 0x3f)
-+                      return -EINVAL;
-+              dscpstatemask = tb[TCA_CTINFO_PARMS_DSCP_STATEMASK] ?
-+                      nla_get_u32(tb[TCA_CTINFO_PARMS_DSCP_STATEMASK]) : 0;
-+              /* mask & statemask must not overlap */
-+              if (dscpmask & dscpstatemask)
-+                      return -EINVAL;
-+      }
-+
-+      /* done the validation:now to the actual action allocation */
-+      err = tcf_idr_check_alloc(tn, &actparm->index, a, bind);
-+      if (!err) {
-+              ret = tcf_idr_create(tn, actparm->index, est, a,
-+                                   &act_ctinfo_ops, bind, false);
-+              if (ret) {
-+                      tcf_idr_cleanup(tn, actparm->index);
-+                      return ret;
-+              }
-+              ret = ACT_P_CREATED;
-+      } else if (err > 0) {
-+              if (bind) /* don't override defaults */
-+                      return 0;
-+              if (!ovr) {
-+                      tcf_idr_release(*a, bind);
-+                      return -EEXIST;
-+              }
-+      } else {
-+              return err;
-+      }
-+
-+/*    err = tcf_action_check_ctrlact(actparm->action, tp, &goto_ch, extack);
-+      if (err < 0)
-+              goto release_idr;
-+              */
-+
-+      ci = to_ctinfo(*a);
-+
-+      cp_new = kzalloc(sizeof(*cp_new), GFP_KERNEL);
-+      if (unlikely(!cp_new)) {
-+              err = -ENOMEM;
-+              goto put_chain;
-+      }
-+
-+      cp_new->net = net;
-+      cp_new->zone = tb[TCA_CTINFO_ZONE] ?
-+                      nla_get_u16(tb[TCA_CTINFO_ZONE]) : 0;
-+      if (dscpmask) {
-+              cp_new->dscpmask = dscpmask;
-+              cp_new->dscpmaskshift = dscpmaskshift;
-+              cp_new->dscpstatemask = dscpstatemask;
-+              cp_new->mode |= CTINFO_MODE_DSCP;
-+      }
-+
-+      if (tb[TCA_CTINFO_PARMS_CPMARK_MASK]) {
-+              cp_new->cpmarkmask =
-+                              nla_get_u32(tb[TCA_CTINFO_PARMS_CPMARK_MASK]);
-+              cp_new->mode |= CTINFO_MODE_CPMARK;
-+      }
-+
-+      spin_lock_bh(&ci->tcf_lock);
-+/*    goto_ch = tcf_action_set_ctrlact(*a, actparm->action, goto_ch); */
-+      ci->tcf_action = actparm->action;
-+      rcu_swap_protected(ci->params, cp_new,
-+                         lockdep_is_held(&ci->tcf_lock));
-+      spin_unlock_bh(&ci->tcf_lock);
-+
-+/*    if (goto_ch)
-+              tcf_chain_put_by_act(goto_ch); */
-+      if (cp_new)
-+              kfree_rcu(cp_new, rcu);
-+
-+      if (ret == ACT_P_CREATED)
-+              tcf_idr_insert(tn, *a);
-+
-+      return ret;
-+
-+put_chain:
-+/*    if (goto_ch)
-+              tcf_chain_put_by_act(goto_ch);
-+release_idr: */
-+      tcf_idr_release(*a, bind);
-+      return err;
-+}
-+
-+static int tcf_ctinfo_dump(struct sk_buff *skb, struct tc_action *a,
-+                         int bind, int ref)
-+{
-+      struct tcf_ctinfo *ci = to_ctinfo(a);
-+      struct tc_ctinfo opt = {
-+              .index   = ci->tcf_index,
-+              .refcnt  = refcount_read(&ci->tcf_refcnt) - ref,
-+              .bindcnt = atomic_read(&ci->tcf_bindcnt) - bind,
-+      };
-+      unsigned char *b = skb_tail_pointer(skb);
-+      struct tcf_ctinfo_params *cp;
-+      struct tcf_t t;
-+
-+      spin_lock_bh(&ci->tcf_lock);
-+      cp = rcu_dereference_protected(ci->params,
-+                                     lockdep_is_held(&ci->tcf_lock));
-+
-+      tcf_tm_dump(&t, &ci->tcf_tm);
-+      if (nla_put_64bit(skb, TCA_CTINFO_TM, sizeof(t), &t, TCA_CTINFO_PAD))
-+              goto nla_put_failure;
-+
-+      opt.action = ci->tcf_action;
-+      if (nla_put(skb, TCA_CTINFO_ACT, sizeof(opt), &opt))
-+              goto nla_put_failure;
-+
-+      if (nla_put_u16(skb, TCA_CTINFO_ZONE, cp->zone))
-+              goto nla_put_failure;
-+
-+      if (cp->mode & CTINFO_MODE_DSCP) {
-+              if (nla_put_u32(skb, TCA_CTINFO_PARMS_DSCP_MASK,
-+                              cp->dscpmask))
-+                      goto nla_put_failure;
-+              if (nla_put_u32(skb, TCA_CTINFO_PARMS_DSCP_STATEMASK,
-+                              cp->dscpstatemask))
-+                      goto nla_put_failure;
-+      }
-+
-+      if (cp->mode & CTINFO_MODE_CPMARK) {
-+              if (nla_put_u32(skb, TCA_CTINFO_PARMS_CPMARK_MASK,
-+                              cp->cpmarkmask))
-+                      goto nla_put_failure;
-+      }
-+
-+      if (nla_put_u64_64bit(skb, TCA_CTINFO_STATS_DSCP_SET,
-+                            ci->stats_dscp_set, TCA_CTINFO_PAD))
-+              goto nla_put_failure;
-+
-+      if (nla_put_u64_64bit(skb, TCA_CTINFO_STATS_DSCP_ERROR,
-+                            ci->stats_dscp_error, TCA_CTINFO_PAD))
-+              goto nla_put_failure;
-+
-+      if (nla_put_u64_64bit(skb, TCA_CTINFO_STATS_CPMARK_SET,
-+                            ci->stats_cpmark_set, TCA_CTINFO_PAD))
-+              goto nla_put_failure;
-+
-+      spin_unlock_bh(&ci->tcf_lock);
-+      return skb->len;
-+
-+nla_put_failure:
-+      spin_unlock_bh(&ci->tcf_lock);
-+      nlmsg_trim(skb, b);
-+      return -1;
-+}
-+
-+static int tcf_ctinfo_walker(struct net *net, struct sk_buff *skb,
-+                           struct netlink_callback *cb, int type,
-+                           const struct tc_action_ops *ops,
-+                           struct netlink_ext_ack *extack)
-+{
-+      struct tc_action_net *tn = net_generic(net, ctinfo_net_id);
-+
-+      return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-+}
-+
-+static int tcf_ctinfo_search(struct net *net, struct tc_action **a, u32 index,
-+                           struct netlink_ext_ack *extack)
-+{
-+      struct tc_action_net *tn = net_generic(net, ctinfo_net_id);
-+
-+      return tcf_idr_search(tn, a, index);
-+}
-+
-+static struct tc_action_ops act_ctinfo_ops = {
-+      .kind   = "ctinfo",
-+      .type   = TCA_ID_CTINFO,
-+      .owner  = THIS_MODULE,
-+      .act    = tcf_ctinfo_act,
-+      .dump   = tcf_ctinfo_dump,
-+      .init   = tcf_ctinfo_init,
-+      .walk   = tcf_ctinfo_walker,
-+      .lookup = tcf_ctinfo_search,
-+      .size   = sizeof(struct tcf_ctinfo),
-+};
-+
-+static __net_init int ctinfo_init_net(struct net *net)
-+{
-+      struct tc_action_net *tn = net_generic(net, ctinfo_net_id);
-+
-+      return tc_action_net_init(tn, &act_ctinfo_ops);
-+}
-+
-+static void __net_exit ctinfo_exit_net(struct list_head *net_list)
-+{
-+      tc_action_net_exit(net_list, ctinfo_net_id);
-+}
-+
-+static struct pernet_operations ctinfo_net_ops = {
-+      .init           = ctinfo_init_net,
-+      .exit_batch     = ctinfo_exit_net,
-+      .id             = &ctinfo_net_id,
-+      .size           = sizeof(struct tc_action_net),
-+};
-+
-+static int __init ctinfo_init_module(void)
-+{
-+      return tcf_register_action(&act_ctinfo_ops, &ctinfo_net_ops);
-+}
-+
-+static void __exit ctinfo_cleanup_module(void)
-+{
-+      tcf_unregister_action(&act_ctinfo_ops, &ctinfo_net_ops);
-+}
-+
-+module_init(ctinfo_init_module);
-+module_exit(ctinfo_cleanup_module);
-+MODULE_AUTHOR("Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>");
-+MODULE_DESCRIPTION("Connection tracking mark actions");
-+MODULE_LICENSE("GPL");
-diff --git a/tools/testing/selftests/tc-testing/config b/tools/testing/selftests/tc-testing/config
-index 203302065458..9d1fddcfb887 100644
---- a/tools/testing/selftests/tc-testing/config
-+++ b/tools/testing/selftests/tc-testing/config
-@@ -37,6 +37,7 @@ CONFIG_NET_ACT_SKBEDIT=m
- CONFIG_NET_ACT_CSUM=m
- CONFIG_NET_ACT_VLAN=m
- CONFIG_NET_ACT_BPF=m
-+CONFIG_NET_ACT_CONNDSCP=m
- CONFIG_NET_ACT_CONNMARK=m
- CONFIG_NET_ACT_SKBMOD=m
- CONFIG_NET_ACT_IFE=m
--- 
-2.20.1 (Apple Git-117)
-
diff --git a/target/linux/generic/backport-4.19/450-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch b/target/linux/generic/backport-4.19/450-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch
deleted file mode 100644 (file)
index 15f761a..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-From c93c613214ac70c87beab5422a60077bf126b855 Mon Sep 17 00:00:00 2001
-From: Chuanhong Guo <gch981213@gmail.com>
-Date: Wed, 28 Nov 2018 21:07:25 +0800
-Subject: [PATCH] mtd: spinand: add support for GigaDevice GD5FxGQ4xA
-
-Add support for GigaDevice GD5F1G/2G/4GQ4xA SPI NAND.
-
-Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
-Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
-Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
----
- drivers/mtd/nand/spi/Makefile     |   2 +-
- drivers/mtd/nand/spi/core.c       |   1 +
- drivers/mtd/nand/spi/gigadevice.c | 148 ++++++++++++++++++++++++++++++++++++++
- include/linux/mtd/spinand.h       |   1 +
- 4 files changed, 151 insertions(+), 1 deletion(-)
- create mode 100644 drivers/mtd/nand/spi/gigadevice.c
-
---- a/drivers/mtd/nand/spi/Makefile
-+++ b/drivers/mtd/nand/spi/Makefile
-@@ -1,3 +1,3 @@
- # SPDX-License-Identifier: GPL-2.0
--spinand-objs := core.o macronix.o micron.o winbond.o
-+spinand-objs := core.o gigadevice.o macronix.o micron.o winbond.o
- obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
---- a/drivers/mtd/nand/spi/core.c
-+++ b/drivers/mtd/nand/spi/core.c
-@@ -762,6 +762,7 @@ static const struct nand_ops spinand_ops
- };
- static const struct spinand_manufacturer *spinand_manufacturers[] = {
-+      &gigadevice_spinand_manufacturer,
-       &macronix_spinand_manufacturer,
-       &micron_spinand_manufacturer,
-       &winbond_spinand_manufacturer,
---- /dev/null
-+++ b/drivers/mtd/nand/spi/gigadevice.c
-@@ -0,0 +1,148 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Author:
-+ *    Chuanhong Guo <gch981213@gmail.com>
-+ */
-+
-+#include <linux/device.h>
-+#include <linux/kernel.h>
-+#include <linux/mtd/spinand.h>
-+
-+#define SPINAND_MFR_GIGADEVICE                        0xC8
-+#define GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS    (1 << 4)
-+#define GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS      (3 << 4)
-+
-+static SPINAND_OP_VARIANTS(read_cache_variants,
-+              SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
-+              SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-+              SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-+              SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-+              SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
-+              SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
-+
-+static SPINAND_OP_VARIANTS(write_cache_variants,
-+              SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
-+              SPINAND_PROG_LOAD(true, 0, NULL, 0));
-+
-+static SPINAND_OP_VARIANTS(update_cache_variants,
-+              SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
-+              SPINAND_PROG_LOAD(false, 0, NULL, 0));
-+
-+static int gd5fxgq4xa_ooblayout_ecc(struct mtd_info *mtd, int section,
-+                                struct mtd_oob_region *region)
-+{
-+      if (section > 3)
-+              return -ERANGE;
-+
-+      region->offset = (16 * section) + 8;
-+      region->length = 8;
-+
-+      return 0;
-+}
-+
-+static int gd5fxgq4xa_ooblayout_free(struct mtd_info *mtd, int section,
-+                                 struct mtd_oob_region *region)
-+{
-+      if (section > 3)
-+              return -ERANGE;
-+
-+      if (section) {
-+              region->offset = 16 * section;
-+              region->length = 8;
-+      } else {
-+              /* section 0 has one byte reserved for bad block mark */
-+              region->offset = 1;
-+              region->length = 7;
-+      }
-+      return 0;
-+}
-+
-+static int gd5fxgq4xa_ecc_get_status(struct spinand_device *spinand,
-+                                       u8 status)
-+{
-+      switch (status & STATUS_ECC_MASK) {
-+      case STATUS_ECC_NO_BITFLIPS:
-+              return 0;
-+
-+      case GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS:
-+              /* 1-7 bits are flipped. return the maximum. */
-+              return 7;
-+
-+      case GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS:
-+              return 8;
-+
-+      case STATUS_ECC_UNCOR_ERROR:
-+              return -EBADMSG;
-+
-+      default:
-+              break;
-+      }
-+
-+      return -EINVAL;
-+}
-+
-+static const struct mtd_ooblayout_ops gd5fxgq4xa_ooblayout = {
-+      .ecc = gd5fxgq4xa_ooblayout_ecc,
-+      .free = gd5fxgq4xa_ooblayout_free,
-+};
-+
-+static const struct spinand_info gigadevice_spinand_table[] = {
-+      SPINAND_INFO("GD5F1GQ4xA", 0xF1,
-+                   NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1),
-+                   NAND_ECCREQ(8, 512),
-+                   SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
-+                                            &write_cache_variants,
-+                                            &update_cache_variants),
-+                   0,
-+                   SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
-+                                   gd5fxgq4xa_ecc_get_status)),
-+      SPINAND_INFO("GD5F2GQ4xA", 0xF2,
-+                   NAND_MEMORG(1, 2048, 64, 64, 2048, 1, 1, 1),
-+                   NAND_ECCREQ(8, 512),
-+                   SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
-+                                            &write_cache_variants,
-+                                            &update_cache_variants),
-+                   0,
-+                   SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
-+                                   gd5fxgq4xa_ecc_get_status)),
-+      SPINAND_INFO("GD5F4GQ4xA", 0xF4,
-+                   NAND_MEMORG(1, 2048, 64, 64, 4096, 1, 1, 1),
-+                   NAND_ECCREQ(8, 512),
-+                   SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
-+                                            &write_cache_variants,
-+                                            &update_cache_variants),
-+                   0,
-+                   SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
-+                                   gd5fxgq4xa_ecc_get_status)),
-+};
-+
-+static int gigadevice_spinand_detect(struct spinand_device *spinand)
-+{
-+      u8 *id = spinand->id.data;
-+      int ret;
-+
-+      /*
-+       * For GD NANDs, There is an address byte needed to shift in before IDs
-+       * are read out, so the first byte in raw_id is dummy.
-+       */
-+      if (id[1] != SPINAND_MFR_GIGADEVICE)
-+              return 0;
-+
-+      ret = spinand_match_and_init(spinand, gigadevice_spinand_table,
-+                                   ARRAY_SIZE(gigadevice_spinand_table),
-+                                   id[2]);
-+      if (ret)
-+              return ret;
-+
-+      return 1;
-+}
-+
-+static const struct spinand_manufacturer_ops gigadevice_spinand_manuf_ops = {
-+      .detect = gigadevice_spinand_detect,
-+};
-+
-+const struct spinand_manufacturer gigadevice_spinand_manufacturer = {
-+      .id = SPINAND_MFR_GIGADEVICE,
-+      .name = "GigaDevice",
-+      .ops = &gigadevice_spinand_manuf_ops,
-+};
---- a/include/linux/mtd/spinand.h
-+++ b/include/linux/mtd/spinand.h
-@@ -194,6 +194,7 @@ struct spinand_manufacturer {
- };
- /* SPI NAND manufacturers */
-+extern const struct spinand_manufacturer gigadevice_spinand_manufacturer;
- extern const struct spinand_manufacturer macronix_spinand_manufacturer;
- extern const struct spinand_manufacturer micron_spinand_manufacturer;
- extern const struct spinand_manufacturer winbond_spinand_manufacturer;
diff --git a/target/linux/generic/backport-4.19/451-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch b/target/linux/generic/backport-4.19/451-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch
deleted file mode 100644 (file)
index f6d6764..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-From c40c7a990a46e5102a1cc4190557bf315d32d80d Mon Sep 17 00:00:00 2001
-From: Stefan Roese <sr@denx.de>
-Date: Thu, 24 Jan 2019 13:48:06 +0100
-Subject: [PATCH] mtd: spinand: Add support for GigaDevice GD5F1GQ4UExxG
-
-Add support for GigaDevice GD5F1GQ4UExxG SPI NAND chip.
-
-Signed-off-by: Stefan Roese <sr@denx.de>
-Cc: Chuanhong Guo <gch981213@gmail.com>
-Cc: Frieder Schrempf <frieder.schrempf@kontron.de>
-Cc: Miquel Raynal <miquel.raynal@bootlin.com>
-Cc: Boris Brezillon <bbrezillon@kernel.org>
-Reviewed-by: Boris Brezillon <bbrezillon@kernel.org>
-Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
----
- drivers/mtd/nand/spi/gigadevice.c | 83 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 83 insertions(+)
-
---- a/drivers/mtd/nand/spi/gigadevice.c
-+++ b/drivers/mtd/nand/spi/gigadevice.c
-@@ -12,6 +12,8 @@
- #define GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS    (1 << 4)
- #define GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS      (3 << 4)
-+#define GD5FXGQ4UEXXG_REG_STATUS2             0xf0
-+
- static SPINAND_OP_VARIANTS(read_cache_variants,
-               SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
-               SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-@@ -81,11 +83,83 @@ static int gd5fxgq4xa_ecc_get_status(str
-       return -EINVAL;
- }
-+static int gd5fxgq4uexxg_ooblayout_ecc(struct mtd_info *mtd, int section,
-+                                     struct mtd_oob_region *region)
-+{
-+      if (section)
-+              return -ERANGE;
-+
-+      region->offset = 64;
-+      region->length = 64;
-+
-+      return 0;
-+}
-+
-+static int gd5fxgq4uexxg_ooblayout_free(struct mtd_info *mtd, int section,
-+                                      struct mtd_oob_region *region)
-+{
-+      if (section)
-+              return -ERANGE;
-+
-+      /* Reserve 1 bytes for the BBM. */
-+      region->offset = 1;
-+      region->length = 63;
-+
-+      return 0;
-+}
-+
-+static int gd5fxgq4uexxg_ecc_get_status(struct spinand_device *spinand,
-+                                      u8 status)
-+{
-+      u8 status2;
-+      struct spi_mem_op op = SPINAND_GET_FEATURE_OP(GD5FXGQ4UEXXG_REG_STATUS2,
-+                                                    &status2);
-+      int ret;
-+
-+      switch (status & STATUS_ECC_MASK) {
-+      case STATUS_ECC_NO_BITFLIPS:
-+              return 0;
-+
-+      case GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS:
-+              /*
-+               * Read status2 register to determine a more fine grained
-+               * bit error status
-+               */
-+              ret = spi_mem_exec_op(spinand->spimem, &op);
-+              if (ret)
-+                      return ret;
-+
-+              /*
-+               * 4 ... 7 bits are flipped (1..4 can't be detected, so
-+               * report the maximum of 4 in this case
-+               */
-+              /* bits sorted this way (3...0): ECCS1,ECCS0,ECCSE1,ECCSE0 */
-+              return ((status & STATUS_ECC_MASK) >> 2) |
-+                      ((status2 & STATUS_ECC_MASK) >> 4);
-+
-+      case GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS:
-+              return 8;
-+
-+      case STATUS_ECC_UNCOR_ERROR:
-+              return -EBADMSG;
-+
-+      default:
-+              break;
-+      }
-+
-+      return -EINVAL;
-+}
-+
- static const struct mtd_ooblayout_ops gd5fxgq4xa_ooblayout = {
-       .ecc = gd5fxgq4xa_ooblayout_ecc,
-       .free = gd5fxgq4xa_ooblayout_free,
- };
-+static const struct mtd_ooblayout_ops gd5fxgq4uexxg_ooblayout = {
-+      .ecc = gd5fxgq4uexxg_ooblayout_ecc,
-+      .free = gd5fxgq4uexxg_ooblayout_free,
-+};
-+
- static const struct spinand_info gigadevice_spinand_table[] = {
-       SPINAND_INFO("GD5F1GQ4xA", 0xF1,
-                    NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1),
-@@ -114,6 +188,15 @@ static const struct spinand_info gigadev
-                    0,
-                    SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
-                                    gd5fxgq4xa_ecc_get_status)),
-+      SPINAND_INFO("GD5F1GQ4UExxG", 0xd1,
-+                   NAND_MEMORG(1, 2048, 128, 64, 1024, 1, 1, 1),
-+                   NAND_ECCREQ(8, 512),
-+                   SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
-+                                            &write_cache_variants,
-+                                            &update_cache_variants),
-+                   0,
-+                   SPINAND_ECCINFO(&gd5fxgq4uexxg_ooblayout,
-+                                   gd5fxgq4uexxg_ecc_get_status)),
- };
- static int gigadevice_spinand_detect(struct spinand_device *spinand)
diff --git a/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch b/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch
deleted file mode 100644 (file)
index 7bd3ed9..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From d62e98ed1efcaa94caa004f622944afdce5f1c3c Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 9 Dec 2018 18:12:13 +0100
-Subject: [PATCH] ubifs: Fix default compression selection in ubifs
-
-When ubifs is build without the LZO compressor and no compressor is
-given the creation of the default file system will fail. before
-selection the LZO compressor check if it is present and if not fall back
-to the zlib or none.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-Signed-off-by: Richard Weinberger <richard@nod.at>
----
- fs/ubifs/sb.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
---- a/fs/ubifs/sb.c
-+++ b/fs/ubifs/sb.c
-@@ -63,6 +63,17 @@
- /* Default time granularity in nanoseconds */
- #define DEFAULT_TIME_GRAN 1000000000
-+static int get_default_compressor(struct ubifs_info *c)
-+{
-+      if (ubifs_compr_present(c, UBIFS_COMPR_LZO))
-+              return UBIFS_COMPR_LZO;
-+
-+      if (ubifs_compr_present(c, UBIFS_COMPR_ZLIB))
-+              return UBIFS_COMPR_ZLIB;
-+
-+      return UBIFS_COMPR_NONE;
-+}
-+
- /**
-  * create_default_filesystem - format empty UBI volume.
-  * @c: UBIFS file-system description object
-@@ -186,7 +197,7 @@ static int create_default_filesystem(str
-       if (c->mount_opts.override_compr)
-               sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
-       else
--              sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO);
-+              sup->default_compr = cpu_to_le16(get_default_compressor(c));
-       generate_random_uuid(sup->uuid);
diff --git a/target/linux/generic/backport-4.9/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch b/target/linux/generic/backport-4.9/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
deleted file mode 100644 (file)
index 1115ee1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13b1ecc3401653a355798eb1dee10cc1608202f4 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 18 Jan 2016 12:27:49 +0100
-Subject: [PATCH 33/34] Kbuild: don't hardcode path to awk in
- scripts/ld-version.sh
-
-On some systems /usr/bin/awk does not exist, or is broken. Find it via
-$PATH instead.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- scripts/ld-version.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/scripts/ld-version.sh
-+++ b/scripts/ld-version.sh
-@@ -1,5 +1,6 @@
--#!/usr/bin/awk -f
-+#!/bin/sh
- # extract linker version number from stdin and turn into single number
-+exec awk '
-       {
-       gsub(".*\\)", "");
-       gsub(".*version ", "");
-@@ -8,3 +9,4 @@
-       print a[1]*100000000 + a[2]*1000000 + a[3]*10000;
-       exit
-       }
-+'
diff --git a/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch
deleted file mode 100644 (file)
index 6ef95db..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From 173019b66dcc9d68ad9333aa744dad1e369b5aa8 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 9 Jul 2017 00:26:53 +0200
-Subject: [PATCH 34/34] kernel: add compile fix for linux 4.9 on x86
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -406,8 +406,8 @@ KERNELRELEASE = $(shell cat include/conf
- KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
- export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
--export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
--export CPP AR NM STRIP OBJCOPY OBJDUMP
-+export ARCH SRCARCH SUBARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD
-+export CC CPP AR NM STRIP OBJCOPY OBJDUMP
- export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
- export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
diff --git a/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch b/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
deleted file mode 100644 (file)
index 4b22ca0..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Tue, 19 Jun 2018 13:14:56 -0700
-Subject: [PATCH] kbuild: add macro for controlling warnings to
- linux/compiler.h
-
-I have occasionally run into a situation where it would make sense to
-control a compiler warning from a source file rather than doing so from
-a Makefile using the $(cc-disable-warning, ...) or $(cc-option, ...)
-helpers.
-
-The approach here is similar to what glibc uses, using __diag() and
-related macros to encapsulate a _Pragma("GCC diagnostic ...") statement
-that gets turned into the respective "#pragma GCC diagnostic ..." by
-the preprocessor when the macro gets expanded.
-
-Like glibc, I also have an argument to pass the affected compiler
-version, but decided to actually evaluate that one. For now, this
-supports GCC_4_6, GCC_4_7, GCC_4_8, GCC_4_9, GCC_5, GCC_6, GCC_7,
-GCC_8 and GCC_9. Adding support for CLANG_5 and other interesting
-versions is straightforward here. GNU compilers starting with gcc-4.2
-could support it in principle, but "#pragma GCC diagnostic push"
-was only added in gcc-4.6, so it seems simpler to not deal with those
-at all. The same versions show a large number of warnings already,
-so it seems easier to just leave it at that and not do a more
-fine-grained control for them.
-
-The use cases I found so far include:
-
-- turning off the gcc-8 -Wattribute-alias warning inside of the
-  SYSCALL_DEFINEx() macro without having to do it globally.
-
-- Reducing the build time for a simple re-make after a change,
-  once we move the warnings from ./Makefile and
-  ./scripts/Makefile.extrawarn into linux/compiler.h
-
-- More control over the warnings based on other configurations,
-  using preprocessor syntax instead of Makefile syntax. This should make
-  it easier for the average developer to understand and change things.
-
-- Adding an easy way to turn the W=1 option on unconditionally
-  for a subdirectory or a specific file. This has been requested
-  by several developers in the past that want to have their subsystems
-  W=1 clean.
-
-- Integrating clang better into the build systems. Clang supports
-  more warnings than GCC, and we probably want to classify them
-  as default, W=1, W=2 etc, but there are cases in which the
-  warnings should be classified differently due to excessive false
-  positives from one or the other compiler.
-
-- Adding a way to turn the default warnings into errors (e.g. using
-  a new "make E=0" tag) while not also turning the W=1 warnings into
-  errors.
-
-This patch for now just adds the minimal infrastructure in order to
-do the first of the list above. As the #pragma GCC diagnostic
-takes precedence over command line options, the next step would be
-to convert a lot of the individual Makefiles that set nonstandard
-options to use __diag() instead.
-
-[paul.burton@mips.com:
-  - Rebase atop current master.
-  - Add __diag_GCC, or more generally __diag_<compiler>, abstraction to
-    avoid code outside of linux/compiler-gcc.h needing to duplicate
-    knowledge about different GCC versions.
-  - Add a comment argument to __diag_{ignore,warn,error} which isn't
-    used in the expansion of the macros but serves to push people to
-    document the reason for using them - per feedback from Kees Cook.
-  - Translate severity to GCC-specific pragmas in linux/compiler-gcc.h
-    rather than using GCC-specific in linux/compiler_types.h.
-  - Drop all but GCC 8 macros, since we only need to define macros for
-    versions that we need to introduce pragmas for, and as of this
-    series that's just GCC 8.
-  - Capitalize comments in linux/compiler-gcc.h to match the style of
-    the rest of the file.
-  - Line up macro definitions with tabs in linux/compiler-gcc.h.]
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Tested-by: Christophe Leroy <christophe.leroy@c-s.fr>
-Tested-by: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
-
---- a/include/linux/compiler-gcc.h
-+++ b/include/linux/compiler-gcc.h
-@@ -338,3 +338,30 @@
- #if GCC_VERSION >= 50100
- #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
- #endif
-+
-+
-+/*
-+ * Turn individual warnings and errors on and off locally, depending
-+ * on version.
-+ */
-+#define __diag_GCC(version, severity, s) \
-+      __diag_GCC_ ## version(__diag_GCC_ ## severity s)
-+
-+/* Severity used in pragma directives */
-+#define __diag_GCC_ignore     ignored
-+#define __diag_GCC_warn               warning
-+#define __diag_GCC_error      error
-+
-+/* Compilers before gcc-4.6 do not understand "#pragma GCC diagnostic push" */
-+#if GCC_VERSION >= 40600
-+#define __diag_str1(s)                #s
-+#define __diag_str(s)         __diag_str1(s)
-+#define __diag(s)             _Pragma(__diag_str(GCC diagnostic s))
-+#endif
-+
-+#if GCC_VERSION >= 80000
-+#define __diag_GCC_8(s)               __diag(s)
-+#else
-+#define __diag_GCC_8(s)
-+#endif
-+
---- a/include/linux/compiler.h
-+++ b/include/linux/compiler.h
-@@ -578,4 +578,23 @@ static __always_inline void __write_once
- # define __kprobes
- # define nokprobe_inline      inline
- #endif
-+
-+#ifndef __diag
-+#define __diag(string)
-+#endif
-+
-+#ifndef __diag_GCC
-+#define __diag_GCC(version, severity, string)
-+#endif
-+
-+#define __diag_push() __diag(push)
-+#define __diag_pop()  __diag(pop)
-+
-+#define __diag_ignore(compiler, version, option, comment) \
-+      __diag_ ## compiler(version, ignore, option)
-+#define __diag_warn(compiler, version, option, comment) \
-+      __diag_ ## compiler(version, warn, option)
-+#define __diag_error(compiler, version, option, comment) \
-+      __diag_ ## compiler(version, error, option)
-+
- #endif /* __LINUX_COMPILER_H */
diff --git a/target/linux/generic/backport-4.9/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch b/target/linux/generic/backport-4.9/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch
deleted file mode 100644 (file)
index fc2a26d..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Tue, 19 Jun 2018 13:14:57 -0700
-Subject: [PATCH] disable -Wattribute-alias warning for SYSCALL_DEFINEx()
-
-gcc-8 warns for every single definition of a system call entry
-point, e.g.:
-
-include/linux/compat.h:56:18: error: 'compat_sys_rt_sigprocmask' alias between functions of incompatible types 'long int(int,  compat_sigset_t *, compat_sigset_t *, compat_size_t)' {aka 'long int(int,  struct <anonymous> *, struct <anonymous> *, unsigned int)'} and 'long int(long int,  long int,  long int,  long int)' [-Werror=attribute-alias]
-  asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
-                  ^~~~~~~~~~
-include/linux/compat.h:45:2: note: in expansion of macro 'COMPAT_SYSCALL_DEFINEx'
-  COMPAT_SYSCALL_DEFINEx(4, _##name, __VA_ARGS__)
-  ^~~~~~~~~~~~~~~~~~~~~~
-kernel/signal.c:2601:1: note: in expansion of macro 'COMPAT_SYSCALL_DEFINE4'
- COMPAT_SYSCALL_DEFINE4(rt_sigprocmask, int, how, compat_sigset_t __user *, nset,
- ^~~~~~~~~~~~~~~~~~~~~~
-include/linux/compat.h:60:18: note: aliased declaration here
-  asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
-                  ^~~~~~~~~~
-
-The new warning seems reasonable in principle, but it doesn't
-help us here, since we rely on the type mismatch to sanitize the
-system call arguments. After I reported this as GCC PR82435, a new
--Wno-attribute-alias option was added that could be used to turn the
-warning off globally on the command line, but I'd prefer to do it a
-little more fine-grained.
-
-Interestingly, turning a warning off and on again inside of
-a single macro doesn't always work, in this case I had to add
-an extra statement inbetween and decided to copy the __SC_TEST
-one from the native syscall to the compat syscall macro.  See
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 for more details
-about this.
-
-[paul.burton@mips.com:
-  - Rebase atop current master.
-  - Split GCC & version arguments to __diag_ignore() in order to match
-    changes to the preceding patch.
-  - Add the comment argument to match the preceding patch.]
-
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82435
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Tested-by: Christophe Leroy <christophe.leroy@c-s.fr>
-Tested-by: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
-
---- a/include/linux/compat.h
-+++ b/include/linux/compat.h
-@@ -47,6 +47,9 @@
-       COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
- #define COMPAT_SYSCALL_DEFINEx(x, name, ...)                          \
-+      __diag_push();                                                  \
-+      __diag_ignore(GCC, 8, "-Wattribute-alias",                      \
-+                    "Type aliasing is used to sanitize syscall arguments");\
-       asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
-               __attribute__((alias(__stringify(compat_SyS##name))));  \
-       static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
-@@ -55,6 +58,7 @@
-       {                                                               \
-               return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
-       }                                                               \
-+      __diag_pop();                                                   \
-       static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
- #ifndef compat_user_stack_pointer
---- a/include/linux/syscalls.h
-+++ b/include/linux/syscalls.h
-@@ -192,6 +192,9 @@ extern struct trace_event_functions exit
- #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
- #define __SYSCALL_DEFINEx(x, name, ...)                                       \
-+      __diag_push();                                                  \
-+      __diag_ignore(GCC, 8, "-Wattribute-alias",                      \
-+                    "Type aliasing is used to sanitize syscall arguments");\
-       asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))       \
-               __attribute__((alias(__stringify(SyS##name))));         \
-       static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));  \
-@@ -203,6 +206,7 @@ extern struct trace_event_functions exit
-               __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));       \
-               return ret;                                             \
-       }                                                               \
-+      __diag_pop();                                                   \
-       static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
- asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special,
diff --git a/target/linux/generic/backport-4.9/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.9/020-backport_netfilter_rtcache.patch
deleted file mode 100644 (file)
index e7c9b4c..0000000
+++ /dev/null
@@ -1,543 +0,0 @@
-From c4d66e57455f5384128753674cc0f9e02db5e1f6 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Sun, 9 Jul 2017 08:58:30 +0200
-Subject: [PATCH] netfilter: conntrack: cache route for forwarded connections
-
-... to avoid per-packet FIB lookup if possible.
-
-The cached dst is re-used provided the input interface
-is the same as that of the previous packet in the same direction.
-
-If not, the cached dst is invalidated.
-
-For ipv6 we also need to store sernum, else dst_check doesn't work,
-pointed out by Eric Dumazet.
-
-This should speed up forwarding when conntrack is already in use
-anyway, especially when using reverse path filtering -- active RPF
-enforces two FIB lookups for each packet.
-
-Before the routing cache removal this didn't matter since RPF was performed
-only when route cache didn't yield a result; but without route cache it
-comes at higher price.
-
-Julian Anastasov suggested to add NETDEV_UNREGISTER handler to
-avoid holding on to dsts of 'frozen' conntracks.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- include/net/netfilter/nf_conntrack_extend.h  |   4 +
- include/net/netfilter/nf_conntrack_rtcache.h |  34 +++
- net/netfilter/Kconfig                        |  12 +
- net/netfilter/Makefile                       |   3 +
- net/netfilter/nf_conntrack_rtcache.c         | 413 +++++++++++++++++++++++++++
- 5 files changed, 466 insertions(+)
- create mode 100644 include/net/netfilter/nf_conntrack_rtcache.h
- create mode 100644 net/netfilter/nf_conntrack_rtcache.c
-
---- a/include/net/netfilter/nf_conntrack_extend.h
-+++ b/include/net/netfilter/nf_conntrack_extend.h
-@@ -27,6 +27,9 @@ enum nf_ct_ext_id {
- #if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
-       NF_CT_EXT_SYNPROXY,
- #endif
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
-+      NF_CT_EXT_RTCACHE,
-+#endif
-       NF_CT_EXT_NUM,
- };
-@@ -39,6 +42,7 @@ enum nf_ct_ext_id {
- #define NF_CT_EXT_TIMEOUT_TYPE struct nf_conn_timeout
- #define NF_CT_EXT_LABELS_TYPE struct nf_conn_labels
- #define NF_CT_EXT_SYNPROXY_TYPE struct nf_conn_synproxy
-+#define NF_CT_EXT_RTCACHE_TYPE struct nf_conn_rtcache
- /* Extensions: optional stuff which isn't permanently in struct. */
- struct nf_ct_ext {
---- /dev/null
-+++ b/include/net/netfilter/nf_conntrack_rtcache.h
-@@ -0,0 +1,34 @@
-+#include <linux/gfp.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_extend.h>
-+
-+struct dst_entry;
-+
-+struct nf_conn_dst_cache {
-+      struct dst_entry *dst;
-+      int iif;
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      u32 cookie;
-+#endif
-+
-+};
-+
-+struct nf_conn_rtcache {
-+      struct nf_conn_dst_cache cached_dst[IP_CT_DIR_MAX];
-+};
-+
-+static inline
-+struct nf_conn_rtcache *nf_ct_rtcache_find(const struct nf_conn *ct)
-+{
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
-+      return nf_ct_ext_find(ct, NF_CT_EXT_RTCACHE);
-+#else
-+      return NULL;
-+#endif
-+}
-+
-+static inline int nf_conn_rtcache_iif_get(const struct nf_conn_rtcache *rtc,
-+                                        enum ip_conntrack_dir dir)
-+{
-+      return rtc->cached_dst[dir].iif;
-+}
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -114,6 +114,18 @@ config NF_CONNTRACK_EVENTS
-         If unsure, say `N'.
-+config NF_CONNTRACK_RTCACHE
-+      tristate "Cache route entries in conntrack objects"
-+      depends on NETFILTER_ADVANCED
-+      depends on NF_CONNTRACK
-+      help
-+        If this option is enabled, the connection tracking code will
-+        cache routing information for each connection that is being
-+        forwarded, at a cost of 32 bytes per conntrack object.
-+
-+        To compile it as a module, choose M here.  If unsure, say N.
-+        The module will be called nf_conntrack_rtcache.
-+
- config NF_CONNTRACK_TIMEOUT
-       bool  'Connection tracking timeout'
-       depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -16,6 +16,9 @@ obj-$(CONFIG_NETFILTER_NETLINK_LOG) += n
- # connection tracking
- obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o
-+# optional conntrack route cache extension
-+obj-$(CONFIG_NF_CONNTRACK_RTCACHE) += nf_conntrack_rtcache.o
-+
- # SCTP protocol connection tracking
- obj-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o
- obj-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtcache.c
-@@ -0,0 +1,413 @@
-+/* route cache for netfilter.
-+ *
-+ * (C) 2014 Red Hat GmbH
-+ *
-+ * 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.
-+ */
-+
-+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-+
-+#include <linux/types.h>
-+#include <linux/netfilter.h>
-+#include <linux/skbuff.h>
-+#include <linux/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/netdevice.h>
-+#include <linux/export.h>
-+#include <linux/module.h>
-+
-+#include <net/dst.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_rtcache.h>
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+#include <net/ip6_fib.h>
-+#endif
-+
-+static void __nf_conn_rtcache_destroy(struct nf_conn_rtcache *rtc,
-+                                    enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *dst = rtc->cached_dst[dir].dst;
-+
-+      dst_release(dst);
-+}
-+
-+static void nf_conn_rtcache_destroy(struct nf_conn *ct)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+
-+      if (!rtc)
-+              return;
-+
-+      __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_ORIGINAL);
-+      __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_REPLY);
-+}
-+
-+static void nf_ct_rtcache_ext_add(struct nf_conn *ct)
-+{
-+      struct nf_conn_rtcache *rtc;
-+
-+      rtc = nf_ct_ext_add(ct, NF_CT_EXT_RTCACHE, GFP_ATOMIC);
-+      if (rtc) {
-+              rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif = -1;
-+              rtc->cached_dst[IP_CT_DIR_ORIGINAL].dst = NULL;
-+              rtc->cached_dst[IP_CT_DIR_REPLY].iif = -1;
-+              rtc->cached_dst[IP_CT_DIR_REPLY].dst = NULL;
-+      }
-+}
-+
-+static struct nf_conn_rtcache *nf_ct_rtcache_find_usable(struct nf_conn *ct)
-+{
-+      if (nf_ct_is_untracked(ct))
-+              return NULL;
-+      return nf_ct_rtcache_find(ct);
-+}
-+
-+static struct dst_entry *
-+nf_conn_rtcache_dst_get(const struct nf_conn_rtcache *rtc,
-+                      enum ip_conntrack_dir dir)
-+{
-+      return rtc->cached_dst[dir].dst;
-+}
-+
-+static u32 nf_rtcache_get_cookie(int pf, const struct dst_entry *dst)
-+{
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      if (pf == NFPROTO_IPV6) {
-+              const struct rt6_info *rt = (const struct rt6_info *)dst;
-+
-+              if (rt->rt6i_node)
-+                      return (u32)rt->rt6i_node->fn_sernum;
-+      }
-+#endif
-+      return 0;
-+}
-+
-+static void nf_conn_rtcache_dst_set(int pf,
-+                                  struct nf_conn_rtcache *rtc,
-+                                  struct dst_entry *dst,
-+                                  enum ip_conntrack_dir dir, int iif)
-+{
-+      if (rtc->cached_dst[dir].iif != iif)
-+              rtc->cached_dst[dir].iif = iif;
-+
-+      if (rtc->cached_dst[dir].dst != dst) {
-+              struct dst_entry *old;
-+
-+              dst_hold(dst);
-+
-+              old = xchg(&rtc->cached_dst[dir].dst, dst);
-+              dst_release(old);
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+              if (pf == NFPROTO_IPV6)
-+                      rtc->cached_dst[dir].cookie =
-+                              nf_rtcache_get_cookie(pf, dst);
-+#endif
-+      }
-+}
-+
-+static void nf_conn_rtcache_dst_obsolete(struct nf_conn_rtcache *rtc,
-+                                       enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *old;
-+
-+      pr_debug("Invalidate iif %d for dir %d on cache %p\n",
-+               rtc->cached_dst[dir].iif, dir, rtc);
-+
-+      old = xchg(&rtc->cached_dst[dir].dst, NULL);
-+      dst_release(old);
-+      rtc->cached_dst[dir].iif = -1;
-+}
-+
-+static unsigned int nf_rtcache_in(u_int8_t pf,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      struct nf_conn_rtcache *rtc;
-+      enum ip_conntrack_info ctinfo;
-+      enum ip_conntrack_dir dir;
-+      struct dst_entry *dst;
-+      struct nf_conn *ct;
-+      int iif;
-+      u32 cookie;
-+
-+      if (skb_dst(skb) || skb->sk)
-+              return NF_ACCEPT;
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (!ct)
-+              return NF_ACCEPT;
-+
-+      rtc = nf_ct_rtcache_find_usable(ct);
-+      if (!rtc)
-+              return NF_ACCEPT;
-+
-+      /* if iif changes, don't use cache and let ip stack
-+       * do route lookup.
-+       *
-+       * If rp_filter is enabled it might toss skb, so
-+       * we don't want to avoid these checks.
-+       */
-+      dir = CTINFO2DIR(ctinfo);
-+      iif = nf_conn_rtcache_iif_get(rtc, dir);
-+      if (state->in->ifindex != iif) {
-+              pr_debug("ct %p, iif %d, cached iif %d, skip cached entry\n",
-+                       ct, iif, state->in->ifindex);
-+              return NF_ACCEPT;
-+      }
-+      dst = nf_conn_rtcache_dst_get(rtc, dir);
-+      if (dst == NULL)
-+              return NF_ACCEPT;
-+
-+      cookie = nf_rtcache_get_cookie(pf, dst);
-+
-+      dst = dst_check(dst, cookie);
-+      pr_debug("obtained dst %p for skb %p, cookie %d\n", dst, skb, cookie);
-+      if (likely(dst))
-+              skb_dst_set_noref(skb, dst);
-+      else
-+              nf_conn_rtcache_dst_obsolete(rtc, dir);
-+
-+      return NF_ACCEPT;
-+}
-+
-+static unsigned int nf_rtcache_forward(u_int8_t pf,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      struct nf_conn_rtcache *rtc;
-+      enum ip_conntrack_info ctinfo;
-+      enum ip_conntrack_dir dir;
-+      struct nf_conn *ct;
-+      struct dst_entry *dst = skb_dst(skb);
-+      int iif;
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (!ct)
-+              return NF_ACCEPT;
-+
-+      if (dst && dst_xfrm(dst))
-+              return NF_ACCEPT;
-+
-+      if (!nf_ct_is_confirmed(ct)) {
-+              if (WARN_ON(nf_ct_rtcache_find(ct)))
-+                      return NF_ACCEPT;
-+              nf_ct_rtcache_ext_add(ct);
-+              return NF_ACCEPT;
-+      }
-+
-+      rtc = nf_ct_rtcache_find_usable(ct);
-+      if (!rtc)
-+              return NF_ACCEPT;
-+
-+      dir = CTINFO2DIR(ctinfo);
-+      iif = nf_conn_rtcache_iif_get(rtc, dir);
-+      pr_debug("ct %p, skb %p, dir %d, iif %d, cached iif %d\n",
-+               ct, skb, dir, iif, state->in->ifindex);
-+      if (likely(state->in->ifindex == iif))
-+              return NF_ACCEPT;
-+
-+      nf_conn_rtcache_dst_set(pf, rtc, skb_dst(skb), dir, state->in->ifindex);
-+      return NF_ACCEPT;
-+}
-+
-+static unsigned int nf_rtcache_in4(void *priv,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_in(NFPROTO_IPV4, skb, state);
-+}
-+
-+static unsigned int nf_rtcache_forward4(void *priv,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_forward(NFPROTO_IPV4, skb, state);
-+}
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+static unsigned int nf_rtcache_in6(void *priv,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_in(NFPROTO_IPV6, skb, state);
-+}
-+
-+static unsigned int nf_rtcache_forward6(void *priv,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_forward(NFPROTO_IPV6, skb, state);
-+}
-+#endif
-+
-+static int nf_rtcache_dst_remove(struct nf_conn *ct, void *data)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+      struct net_device *dev = data;
-+
-+      if (!rtc)
-+              return 0;
-+
-+      if (dev->ifindex == rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif ||
-+          dev->ifindex == rtc->cached_dst[IP_CT_DIR_REPLY].iif) {
-+              nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_ORIGINAL);
-+              nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_REPLY);
-+      }
-+
-+      return 0;
-+}
-+
-+static int nf_rtcache_netdev_event(struct notifier_block *this,
-+                                 unsigned long event, void *ptr)
-+{
-+      struct net_device *dev = netdev_notifier_info_to_dev(ptr);
-+      struct net *net = dev_net(dev);
-+
-+      if (event == NETDEV_DOWN)
-+              nf_ct_iterate_cleanup(net, nf_rtcache_dst_remove, dev, 0, 0);
-+
-+      return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block nf_rtcache_notifier = {
-+      .notifier_call = nf_rtcache_netdev_event,
-+};
-+
-+static struct nf_hook_ops rtcache_ops[] = {
-+      {
-+              .hook           = nf_rtcache_in4,
-+              .pf             = NFPROTO_IPV4,
-+              .hooknum        = NF_INET_PRE_ROUTING,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+      {
-+              .hook           = nf_rtcache_forward4,
-+              .pf             = NFPROTO_IPV4,
-+              .hooknum        = NF_INET_FORWARD,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      {
-+              .hook           = nf_rtcache_in6,
-+              .pf             = NFPROTO_IPV6,
-+              .hooknum        = NF_INET_PRE_ROUTING,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+      {
-+              .hook           = nf_rtcache_forward6,
-+              .pf             = NFPROTO_IPV6,
-+              .hooknum        = NF_INET_FORWARD,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+#endif
-+};
-+
-+static struct nf_ct_ext_type rtcache_extend __read_mostly = {
-+      .len    = sizeof(struct nf_conn_rtcache),
-+      .align  = __alignof__(struct nf_conn_rtcache),
-+      .id     = NF_CT_EXT_RTCACHE,
-+      .destroy = nf_conn_rtcache_destroy,
-+};
-+
-+static int __init nf_conntrack_rtcache_init(void)
-+{
-+      int ret = nf_ct_extend_register(&rtcache_extend);
-+
-+      if (ret < 0) {
-+              pr_err("nf_conntrack_rtcache: Unable to register extension\n");
-+              return ret;
-+      }
-+
-+      ret = nf_register_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
-+      if (ret < 0) {
-+              nf_ct_extend_unregister(&rtcache_extend);
-+              return ret;
-+      }
-+
-+      ret = register_netdevice_notifier(&nf_rtcache_notifier);
-+      if (ret) {
-+              nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
-+              nf_ct_extend_unregister(&rtcache_extend);
-+      }
-+
-+      return ret;
-+}
-+
-+static int nf_rtcache_ext_remove(struct nf_conn *ct, void *data)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+
-+      return rtc != NULL;
-+}
-+
-+static bool __exit nf_conntrack_rtcache_wait_for_dying(struct net *net)
-+{
-+      bool wait = false;
-+      int cpu;
-+
-+      for_each_possible_cpu(cpu) {
-+              struct nf_conntrack_tuple_hash *h;
-+              struct hlist_nulls_node *n;
-+              struct nf_conn *ct;
-+              struct ct_pcpu *pcpu = per_cpu_ptr(net->ct.pcpu_lists, cpu);
-+
-+              rcu_read_lock();
-+              spin_lock_bh(&pcpu->lock);
-+
-+              hlist_nulls_for_each_entry(h, n, &pcpu->dying, hnnode) {
-+                      ct = nf_ct_tuplehash_to_ctrack(h);
-+                      if (nf_ct_rtcache_find(ct) != NULL) {
-+                              wait = true;
-+                              break;
-+                      }
-+              }
-+              spin_unlock_bh(&pcpu->lock);
-+              rcu_read_unlock();
-+      }
-+
-+      return wait;
-+}
-+
-+static void __exit nf_conntrack_rtcache_fini(void)
-+{
-+      struct net *net;
-+      int count = 0;
-+
-+      /* remove hooks so no new connections get rtcache extension */
-+      nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
-+
-+      synchronize_net();
-+
-+      unregister_netdevice_notifier(&nf_rtcache_notifier);
-+
-+      rtnl_lock();
-+
-+      /* zap all conntracks with rtcache extension */
-+      for_each_net(net)
-+              nf_ct_iterate_cleanup(net, nf_rtcache_ext_remove, NULL, 0, 0);
-+
-+      for_each_net(net) {
-+              /* .. and make sure they're gone from dying list, too */
-+              while (nf_conntrack_rtcache_wait_for_dying(net)) {
-+                      msleep(200);
-+                      WARN_ONCE(++count > 25, "Waiting for all rtcache conntracks to go away\n");
-+              }
-+      }
-+
-+      rtnl_unlock();
-+      synchronize_net();
-+      nf_ct_extend_unregister(&rtcache_extend);
-+}
-+module_init(nf_conntrack_rtcache_init);
-+module_exit(nf_conntrack_rtcache_fini);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Florian Westphal <fw@strlen.de>");
-+MODULE_DESCRIPTION("Conntrack route cache extension");
diff --git a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch
deleted file mode 100644 (file)
index 1d3ce28..0000000
+++ /dev/null
@@ -1,499 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 19 Jan 2017 03:45:10 +0100
-Subject: [PATCH] bridge: multicast to unicast
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Implements an optional, per bridge port flag and feature to deliver
-multicast packets to any host on the according port via unicast
-individually. This is done by copying the packet per host and
-changing the multicast destination MAC to a unicast one accordingly.
-
-multicast-to-unicast works on top of the multicast snooping feature of
-the bridge. Which means unicast copies are only delivered to hosts which
-are interested in it and signalized this via IGMP/MLD reports
-previously.
-
-This feature is intended for interface types which have a more reliable
-and/or efficient way to deliver unicast packets than broadcast ones
-(e.g. wifi).
-
-However, it should only be enabled on interfaces where no IGMPv2/MLDv1
-report suppression takes place. This feature is disabled by default.
-
-The initial patch and idea is from Felix Fietkau.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-[linus.luessing@c0d3.blue: various bug + style fixes, commit message]
-Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
----
-
---- a/include/linux/if_bridge.h
-+++ b/include/linux/if_bridge.h
-@@ -46,6 +46,7 @@ struct br_ip_list {
- #define BR_LEARNING_SYNC      BIT(9)
- #define BR_PROXYARP_WIFI      BIT(10)
- #define BR_MCAST_FLOOD                BIT(11)
-+#define BR_MULTICAST_TO_UNICAST       BIT(12)
- #define BR_DEFAULT_AGEING_TIME        (300 * HZ)
---- a/include/uapi/linux/if_link.h
-+++ b/include/uapi/linux/if_link.h
-@@ -319,6 +319,7 @@ enum {
-       IFLA_BRPORT_MULTICAST_ROUTER,
-       IFLA_BRPORT_PAD,
-       IFLA_BRPORT_MCAST_FLOOD,
-+      IFLA_BRPORT_MCAST_TO_UCAST,
-       __IFLA_BRPORT_MAX
- };
- #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
---- a/net/bridge/br_forward.c
-+++ b/net/bridge/br_forward.c
-@@ -173,6 +173,29 @@ out:
-       return p;
- }
-+static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,
-+                             const unsigned char *addr, bool local_orig)
-+{
-+      struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
-+      const unsigned char *src = eth_hdr(skb)->h_source;
-+
-+      if (!should_deliver(p, skb))
-+              return;
-+
-+      /* Even with hairpin, no soliloquies - prevent breaking IPv6 DAD */
-+      if (skb->dev == p->dev && ether_addr_equal(src, addr))
-+              return;
-+
-+      skb = skb_copy(skb, GFP_ATOMIC);
-+      if (!skb) {
-+              dev->stats.tx_dropped++;
-+              return;
-+      }
-+
-+      memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
-+      __br_forward(p, skb, local_orig);
-+}
-+
- /* called under rcu_read_lock */
- void br_flood(struct net_bridge *br, struct sk_buff *skb,
-             enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
-@@ -241,10 +264,20 @@ void br_multicast_flood(struct net_bridg
-               rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
-                            NULL;
--              port = (unsigned long)lport > (unsigned long)rport ?
--                     lport : rport;
-+              if ((unsigned long)lport > (unsigned long)rport) {
-+                      port = lport;
-+
-+                      if (p->flags & MDB_PG_FLAGS_MCAST_TO_UCAST) {
-+                              maybe_deliver_addr(lport, skb, p->eth_addr,
-+                                                 local_orig);
-+                              goto delivered;
-+                      }
-+              } else {
-+                      port = rport;
-+              }
-               prev = maybe_deliver(prev, port, skb, local_orig);
-+delivered:
-               if (IS_ERR(prev))
-                       goto out;
-               if (prev == port)
---- a/net/bridge/br_mdb.c
-+++ b/net/bridge/br_mdb.c
-@@ -532,7 +532,7 @@ static int br_mdb_add_group(struct net_b
-                       break;
-       }
--      p = br_multicast_new_port_group(port, group, *pp, state);
-+      p = br_multicast_new_port_group(port, group, *pp, state, NULL);
-       if (unlikely(!p))
-               return -ENOMEM;
-       rcu_assign_pointer(*pp, p);
---- a/net/bridge/br_multicast.c
-+++ b/net/bridge/br_multicast.c
-@@ -42,12 +42,14 @@ static void br_multicast_add_router(stru
- static void br_ip4_multicast_leave_group(struct net_bridge *br,
-                                        struct net_bridge_port *port,
-                                        __be32 group,
--                                       __u16 vid);
-+                                       __u16 vid,
-+                                       const unsigned char *src);
-+
- #if IS_ENABLED(CONFIG_IPV6)
- static void br_ip6_multicast_leave_group(struct net_bridge *br,
-                                        struct net_bridge_port *port,
-                                        const struct in6_addr *group,
--                                       __u16 vid);
-+                                       __u16 vid, const unsigned char *src);
- #endif
- unsigned int br_mdb_rehash_seq;
-@@ -658,7 +660,8 @@ struct net_bridge_port_group *br_multica
-                       struct net_bridge_port *port,
-                       struct br_ip *group,
-                       struct net_bridge_port_group __rcu *next,
--                      unsigned char flags)
-+                      unsigned char flags,
-+                      const unsigned char *src)
- {
-       struct net_bridge_port_group *p;
-@@ -673,12 +676,39 @@ struct net_bridge_port_group *br_multica
-       hlist_add_head(&p->mglist, &port->mglist);
-       setup_timer(&p->timer, br_multicast_port_group_expired,
-                   (unsigned long)p);
-+
-+      if ((port->flags & BR_MULTICAST_TO_UNICAST) && src) {
-+              memcpy(p->eth_addr, src, ETH_ALEN);
-+              p->flags |= MDB_PG_FLAGS_MCAST_TO_UCAST;
-+      }
-+
-       return p;
- }
-+static bool br_port_group_equal(struct net_bridge_port_group *p,
-+                              struct net_bridge_port *port,
-+                              const unsigned char *src)
-+{
-+      if (p->port != port)
-+              return false;
-+
-+      if (!(p->flags & MDB_PG_FLAGS_MCAST_TO_UCAST) !=
-+          !(port->flags & BR_MULTICAST_TO_UNICAST))
-+              return false;
-+
-+      if (!(p->flags & MDB_PG_FLAGS_MCAST_TO_UCAST))
-+              return true;
-+
-+      if (!src)
-+              return false;
-+
-+      return ether_addr_equal(src, p->eth_addr);
-+}
-+
- static int br_multicast_add_group(struct net_bridge *br,
-                                 struct net_bridge_port *port,
--                                struct br_ip *group)
-+                                struct br_ip *group,
-+                                const unsigned char *src)
- {
-       struct net_bridge_mdb_entry *mp;
-       struct net_bridge_port_group *p;
-@@ -705,13 +735,13 @@ static int br_multicast_add_group(struct
-       for (pp = &mp->ports;
-            (p = mlock_dereference(*pp, br)) != NULL;
-            pp = &p->next) {
--              if (p->port == port)
-+              if (br_port_group_equal(p, port, src))
-                       goto found;
-               if ((unsigned long)p->port < (unsigned long)port)
-                       break;
-       }
--      p = br_multicast_new_port_group(port, group, *pp, 0);
-+      p = br_multicast_new_port_group(port, group, *pp, 0, src);
-       if (unlikely(!p))
-               goto err;
-       rcu_assign_pointer(*pp, p);
-@@ -730,7 +760,8 @@ err:
- static int br_ip4_multicast_add_group(struct net_bridge *br,
-                                     struct net_bridge_port *port,
-                                     __be32 group,
--                                    __u16 vid)
-+                                    __u16 vid,
-+                                    const unsigned char *src)
- {
-       struct br_ip br_group;
-@@ -741,14 +772,15 @@ static int br_ip4_multicast_add_group(st
-       br_group.proto = htons(ETH_P_IP);
-       br_group.vid = vid;
--      return br_multicast_add_group(br, port, &br_group);
-+      return br_multicast_add_group(br, port, &br_group, src);
- }
- #if IS_ENABLED(CONFIG_IPV6)
- static int br_ip6_multicast_add_group(struct net_bridge *br,
-                                     struct net_bridge_port *port,
-                                     const struct in6_addr *group,
--                                    __u16 vid)
-+                                    __u16 vid,
-+                                    const unsigned char *src)
- {
-       struct br_ip br_group;
-@@ -759,7 +791,7 @@ static int br_ip6_multicast_add_group(st
-       br_group.proto = htons(ETH_P_IPV6);
-       br_group.vid = vid;
--      return br_multicast_add_group(br, port, &br_group);
-+      return br_multicast_add_group(br, port, &br_group, src);
- }
- #endif
-@@ -1028,6 +1060,7 @@ static int br_ip4_multicast_igmp3_report
-                                        struct sk_buff *skb,
-                                        u16 vid)
- {
-+      const unsigned char *src;
-       struct igmpv3_report *ih;
-       struct igmpv3_grec *grec;
-       int i;
-@@ -1068,12 +1101,14 @@ static int br_ip4_multicast_igmp3_report
-                       continue;
-               }
-+              src = eth_hdr(skb)->h_source;
-               if ((type == IGMPV3_CHANGE_TO_INCLUDE ||
-                    type == IGMPV3_MODE_IS_INCLUDE) &&
-                   ntohs(grec->grec_nsrcs) == 0) {
--                      br_ip4_multicast_leave_group(br, port, group, vid);
-+                      br_ip4_multicast_leave_group(br, port, group, vid, src);
-               } else {
--                      err = br_ip4_multicast_add_group(br, port, group, vid);
-+                      err = br_ip4_multicast_add_group(br, port, group, vid,
-+                                                       src);
-                       if (err)
-                               break;
-               }
-@@ -1088,6 +1123,7 @@ static int br_ip6_multicast_mld2_report(
-                                       struct sk_buff *skb,
-                                       u16 vid)
- {
-+      const unsigned char *src = eth_hdr(skb)->h_source;
-       struct icmp6hdr *icmp6h;
-       struct mld2_grec *grec;
-       int i;
-@@ -1139,10 +1175,11 @@ static int br_ip6_multicast_mld2_report(
-                    grec->grec_type == MLD2_MODE_IS_INCLUDE) &&
-                   ntohs(*nsrcs) == 0) {
-                       br_ip6_multicast_leave_group(br, port, &grec->grec_mca,
--                                                   vid);
-+                                                   vid, src);
-               } else {
-                       err = br_ip6_multicast_add_group(br, port,
--                                                       &grec->grec_mca, vid);
-+                                                       &grec->grec_mca, vid,
-+                                                       src);
-                       if (err)
-                               break;
-               }
-@@ -1458,7 +1495,8 @@ br_multicast_leave_group(struct net_brid
-                        struct net_bridge_port *port,
-                        struct br_ip *group,
-                        struct bridge_mcast_other_query *other_query,
--                       struct bridge_mcast_own_query *own_query)
-+                       struct bridge_mcast_own_query *own_query,
-+                       const unsigned char *src)
- {
-       struct net_bridge_mdb_htable *mdb;
-       struct net_bridge_mdb_entry *mp;
-@@ -1482,7 +1520,7 @@ br_multicast_leave_group(struct net_brid
-               for (pp = &mp->ports;
-                    (p = mlock_dereference(*pp, br)) != NULL;
-                    pp = &p->next) {
--                      if (p->port != port)
-+                      if (!br_port_group_equal(p, port, src))
-                               continue;
-                       rcu_assign_pointer(*pp, p->next);
-@@ -1513,7 +1551,7 @@ br_multicast_leave_group(struct net_brid
-               for (p = mlock_dereference(mp->ports, br);
-                    p != NULL;
-                    p = mlock_dereference(p->next, br)) {
--                      if (p->port != port)
-+                      if (!br_port_group_equal(p, port, src))
-                               continue;
-                       if (!hlist_unhashed(&p->mglist) &&
-@@ -1564,7 +1602,8 @@ out:
- static void br_ip4_multicast_leave_group(struct net_bridge *br,
-                                        struct net_bridge_port *port,
-                                        __be32 group,
--                                       __u16 vid)
-+                                       __u16 vid,
-+                                       const unsigned char *src)
- {
-       struct br_ip br_group;
-       struct bridge_mcast_own_query *own_query;
-@@ -1579,14 +1618,15 @@ static void br_ip4_multicast_leave_group
-       br_group.vid = vid;
-       br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
--                               own_query);
-+                               own_query, src);
- }
- #if IS_ENABLED(CONFIG_IPV6)
- static void br_ip6_multicast_leave_group(struct net_bridge *br,
-                                        struct net_bridge_port *port,
-                                        const struct in6_addr *group,
--                                       __u16 vid)
-+                                       __u16 vid,
-+                                       const unsigned char *src)
- {
-       struct br_ip br_group;
-       struct bridge_mcast_own_query *own_query;
-@@ -1601,7 +1641,7 @@ static void br_ip6_multicast_leave_group
-       br_group.vid = vid;
-       br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
--                               own_query);
-+                               own_query, src);
- }
- #endif
-@@ -1644,6 +1684,7 @@ static int br_multicast_ipv4_rcv(struct
-                                u16 vid)
- {
-       struct sk_buff *skb_trimmed = NULL;
-+      const unsigned char *src;
-       struct igmphdr *ih;
-       int err;
-@@ -1659,13 +1700,14 @@ static int br_multicast_ipv4_rcv(struct
-       }
-       ih = igmp_hdr(skb);
-+      src = eth_hdr(skb)->h_source;
-       BR_INPUT_SKB_CB(skb)->igmp = ih->type;
-       switch (ih->type) {
-       case IGMP_HOST_MEMBERSHIP_REPORT:
-       case IGMPV2_HOST_MEMBERSHIP_REPORT:
-               BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
--              err = br_ip4_multicast_add_group(br, port, ih->group, vid);
-+              err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
-               break;
-       case IGMPV3_HOST_MEMBERSHIP_REPORT:
-               err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid);
-@@ -1674,7 +1716,7 @@ static int br_multicast_ipv4_rcv(struct
-               err = br_ip4_multicast_query(br, port, skb_trimmed, vid);
-               break;
-       case IGMP_HOST_LEAVE_MESSAGE:
--              br_ip4_multicast_leave_group(br, port, ih->group, vid);
-+              br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
-               break;
-       }
-@@ -1694,6 +1736,7 @@ static int br_multicast_ipv6_rcv(struct
-                                u16 vid)
- {
-       struct sk_buff *skb_trimmed = NULL;
-+      const unsigned char *src;
-       struct mld_msg *mld;
-       int err;
-@@ -1713,8 +1756,10 @@ static int br_multicast_ipv6_rcv(struct
-       switch (mld->mld_type) {
-       case ICMPV6_MGM_REPORT:
-+              src = eth_hdr(skb)->h_source;
-               BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
--              err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
-+              err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
-+                                               src);
-               break;
-       case ICMPV6_MLD2_REPORT:
-               err = br_ip6_multicast_mld2_report(br, port, skb_trimmed, vid);
-@@ -1723,7 +1768,8 @@ static int br_multicast_ipv6_rcv(struct
-               err = br_ip6_multicast_query(br, port, skb_trimmed, vid);
-               break;
-       case ICMPV6_MGM_REDUCTION:
--              br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
-+              src = eth_hdr(skb)->h_source;
-+              br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
-               break;
-       }
---- a/net/bridge/br_netlink.c
-+++ b/net/bridge/br_netlink.c
-@@ -123,6 +123,7 @@ static inline size_t br_port_info_size(v
-               + nla_total_size(1)     /* IFLA_BRPORT_GUARD */
-               + nla_total_size(1)     /* IFLA_BRPORT_PROTECT */
-               + nla_total_size(1)     /* IFLA_BRPORT_FAST_LEAVE */
-+              + nla_total_size(1)     /* IFLA_BRPORT_MCAST_TO_UCAST */
-               + nla_total_size(1)     /* IFLA_BRPORT_LEARNING */
-               + nla_total_size(1)     /* IFLA_BRPORT_UNICAST_FLOOD */
-               + nla_total_size(1)     /* IFLA_BRPORT_PROXYARP */
-@@ -173,6 +174,8 @@ static int br_port_fill_attrs(struct sk_
-                      !!(p->flags & BR_ROOT_BLOCK)) ||
-           nla_put_u8(skb, IFLA_BRPORT_FAST_LEAVE,
-                      !!(p->flags & BR_MULTICAST_FAST_LEAVE)) ||
-+          nla_put_u8(skb, IFLA_BRPORT_MCAST_TO_UCAST,
-+                     !!(p->flags & BR_MULTICAST_TO_UNICAST)) ||
-           nla_put_u8(skb, IFLA_BRPORT_LEARNING, !!(p->flags & BR_LEARNING)) ||
-           nla_put_u8(skb, IFLA_BRPORT_UNICAST_FLOOD,
-                      !!(p->flags & BR_FLOOD)) ||
-@@ -586,6 +589,7 @@ static const struct nla_policy br_port_p
-       [IFLA_BRPORT_PROXYARP]  = { .type = NLA_U8 },
-       [IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
-       [IFLA_BRPORT_MULTICAST_ROUTER] = { .type = NLA_U8 },
-+      [IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 },
- };
- /* Change the state of the port and notify spanning tree */
-@@ -636,6 +640,7 @@ static int br_setport(struct net_bridge_
-       br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING);
-       br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD);
-       br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD);
-+      br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST, BR_MULTICAST_TO_UNICAST);
-       br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP);
-       br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI);
---- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -166,8 +166,9 @@ struct net_bridge_fdb_entry
-       struct rcu_head                 rcu;
- };
--#define MDB_PG_FLAGS_PERMANENT        BIT(0)
--#define MDB_PG_FLAGS_OFFLOAD  BIT(1)
-+#define MDB_PG_FLAGS_PERMANENT                BIT(0)
-+#define MDB_PG_FLAGS_OFFLOAD          BIT(1)
-+#define MDB_PG_FLAGS_MCAST_TO_UCAST   BIT(2)
- struct net_bridge_port_group {
-       struct net_bridge_port          *port;
-@@ -177,6 +178,7 @@ struct net_bridge_port_group {
-       struct timer_list               timer;
-       struct br_ip                    addr;
-       unsigned char                   flags;
-+      unsigned char                   eth_addr[ETH_ALEN];
- };
- struct net_bridge_mdb_entry
-@@ -591,7 +593,7 @@ void br_multicast_free_pg(struct rcu_hea
- struct net_bridge_port_group *
- br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
-                           struct net_bridge_port_group __rcu *next,
--                          unsigned char flags);
-+                          unsigned char flags, const unsigned char *src);
- void br_mdb_init(void);
- void br_mdb_uninit(void);
- void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
---- a/net/bridge/br_sysfs_if.c
-+++ b/net/bridge/br_sysfs_if.c
-@@ -188,6 +188,7 @@ static BRPORT_ATTR(multicast_router, S_I
-                  store_multicast_router);
- BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
-+BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UNICAST);
- #endif
- static const struct brport_attribute *brport_attrs[] = {
-@@ -214,6 +215,7 @@ static const struct brport_attribute *br
- #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
-       &brport_attr_multicast_router,
-       &brport_attr_multicast_fast_leave,
-+      &brport_attr_multicast_to_unicast,
- #endif
-       &brport_attr_proxyarp,
-       &brport_attr_proxyarp_wifi,
diff --git a/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch b/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch
deleted file mode 100644 (file)
index c5d65b7..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sat, 28 Jan 2017 15:15:42 +0100
-Subject: [PATCH] net: add devm version of alloc_etherdev_mqs function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch adds devm_alloc_etherdev_mqs function and devm_alloc_etherdev
-macro. These can be used for simpler netdev allocation without having to
-care about calling free_netdev.
-
-Thanks to this change drivers, their error paths and removal paths may
-get simpler by a bit.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/include/linux/etherdevice.h
-+++ b/include/linux/etherdevice.h
-@@ -54,6 +54,11 @@ struct net_device *alloc_etherdev_mqs(in
- #define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)
- #define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count)
-+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
-+                                         unsigned int txqs,
-+                                         unsigned int rxqs);
-+#define devm_alloc_etherdev(dev, sizeof_priv) devm_alloc_etherdev_mqs(dev, sizeof_priv, 1, 1)
-+
- struct sk_buff **eth_gro_receive(struct sk_buff **head,
-                                struct sk_buff *skb);
- int eth_gro_complete(struct sk_buff *skb, int nhoff);
---- a/net/ethernet/eth.c
-+++ b/net/ethernet/eth.c
-@@ -391,6 +391,34 @@ struct net_device *alloc_etherdev_mqs(in
- }
- EXPORT_SYMBOL(alloc_etherdev_mqs);
-+static void devm_free_netdev(struct device *dev, void *res)
-+{
-+      free_netdev(*(struct net_device **)res);
-+}
-+
-+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
-+                                         unsigned int txqs, unsigned int rxqs)
-+{
-+      struct net_device **dr;
-+      struct net_device *netdev;
-+
-+      dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);
-+      if (!dr)
-+              return NULL;
-+
-+      netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);
-+      if (!netdev) {
-+              devres_free(dr);
-+              return NULL;
-+      }
-+
-+      *dr = netdev;
-+      devres_add(dev, dr);
-+
-+      return netdev;
-+}
-+EXPORT_SYMBOL(devm_alloc_etherdev_mqs);
-+
- ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
- {
-       return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);
diff --git a/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch b/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch
deleted file mode 100644 (file)
index 172e714..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-From 40fc3423b983b864bf70b03199191260ae9b2ea6 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:50 -0800
-Subject: [PATCH 01/10] tcp: tsq: add tsq_flags / tsq_enum
-
-This is a cleanup, to ease code review of following patches.
-
-Old 'enum tsq_flags' is renamed, and a new enumeration is added
-with the flags used in cmpxchg() operations as opposed to
-single bit operations.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/linux/tcp.h   | 11 ++++++++++-
- net/ipv4/tcp_output.c | 16 ++++++++--------
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
---- a/include/linux/tcp.h
-+++ b/include/linux/tcp.h
-@@ -368,7 +368,7 @@ struct tcp_sock {
-       u32     *saved_syn;
- };
--enum tsq_flags {
-+enum tsq_enum {
-       TSQ_THROTTLED,
-       TSQ_QUEUED,
-       TCP_TSQ_DEFERRED,          /* tcp_tasklet_func() found socket was owned */
-@@ -379,6 +379,15 @@ enum tsq_flags {
-                                   */
- };
-+enum tsq_flags {
-+      TSQF_THROTTLED                  = (1UL << TSQ_THROTTLED),
-+      TSQF_QUEUED                     = (1UL << TSQ_QUEUED),
-+      TCPF_TSQ_DEFERRED               = (1UL << TCP_TSQ_DEFERRED),
-+      TCPF_WRITE_TIMER_DEFERRED       = (1UL << TCP_WRITE_TIMER_DEFERRED),
-+      TCPF_DELACK_TIMER_DEFERRED      = (1UL << TCP_DELACK_TIMER_DEFERRED),
-+      TCPF_MTU_REDUCED_DEFERRED       = (1UL << TCP_MTU_REDUCED_DEFERRED),
-+};
-+
- static inline struct tcp_sock *tcp_sk(const struct sock *sk)
- {
-       return (struct tcp_sock *)sk;
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -789,10 +789,10 @@ static void tcp_tasklet_func(unsigned lo
-       }
- }
--#define TCP_DEFERRED_ALL ((1UL << TCP_TSQ_DEFERRED) |         \
--                        (1UL << TCP_WRITE_TIMER_DEFERRED) |   \
--                        (1UL << TCP_DELACK_TIMER_DEFERRED) |  \
--                        (1UL << TCP_MTU_REDUCED_DEFERRED))
-+#define TCP_DEFERRED_ALL (TCPF_TSQ_DEFERRED |         \
-+                        TCPF_WRITE_TIMER_DEFERRED |   \
-+                        TCPF_DELACK_TIMER_DEFERRED |  \
-+                        TCPF_MTU_REDUCED_DEFERRED)
- /**
-  * tcp_release_cb - tcp release_sock() callback
-  * @sk: socket
-@@ -813,7 +813,7 @@ void tcp_release_cb(struct sock *sk)
-               nflags = flags & ~TCP_DEFERRED_ALL;
-       } while (cmpxchg(&tp->tsq_flags, flags, nflags) != flags);
--      if (flags & (1UL << TCP_TSQ_DEFERRED))
-+      if (flags & TCPF_TSQ_DEFERRED)
-               tcp_tsq_handler(sk);
-       /* Here begins the tricky part :
-@@ -827,15 +827,15 @@ void tcp_release_cb(struct sock *sk)
-        */
-       sock_release_ownership(sk);
--      if (flags & (1UL << TCP_WRITE_TIMER_DEFERRED)) {
-+      if (flags & TCPF_WRITE_TIMER_DEFERRED) {
-               tcp_write_timer_handler(sk);
-               __sock_put(sk);
-       }
--      if (flags & (1UL << TCP_DELACK_TIMER_DEFERRED)) {
-+      if (flags & TCPF_DELACK_TIMER_DEFERRED) {
-               tcp_delack_timer_handler(sk);
-               __sock_put(sk);
-       }
--      if (flags & (1UL << TCP_MTU_REDUCED_DEFERRED)) {
-+      if (flags & TCPF_MTU_REDUCED_DEFERRED) {
-               inet_csk(sk)->icsk_af_ops->mtu_reduced(sk);
-               __sock_put(sk);
-       }
diff --git a/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch b/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch
deleted file mode 100644 (file)
index af194b2..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 408f0a6c21e124cc4f6c7aa370b38aa47e55428d Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:51 -0800
-Subject: [PATCH 02/10] tcp: tsq: remove one locked operation in tcp_wfree()
-
-Instead of atomically clear TSQ_THROTTLED and atomically set TSQ_QUEUED
-bits, use one cmpxchg() to perform a single locked operation.
-
-Since the following patch will also set TCP_TSQ_DEFERRED here,
-this cmpxchg() will make this addition free.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv4/tcp_output.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -865,6 +865,7 @@ void tcp_wfree(struct sk_buff *skb)
- {
-       struct sock *sk = skb->sk;
-       struct tcp_sock *tp = tcp_sk(sk);
-+      unsigned long flags, nval, oval;
-       int wmem;
-       /* Keep one reference on sk_wmem_alloc.
-@@ -882,11 +883,17 @@ void tcp_wfree(struct sk_buff *skb)
-       if (wmem >= SKB_TRUESIZE(1) && this_cpu_ksoftirqd() == current)
-               goto out;
--      if (test_and_clear_bit(TSQ_THROTTLED, &tp->tsq_flags) &&
--          !test_and_set_bit(TSQ_QUEUED, &tp->tsq_flags)) {
--              unsigned long flags;
-+      for (oval = READ_ONCE(tp->tsq_flags);; oval = nval) {
-               struct tsq_tasklet *tsq;
-+              if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED))
-+                      goto out;
-+
-+              nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED;
-+              nval = cmpxchg(&tp->tsq_flags, oval, nval);
-+              if (nval != oval)
-+                      continue;
-+
-               /* queue this socket to tasklet queue */
-               local_irq_save(flags);
-               tsq = this_cpu_ptr(&tsq_tasklet);
diff --git a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch
deleted file mode 100644 (file)
index b9b3c55..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From b223feb9de2a65c533ff95c08e834fa732906ea5 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:52 -0800
-Subject: [PATCH 03/10] tcp: tsq: add shortcut in tcp_tasklet_func()
-
-Under high stress, I've seen tcp_tasklet_func() consuming
-~700 usec, handling ~150 tcp sockets.
-
-By setting TCP_TSQ_DEFERRED in tcp_wfree(), we give a chance
-for other cpus/threads entering tcp_write_xmit() to grab it,
-allowing tcp_tasklet_func() to skip sockets that already did
-an xmit cycle.
-
-In the future, we might give to ACK processing an increased
-budget to reduce even more tcp_tasklet_func() amount of work.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv4/tcp_output.c | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -772,19 +772,19 @@ static void tcp_tasklet_func(unsigned lo
-       list_for_each_safe(q, n, &list) {
-               tp = list_entry(q, struct tcp_sock, tsq_node);
-               list_del(&tp->tsq_node);
-+              clear_bit(TSQ_QUEUED, &tp->tsq_flags);
-               sk = (struct sock *)tp;
--              bh_lock_sock(sk);
--
--              if (!sock_owned_by_user(sk)) {
--                      tcp_tsq_handler(sk);
--              } else {
--                      /* defer the work to tcp_release_cb() */
--                      set_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags);
-+              if (!sk->sk_lock.owned &&
-+                  test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags)) {
-+                      bh_lock_sock(sk);
-+                      if (!sock_owned_by_user(sk)) {
-+                              clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags);
-+                              tcp_tsq_handler(sk);
-+                      }
-+                      bh_unlock_sock(sk);
-               }
--              bh_unlock_sock(sk);
--              clear_bit(TSQ_QUEUED, &tp->tsq_flags);
-               sk_free(sk);
-       }
- }
-@@ -889,7 +889,7 @@ void tcp_wfree(struct sk_buff *skb)
-               if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED))
-                       goto out;
--              nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED;
-+              nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED | TCPF_TSQ_DEFERRED;
-               nval = cmpxchg(&tp->tsq_flags, oval, nval);
-               if (nval != oval)
-                       continue;
-@@ -2222,6 +2222,8 @@ static bool tcp_write_xmit(struct sock *
-                   unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
-                       break;
-+              if (test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags))
-+                      clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags);
-               if (tcp_small_queue_check(sk, skb, 0))
-                       break;
diff --git a/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch b/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch
deleted file mode 100644 (file)
index 87452ac..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From a9b204d1564702b704ad6fe74f10a102c7b87ba3 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:53 -0800
-Subject: [PATCH 04/10] tcp: tsq: avoid one atomic in tcp_wfree()
-
-Under high load, tcp_wfree() has an atomic operation trying
-to schedule a tasklet over and over.
-
-We can schedule it only if our per cpu list was empty.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv4/tcp_output.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -885,6 +885,7 @@ void tcp_wfree(struct sk_buff *skb)
-       for (oval = READ_ONCE(tp->tsq_flags);; oval = nval) {
-               struct tsq_tasklet *tsq;
-+              bool empty;
-               if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED))
-                       goto out;
-@@ -897,8 +898,10 @@ void tcp_wfree(struct sk_buff *skb)
-               /* queue this socket to tasklet queue */
-               local_irq_save(flags);
-               tsq = this_cpu_ptr(&tsq_tasklet);
-+              empty = list_empty(&tsq->head);
-               list_add(&tp->tsq_node, &tsq->head);
--              tasklet_schedule(&tsq->tasklet);
-+              if (empty)
-+                      tasklet_schedule(&tsq->tasklet);
-               local_irq_restore(flags);
-               return;
-       }
diff --git a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch
deleted file mode 100644 (file)
index d04e365..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 75eefc6c59fd2c5f1ab95a3a113c217237d12a31 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:54 -0800
-Subject: [PATCH 05/10] tcp: tsq: add a shortcut in tcp_small_queue_check()
-
-Always allow the two first skbs in write queue to be sent,
-regardless of sk_wmem_alloc/sk_pacing_rate values.
-
-This helps a lot in situations where TX completions are delayed either
-because of driver latencies or softirq latencies.
-
-Test is done with no cache line misses.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv4/tcp_output.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -2127,6 +2127,15 @@ static bool tcp_small_queue_check(struct
-       limit <<= factor;
-       if (atomic_read(&sk->sk_wmem_alloc) > limit) {
-+              /* Always send the 1st or 2nd skb in write queue.
-+               * No need to wait for TX completion to call us back,
-+               * after softirq/tasklet schedule.
-+               * This helps when TX completions are delayed too much.
-+               */
-+              if (skb == sk->sk_write_queue.next ||
-+                  skb->prev == sk->sk_write_queue.next)
-+                      return false;
-+
-               set_bit(TSQ_THROTTLED, &tcp_sk(sk)->tsq_flags);
-               /* It is possible TX completion already happened
-                * before we set TSQ_THROTTLED, so we must
diff --git a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch
deleted file mode 100644 (file)
index 2a6cd40..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 12a59abc22d6664f7d3944f625ceefee92de8820 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:55 -0800
-Subject: [PATCH 06/10] tcp: tcp_mtu_probe() is likely to exit early
-
-Adding a likely() in tcp_mtu_probe() moves its code which used to
-be inlined in front of tcp_write_xmit()
-
-We still have a cache line miss to access icsk->icsk_mtup.enabled,
-we will probably have to reorganize fields to help data locality.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv4/tcp_output.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1960,26 +1960,26 @@ static bool tcp_can_coalesce_send_queue_
-  */
- static int tcp_mtu_probe(struct sock *sk)
- {
--      struct tcp_sock *tp = tcp_sk(sk);
-       struct inet_connection_sock *icsk = inet_csk(sk);
-+      struct tcp_sock *tp = tcp_sk(sk);
-       struct sk_buff *skb, *nskb, *next;
-       struct net *net = sock_net(sk);
--      int len;
-       int probe_size;
-       int size_needed;
--      int copy;
-+      int copy, len;
-       int mss_now;
-       int interval;
-       /* Not currently probing/verifying,
-        * not in recovery,
-        * have enough cwnd, and
--       * not SACKing (the variable headers throw things off) */
--      if (!icsk->icsk_mtup.enabled ||
--          icsk->icsk_mtup.probe_size ||
--          inet_csk(sk)->icsk_ca_state != TCP_CA_Open ||
--          tp->snd_cwnd < 11 ||
--          tp->rx_opt.num_sacks || tp->rx_opt.dsack)
-+       * not SACKing (the variable headers throw things off)
-+       */
-+      if (likely(!icsk->icsk_mtup.enabled ||
-+                 icsk->icsk_mtup.probe_size ||
-+                 inet_csk(sk)->icsk_ca_state != TCP_CA_Open ||
-+                 tp->snd_cwnd < 11 ||
-+                 tp->rx_opt.num_sacks || tp->rx_opt.dsack))
-               return -1;
-       /* Use binary search for probe_size between tcp_mss_base,
diff --git a/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch b/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch
deleted file mode 100644 (file)
index a43b403..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-From 9115e8cd2a0c6eaaa900c462721f12e1d45f326c Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:56 -0800
-Subject: [PATCH 07/10] net: reorganize struct sock for better data locality
-
-Group fields used in TX path, and keep some cache lines mostly read
-to permit sharing among cpus.
-
-Gained two 4 bytes holes on 64bit arches.
-
-Added a place holder for tcp tsq_flags, next to sk_wmem_alloc
-to speed up tcp_wfree() in the following patch.
-
-I have not added ____cacheline_aligned_in_smp, this might be done later.
-I prefer doing this once inet and tcp/udp sockets reorg is also done.
-
-Tested with both TCP and UDP.
-
-UDP receiver performance under flood increased by ~20 % :
-Accessing sk_filter/sk_wq/sk_napi_id no longer stalls because sk_drops
-was moved away from a critical cache line, now mostly read and shared.
-
-       /* --- cacheline 4 boundary (256 bytes) --- */
-       unsigned int               sk_napi_id;           /* 0x100   0x4 */
-       int                        sk_rcvbuf;            /* 0x104   0x4 */
-       struct sk_filter *         sk_filter;            /* 0x108   0x8 */
-       union {
-               struct socket_wq * sk_wq;                /*         0x8 */
-               struct socket_wq * sk_wq_raw;            /*         0x8 */
-       };                                               /* 0x110   0x8 */
-       struct xfrm_policy *       sk_policy[2];         /* 0x118  0x10 */
-       struct dst_entry *         sk_rx_dst;            /* 0x128   0x8 */
-       struct dst_entry *         sk_dst_cache;         /* 0x130   0x8 */
-       atomic_t                   sk_omem_alloc;        /* 0x138   0x4 */
-       int                        sk_sndbuf;            /* 0x13c   0x4 */
-       /* --- cacheline 5 boundary (320 bytes) --- */
-       int                        sk_wmem_queued;       /* 0x140   0x4 */
-       atomic_t                   sk_wmem_alloc;        /* 0x144   0x4 */
-       long unsigned int          sk_tsq_flags;         /* 0x148   0x8 */
-       struct sk_buff *           sk_send_head;         /* 0x150   0x8 */
-       struct sk_buff_head        sk_write_queue;       /* 0x158  0x18 */
-       __s32                      sk_peek_off;          /* 0x170   0x4 */
-       int                        sk_write_pending;     /* 0x174   0x4 */
-       long int                   sk_sndtimeo;          /* 0x178   0x8 */
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Tested-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/net/sock.h | 51 +++++++++++++++++++++++++++------------------------
- 1 file changed, 27 insertions(+), 24 deletions(-)
-
---- a/include/net/sock.h
-+++ b/include/net/sock.h
-@@ -344,6 +344,9 @@ struct sock {
- #define sk_rxhash             __sk_common.skc_rxhash
-       socket_lock_t           sk_lock;
-+      atomic_t                sk_drops;
-+      int                     sk_rcvlowat;
-+      struct sk_buff_head     sk_error_queue;
-       struct sk_buff_head     sk_receive_queue;
-       /*
-        * The backlog queue is special, it is always used with
-@@ -360,14 +363,13 @@ struct sock {
-               struct sk_buff  *tail;
-       } sk_backlog;
- #define sk_rmem_alloc sk_backlog.rmem_alloc
--      int                     sk_forward_alloc;
--      __u32                   sk_txhash;
-+      int                     sk_forward_alloc;
- #ifdef CONFIG_NET_RX_BUSY_POLL
--      unsigned int            sk_napi_id;
-       unsigned int            sk_ll_usec;
-+      /* ===== mostly read cache line ===== */
-+      unsigned int            sk_napi_id;
- #endif
--      atomic_t                sk_drops;
-       int                     sk_rcvbuf;
-       struct sk_filter __rcu  *sk_filter;
-@@ -380,11 +382,30 @@ struct sock {
- #endif
-       struct dst_entry        *sk_rx_dst;
-       struct dst_entry __rcu  *sk_dst_cache;
--      /* Note: 32bit hole on 64bit arches */
--      atomic_t                sk_wmem_alloc;
-       atomic_t                sk_omem_alloc;
-       int                     sk_sndbuf;
-+
-+      /* ===== cache line for TX ===== */
-+      int                     sk_wmem_queued;
-+      atomic_t                sk_wmem_alloc;
-+      unsigned long           sk_tsq_flags;
-+      struct sk_buff          *sk_send_head;
-       struct sk_buff_head     sk_write_queue;
-+      __s32                   sk_peek_off;
-+      int                     sk_write_pending;
-+      long                    sk_sndtimeo;
-+      struct timer_list       sk_timer;
-+      __u32                   sk_priority;
-+      __u32                   sk_mark;
-+      u32                     sk_pacing_rate; /* bytes per second */
-+      u32                     sk_max_pacing_rate;
-+      struct page_frag        sk_frag;
-+      netdev_features_t       sk_route_caps;
-+      netdev_features_t       sk_route_nocaps;
-+      int                     sk_gso_type;
-+      unsigned int            sk_gso_max_size;
-+      gfp_t                   sk_allocation;
-+      __u32                   sk_txhash;
-       /*
-        * Because of non atomicity rules, all
-@@ -400,31 +421,17 @@ struct sock {
- #define SK_PROTOCOL_MAX U8_MAX
-       kmemcheck_bitfield_end(flags);
--      int                     sk_wmem_queued;
--      gfp_t                   sk_allocation;
--      u32                     sk_pacing_rate; /* bytes per second */
--      u32                     sk_max_pacing_rate;
--      netdev_features_t       sk_route_caps;
--      netdev_features_t       sk_route_nocaps;
--      int                     sk_gso_type;
--      unsigned int            sk_gso_max_size;
-       u16                     sk_gso_max_segs;
--      int                     sk_rcvlowat;
-       unsigned long           sk_lingertime;
--      struct sk_buff_head     sk_error_queue;
-       struct proto            *sk_prot_creator;
-       rwlock_t                sk_callback_lock;
-       int                     sk_err,
-                               sk_err_soft;
-       u32                     sk_ack_backlog;
-       u32                     sk_max_ack_backlog;
--      __u32                   sk_priority;
--      __u32                   sk_mark;
-       struct pid              *sk_peer_pid;
-       const struct cred       *sk_peer_cred;
-       long                    sk_rcvtimeo;
--      long                    sk_sndtimeo;
--      struct timer_list       sk_timer;
-       ktime_t                 sk_stamp;
- #if BITS_PER_LONG==32
-       seqlock_t               sk_stamp_seq;
-@@ -434,10 +441,6 @@ struct sock {
-       u32                     sk_tskey;
-       struct socket           *sk_socket;
-       void                    *sk_user_data;
--      struct page_frag        sk_frag;
--      struct sk_buff          *sk_send_head;
--      __s32                   sk_peek_off;
--      int                     sk_write_pending;
- #ifdef CONFIG_SECURITY
-       void                    *sk_security;
- #endif
diff --git a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch
deleted file mode 100644 (file)
index 0a5b9ea..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-From 7aa5470c2c09265902b5e4289afa82e4e7c2987e Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 3 Dec 2016 11:14:57 -0800
-Subject: [PATCH 08/10] tcp: tsq: move tsq_flags close to sk_wmem_alloc
-
-tsq_flags being in the same cache line than sk_wmem_alloc
-makes a lot of sense. Both fields are changed from tcp_wfree()
-and more generally by various TSQ related functions.
-
-Prior patch made room in struct sock and added sk_tsq_flags,
-this patch deletes tsq_flags from struct tcp_sock.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/linux/tcp.h   |  1 -
- net/ipv4/tcp.c        |  4 ++--
- net/ipv4/tcp_ipv4.c   |  2 +-
- net/ipv4/tcp_output.c | 24 +++++++++++-------------
- net/ipv4/tcp_timer.c  |  4 ++--
- net/ipv6/tcp_ipv6.c   |  2 +-
- 6 files changed, 17 insertions(+), 20 deletions(-)
-
---- a/include/linux/tcp.h
-+++ b/include/linux/tcp.h
-@@ -192,7 +192,6 @@ struct tcp_sock {
-       u32     tsoffset;       /* timestamp offset */
-       struct list_head tsq_node; /* anchor in tsq_tasklet.head list */
--      unsigned long   tsq_flags;
-       /* Data for direct copy to user */
-       struct {
---- a/net/ipv4/tcp.c
-+++ b/net/ipv4/tcp.c
-@@ -665,9 +665,9 @@ static void tcp_push(struct sock *sk, in
-       if (tcp_should_autocork(sk, skb, size_goal)) {
-               /* avoid atomic op if TSQ_THROTTLED bit is already set */
--              if (!test_bit(TSQ_THROTTLED, &tp->tsq_flags)) {
-+              if (!test_bit(TSQ_THROTTLED, &sk->sk_tsq_flags)) {
-                       NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAUTOCORKING);
--                      set_bit(TSQ_THROTTLED, &tp->tsq_flags);
-+                      set_bit(TSQ_THROTTLED, &sk->sk_tsq_flags);
-               }
-               /* It is possible TX completion already happened
-                * before we set TSQ_THROTTLED.
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -446,7 +446,7 @@ void tcp_v4_err(struct sk_buff *icmp_skb
-                       if (!sock_owned_by_user(sk)) {
-                               tcp_v4_mtu_reduced(sk);
-                       } else {
--                              if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags))
-+                              if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, &sk->sk_tsq_flags))
-                                       sock_hold(sk);
-                       }
-                       goto out;
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -772,14 +772,15 @@ static void tcp_tasklet_func(unsigned lo
-       list_for_each_safe(q, n, &list) {
-               tp = list_entry(q, struct tcp_sock, tsq_node);
-               list_del(&tp->tsq_node);
--              clear_bit(TSQ_QUEUED, &tp->tsq_flags);
-               sk = (struct sock *)tp;
-+              clear_bit(TSQ_QUEUED, &sk->sk_tsq_flags);
-+
-               if (!sk->sk_lock.owned &&
--                  test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags)) {
-+                  test_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags)) {
-                       bh_lock_sock(sk);
-                       if (!sock_owned_by_user(sk)) {
--                              clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags);
-+                              clear_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags);
-                               tcp_tsq_handler(sk);
-                       }
-                       bh_unlock_sock(sk);
-@@ -802,16 +803,15 @@ static void tcp_tasklet_func(unsigned lo
-  */
- void tcp_release_cb(struct sock *sk)
- {
--      struct tcp_sock *tp = tcp_sk(sk);
-       unsigned long flags, nflags;
-       /* perform an atomic operation only if at least one flag is set */
-       do {
--              flags = tp->tsq_flags;
-+              flags = sk->sk_tsq_flags;
-               if (!(flags & TCP_DEFERRED_ALL))
-                       return;
-               nflags = flags & ~TCP_DEFERRED_ALL;
--      } while (cmpxchg(&tp->tsq_flags, flags, nflags) != flags);
-+      } while (cmpxchg(&sk->sk_tsq_flags, flags, nflags) != flags);
-       if (flags & TCPF_TSQ_DEFERRED)
-               tcp_tsq_handler(sk);
-@@ -883,7 +883,7 @@ void tcp_wfree(struct sk_buff *skb)
-       if (wmem >= SKB_TRUESIZE(1) && this_cpu_ksoftirqd() == current)
-               goto out;
--      for (oval = READ_ONCE(tp->tsq_flags);; oval = nval) {
-+      for (oval = READ_ONCE(sk->sk_tsq_flags);; oval = nval) {
-               struct tsq_tasklet *tsq;
-               bool empty;
-@@ -891,7 +891,7 @@ void tcp_wfree(struct sk_buff *skb)
-                       goto out;
-               nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED | TCPF_TSQ_DEFERRED;
--              nval = cmpxchg(&tp->tsq_flags, oval, nval);
-+              nval = cmpxchg(&sk->sk_tsq_flags, oval, nval);
-               if (nval != oval)
-                       continue;
-@@ -2136,7 +2136,7 @@ static bool tcp_small_queue_check(struct
-                   skb->prev == sk->sk_write_queue.next)
-                       return false;
--              set_bit(TSQ_THROTTLED, &tcp_sk(sk)->tsq_flags);
-+              set_bit(TSQ_THROTTLED, &sk->sk_tsq_flags);
-               /* It is possible TX completion already happened
-                * before we set TSQ_THROTTLED, so we must
-                * test again the condition.
-@@ -2234,8 +2234,8 @@ static bool tcp_write_xmit(struct sock *
-                   unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
-                       break;
--              if (test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags))
--                      clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags);
-+              if (test_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags))
-+                      clear_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags);
-               if (tcp_small_queue_check(sk, skb, 0))
-                       break;
-@@ -3546,8 +3546,6 @@ void __tcp_send_ack(struct sock *sk, u32
-       /* We do not want pure acks influencing TCP Small Queues or fq/pacing
-        * too much.
-        * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784
--       * We also avoid tcp_wfree() overhead (cache line miss accessing
--       * tp->tsq_flags) by using regular sock_wfree()
-        */
-       skb_set_tcp_pure_ack(buff);
---- a/net/ipv4/tcp_timer.c
-+++ b/net/ipv4/tcp_timer.c
-@@ -326,7 +326,7 @@ static void tcp_delack_timer(unsigned lo
-               inet_csk(sk)->icsk_ack.blocked = 1;
-               __NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);
-               /* deleguate our work to tcp_release_cb() */
--              if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags))
-+              if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, &sk->sk_tsq_flags))
-                       sock_hold(sk);
-       }
-       bh_unlock_sock(sk);
-@@ -609,7 +609,7 @@ static void tcp_write_timer(unsigned lon
-               tcp_write_timer_handler(sk);
-       } else {
-               /* delegate our work to tcp_release_cb() */
--              if (!test_and_set_bit(TCP_WRITE_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags))
-+              if (!test_and_set_bit(TCP_WRITE_TIMER_DEFERRED, &sk->sk_tsq_flags))
-                       sock_hold(sk);
-       }
-       bh_unlock_sock(sk);
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -404,7 +404,7 @@ static void tcp_v6_err(struct sk_buff *s
-               if (!sock_owned_by_user(sk))
-                       tcp_v6_mtu_reduced(sk);
-               else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED,
--                                         &tp->tsq_flags))
-+                                         &sk->sk_tsq_flags))
-                       sock_hold(sk);
-               goto out;
-       }
diff --git a/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch b/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch
deleted file mode 100644 (file)
index bd74303..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0a9648f1293966c838dc570da73c15a76f4c89d6 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Wed, 21 Dec 2016 05:42:43 -0800
-Subject: [PATCH 09/10] tcp: add a missing barrier in tcp_tasklet_func()
-
-Madalin reported crashes happening in tcp_tasklet_func() on powerpc64
-
-Before TSQ_QUEUED bit is cleared, we must ensure the changes done
-by list_del(&tp->tsq_node); are committed to memory, otherwise
-corruption might happen, as an other cpu could catch TSQ_QUEUED
-clearance too soon.
-
-We can notice that old kernels were immune to this bug, because
-TSQ_QUEUED was cleared after a bh_lock_sock(sk)/bh_unlock_sock(sk)
-section, but they could have missed a kick to write additional bytes,
-when NIC interrupts for a given flow are spread to multiple cpus.
-
-Affected TCP flows would need an incoming ACK or RTO timer to add more
-packets to the pipe. So overall situation should be better now.
-
-Fixes: b223feb9de2a ("tcp: tsq: add shortcut in tcp_tasklet_func()")
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Reported-by: Madalin Bucur <madalin.bucur@nxp.com>
-Tested-by: Madalin Bucur <madalin.bucur@nxp.com>
-Tested-by: Xing Lei <xing.lei@nxp.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv4/tcp_output.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -774,6 +774,7 @@ static void tcp_tasklet_func(unsigned lo
-               list_del(&tp->tsq_node);
-               sk = (struct sock *)tp;
-+              smp_mb__before_atomic();
-               clear_bit(TSQ_QUEUED, &sk->sk_tsq_flags);
-               if (!sk->sk_lock.owned &&
diff --git a/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
deleted file mode 100644 (file)
index 7741fd7..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 11 Nov 2017 15:54:12 -0800
-Subject: [PATCH] tcp: allow drivers to tweak TSQ logic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I had many reports that TSQ logic breaks wifi aggregation.
-
-Current logic is to allow up to 1 ms of bytes to be queued into qdisc
-and drivers queues.
-
-But Wifi aggregation needs a bigger budget to allow bigger rates to
-be discovered by various TCP Congestion Controls algorithms.
-
-This patch adds an extra socket field, allowing wifi drivers to select
-another log scale to derive TCP Small Queue credit from current pacing
-rate.
-
-Initial value is 10, meaning that this patch does not change current
-behavior.
-
-We expect wifi drivers to set this field to smaller values (tests have
-been done with values from 6 to 9)
-
-They would have to use following template :
-
-if (skb->sk && skb->sk->sk_pacing_shift != MY_PACING_SHIFT)
-     skb->sk->sk_pacing_shift = MY_PACING_SHIFT;
-
-Ref: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1670041
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Cc: Johannes Berg <johannes.berg@intel.com>
-Cc: Toke Høiland-Jørgensen <toke@toke.dk>
-Cc: Kir Kolyshkin <kir@openvz.org>
----
---- a/include/net/sock.h
-+++ b/include/net/sock.h
-@@ -260,6 +260,7 @@ struct sock_common {
-   *   @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)
-   *   @sk_gso_max_size: Maximum GSO segment size to build
-   *   @sk_gso_max_segs: Maximum number of GSO segments
-+  *   @sk_pacing_shift: scaling factor for TCP Small Queues
-   *   @sk_lingertime: %SO_LINGER l_linger setting
-   *   @sk_backlog: always used with the per-socket spinlock held
-   *   @sk_callback_lock: used with the callbacks in the end of this struct
-@@ -422,6 +423,8 @@ struct sock {
-       kmemcheck_bitfield_end(flags);
-       u16                     sk_gso_max_segs;
-+#define sk_pacing_shift sk_pacing_shift /* for backport checks */
-+      u8                      sk_pacing_shift;
-       unsigned long           sk_lingertime;
-       struct proto            *sk_prot_creator;
-       rwlock_t                sk_callback_lock;
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -2479,6 +2479,7 @@ void sock_init_data(struct socket *sock,
-       sk->sk_max_pacing_rate = ~0U;
-       sk->sk_pacing_rate = ~0U;
-+      sk->sk_pacing_shift = 10;
-       sk->sk_incoming_cpu = -1;
-       /*
-        * Before updating sk_refcnt, we must commit prior changes to memory
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1593,7 +1593,7 @@ u32 tcp_tso_autosize(const struct sock *
- {
-       u32 bytes, segs;
--      bytes = min(sk->sk_pacing_rate >> 10,
-+      bytes = min(sk->sk_pacing_rate >> sk->sk_pacing_shift,
-                   sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
-       /* Goal is to send at least one packet per ms,
-@@ -2123,7 +2123,7 @@ static bool tcp_small_queue_check(struct
- {
-       unsigned int limit;
--      limit = max(2 * skb->truesize, sk->sk_pacing_rate >> 10);
-+      limit = max(2 * skb->truesize, sk->sk_pacing_rate >> sk->sk_pacing_shift);
-       limit = min_t(u32, limit, sysctl_tcp_limit_output_bytes);
-       limit <<= factor;
diff --git a/target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch b/target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch
deleted file mode 100644 (file)
index 8e1f312..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 854826c9d526fd81077742c3b000e3f7fcaef3ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 20 Sep 2016 10:36:14 +0200
-Subject: [PATCH] ubifs: Drop softlimit and delta fields from struct ubifs_wbuf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Values of these fields are set during init and never modified. They are
-used (read) in a single function only. There isn't really any reason to
-keep them in a struct. It only makes struct just a bit bigger without
-any visible gain.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
----
- fs/ubifs/io.c    | 18 ++++++++++--------
- fs/ubifs/ubifs.h |  5 -----
- 2 files changed, 10 insertions(+), 13 deletions(-)
-
---- a/fs/ubifs/io.c
-+++ b/fs/ubifs/io.c
-@@ -452,16 +452,22 @@ static enum hrtimer_restart wbuf_timer_c
-  */
- static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
- {
-+      ktime_t softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0);
-+      unsigned long long delta;
-+
-+      delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT;
-+      delta *= 1000000000ULL;
-+
-       ubifs_assert(!hrtimer_active(&wbuf->timer));
-+      ubifs_assert(delta <= ULONG_MAX);
-       if (wbuf->no_timer)
-               return;
-       dbg_io("set timer for jhead %s, %llu-%llu millisecs",
-              dbg_jhead(wbuf->jhead),
--             div_u64(ktime_to_ns(wbuf->softlimit), USEC_PER_SEC),
--             div_u64(ktime_to_ns(wbuf->softlimit) + wbuf->delta,
--                     USEC_PER_SEC));
--      hrtimer_start_range_ns(&wbuf->timer, wbuf->softlimit, wbuf->delta,
-+             div_u64(ktime_to_ns(softlimit), USEC_PER_SEC),
-+             div_u64(ktime_to_ns(softlimit) + delta, USEC_PER_SEC));
-+      hrtimer_start_range_ns(&wbuf->timer, softlimit, delta,
-                              HRTIMER_MODE_REL);
- }
-@@ -1059,10 +1065,6 @@ int ubifs_wbuf_init(struct ubifs_info *c
-       hrtimer_init(&wbuf->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-       wbuf->timer.function = wbuf_timer_callback_nolock;
--      wbuf->softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0);
--      wbuf->delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT;
--      wbuf->delta *= 1000000000ULL;
--      ubifs_assert(wbuf->delta <= ULONG_MAX);
-       return 0;
- }
---- a/fs/ubifs/ubifs.h
-+++ b/fs/ubifs/ubifs.h
-@@ -645,9 +645,6 @@ typedef int (*ubifs_lpt_scan_callback)(s
-  * @io_mutex: serializes write-buffer I/O
-  * @lock: serializes @buf, @lnum, @offs, @avail, @used, @next_ino and @inodes
-  *        fields
-- * @softlimit: soft write-buffer timeout interval
-- * @delta: hard and soft timeouts delta (the timer expire interval is @softlimit
-- *         and @softlimit + @delta)
-  * @timer: write-buffer timer
-  * @no_timer: non-zero if this write-buffer does not have a timer
-  * @need_sync: non-zero if the timer expired and the wbuf needs sync'ing
-@@ -676,8 +673,6 @@ struct ubifs_wbuf {
-       int (*sync_callback)(struct ubifs_info *c, int lnum, int free, int pad);
-       struct mutex io_mutex;
-       spinlock_t lock;
--      ktime_t softlimit;
--      unsigned long long delta;
-       struct hrtimer timer;
-       unsigned int no_timer:1;
-       unsigned int need_sync:1;
diff --git a/target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch b/target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch
deleted file mode 100644 (file)
index 96fa441..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1b7fc2c0069f3864a3dda15430b7aded31c0bfcc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 20 Sep 2016 10:36:15 +0200
-Subject: [PATCH] ubifs: Use dirty_writeback_interval value for wbuf timer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Right now wbuf timer has hardcoded timeouts and there is no place for
-manual adjustments. Some projects / cases many need that though. Few
-file systems allow doing that by respecting dirty_writeback_interval
-that can be set using sysctl (dirty_writeback_centisecs).
-
-Lowering dirty_writeback_interval could be some way of dealing with user
-space apps lacking proper fsyncs. This is definitely *not* a perfect
-solution but we don't have ideal (user space) world. There were already
-advanced discussions on this matter, mostly when ext4 was introduced and
-it wasn't behaving as ext3. Anyway, the final decision was to add some
-hacks to the ext4, as trying to fix whole user space or adding new API
-was pointless.
-
-We can't (and shouldn't?) just follow ext4. We can't e.g. sync on close
-as this would cause too many commits and flash wearing. On the other
-hand we still should allow some trade-off between -o sync and default
-wbuf timeout. Respecting dirty_writeback_interval should allow some sane
-cutomizations if used warily.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
----
- fs/ubifs/io.c    | 8 ++++----
- fs/ubifs/ubifs.h | 4 ----
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
---- a/fs/ubifs/io.c
-+++ b/fs/ubifs/io.c
-@@ -452,11 +452,11 @@ static enum hrtimer_restart wbuf_timer_c
-  */
- static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
- {
--      ktime_t softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0);
--      unsigned long long delta;
-+      ktime_t softlimit = ms_to_ktime(dirty_writeback_interval * 10);
-+      unsigned long long delta = dirty_writeback_interval;
--      delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT;
--      delta *= 1000000000ULL;
-+      /* centi to milli, milli to nano, then 10% */
-+      delta *= 10ULL * NSEC_PER_MSEC / 10ULL;
-       ubifs_assert(!hrtimer_active(&wbuf->timer));
-       ubifs_assert(delta <= ULONG_MAX);
---- a/fs/ubifs/ubifs.h
-+++ b/fs/ubifs/ubifs.h
-@@ -83,10 +83,6 @@
-  */
- #define BGT_NAME_PATTERN "ubifs_bgt%d_%d"
--/* Write-buffer synchronization timeout interval in seconds */
--#define WBUF_TIMEOUT_SOFTLIMIT 3
--#define WBUF_TIMEOUT_HARDLIMIT 5
--
- /* Maximum possible inode number (only 32-bit inodes are supported now) */
- #define MAX_INUM 0xFFFFFFFF
diff --git a/target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch b/target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch
deleted file mode 100644 (file)
index d4b60d4..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Alexander Duyck <alexander.h.duyck@intel.com>
-Date: Wed, 14 Dec 2016 15:05:26 -0800
-Subject: [PATCH] mm: add support for releasing multiple instances of a page
-
-Add a function that allows us to batch free a page that has multiple
-references outstanding.  Specifically this function can be used to drop
-a page being used in the page frag alloc cache.  With this drivers can
-make use of functionality similar to the page frag alloc cache without
-having to do any workarounds for the fact that there is no function that
-frees multiple references.
-
-Link: http://lkml.kernel.org/r/20161110113606.76501.70752.stgit@ahduyck-blue-test.jf.intel.com
-Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
-Cc: Chris Metcalf <cmetcalf@mellanox.com>
-Cc: David Howells <dhowells@redhat.com>
-Cc: Geert Uytterhoeven <geert@linux-m68k.org>
-Cc: Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>
-Cc: Helge Deller <deller@gmx.de>
-Cc: James Hogan <james.hogan@imgtec.com>
-Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-Cc: Jonas Bonn <jonas@southpole.se>
-Cc: Keguang Zhang <keguang.zhang@gmail.com>
-Cc: Ley Foon Tan <lftan@altera.com>
-Cc: Mark Salter <msalter@redhat.com>
-Cc: Max Filippov <jcmvbkbc@gmail.com>
-Cc: Michael Ellerman <mpe@ellerman.id.au>
-Cc: Michal Simek <monstr@monstr.eu>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: Rich Felker <dalias@libc.org>
-Cc: Richard Kuo <rkuo@codeaurora.org>
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: Steven Miao <realmz6@gmail.com>
-Cc: Tobias Klauser <tklauser@distanz.ch>
-Cc: Vineet Gupta <vgupta@synopsys.com>
-Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/include/linux/gfp.h
-+++ b/include/linux/gfp.h
-@@ -506,6 +506,8 @@ extern void free_hot_cold_page(struct pa
- extern void free_hot_cold_page_list(struct list_head *list, bool cold);
- struct page_frag_cache;
-+extern void __page_frag_drain(struct page *page, unsigned int order,
-+                            unsigned int count);
- extern void *__alloc_page_frag(struct page_frag_cache *nc,
-                              unsigned int fragsz, gfp_t gfp_mask);
- extern void __free_page_frag(void *addr);
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -3935,6 +3935,20 @@ static struct page *__page_frag_refill(s
-       return page;
- }
-+void __page_frag_drain(struct page *page, unsigned int order,
-+                     unsigned int count)
-+{
-+      VM_BUG_ON_PAGE(page_ref_count(page) == 0, page);
-+
-+      if (page_ref_sub_and_test(page, count)) {
-+              if (order == 0)
-+                      free_hot_cold_page(page, false);
-+              else
-+                      __free_pages_ok(page, order);
-+      }
-+}
-+EXPORT_SYMBOL(__page_frag_drain);
-+
- void *__alloc_page_frag(struct page_frag_cache *nc,
-                       unsigned int fragsz, gfp_t gfp_mask)
- {
diff --git a/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch b/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
deleted file mode 100644 (file)
index facc430..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-From: Alexander Duyck <alexander.h.duyck@intel.com>
-Date: Tue, 10 Jan 2017 16:58:06 -0800
-Subject: [PATCH] mm: rename __alloc_page_frag to page_frag_alloc and
- __free_page_frag to page_frag_free
-
-Patch series "Page fragment updates", v4.
-
-This patch series takes care of a few cleanups for the page fragments
-API.
-
-First we do some renames so that things are much more consistent.  First
-we move the page_frag_ portion of the name to the front of the functions
-names.  Secondly we split out the cache specific functions from the
-other page fragment functions by adding the word "cache" to the name.
-
-Finally I added a bit of documentation that will hopefully help to
-explain some of this.  I plan to revisit this later as we get things
-more ironed out in the near future with the changes planned for the DMA
-setup to support eXpress Data Path.
-
-This patch (of 3):
-
-This patch renames the page frag functions to be more consistent with
-other APIs.  Specifically we place the name page_frag first in the name
-and then have either an alloc or free call name that we append as the
-suffix.  This makes it a bit clearer in terms of naming.
-
-In addition we drop the leading double underscores since we are
-technically no longer a backing interface and instead the front end that
-is called from the networking APIs.
-
-Link: http://lkml.kernel.org/r/20170104023854.13451.67390.stgit@localhost.localdomain
-Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/include/linux/gfp.h
-+++ b/include/linux/gfp.h
-@@ -508,9 +508,9 @@ extern void free_hot_cold_page_list(stru
- struct page_frag_cache;
- extern void __page_frag_drain(struct page *page, unsigned int order,
-                             unsigned int count);
--extern void *__alloc_page_frag(struct page_frag_cache *nc,
--                             unsigned int fragsz, gfp_t gfp_mask);
--extern void __free_page_frag(void *addr);
-+extern void *page_frag_alloc(struct page_frag_cache *nc,
-+                           unsigned int fragsz, gfp_t gfp_mask);
-+extern void page_frag_free(void *addr);
- #define __free_page(page) __free_pages((page), 0)
- #define free_page(addr) free_pages((addr), 0)
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -2476,7 +2476,7 @@ static inline struct sk_buff *netdev_all
- static inline void skb_free_frag(void *addr)
- {
--      __free_page_frag(addr);
-+      page_frag_free(addr);
- }
- void *napi_alloc_frag(unsigned int fragsz);
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -3949,8 +3949,8 @@ void __page_frag_drain(struct page *page
- }
- EXPORT_SYMBOL(__page_frag_drain);
--void *__alloc_page_frag(struct page_frag_cache *nc,
--                      unsigned int fragsz, gfp_t gfp_mask)
-+void *page_frag_alloc(struct page_frag_cache *nc,
-+                    unsigned int fragsz, gfp_t gfp_mask)
- {
-       unsigned int size = PAGE_SIZE;
-       struct page *page;
-@@ -4001,19 +4001,19 @@ refill:
-       return nc->va + offset;
- }
--EXPORT_SYMBOL(__alloc_page_frag);
-+EXPORT_SYMBOL(page_frag_alloc);
- /*
-  * Frees a page fragment allocated out of either a compound or order 0 page.
-  */
--void __free_page_frag(void *addr)
-+void page_frag_free(void *addr)
- {
-       struct page *page = virt_to_head_page(addr);
-       if (unlikely(put_page_testzero(page)))
-               __free_pages_ok(page, compound_order(page));
- }
--EXPORT_SYMBOL(__free_page_frag);
-+EXPORT_SYMBOL(page_frag_free);
- static void *make_alloc_exact(unsigned long addr, unsigned int order,
-               size_t size)
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -369,7 +369,7 @@ static void *__netdev_alloc_frag(unsigne
-       local_irq_save(flags);
-       nc = this_cpu_ptr(&netdev_alloc_cache);
--      data = __alloc_page_frag(nc, fragsz, gfp_mask);
-+      data = page_frag_alloc(nc, fragsz, gfp_mask);
-       local_irq_restore(flags);
-       return data;
- }
-@@ -393,7 +393,7 @@ static void *__napi_alloc_frag(unsigned
- {
-       struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
--      return __alloc_page_frag(&nc->page, fragsz, gfp_mask);
-+      return page_frag_alloc(&nc->page, fragsz, gfp_mask);
- }
- void *napi_alloc_frag(unsigned int fragsz)
-@@ -445,7 +445,7 @@ struct sk_buff *__netdev_alloc_skb(struc
-       local_irq_save(flags);
-       nc = this_cpu_ptr(&netdev_alloc_cache);
--      data = __alloc_page_frag(nc, len, gfp_mask);
-+      data = page_frag_alloc(nc, len, gfp_mask);
-       pfmemalloc = nc->pfmemalloc;
-       local_irq_restore(flags);
-@@ -509,7 +509,7 @@ struct sk_buff *__napi_alloc_skb(struct
-       if (sk_memalloc_socks())
-               gfp_mask |= __GFP_MEMALLOC;
--      data = __alloc_page_frag(&nc->page, len, gfp_mask);
-+      data = page_frag_alloc(&nc->page, len, gfp_mask);
-       if (unlikely(!data))
-               return NULL;
diff --git a/target/linux/generic/backport-4.9/042-mm-rename-__page_frag-functions-to-__page_frag_cache.patch b/target/linux/generic/backport-4.9/042-mm-rename-__page_frag-functions-to-__page_frag_cache.patch
deleted file mode 100644 (file)
index 31b5716..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Alexander Duyck <alexander.h.duyck@intel.com>
-Date: Tue, 10 Jan 2017 16:58:09 -0800
-Subject: [PATCH] mm: rename __page_frag functions to __page_frag_cache, drop
- order from drain
-
-This patch does two things.
-
-First it goes through and renames the __page_frag prefixed functions to
-__page_frag_cache so that we can be clear that we are draining or
-refilling the cache, not the frags themselves.
-
-Second we drop the order parameter from __page_frag_cache_drain since we
-don't actually need to pass it since all fragments are either order 0 or
-must be a compound page.
-
-Link: http://lkml.kernel.org/r/20170104023954.13451.5678.stgit@localhost.localdomain
-Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/include/linux/gfp.h
-+++ b/include/linux/gfp.h
-@@ -506,8 +506,7 @@ extern void free_hot_cold_page(struct pa
- extern void free_hot_cold_page_list(struct list_head *list, bool cold);
- struct page_frag_cache;
--extern void __page_frag_drain(struct page *page, unsigned int order,
--                            unsigned int count);
-+extern void __page_frag_cache_drain(struct page *page, unsigned int count);
- extern void *page_frag_alloc(struct page_frag_cache *nc,
-                            unsigned int fragsz, gfp_t gfp_mask);
- extern void page_frag_free(void *addr);
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -3914,8 +3914,8 @@ EXPORT_SYMBOL(free_pages);
-  * drivers to provide a backing region of memory for use as either an
-  * sk_buff->head, or to be used in the "frags" portion of skb_shared_info.
-  */
--static struct page *__page_frag_refill(struct page_frag_cache *nc,
--                                     gfp_t gfp_mask)
-+static struct page *__page_frag_cache_refill(struct page_frag_cache *nc,
-+                                           gfp_t gfp_mask)
- {
-       struct page *page = NULL;
-       gfp_t gfp = gfp_mask;
-@@ -3935,19 +3935,20 @@ static struct page *__page_frag_refill(s
-       return page;
- }
--void __page_frag_drain(struct page *page, unsigned int order,
--                     unsigned int count)
-+void __page_frag_cache_drain(struct page *page, unsigned int count)
- {
-       VM_BUG_ON_PAGE(page_ref_count(page) == 0, page);
-       if (page_ref_sub_and_test(page, count)) {
-+              unsigned int order = compound_order(page);
-+
-               if (order == 0)
-                       free_hot_cold_page(page, false);
-               else
-                       __free_pages_ok(page, order);
-       }
- }
--EXPORT_SYMBOL(__page_frag_drain);
-+EXPORT_SYMBOL(__page_frag_cache_drain);
- void *page_frag_alloc(struct page_frag_cache *nc,
-                     unsigned int fragsz, gfp_t gfp_mask)
-@@ -3958,7 +3959,7 @@ void *page_frag_alloc(struct page_frag_c
-       if (unlikely(!nc->va)) {
- refill:
--              page = __page_frag_refill(nc, gfp_mask);
-+              page = __page_frag_cache_refill(nc, gfp_mask);
-               if (!page)
-                       return NULL;
diff --git a/target/linux/generic/backport-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch b/target/linux/generic/backport-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch
deleted file mode 100644 (file)
index d975a26..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From be5e5099183301fb7920f8f6b66bd3ac1f820a97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 16 Jan 2017 17:28:18 +0100
-Subject: [PATCH] mtd: bcm47xxsflash: use platform_(set|get)_drvdata
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We have generic place & helpers for storing platform driver data so
-there is no reason for using custom priv pointer.
-
-This allows cleaning up struct bcma_sflash from unneeded fields.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Kalle Valo <kvalo@codeaurora.org>
-Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/devices/bcm47xxsflash.c         | 6 +++---
- include/linux/bcma/bcma_driver_chipcommon.h | 3 ---
- 2 files changed, 3 insertions(+), 6 deletions(-)
-
---- a/drivers/mtd/devices/bcm47xxsflash.c
-+++ b/drivers/mtd/devices/bcm47xxsflash.c
-@@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(stru
-       b47s = devm_kzalloc(dev, sizeof(*b47s), GFP_KERNEL);
-       if (!b47s)
-               return -ENOMEM;
--      sflash->priv = b47s;
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-@@ -320,6 +319,8 @@ static int bcm47xxsflash_bcma_probe(stru
-       b47s->size = sflash->size;
-       bcm47xxsflash_fill_mtd(b47s, &pdev->dev);
-+      platform_set_drvdata(pdev, b47s);
-+
-       err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0);
-       if (err) {
-               pr_err("Failed to register MTD device: %d\n", err);
-@@ -335,8 +336,7 @@ static int bcm47xxsflash_bcma_probe(stru
- static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)
- {
--      struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
--      struct bcm47xxsflash *b47s = sflash->priv;
-+      struct bcm47xxsflash *b47s = platform_get_drvdata(pdev);
-       mtd_device_unregister(&b47s->mtd);
-       iounmap(b47s->window);
---- a/include/linux/bcma/bcma_driver_chipcommon.h
-+++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -593,9 +593,6 @@ struct bcma_sflash {
-       u32 blocksize;
-       u16 numblocks;
-       u32 size;
--
--      struct mtd_info *mtd;
--      void *priv;
- };
- #endif
diff --git a/target/linux/generic/backport-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch b/target/linux/generic/backport-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch
deleted file mode 100644 (file)
index ecdae2a..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-From ccc38234fdc70120be79e7fb2df5c27ca5cd4c8a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 8 Feb 2017 23:53:44 +0100
-Subject: [PATCH] mtd: bcm47xxsflash: support reading flash out of mapping
- window
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For reading flash content we use MMIO but it's possible to read only
-first 16 MiB this way. It's simply an arch design/limitation.
-To support flash sizes bigger than 16 MiB implement indirect access
-using ChipCommon registers.
-This has been tested using MX25L25635F.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/devices/bcm47xxsflash.c | 24 +++++++++++++++++++++---
- drivers/mtd/devices/bcm47xxsflash.h |  3 +++
- 2 files changed, 24 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/devices/bcm47xxsflash.c
-+++ b/drivers/mtd/devices/bcm47xxsflash.c
-@@ -105,15 +105,33 @@ static int bcm47xxsflash_read(struct mtd
-                             size_t *retlen, u_char *buf)
- {
-       struct bcm47xxsflash *b47s = mtd->priv;
-+      size_t orig_len = len;
-       /* Check address range */
-       if ((from + len) > mtd->size)
-               return -EINVAL;
--      memcpy_fromio(buf, b47s->window + from, len);
--      *retlen = len;
-+      /* Read as much as possible using fast MMIO window */
-+      if (from < BCM47XXSFLASH_WINDOW_SZ) {
-+              size_t memcpy_len;
--      return len;
-+              memcpy_len = min(len, (size_t)(BCM47XXSFLASH_WINDOW_SZ - from));
-+              memcpy_fromio(buf, b47s->window + from, memcpy_len);
-+              from += memcpy_len;
-+              len -= memcpy_len;
-+              buf += memcpy_len;
-+      }
-+
-+      /* Use indirect access for content out of the window */
-+      for (; len; len--) {
-+              b47s->cc_write(b47s, BCMA_CC_FLASHADDR, from++);
-+              bcm47xxsflash_cmd(b47s, OPCODE_ST_READ4B);
-+              *buf++ = b47s->cc_read(b47s, BCMA_CC_FLASHDATA);
-+      }
-+
-+      *retlen = orig_len;
-+
-+      return orig_len;
- }
- static int bcm47xxsflash_write_st(struct mtd_info *mtd, u32 offset, size_t len,
---- a/drivers/mtd/devices/bcm47xxsflash.h
-+++ b/drivers/mtd/devices/bcm47xxsflash.h
-@@ -3,6 +3,8 @@
- #include <linux/mtd/mtd.h>
-+#define BCM47XXSFLASH_WINDOW_SZ                       SZ_16M
-+
- /* Used for ST flashes only. */
- #define OPCODE_ST_WREN                0x0006          /* Write Enable */
- #define OPCODE_ST_WRDIS               0x0004          /* Write Disable */
-@@ -16,6 +18,7 @@
- #define OPCODE_ST_RES         0x03ab          /* Read Electronic Signature */
- #define OPCODE_ST_CSA         0x1000          /* Keep chip select asserted */
- #define OPCODE_ST_SSE         0x0220          /* Sub-sector Erase */
-+#define OPCODE_ST_READ4B      0x6313          /* Read Data Bytes in 4Byte addressing mode */
- /* Used for Atmel flashes only. */
- #define OPCODE_AT_READ                                0x07e8
diff --git a/target/linux/generic/backport-4.9/060-0004-mtd-bcm47xxpart-move-TRX-parsing-code-to-separated-f.patch b/target/linux/generic/backport-4.9/060-0004-mtd-bcm47xxpart-move-TRX-parsing-code-to-separated-f.patch
deleted file mode 100644 (file)
index 999f544..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-From b522d7b0ebe3539340c2a6d46d787ae3d33bcb92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 10 Jan 2017 23:15:24 +0100
-Subject: [PATCH] mtd: bcm47xxpart: move TRX parsing code to separated function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This change simplifies main parsing loop logic a bit. In future it may
-be useful for moving TRX support to separated module / parser (if we
-implement support for them at some point).
-Finally parsing TRX at the end puts us in a better position as we have
-better flash layout knowledge. It may be useful e.g. if it appears there
-is more than 1 TRX partition.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/bcm47xxpart.c | 121 ++++++++++++++++++++++++++++------------------
- 1 file changed, 74 insertions(+), 47 deletions(-)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -83,6 +83,67 @@ out_default:
-       return "rootfs";
- }
-+static int bcm47xxpart_parse_trx(struct mtd_info *master,
-+                               struct mtd_partition *trx,
-+                               struct mtd_partition *parts,
-+                               size_t parts_len)
-+{
-+      struct trx_header header;
-+      size_t bytes_read;
-+      int curr_part = 0;
-+      int i, err;
-+
-+      if (parts_len < 3) {
-+              pr_warn("No enough space to add TRX partitions!\n");
-+              return -ENOMEM;
-+      }
-+
-+      err = mtd_read(master, trx->offset, sizeof(header), &bytes_read,
-+                     (uint8_t *)&header);
-+      if (err && !mtd_is_bitflip(err)) {
-+              pr_err("mtd_read error while reading TRX header: %d\n", err);
-+              return err;
-+      }
-+
-+      i = 0;
-+
-+      /* We have LZMA loader if offset[2] points to sth */
-+      if (header.offset[2]) {
-+              bcm47xxpart_add_part(&parts[curr_part++], "loader",
-+                                   trx->offset + header.offset[i], 0);
-+              i++;
-+      }
-+
-+      if (header.offset[i]) {
-+              bcm47xxpart_add_part(&parts[curr_part++], "linux",
-+                                   trx->offset + header.offset[i], 0);
-+              i++;
-+      }
-+
-+      if (header.offset[i]) {
-+              size_t offset = trx->offset + header.offset[i];
-+              const char *name = bcm47xxpart_trx_data_part_name(master,
-+                                                                offset);
-+
-+              bcm47xxpart_add_part(&parts[curr_part++], name, offset, 0);
-+              i++;
-+      }
-+
-+      /*
-+       * Assume that every partition ends at the beginning of the one it is
-+       * followed by.
-+       */
-+      for (i = 0; i < curr_part; i++) {
-+              u64 next_part_offset = (i < curr_part - 1) ?
-+                                      parts[i + 1].offset :
-+                                      trx->offset + trx->size;
-+
-+              parts[i].size = next_part_offset - parts[i].offset;
-+      }
-+
-+      return curr_part;
-+}
-+
- static int bcm47xxpart_parse(struct mtd_info *master,
-                            const struct mtd_partition **pparts,
-                            struct mtd_part_parser_data *data)
-@@ -93,9 +154,7 @@ static int bcm47xxpart_parse(struct mtd_
-       size_t bytes_read;
-       uint32_t offset;
-       uint32_t blocksize = master->erasesize;
--      struct trx_header *trx;
-       int trx_part = -1;
--      int last_trx_part = -1;
-       int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
-       int err;
-@@ -182,54 +241,14 @@ static int bcm47xxpart_parse(struct mtd_
-               /* TRX */
-               if (buf[0x000 / 4] == TRX_MAGIC) {
--                      if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
--                              pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
--                              break;
--                      }
--
--                      trx = (struct trx_header *)buf;
-+                      struct trx_header *trx;
-                       trx_part = curr_part;
-                       bcm47xxpart_add_part(&parts[curr_part++], "firmware",
-                                            offset, 0);
--                      i = 0;
--                      /* We have LZMA loader if offset[2] points to sth */
--                      if (trx->offset[2]) {
--                              bcm47xxpart_add_part(&parts[curr_part++],
--                                                   "loader",
--                                                   offset + trx->offset[i],
--                                                   0);
--                              i++;
--                      }
--
--                      if (trx->offset[i]) {
--                              bcm47xxpart_add_part(&parts[curr_part++],
--                                                   "linux",
--                                                   offset + trx->offset[i],
--                                                   0);
--                              i++;
--                      }
--
--                      /*
--                       * Pure rootfs size is known and can be calculated as:
--                       * trx->length - trx->offset[i]. We don't fill it as
--                       * we want to have jffs2 (overlay) in the same mtd.
--                       */
--                      if (trx->offset[i]) {
--                              const char *name;
--
--                              name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
--                              bcm47xxpart_add_part(&parts[curr_part++],
--                                                   name,
--                                                   offset + trx->offset[i],
--                                                   0);
--                              i++;
--                      }
--
--                      last_trx_part = curr_part - 1;
--
-                       /* Jump to the end of TRX */
-+                      trx = (struct trx_header *)buf;
-                       offset = roundup(offset + trx->length, blocksize);
-                       /* Next loop iteration will increase the offset */
-                       offset -= blocksize;
-@@ -307,9 +326,17 @@ static int bcm47xxpart_parse(struct mtd_
-                                      parts[i + 1].offset : master->size;
-               parts[i].size = next_part_offset - parts[i].offset;
--              if (i == last_trx_part && trx_part >= 0)
--                      parts[trx_part].size = next_part_offset -
--                                             parts[trx_part].offset;
-+      }
-+
-+      /* If there was TRX parse it now */
-+      if (trx_part >= 0) {
-+              int num_parts;
-+
-+              num_parts = bcm47xxpart_parse_trx(master, &parts[trx_part],
-+                                                parts + curr_part,
-+                                                BCM47XXPART_MAX_PARTS - curr_part);
-+              if (num_parts > 0)
-+                      curr_part += num_parts;
-       }
-       *pparts = parts;
diff --git a/target/linux/generic/backport-4.9/060-0005-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch b/target/linux/generic/backport-4.9/060-0005-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch
deleted file mode 100644 (file)
index bcefee8..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-From 89a0d9a9f1941a086a82bc7cd73d275cec98ba14 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 10 Jan 2017 23:15:25 +0100
-Subject: [PATCH] mtd: bcm47xxpart: support layouts with multiple TRX
- partitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some devices may have an extra TRX partition used as failsafe one. If
-we detect such partition we should set a proper name for it and don't
-parse it.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/bcm47xxpart.c | 56 ++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 46 insertions(+), 10 deletions(-)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -9,6 +9,7 @@
-  *
-  */
-+#include <linux/bcm47xx_nvram.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/slab.h>
-@@ -144,6 +145,30 @@ static int bcm47xxpart_parse_trx(struct
-       return curr_part;
- }
-+/**
-+ * bcm47xxpart_bootpartition - gets index of TRX partition used by bootloader
-+ *
-+ * Some devices may have more than one TRX partition. In such case one of them
-+ * is the main one and another a failsafe one. Bootloader may fallback to the
-+ * failsafe firmware if it detects corruption of the main image.
-+ *
-+ * This function provides info about currently used TRX partition. It's the one
-+ * containing kernel started by the bootloader.
-+ */
-+static int bcm47xxpart_bootpartition(void)
-+{
-+      char buf[4];
-+      int bootpartition;
-+
-+      /* Check CFE environment variable */
-+      if (bcm47xx_nvram_getenv("bootpartition", buf, sizeof(buf)) > 0) {
-+              if (!kstrtoint(buf, 0, &bootpartition))
-+                      return bootpartition;
-+      }
-+
-+      return 0;
-+}
-+
- static int bcm47xxpart_parse(struct mtd_info *master,
-                            const struct mtd_partition **pparts,
-                            struct mtd_part_parser_data *data)
-@@ -154,7 +179,8 @@ static int bcm47xxpart_parse(struct mtd_
-       size_t bytes_read;
-       uint32_t offset;
-       uint32_t blocksize = master->erasesize;
--      int trx_part = -1;
-+      int trx_parts[2]; /* Array with indexes of TRX partitions */
-+      int trx_num = 0; /* Number of found TRX partitions */
-       int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
-       int err;
-@@ -243,7 +269,11 @@ static int bcm47xxpart_parse(struct mtd_
-               if (buf[0x000 / 4] == TRX_MAGIC) {
-                       struct trx_header *trx;
--                      trx_part = curr_part;
-+                      if (trx_num >= ARRAY_SIZE(trx_parts))
-+                              pr_warn("No enough space to store another TRX found at 0x%X\n",
-+                                      offset);
-+                      else
-+                              trx_parts[trx_num++] = curr_part;
-                       bcm47xxpart_add_part(&parts[curr_part++], "firmware",
-                                            offset, 0);
-@@ -329,14 +359,20 @@ static int bcm47xxpart_parse(struct mtd_
-       }
-       /* If there was TRX parse it now */
--      if (trx_part >= 0) {
--              int num_parts;
-+      for (i = 0; i < trx_num; i++) {
-+              struct mtd_partition *trx = &parts[trx_parts[i]];
--              num_parts = bcm47xxpart_parse_trx(master, &parts[trx_part],
--                                                parts + curr_part,
--                                                BCM47XXPART_MAX_PARTS - curr_part);
--              if (num_parts > 0)
--                      curr_part += num_parts;
-+              if (i == bcm47xxpart_bootpartition()) {
-+                      int num_parts;
-+
-+                      num_parts = bcm47xxpart_parse_trx(master, trx,
-+                                                        parts + curr_part,
-+                                                        BCM47XXPART_MAX_PARTS - curr_part);
-+                      if (num_parts > 0)
-+                              curr_part += num_parts;
-+              } else {
-+                      trx->name = "failsafe";
-+              }
-       }
-       *pparts = parts;
diff --git a/target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch b/target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch
deleted file mode 100644 (file)
index a70d827..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From 355445b86f0f61125409e1217be4f0a8ee362116 Mon Sep 17 00:00:00 2001
-From: Ash Benz <ash.benz@bk.ru>
-Date: Sat, 19 Nov 2016 07:51:49 +0800
-Subject: [PATCH] mtd: spi-nor: add Macronix mx25u25635f to list of known
- devices.
-
-Signed-off-by: Ash Benz <ash.benz@bk.ru>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -878,6 +878,7 @@ static const struct flash_info spi_nor_i
-       { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
-       { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
-       { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
-+      { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K) },
-       { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
-       { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_QUAD_READ) },
-       { "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
diff --git a/target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch b/target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch
deleted file mode 100644 (file)
index e4563eb..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 807c16253319ee6ccf8873ae64f070f7eb532cd5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jo=C3=ABl=20Esponde?= <joel.esponde@honeywell.com>
-Date: Wed, 23 Nov 2016 12:47:40 +0100
-Subject: [PATCH] mtd: spi-nor: fix spansion quad enable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With the S25FL127S nor flash part, each writing to the configuration
-register takes hundreds of ms. During that  time, no more accesses to
-the flash should be done (even reads).
-
-This commit adds a wait loop after the register writing until the flash
-finishes its work.
-
-This issue could make rootfs mounting fail when the latter was done too
-much closely to this quad enable bit setting step. And in this case, a
-driver as UBIFS may try to recover the filesystem and may broke it
-completely.
-
-Signed-off-by: Joël Esponde <joel.esponde@honeywell.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1269,6 +1269,13 @@ static int spansion_quad_enable(struct s
-               return ret;
-       }
-+      ret = spi_nor_wait_till_ready(nor);
-+      if (ret) {
-+              dev_err(nor->dev,
-+                      "timeout while writing configuration register\n");
-+              return ret;
-+      }
-+
-       /* read back and check it */
-       ret = read_cr(nor);
-       if (!(ret > 0 && (ret & CR_QUAD_EN_SPAN))) {
diff --git a/target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch b/target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch
deleted file mode 100644 (file)
index 76c5d2d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4287916d7bab2806305d3296b4cf261fa49d959b Mon Sep 17 00:00:00 2001
-From: Heiner Kallweit <hkallweit1@gmail.com>
-Date: Thu, 27 Oct 2016 23:13:26 +0200
-Subject: [PATCH] mtd: spi-nor: fix flags for s25fl128s
-
-The Spansion S25FL128S also supports dual read mode.
-In addition remove flag SECT_4K. 4K erases are supported,
-but not uniformly.
-
-Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
-Reviewed-by: Jagan Teki <jteki@openedev.com>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -912,7 +912,7 @@ static const struct flash_info spi_nor_i
-       { "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
-       { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
-       { "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
--      { "s25fl128s",  INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SECT_4K | SPI_NOR_QUAD_READ) },
-+      { "s25fl128s",  INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
diff --git a/target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch b/target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch
deleted file mode 100644 (file)
index 004c1c5..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From 022a400f90ceeb26405edd5e077d56e2f38c8123 Mon Sep 17 00:00:00 2001
-From: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
-Date: Wed, 5 Oct 2016 10:59:49 +0200
-Subject: [PATCH] mtd: spi-nor: add support for s25fl208k
-
-Signed-off-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
-Reviewed-by: Jagan Teki <jagan@openedev.com>
-Acked-by: Marek Vasut <marex@denx.de>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -928,6 +928,7 @@ static const struct flash_info spi_nor_i
-       { "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, SECT_4K) },
-       { "s25fl164k",  INFO(0x014017,      0,  64 * 1024, 128, SECT_4K) },
-       { "s25fl204k",  INFO(0x014013,      0,  64 * 1024,   8, SECT_4K | SPI_NOR_DUAL_READ) },
-+      { "s25fl208k",  INFO(0x014014,      0,  64 * 1024,  16, SECT_4K | SPI_NOR_DUAL_READ) },
-       /* SST -- large erase sizes are "overlays", "sectors" are 4K */
-       { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024,  8, SECT_4K | SST_WRITE) },
diff --git a/target/linux/generic/backport-4.9/061-v4.10-0005-mtd-spi-nor-Add-at25df321-spi-nor-flash-support.patch b/target/linux/generic/backport-4.9/061-v4.10-0005-mtd-spi-nor-Add-at25df321-spi-nor-flash-support.patch
deleted file mode 100644 (file)
index b97d8c7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From b08618c929b289699a496b8d45a4e1a014187e56 Mon Sep 17 00:00:00 2001
-From: Jagan Teki <jteki@openedev.com>
-Date: Tue, 26 Jul 2016 14:07:54 +0530
-Subject: [PATCH] mtd: spi-nor: Add at25df321 spi-nor flash support
-
-Add Atmel at25df321 spi-nor flash to the list of spi_nor_ids.
-
-Cc: Brian Norris <computersforpeace@gmail.com>
-Cc: Wenyou Yang <wenyou.yang@atmel.com>
-Signed-off-by: Jagan Teki <jteki@openedev.com>
-Acked-by: Wenyou Yang <wenyou.yang@atmel.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -799,6 +799,7 @@ static const struct flash_info spi_nor_i
-       { "at25fs040",  INFO(0x1f6604, 0, 64 * 1024,   8, SECT_4K) },
-       { "at25df041a", INFO(0x1f4401, 0, 64 * 1024,   8, SECT_4K) },
-+      { "at25df321",  INFO(0x1f4700, 0, 64 * 1024,  64, SECT_4K) },
-       { "at25df321a", INFO(0x1f4701, 0, 64 * 1024,  64, SECT_4K) },
-       { "at25df641",  INFO(0x1f4800, 0, 64 * 1024, 128, SECT_4K) },
diff --git a/target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch b/target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch
deleted file mode 100644 (file)
index 8df61f6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 61e4611864b396c7e9040b7335f25d3921bc87cd Mon Sep 17 00:00:00 2001
-From: Moritz Fischer <moritz.fischer@ettus.com>
-Date: Fri, 15 Jul 2016 10:03:48 -0700
-Subject: [PATCH] mtd: spi-nor: Add support for N25Q016A
-
-This commit adds support in the spi-nor driver for the
-N25Q016A, a 16Mbit SPI NOR flash from Micron.
-
-Cc: David Woodhouse <dwmw2@infradead.org>
-Cc: Brian Norris <computersforpeace@gmail.com>
-Cc: Jagan Teki <jteki@openedev.com>
-
-Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
-Reviewed-by: Jagan Teki <jteki@openedev.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -885,6 +885,7 @@ static const struct flash_info spi_nor_i
-       { "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
-       /* Micron */
-+      { "n25q016a",    INFO(0x20bb15, 0, 64 * 1024,   32, SECT_4K | SPI_NOR_QUAD_READ) },
-       { "n25q032",     INFO(0x20ba16, 0, 64 * 1024,   64, SPI_NOR_QUAD_READ) },
-       { "n25q032a",    INFO(0x20bb16, 0, 64 * 1024,   64, SPI_NOR_QUAD_READ) },
-       { "n25q064",     INFO(0x20ba17, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_QUAD_READ) },
diff --git a/target/linux/generic/backport-4.9/061-v4.10-0007-mtd-spi-nor-Add-support-for-mr25h40.patch b/target/linux/generic/backport-4.9/061-v4.10-0007-mtd-spi-nor-Add-support-for-mr25h40.patch
deleted file mode 100644 (file)
index 3bae77d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From edd0c8f4932dbf3e21036cb443ba5bdf7449d02b Mon Sep 17 00:00:00 2001
-From: IWAMOTO Masahiko <iwamoto@allied-telesis.co.jp>
-Date: Wed, 5 Oct 2016 08:22:52 +0000
-Subject: [PATCH] mtd: spi-nor: Add support for mr25h40
-
-Add Everspin mr25h40 512KB MRAM to the list of supported chips.
-
-Signed-off-by: Masahiko Iwamoto <iwamoto@allied-telesis.co.jp>
-Reviewed-by: Jagan Teki <jagan@openedev.com>
-Acked-by: Marek Vasut <marex@denx.de>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -826,6 +826,7 @@ static const struct flash_info spi_nor_i
-       /* Everspin */
-       { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-       { "mr25h10",  CAT25_INFO(128 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-+      { "mr25h40",  CAT25_INFO(512 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-       /* Fujitsu */
-       { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch b/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
deleted file mode 100644 (file)
index a174984..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-From 61cba34bd6c1bddfc38f94cc3f80bdfefcc3393b Mon Sep 17 00:00:00 2001
-From: Ricardo Ribalda <ricardo.ribalda@gmail.com>
-Date: Fri, 2 Dec 2016 12:31:44 +0100
-Subject: [PATCH] mtd: spi-nor: Add support for S3AN spi-nor devices
-
-Xilinx Spartan-3AN FPGAs contain an In-System Flash where they keep
-their configuration data and (optionally) some user data.
-
-The protocol of this flash follows most of the spi-nor standard. With
-the following differences:
-
-- Page size might not be a power of two.
-- The address calculation (default addressing mode).
-- The spi nor commands used.
-
-Protocol is described on Xilinx User Guide UG333
-
-Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
-Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
-Cc: Brian Norris <computersforpeace@gmail.com>
-Cc: Marek Vasut <marek.vasut@gmail.com>
-Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 154 ++++++++++++++++++++++++++++++++++++++++--
- include/linux/mtd/spi-nor.h   |  12 ++++
- 2 files changed, 161 insertions(+), 5 deletions(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -75,6 +75,12 @@ struct flash_info {
-                                        * bit. Must be used with
-                                        * SPI_NOR_HAS_LOCK.
-                                        */
-+#define       SPI_S3AN                BIT(10) /*
-+                                       * Xilinx Spartan 3AN In-System Flash
-+                                       * (MFR cannot be used for probing
-+                                       * because it has the same value as
-+                                       * ATMEL flashes)
-+                                      */
- };
- #define JEDEC_MFR(info)       ((info)->id[0])
-@@ -217,6 +223,21 @@ static inline int set_4byte(struct spi_n
-               return nor->write_reg(nor, SPINOR_OP_BRWR, nor->cmd_buf, 1);
-       }
- }
-+
-+static int s3an_sr_ready(struct spi_nor *nor)
-+{
-+      int ret;
-+      u8 val;
-+
-+      ret = nor->read_reg(nor, SPINOR_OP_XRDSR, &val, 1);
-+      if (ret < 0) {
-+              dev_err(nor->dev, "error %d reading XRDSR\n", (int) ret);
-+              return ret;
-+      }
-+
-+      return !!(val & XSR_RDY);
-+}
-+
- static inline int spi_nor_sr_ready(struct spi_nor *nor)
- {
-       int sr = read_sr(nor);
-@@ -238,7 +259,11 @@ static inline int spi_nor_fsr_ready(stru
- static int spi_nor_ready(struct spi_nor *nor)
- {
-       int sr, fsr;
--      sr = spi_nor_sr_ready(nor);
-+
-+      if (nor->flags & SNOR_F_READY_XSR_RDY)
-+              sr = s3an_sr_ready(nor);
-+      else
-+              sr = spi_nor_sr_ready(nor);
-       if (sr < 0)
-               return sr;
-       fsr = nor->flags & SNOR_F_USE_FSR ? spi_nor_fsr_ready(nor) : 1;
-@@ -320,6 +345,24 @@ static void spi_nor_unlock_and_unprep(st
- }
- /*
-+ * This code converts an address to the Default Address Mode, that has non
-+ * power of two page sizes. We must support this mode because it is the default
-+ * mode supported by Xilinx tools, it can access the whole flash area and
-+ * changing over to the Power-of-two mode is irreversible and corrupts the
-+ * original data.
-+ * Addr can safely be unsigned int, the biggest S3AN device is smaller than
-+ * 4 MiB.
-+ */
-+static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr)
-+{
-+      unsigned int offset = addr;
-+
-+      offset %= nor->page_size;
-+
-+      return ((addr - offset) << 1) | offset;
-+}
-+
-+/*
-  * Initiate the erasure of a single sector
-  */
- static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr)
-@@ -327,6 +370,9 @@ static int spi_nor_erase_sector(struct s
-       u8 buf[SPI_NOR_MAX_ADDR_WIDTH];
-       int i;
-+      if (nor->flags & SNOR_F_S3AN_ADDR_DEFAULT)
-+              addr = spi_nor_s3an_addr_convert(nor, addr);
-+
-       if (nor->erase)
-               return nor->erase(nor, addr);
-@@ -368,7 +414,7 @@ static int spi_nor_erase(struct mtd_info
-               return ret;
-       /* whole-chip erase? */
--      if (len == mtd->size) {
-+      if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) {
-               unsigned long timeout;
-               write_enable(nor);
-@@ -782,6 +828,19 @@ static int spi_nor_is_locked(struct mtd_
-               .addr_width = (_addr_width),                            \
-               .flags = (_flags),
-+#define S3AN_INFO(_jedec_id, _n_sectors, _page_size)                  \
-+              .id = {                                                 \
-+                      ((_jedec_id) >> 16) & 0xff,                     \
-+                      ((_jedec_id) >> 8) & 0xff,                      \
-+                      (_jedec_id) & 0xff                              \
-+                      },                                              \
-+              .id_len = 3,                                            \
-+              .sector_size = (8*_page_size),                          \
-+              .n_sectors = (_n_sectors),                              \
-+              .page_size = _page_size,                                \
-+              .addr_width = 3,                                        \
-+              .flags = SPI_NOR_NO_FR | SPI_S3AN,
-+
- /* NOTE: double check command sets and memory organization when you add
-  * more nor chips.  This current list focusses on newer chips, which
-  * have been converging on command sets which including JEDEC ID.
-@@ -1020,6 +1079,13 @@ static const struct flash_info spi_nor_i
-       { "cat25c09", CAT25_INFO( 128, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-       { "cat25c17", CAT25_INFO( 256, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-       { "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-+
-+      /* Xilinx S3AN Internal Flash */
-+      { "3S50AN", S3AN_INFO(0x1f2200, 64, 264) },
-+      { "3S200AN", S3AN_INFO(0x1f2400, 256, 264) },
-+      { "3S400AN", S3AN_INFO(0x1f2400, 256, 264) },
-+      { "3S700AN", S3AN_INFO(0x1f2500, 512, 264) },
-+      { "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) },
-       { },
- };
-@@ -1060,7 +1126,12 @@ static int spi_nor_read(struct mtd_info
-               return ret;
-       while (len) {
--              ret = nor->read(nor, from, len, buf);
-+              loff_t addr = from;
-+
-+              if (nor->flags & SNOR_F_S3AN_ADDR_DEFAULT)
-+                      addr = spi_nor_s3an_addr_convert(nor, addr);
-+
-+              ret = nor->read(nor, addr, len, buf);
-               if (ret == 0) {
-                       /* We shouldn't see 0-length reads */
-                       ret = -EIO;
-@@ -1181,8 +1252,23 @@ static int spi_nor_write(struct mtd_info
-       for (i = 0; i < len; ) {
-               ssize_t written;
-+              loff_t addr = to + i;
--              page_offset = (to + i) & (nor->page_size - 1);
-+              /*
-+               * If page_size is a power of two, the offset can be quickly
-+               * calculated with an AND operation. On the other cases we
-+               * need to do a modulus operation (more expensive).
-+               * Power of two numbers have only one bit set and we can use
-+               * the instruction hweight32 to detect if we need to do a
-+               * modulus (do_div()) or not.
-+               */
-+              if (hweight32(nor->page_size) == 1) {
-+                      page_offset = addr & (nor->page_size - 1);
-+              } else {
-+                      uint64_t aux = addr;
-+
-+                      page_offset = do_div(aux, nor->page_size);
-+              }
-               WARN_ONCE(page_offset,
-                         "Writing at offset %zu into a NOR page. Writing partial pages may decrease reliability and increase wear of NOR flash.",
-                         page_offset);
-@@ -1190,8 +1276,11 @@ static int spi_nor_write(struct mtd_info
-               page_remain = min_t(size_t,
-                                   nor->page_size - page_offset, len - i);
-+              if (nor->flags & SNOR_F_S3AN_ADDR_DEFAULT)
-+                      addr = spi_nor_s3an_addr_convert(nor, addr);
-+
-               write_enable(nor);
--              ret = nor->write(nor, to + i, page_remain, buf + i);
-+              ret = nor->write(nor, addr, page_remain, buf + i);
-               if (ret < 0)
-                       goto write_err;
-               written = ret;
-@@ -1325,6 +1414,47 @@ static int spi_nor_check(struct spi_nor
-       return 0;
- }
-+static int s3an_nor_scan(const struct flash_info *info, struct spi_nor *nor)
-+{
-+      int ret;
-+      u8 val;
-+
-+      ret = nor->read_reg(nor, SPINOR_OP_XRDSR, &val, 1);
-+      if (ret < 0) {
-+              dev_err(nor->dev, "error %d reading XRDSR\n", (int) ret);
-+              return ret;
-+      }
-+
-+      nor->erase_opcode = SPINOR_OP_XSE;
-+      nor->program_opcode = SPINOR_OP_XPP;
-+      nor->read_opcode = SPINOR_OP_READ;
-+      nor->flags |= SNOR_F_NO_OP_CHIP_ERASE;
-+
-+      /*
-+       * This flashes have a page size of 264 or 528 bytes (known as
-+       * Default addressing mode). It can be changed to a more standard
-+       * Power of two mode where the page size is 256/512. This comes
-+       * with a price: there is 3% less of space, the data is corrupted
-+       * and the page size cannot be changed back to default addressing
-+       * mode.
-+       *
-+       * The current addressing mode can be read from the XRDSR register
-+       * and should not be changed, because is a destructive operation.
-+       */
-+      if (val & XSR_PAGESIZE) {
-+              /* Flash in Power of 2 mode */
-+              nor->page_size = (nor->page_size == 264) ? 256 : 512;
-+              nor->mtd.writebufsize = nor->page_size;
-+              nor->mtd.size = 8 * nor->page_size * info->n_sectors;
-+              nor->mtd.erasesize = 8 * nor->page_size;
-+      } else {
-+              /* Flash in Default addressing mode */
-+              nor->flags |= SNOR_F_S3AN_ADDR_DEFAULT;
-+      }
-+
-+      return 0;
-+}
-+
- int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
- {
-       const struct flash_info *info = NULL;
-@@ -1373,6 +1503,14 @@ int spi_nor_scan(struct spi_nor *nor, co
-       mutex_init(&nor->lock);
-       /*
-+       * Make sure the XSR_RDY flag is set before calling
-+       * spi_nor_wait_till_ready(). Xilinx S3AN share MFR
-+       * with Atmel spi-nor
-+       */
-+      if (info->flags & SPI_S3AN)
-+              nor->flags |=  SNOR_F_READY_XSR_RDY;
-+
-+      /*
-        * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up
-        * with the software protection bits set
-        */
-@@ -1530,6 +1668,12 @@ int spi_nor_scan(struct spi_nor *nor, co
-       nor->read_dummy = spi_nor_read_dummy_cycles(nor);
-+      if (info->flags & SPI_S3AN) {
-+              ret = s3an_nor_scan(info, nor);
-+              if (ret)
-+                      return ret;
-+      }
-+
-       dev_info(dev, "%s (%lld Kbytes)\n", info->name,
-                       (long long)mtd->size >> 10);
---- a/include/linux/mtd/spi-nor.h
-+++ b/include/linux/mtd/spi-nor.h
-@@ -68,6 +68,15 @@
- #define SPINOR_OP_WRDI                0x04    /* Write disable */
- #define SPINOR_OP_AAI_WP      0xad    /* Auto address increment word program */
-+/* Used for S3AN flashes only */
-+#define SPINOR_OP_XSE         0x50    /* Sector erase */
-+#define SPINOR_OP_XPP         0x82    /* Page program */
-+#define SPINOR_OP_XRDSR               0xd7    /* Read status register */
-+
-+#define XSR_PAGESIZE          BIT(0)  /* Page size in Po2 or Linear */
-+#define XSR_RDY                       BIT(7)  /* Ready */
-+
-+
- /* Used for Macronix and Winbond flashes. */
- #define SPINOR_OP_EN4B                0xb7    /* Enter 4-byte mode */
- #define SPINOR_OP_EX4B                0xe9    /* Exit 4-byte mode */
-@@ -119,6 +128,9 @@ enum spi_nor_ops {
- enum spi_nor_option_flags {
-       SNOR_F_USE_FSR          = BIT(0),
-       SNOR_F_HAS_SR_TB        = BIT(1),
-+      SNOR_F_NO_OP_CHIP_ERASE = BIT(2),
-+      SNOR_F_S3AN_ADDR_DEFAULT = BIT(3),
-+      SNOR_F_READY_XSR_RDY    = BIT(4),
- };
- /**
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch b/target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch
deleted file mode 100644 (file)
index ec469d4..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1e99d0d51ec97bf48edd277658004ce030543d98 Mon Sep 17 00:00:00 2001
-From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Date: Tue, 6 Dec 2016 17:01:41 +0100
-Subject: [PATCH] mtd: spi-nor: improve macronix_quad_enable()
-
-The patch checks whether the Quad Enable bit is already set in the Status
-Register. If so, the function exits immediately with a successful return
-code.
-
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Reviewed-by: Jagan Teki <jagan@openedev.com>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1311,6 +1311,9 @@ static int macronix_quad_enable(struct s
-       val = read_sr(nor);
-       if (val < 0)
-               return val;
-+      if (val & SR_QUAD_EN_MX)
-+              return 0;
-+
-       write_enable(nor);
-       write_sr(nor, val | SR_QUAD_EN_MX);
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch b/target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch
deleted file mode 100644 (file)
index 790b557..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From dc176595bf184e89bf28fdf91cbc1d050dfe63b3 Mon Sep 17 00:00:00 2001
-From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Date: Tue, 6 Dec 2016 18:14:24 +0100
-Subject: [PATCH] mtd: spi-nor: remove WARN_ONCE() message in spi_nor_write()
-
-This patch removes the WARN_ONCE() test in spi_nor_write().
-This macro triggers the display of a warning message almost every time we
-use a UBI file-system because a write operation is performed at offset 64,
-which is in the middle of the SPI NOR memory page. This is a valid
-operation for ubifs.
-
-Hence this warning is pretty annoying and useless so we just remove it.
-
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Suggested-by: Richard Weinberger <richard@nod.at>
-Suggested-by: Andras Szemzo <szemzo.andras@gmail.com>
-Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 3 ---
- 1 file changed, 3 deletions(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1269,9 +1269,6 @@ static int spi_nor_write(struct mtd_info
-                       page_offset = do_div(aux, nor->page_size);
-               }
--              WARN_ONCE(page_offset,
--                        "Writing at offset %zu into a NOR page. Writing partial pages may decrease reliability and increase wear of NOR flash.",
--                        page_offset);
-               /* the size of data remaining on the first page */
-               page_remain = min_t(size_t,
-                                   nor->page_size - page_offset, len - i);
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch b/target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch
deleted file mode 100644 (file)
index 34562e1..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-From 05aba5763dcf35eddc58aaf99c9f16d19730e0a8 Mon Sep 17 00:00:00 2001
-From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Date: Thu, 27 Oct 2016 11:55:39 +0200
-Subject: [PATCH] mtd: spi-nor: rename SPINOR_OP_* macros of the 4-byte address
- op codes
-
-This patch renames the SPINOR_OP_* macros of the 4-byte address
-instruction set so the new names all share a common pattern: the 4-byte
-address name is built from the 3-byte address name appending the "_4B"
-suffix.
-
-The patch also introduces new op codes to support other SPI protocols such
-as SPI 1-4-4 and SPI 1-2-2.
-
-This is a transitional patch and will help a later patch of spi-nor.c
-to automate the translation from the 3-byte address op codes into their
-4-byte address version.
-
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Acked-by: Mark Brown <broonie@kernel.org>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
----
- drivers/mtd/devices/serial_flash_cmds.h |  7 -------
- drivers/mtd/devices/st_spi_fsm.c        | 28 ++++++++++++++--------------
- drivers/mtd/spi-nor/spi-nor.c           |  8 ++++----
- drivers/spi/spi-bcm-qspi.c              |  6 +++---
- include/linux/mtd/spi-nor.h             | 22 ++++++++++++++++------
- 5 files changed, 37 insertions(+), 34 deletions(-)
-
---- a/drivers/mtd/devices/serial_flash_cmds.h
-+++ b/drivers/mtd/devices/serial_flash_cmds.h
-@@ -18,19 +18,12 @@
- #define SPINOR_OP_RDVCR               0x85
- /* JEDEC Standard - Serial Flash Discoverable Parmeters (SFDP) Commands */
--#define SPINOR_OP_READ_1_2_2  0xbb    /* DUAL I/O READ */
--#define SPINOR_OP_READ_1_4_4  0xeb    /* QUAD I/O READ */
--
- #define SPINOR_OP_WRITE               0x02    /* PAGE PROGRAM */
- #define SPINOR_OP_WRITE_1_1_2 0xa2    /* DUAL INPUT PROGRAM */
- #define SPINOR_OP_WRITE_1_2_2 0xd2    /* DUAL INPUT EXT PROGRAM */
- #define SPINOR_OP_WRITE_1_1_4 0x32    /* QUAD INPUT PROGRAM */
- #define SPINOR_OP_WRITE_1_4_4 0x12    /* QUAD INPUT EXT PROGRAM */
--/* READ commands with 32-bit addressing */
--#define SPINOR_OP_READ4_1_2_2 0xbc
--#define SPINOR_OP_READ4_1_4_4 0xec
--
- /* Configuration flags */
- #define FLASH_FLAG_SINGLE     0x000000ff
- #define FLASH_FLAG_READ_WRITE 0x00000001
---- a/drivers/mtd/devices/st_spi_fsm.c
-+++ b/drivers/mtd/devices/st_spi_fsm.c
-@@ -507,13 +507,13 @@ static struct seq_rw_config n25q_read3_c
-  *    - 'FAST' variants configured for 8 dummy cycles (see note above.)
-  */
- static struct seq_rw_config n25q_read4_configs[] = {
--      {FLASH_FLAG_READ_1_4_4, SPINOR_OP_READ4_1_4_4,  0, 4, 4, 0x00, 0, 8},
--      {FLASH_FLAG_READ_1_1_4, SPINOR_OP_READ4_1_1_4,  0, 1, 4, 0x00, 0, 8},
--      {FLASH_FLAG_READ_1_2_2, SPINOR_OP_READ4_1_2_2,  0, 2, 2, 0x00, 0, 8},
--      {FLASH_FLAG_READ_1_1_2, SPINOR_OP_READ4_1_1_2,  0, 1, 2, 0x00, 0, 8},
--      {FLASH_FLAG_READ_FAST,  SPINOR_OP_READ4_FAST,   0, 1, 1, 0x00, 0, 8},
--      {FLASH_FLAG_READ_WRITE, SPINOR_OP_READ4,        0, 1, 1, 0x00, 0, 0},
--      {0x00,                  0,                      0, 0, 0, 0x00, 0, 0},
-+      {FLASH_FLAG_READ_1_4_4, SPINOR_OP_READ_1_4_4_4B, 0, 4, 4, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_1_1_4, SPINOR_OP_READ_1_1_4_4B, 0, 1, 4, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_1_2_2, SPINOR_OP_READ_1_2_2_4B, 0, 2, 2, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_1_1_2, SPINOR_OP_READ_1_1_2_4B, 0, 1, 2, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_FAST,  SPINOR_OP_READ_FAST_4B,  0, 1, 1, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_WRITE, SPINOR_OP_READ_4B,       0, 1, 1, 0x00, 0, 0},
-+      {0x00,                  0,                       0, 0, 0, 0x00, 0, 0},
- };
- /*
-@@ -553,13 +553,13 @@ static int stfsm_mx25_en_32bit_addr_seq(
-  * entering a state that is incompatible with the SPIBoot Controller.
-  */
- static struct seq_rw_config stfsm_s25fl_read4_configs[] = {
--      {FLASH_FLAG_READ_1_4_4,  SPINOR_OP_READ4_1_4_4,  0, 4, 4, 0x00, 2, 4},
--      {FLASH_FLAG_READ_1_1_4,  SPINOR_OP_READ4_1_1_4,  0, 1, 4, 0x00, 0, 8},
--      {FLASH_FLAG_READ_1_2_2,  SPINOR_OP_READ4_1_2_2,  0, 2, 2, 0x00, 4, 0},
--      {FLASH_FLAG_READ_1_1_2,  SPINOR_OP_READ4_1_1_2,  0, 1, 2, 0x00, 0, 8},
--      {FLASH_FLAG_READ_FAST,   SPINOR_OP_READ4_FAST,   0, 1, 1, 0x00, 0, 8},
--      {FLASH_FLAG_READ_WRITE,  SPINOR_OP_READ4,        0, 1, 1, 0x00, 0, 0},
--      {0x00,                   0,                      0, 0, 0, 0x00, 0, 0},
-+      {FLASH_FLAG_READ_1_4_4,  SPINOR_OP_READ_1_4_4_4B,  0, 4, 4, 0x00, 2, 4},
-+      {FLASH_FLAG_READ_1_1_4,  SPINOR_OP_READ_1_1_4_4B,  0, 1, 4, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_1_2_2,  SPINOR_OP_READ_1_2_2_4B,  0, 2, 2, 0x00, 4, 0},
-+      {FLASH_FLAG_READ_1_1_2,  SPINOR_OP_READ_1_1_2_4B,  0, 1, 2, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_FAST,   SPINOR_OP_READ_FAST_4B,   0, 1, 1, 0x00, 0, 8},
-+      {FLASH_FLAG_READ_WRITE,  SPINOR_OP_READ_4B,        0, 1, 1, 0x00, 0, 0},
-+      {0x00,                   0,                        0, 0, 0, 0x00, 0, 0},
- };
- static struct seq_rw_config stfsm_s25fl_write4_configs[] = {
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1638,16 +1638,16 @@ int spi_nor_scan(struct spi_nor *nor, co
-                       /* Dedicated 4-byte command set */
-                       switch (nor->flash_read) {
-                       case SPI_NOR_QUAD:
--                              nor->read_opcode = SPINOR_OP_READ4_1_1_4;
-+                              nor->read_opcode = SPINOR_OP_READ_1_1_4_4B;
-                               break;
-                       case SPI_NOR_DUAL:
--                              nor->read_opcode = SPINOR_OP_READ4_1_1_2;
-+                              nor->read_opcode = SPINOR_OP_READ_1_1_2_4B;
-                               break;
-                       case SPI_NOR_FAST:
--                              nor->read_opcode = SPINOR_OP_READ4_FAST;
-+                              nor->read_opcode = SPINOR_OP_READ_FAST_4B;
-                               break;
-                       case SPI_NOR_NORMAL:
--                              nor->read_opcode = SPINOR_OP_READ4;
-+                              nor->read_opcode = SPINOR_OP_READ_4B;
-                               break;
-                       }
-                       nor->program_opcode = SPINOR_OP_PP_4B;
---- a/drivers/spi/spi-bcm-qspi.c
-+++ b/drivers/spi/spi-bcm-qspi.c
-@@ -371,7 +371,7 @@ static int bcm_qspi_bspi_set_flex_mode(s
-                       /* default mode, does not need flex_cmd */
-                       flex_mode = 0;
-               else
--                      command = SPINOR_OP_READ4_FAST;
-+                      command = SPINOR_OP_READ_FAST_4B;
-               break;
-       case SPI_NBITS_DUAL:
-               bpc = 0x00000001;
-@@ -384,7 +384,7 @@ static int bcm_qspi_bspi_set_flex_mode(s
-               } else {
-                       command = SPINOR_OP_READ_1_1_2;
-                       if (spans_4byte)
--                              command = SPINOR_OP_READ4_1_1_2;
-+                              command = SPINOR_OP_READ_1_1_2_4B;
-               }
-               break;
-       case SPI_NBITS_QUAD:
-@@ -399,7 +399,7 @@ static int bcm_qspi_bspi_set_flex_mode(s
-               } else {
-                       command = SPINOR_OP_READ_1_1_4;
-                       if (spans_4byte)
--                              command = SPINOR_OP_READ4_1_1_4;
-+                              command = SPINOR_OP_READ_1_1_4_4B;
-               }
-               break;
-       default:
---- a/include/linux/mtd/spi-nor.h
-+++ b/include/linux/mtd/spi-nor.h
-@@ -43,9 +43,13 @@
- #define SPINOR_OP_WRSR                0x01    /* Write status register 1 byte */
- #define SPINOR_OP_READ                0x03    /* Read data bytes (low frequency) */
- #define SPINOR_OP_READ_FAST   0x0b    /* Read data bytes (high frequency) */
--#define SPINOR_OP_READ_1_1_2  0x3b    /* Read data bytes (Dual SPI) */
--#define SPINOR_OP_READ_1_1_4  0x6b    /* Read data bytes (Quad SPI) */
-+#define SPINOR_OP_READ_1_1_2  0x3b    /* Read data bytes (Dual Output SPI) */
-+#define SPINOR_OP_READ_1_2_2  0xbb    /* Read data bytes (Dual I/O SPI) */
-+#define SPINOR_OP_READ_1_1_4  0x6b    /* Read data bytes (Quad Output SPI) */
-+#define SPINOR_OP_READ_1_4_4  0xeb    /* Read data bytes (Quad I/O SPI) */
- #define SPINOR_OP_PP          0x02    /* Page program (up to 256 bytes) */
-+#define SPINOR_OP_PP_1_1_4    0x32    /* Quad page program */
-+#define SPINOR_OP_PP_1_4_4    0x38    /* Quad page program */
- #define SPINOR_OP_BE_4K               0x20    /* Erase 4KiB block */
- #define SPINOR_OP_BE_4K_PMC   0xd7    /* Erase 4KiB block on PMC chips */
- #define SPINOR_OP_BE_32K      0x52    /* Erase 32KiB block */
-@@ -56,11 +60,17 @@
- #define SPINOR_OP_RDFSR               0x70    /* Read flag status register */
- /* 4-byte address opcodes - used on Spansion and some Macronix flashes. */
--#define SPINOR_OP_READ4               0x13    /* Read data bytes (low frequency) */
--#define SPINOR_OP_READ4_FAST  0x0c    /* Read data bytes (high frequency) */
--#define SPINOR_OP_READ4_1_1_2 0x3c    /* Read data bytes (Dual SPI) */
--#define SPINOR_OP_READ4_1_1_4 0x6c    /* Read data bytes (Quad SPI) */
-+#define SPINOR_OP_READ_4B     0x13    /* Read data bytes (low frequency) */
-+#define SPINOR_OP_READ_FAST_4B        0x0c    /* Read data bytes (high frequency) */
-+#define SPINOR_OP_READ_1_1_2_4B       0x3c    /* Read data bytes (Dual Output SPI) */
-+#define SPINOR_OP_READ_1_2_2_4B       0xbc    /* Read data bytes (Dual I/O SPI) */
-+#define SPINOR_OP_READ_1_1_4_4B       0x6c    /* Read data bytes (Quad Output SPI) */
-+#define SPINOR_OP_READ_1_4_4_4B       0xec    /* Read data bytes (Quad I/O SPI) */
- #define SPINOR_OP_PP_4B               0x12    /* Page program (up to 256 bytes) */
-+#define SPINOR_OP_PP_1_1_4_4B 0x34    /* Quad page program */
-+#define SPINOR_OP_PP_1_4_4_4B 0x3e    /* Quad page program */
-+#define SPINOR_OP_BE_4K_4B    0x21    /* Erase 4KiB block */
-+#define SPINOR_OP_BE_32K_4B   0x5c    /* Erase 32KiB block */
- #define SPINOR_OP_SE_4B               0xdc    /* Sector erase (usually 64KiB) */
- /* Used for SST flashes only. */
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch b/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
deleted file mode 100644 (file)
index 1d507c1..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-From 3274ba26f27becfc4193ec6e229288140651f240 Mon Sep 17 00:00:00 2001
-From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Date: Thu, 27 Oct 2016 12:03:57 +0200
-Subject: [PATCH] mtd: spi-nor: add a stateless method to support memory size
- above 128Mib
-
-This patch provides an alternative mean to support memory above 16MiB
-(128Mib) by replacing 3byte address op codes by their associated 4byte
-address versions.
-
-Using the dedicated 4byte address op codes doesn't change the internal
-state of the SPI NOR memory as opposed to using other means such as
-updating a Base Address Register (BAR) and sending command to enter/leave
-the 4byte mode.
-
-Hence when a CPU reset occurs, early bootloaders don't need to be aware
-of BAR value or 4byte mode being enabled: they can still access the first
-16MiB of the SPI NOR memory using the regular 3byte address op codes.
-
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-Tested-by: Vignesh R <vigneshr@ti.com>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 101 +++++++++++++++++++++++++++++++++---------
- 1 file changed, 80 insertions(+), 21 deletions(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -81,6 +81,10 @@ struct flash_info {
-                                        * because it has the same value as
-                                        * ATMEL flashes)
-                                       */
-+#define SPI_NOR_4B_OPCODES    BIT(11) /*
-+                                       * Use dedicated 4byte address op codes
-+                                       * to support memory size above 128Mib.
-+                                       */
- };
- #define JEDEC_MFR(info)       ((info)->id[0])
-@@ -194,6 +198,78 @@ static inline struct spi_nor *mtd_to_spi
-       return mtd->priv;
- }
-+
-+static u8 spi_nor_convert_opcode(u8 opcode, const u8 table[][2], size_t size)
-+{
-+      size_t i;
-+
-+      for (i = 0; i < size; i++)
-+              if (table[i][0] == opcode)
-+                      return table[i][1];
-+
-+      /* No conversion found, keep input op code. */
-+      return opcode;
-+}
-+
-+static inline u8 spi_nor_convert_3to4_read(u8 opcode)
-+{
-+      static const u8 spi_nor_3to4_read[][2] = {
-+              { SPINOR_OP_READ,       SPINOR_OP_READ_4B },
-+              { SPINOR_OP_READ_FAST,  SPINOR_OP_READ_FAST_4B },
-+              { SPINOR_OP_READ_1_1_2, SPINOR_OP_READ_1_1_2_4B },
-+              { SPINOR_OP_READ_1_2_2, SPINOR_OP_READ_1_2_2_4B },
-+              { SPINOR_OP_READ_1_1_4, SPINOR_OP_READ_1_1_4_4B },
-+              { SPINOR_OP_READ_1_4_4, SPINOR_OP_READ_1_4_4_4B },
-+      };
-+
-+      return spi_nor_convert_opcode(opcode, spi_nor_3to4_read,
-+                                    ARRAY_SIZE(spi_nor_3to4_read));
-+}
-+
-+static inline u8 spi_nor_convert_3to4_program(u8 opcode)
-+{
-+      static const u8 spi_nor_3to4_program[][2] = {
-+              { SPINOR_OP_PP,         SPINOR_OP_PP_4B },
-+              { SPINOR_OP_PP_1_1_4,   SPINOR_OP_PP_1_1_4_4B },
-+              { SPINOR_OP_PP_1_4_4,   SPINOR_OP_PP_1_4_4_4B },
-+      };
-+
-+      return spi_nor_convert_opcode(opcode, spi_nor_3to4_program,
-+                                    ARRAY_SIZE(spi_nor_3to4_program));
-+}
-+
-+static inline u8 spi_nor_convert_3to4_erase(u8 opcode)
-+{
-+      static const u8 spi_nor_3to4_erase[][2] = {
-+              { SPINOR_OP_BE_4K,      SPINOR_OP_BE_4K_4B },
-+              { SPINOR_OP_BE_32K,     SPINOR_OP_BE_32K_4B },
-+              { SPINOR_OP_SE,         SPINOR_OP_SE_4B },
-+      };
-+
-+      return spi_nor_convert_opcode(opcode, spi_nor_3to4_erase,
-+                                    ARRAY_SIZE(spi_nor_3to4_erase));
-+}
-+
-+static void spi_nor_set_4byte_opcodes(struct spi_nor *nor,
-+                                    const struct flash_info *info)
-+{
-+      /* Do some manufacturer fixups first */
-+      switch (JEDEC_MFR(info)) {
-+      case SNOR_MFR_SPANSION:
-+              /* No small sector erase for 4-byte command set */
-+              nor->erase_opcode = SPINOR_OP_SE;
-+              nor->mtd.erasesize = info->sector_size;
-+              break;
-+
-+      default:
-+              break;
-+      }
-+
-+      nor->read_opcode = spi_nor_convert_3to4_read(nor->read_opcode);
-+      nor->program_opcode = spi_nor_convert_3to4_program(nor->program_opcode);
-+      nor->erase_opcode = spi_nor_convert_3to4_erase(nor->erase_opcode);
-+}
-+
- /* Enable/disable 4-byte addressing mode. */
- static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info,
-                           int enable)
-@@ -1634,27 +1710,10 @@ int spi_nor_scan(struct spi_nor *nor, co
-       else if (mtd->size > 0x1000000) {
-               /* enable 4-byte addressing if the device exceeds 16MiB */
-               nor->addr_width = 4;
--              if (JEDEC_MFR(info) == SNOR_MFR_SPANSION) {
--                      /* Dedicated 4-byte command set */
--                      switch (nor->flash_read) {
--                      case SPI_NOR_QUAD:
--                              nor->read_opcode = SPINOR_OP_READ_1_1_4_4B;
--                              break;
--                      case SPI_NOR_DUAL:
--                              nor->read_opcode = SPINOR_OP_READ_1_1_2_4B;
--                              break;
--                      case SPI_NOR_FAST:
--                              nor->read_opcode = SPINOR_OP_READ_FAST_4B;
--                              break;
--                      case SPI_NOR_NORMAL:
--                              nor->read_opcode = SPINOR_OP_READ_4B;
--                              break;
--                      }
--                      nor->program_opcode = SPINOR_OP_PP_4B;
--                      /* No small sector erase for 4-byte command set */
--                      nor->erase_opcode = SPINOR_OP_SE_4B;
--                      mtd->erasesize = info->sector_size;
--              } else
-+              if (JEDEC_MFR(info) == SNOR_MFR_SPANSION ||
-+                  info->flags & SPI_NOR_4B_OPCODES)
-+                      spi_nor_set_4byte_opcodes(nor, info);
-+              else
-                       set_4byte(nor, info, 1);
-       } else {
-               nor->addr_width = 3;
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0006-mtd-spi-nor-Add-lock-unlock-support-for-f25l32pa.patch b/target/linux/generic/backport-4.9/062-v4.11-0006-mtd-spi-nor-Add-lock-unlock-support-for-f25l32pa.patch
deleted file mode 100644 (file)
index be78682..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 252c36bb9c7b98b356f033d16ea83d20fb8b4d3e Mon Sep 17 00:00:00 2001
-From: Victor Shyba <victor1984@riseup.net>
-Date: Mon, 2 Jan 2017 22:34:30 -0300
-Subject: [PATCH] mtd: spi-nor: Add lock/unlock support for f25l32pa
-
-This chip has write protection enabled on power-up,
-so this flag is necessary to support write operations.
-
-Signed-off-by: Victor Shyba <victor1984@riseup.net>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -956,7 +956,7 @@ static const struct flash_info spi_nor_i
-       { "en25s64",    INFO(0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
-       /* ESMT */
--      { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) },
-+      { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_HAS_LOCK) },
-       /* Everspin */
-       { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch b/target/linux/generic/backport-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch
deleted file mode 100644 (file)
index f8d0541..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5f0e0758efddef5b06994a76d8c7f0b8a4c1daae Mon Sep 17 00:00:00 2001
-From: Ricardo Ribalda <ricardo.ribalda@gmail.com>
-Date: Wed, 18 Jan 2017 17:40:16 +0100
-Subject: [PATCH] mtd: spi-nor: Fix S3AN addressing calculation
-
-The page calculation under spi_nor_s3an_addr_convert() was wrong. On
-Default Address Mode we need to perform a divide by page_size.
-
-Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -431,11 +431,14 @@ static void spi_nor_unlock_and_unprep(st
-  */
- static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr)
- {
--      unsigned int offset = addr;
-+      unsigned int offset;
-+      unsigned int page;
--      offset %= nor->page_size;
-+      offset = addr % nor->page_size;
-+      page = addr / nor->page_size;
-+      page <<= (nor->page_size > 512) ? 10 : 9;
--      return ((addr - offset) << 1) | offset;
-+      return page | offset;
- }
- /*
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0008-mtd-spi-nor-Add-support-for-gd25q16.patch b/target/linux/generic/backport-4.9/062-v4.11-0008-mtd-spi-nor-Add-support-for-gd25q16.patch
deleted file mode 100644 (file)
index 5253957..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4c5747a390acc9d1da3b332507c8bae7a8ddfc48 Mon Sep 17 00:00:00 2001
-From: Kamal Dasu <kdasu.kdev@gmail.com>
-Date: Fri, 20 Jan 2017 14:25:51 -0500
-Subject: [PATCH] mtd: spi-nor: Add support for gd25q16
-
-Add GigaDevice GD25Q16 (16M-bit) to supported list.
-
-Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -971,6 +971,11 @@ static const struct flash_info spi_nor_i
-       /* GigaDevice */
-       {
-+              "gd25q16", INFO(0xc84015, 0, 64 * 1024,  32,
-+                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-+                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-+      },
-+      {
-               "gd25q32", INFO(0xc84016, 0, 64 * 1024,  64,
-                       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-                       SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
diff --git a/target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch b/target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch
deleted file mode 100644 (file)
index cbab378..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From a4077ce5871304f8a78f80b74b18b6052a410f1a Mon Sep 17 00:00:00 2001
-From: "Andrey Jr. Melnikov" <temnota.am@gmail.com>
-Date: Thu, 8 Dec 2016 19:57:08 +0300
-Subject: [PATCH] mtd: nand: Add Winbond manufacturer id
-
-Add WINBOND manufacturer id.
-
-Signed-off-by: Andrey Jr. Melnikov <temnota.am@gmail.com>
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
----
- drivers/mtd/nand/nand_ids.c | 1 +
- include/linux/mtd/nand.h    | 1 +
- 2 files changed, 2 insertions(+)
-
---- a/drivers/mtd/nand/nand_ids.c
-+++ b/drivers/mtd/nand/nand_ids.c
-@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids
-       {NAND_MFR_SANDISK, "SanDisk"},
-       {NAND_MFR_INTEL, "Intel"},
-       {NAND_MFR_ATO, "ATO"},
-+      {NAND_MFR_WINBOND, "Winbond"},
-       {0x0, "Unknown"}
- };
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -928,6 +928,7 @@ static inline void nand_set_controller_d
- #define NAND_MFR_SANDISK      0x45
- #define NAND_MFR_INTEL                0x89
- #define NAND_MFR_ATO          0x9b
-+#define NAND_MFR_WINBOND      0xef
- /* The maximum expected count of bytes in the NAND ID sequence */
- #define NAND_MAX_ID_LEN 8
diff --git a/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch b/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch
deleted file mode 100644 (file)
index d2e582e..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 6080ef6e7c0a0592cbcca11200d879faf65e27d4 Mon Sep 17 00:00:00 2001
-From: Jeff Westfahl <jeff.westfahl@ni.com>
-Date: Tue, 10 Jan 2017 13:30:17 -0600
-Subject: [PATCH] mtd: introduce function max_bad_blocks
-
-If implemented, 'max_bad_blocks' returns the maximum number of bad
-blocks to reserve for a MTD. An implementation for NAND is coming soon.
-
-Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com>
-Signed-off-by: Zach Brown <zach.brown@ni.com>
-Acked-by: Boris Brezillon <boris.brezillon@free-electron.com>
-Acked-by: Brian Norris <computersforpeace@gmail.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c   | 10 ++++++++++
- include/linux/mtd/mtd.h | 13 +++++++++++++
- 2 files changed, 23 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -349,6 +349,14 @@ static const struct mtd_ooblayout_ops pa
-       .free = part_ooblayout_free,
- };
-+static int part_max_bad_blocks(struct mtd_info *mtd, loff_t ofs, size_t len)
-+{
-+      struct mtd_part *part = mtd_to_part(mtd);
-+
-+      return part->master->_max_bad_blocks(part->master,
-+                                           ofs + part->offset, len);
-+}
-+
- static inline void free_partition(struct mtd_part *p)
- {
-       kfree(p->mtd.name);
-@@ -475,6 +483,8 @@ static struct mtd_part *allocate_partiti
-               slave->mtd._block_isbad = part_block_isbad;
-       if (master->_block_markbad)
-               slave->mtd._block_markbad = part_block_markbad;
-+      if (master->_max_bad_blocks)
-+              slave->mtd._max_bad_blocks = part_max_bad_blocks;
-       if (master->_get_device)
-               slave->mtd._get_device = part_get_device;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -322,6 +322,7 @@ struct mtd_info {
-       int (*_block_isreserved) (struct mtd_info *mtd, loff_t ofs);
-       int (*_block_isbad) (struct mtd_info *mtd, loff_t ofs);
-       int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs);
-+      int (*_max_bad_blocks) (struct mtd_info *mtd, loff_t ofs, size_t len);
-       int (*_suspend) (struct mtd_info *mtd);
-       void (*_resume) (struct mtd_info *mtd);
-       void (*_reboot) (struct mtd_info *mtd);
-@@ -397,6 +398,18 @@ static inline int mtd_oobavail(struct mt
-       return ops->mode == MTD_OPS_AUTO_OOB ? mtd->oobavail : mtd->oobsize;
- }
-+static inline int mtd_max_bad_blocks(struct mtd_info *mtd,
-+                                   loff_t ofs, size_t len)
-+{
-+      if (!mtd->_max_bad_blocks)
-+              return -ENOTSUPP;
-+
-+      if (mtd->size < (len + ofs) || ofs < 0)
-+              return -EINVAL;
-+
-+      return mtd->_max_bad_blocks(mtd, ofs, len);
-+}
-+
- int mtd_wunit_to_pairing_info(struct mtd_info *mtd, int wunit,
-                             struct mtd_pairing_info *info);
- int mtd_pairing_info_to_wunit(struct mtd_info *mtd,
diff --git a/target/linux/generic/backport-4.9/063-v4.11-0003-mtd-Add-partition-device-node-to-mtd-partition-devic.patch b/target/linux/generic/backport-4.9/063-v4.11-0003-mtd-Add-partition-device-node-to-mtd-partition-devic.patch
deleted file mode 100644 (file)
index ea68fc4..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42e9401bd1467d22c4dc4d2c637347b874e6a80b Mon Sep 17 00:00:00 2001
-From: Sascha Hauer <s.hauer@pengutronix.de>
-Date: Thu, 9 Feb 2017 11:50:24 +0100
-Subject: [PATCH] mtd: Add partition device node to mtd partition devices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The user visible change here is that mtd partitions get an of_node link
-in sysfs.
-
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c          | 1 +
- drivers/mtd/ofpart.c           | 1 +
- include/linux/mtd/partitions.h | 1 +
- 3 files changed, 3 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -432,6 +432,7 @@ static struct mtd_part *allocate_partiti
-       slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) ?
-                               &master->dev :
-                               master->dev.parent;
-+      slave->mtd.dev.of_node = part->of_node;
-       slave->mtd._read = part_read;
-       slave->mtd._write = part_write;
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -108,6 +108,7 @@ static int parse_ofpart_partitions(struc
-               parts[i].offset = of_read_number(reg, a_cells);
-               parts[i].size = of_read_number(reg + a_cells, s_cells);
-+              parts[i].of_node = pp;
-               partname = of_get_property(pp, "label", &len);
-               if (!partname)
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -41,6 +41,7 @@ struct mtd_partition {
-       uint64_t size;                  /* partition size */
-       uint64_t offset;                /* offset within the master MTD space */
-       uint32_t mask_flags;            /* master MTD flags to mask out for this partition */
-+      struct device_node *of_node;
- };
- #define MTDPART_OFS_RETAIN    (-3)
diff --git a/target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch b/target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch
deleted file mode 100644 (file)
index d1544b1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From b0fcb4b413028376894feaaaf62bcb09ab1b52f2 Mon Sep 17 00:00:00 2001
-From: Mathias Kresin <dev@kresin.me>
-Date: Thu, 13 Apr 2017 09:23:54 +0200
-Subject: [PATCH] mtd: spi-nor: enable stateless 4b op codes for mx25u25635f
-
-All required stateless 4-byte op codes are supported by this flash
-chip. The stateless 4-byte support can't be autodetected due to a
-missing 4-byte Address Instruction Table in SFDP.
-
-Fixes hangs on reboot for SoCs expecting the flash chip in 3byte mode.
-
-Signed-off-by: Mathias Kresin <dev@kresin.me>
-Acked-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1023,7 +1023,7 @@ static const struct flash_info spi_nor_i
-       { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
-       { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
-       { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
--      { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K) },
-+      { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
-       { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
-       { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_QUAD_READ) },
-       { "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0001-mtd-handle-partitioning-on-devices-with-0-erasesize.patch b/target/linux/generic/backport-4.9/065-v4.13-0001-mtd-handle-partitioning-on-devices-with-0-erasesize.patch
deleted file mode 100644 (file)
index d912811..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From 1eeef2d7483a7e3f8d2dd2a5b9939b3b814dc549 Mon Sep 17 00:00:00 2001
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Fri, 9 Jun 2017 15:58:31 +1200
-Subject: [PATCH] mtd: handle partitioning on devices with 0 erasesize
-
-erasesize is meaningful for flash devices but for SRAM there is no
-concept of an erase block so erasesize is set to 0. When partitioning
-these devices instead of ensuring partitions fall on erasesize
-boundaries we ensure they fall on writesize boundaries.
-
-Helped-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c | 26 +++++++++++++++++---------
- 1 file changed, 17 insertions(+), 9 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -393,8 +393,12 @@ static struct mtd_part *allocate_partiti
-                       const struct mtd_partition *part, int partno,
-                       uint64_t cur_offset)
- {
-+      int wr_alignment = (master->flags & MTD_NO_ERASE) ? master->writesize:
-+                                                          master->erasesize;
-       struct mtd_part *slave;
-+      u32 remainder;
-       char *name;
-+      u64 tmp;
-       /* allocate the partition structure */
-       slave = kzalloc(sizeof(*slave), GFP_KERNEL);
-@@ -499,10 +503,11 @@ static struct mtd_part *allocate_partiti
-       if (slave->offset == MTDPART_OFS_APPEND)
-               slave->offset = cur_offset;
-       if (slave->offset == MTDPART_OFS_NXTBLK) {
-+              tmp = cur_offset;
-               slave->offset = cur_offset;
--              if (mtd_mod_by_eb(cur_offset, master) != 0) {
--                      /* Round up to next erasesize */
--                      slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
-+              remainder = do_div(tmp, wr_alignment);
-+              if (remainder) {
-+                      slave->offset += wr_alignment - remainder;
-                       printk(KERN_NOTICE "Moving partition %d: "
-                              "0x%012llx -> 0x%012llx\n", partno,
-                              (unsigned long long)cur_offset, (unsigned long long)slave->offset);
-@@ -567,19 +572,22 @@ static struct mtd_part *allocate_partiti
-               slave->mtd.erasesize = master->erasesize;
-       }
--      if ((slave->mtd.flags & MTD_WRITEABLE) &&
--          mtd_mod_by_eb(slave->offset, &slave->mtd)) {
-+      tmp = slave->offset;
-+      remainder = do_div(tmp, wr_alignment);
-+      if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               /* Doesn't start on a boundary of major erase size */
-               /* FIXME: Let it be writable if it is on a boundary of
-                * _minor_ erase size though */
-               slave->mtd.flags &= ~MTD_WRITEABLE;
--              printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
-+              printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n",
-                       part->name);
-       }
--      if ((slave->mtd.flags & MTD_WRITEABLE) &&
--          mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
-+
-+      tmp = slave->mtd.size;
-+      remainder = do_div(tmp, wr_alignment);
-+      if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               slave->mtd.flags &= ~MTD_WRITEABLE;
--              printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
-+              printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n",
-                       part->name);
-       }
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
deleted file mode 100644 (file)
index d312e08..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From 01f9c7240a900d5676a8496496f2974dd36996b1 Mon Sep 17 00:00:00 2001
-From: Brian Norris <computersforpeace@gmail.com>
-Date: Tue, 23 May 2017 07:30:20 +0200
-Subject: [PATCH] mtd: partitions: factor out code calling parser
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This code is going to be reused for parsers matched using OF so let's
-factor it out to make this easier.
-
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c | 33 ++++++++++++++++++++++++---------
- 1 file changed, 24 insertions(+), 9 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -807,6 +807,27 @@ static const char * const default_mtd_pa
-       NULL
- };
-+static int mtd_part_do_parse(struct mtd_part_parser *parser,
-+                           struct mtd_info *master,
-+                           struct mtd_partitions *pparts,
-+                           struct mtd_part_parser_data *data)
-+{
-+      int ret;
-+
-+      ret = (*parser->parse_fn)(master, &pparts->parts, data);
-+      pr_debug("%s: parser %s: %i\n", master->name, parser->name, ret);
-+      if (ret <= 0)
-+              return ret;
-+
-+      pr_notice("%d %s partitions found on MTD device %s\n", ret,
-+                parser->name, master->name);
-+
-+      pparts->nr_parts = ret;
-+      pparts->parser = parser;
-+
-+      return ret;
-+}
-+
- /**
-  * parse_mtd_partitions - parse MTD partitions
-  * @master: the master partition (describes whole MTD device)
-@@ -847,16 +868,10 @@ int parse_mtd_partitions(struct mtd_info
-                        parser ? parser->name : NULL);
-               if (!parser)
-                       continue;
--              ret = (*parser->parse_fn)(master, &pparts->parts, data);
--              pr_debug("%s: parser %s: %i\n",
--                       master->name, parser->name, ret);
--              if (ret > 0) {
--                      printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n",
--                             ret, parser->name, master->name);
--                      pparts->nr_parts = ret;
--                      pparts->parser = parser;
-+              ret = mtd_part_do_parse(parser, master, pparts, data);
-+              /* Found partitions! */
-+              if (ret > 0)
-                       return 0;
--              }
-               mtd_part_parser_put(parser);
-               /*
-                * Stash the first error we see; only report it if no parser
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch
deleted file mode 100644 (file)
index d93f4ba..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-From 08263a9ae664b24fa777d20b365601534842b236 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 21 Jun 2017 08:26:42 +0200
-Subject: [PATCH] mtd: partitions: add helper for deleting partition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are two similar functions handling deletion. One handles single
-partition and another the whole MTD flash device. They share (duplicate)
-some code so it makes sense to add a small helper for that part.
-
-Function del_mtd_partitions has been moved a bit to keep all deleting
-stuff together.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c | 75 +++++++++++++++++++++++++++++----------------------
- 1 file changed, 43 insertions(+), 32 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -363,32 +363,6 @@ static inline void free_partition(struct
-       kfree(p);
- }
--/*
-- * This function unregisters and destroy all slave MTD objects which are
-- * attached to the given master MTD object.
-- */
--
--int del_mtd_partitions(struct mtd_info *master)
--{
--      struct mtd_part *slave, *next;
--      int ret, err = 0;
--
--      mutex_lock(&mtd_partitions_mutex);
--      list_for_each_entry_safe(slave, next, &mtd_partitions, list)
--              if (slave->master == master) {
--                      ret = del_mtd_device(&slave->mtd);
--                      if (ret < 0) {
--                              err = ret;
--                              continue;
--                      }
--                      list_del(&slave->list);
--                      free_partition(slave);
--              }
--      mutex_unlock(&mtd_partitions_mutex);
--
--      return err;
--}
--
- static struct mtd_part *allocate_partition(struct mtd_info *master,
-                       const struct mtd_partition *part, int partno,
-                       uint64_t cur_offset)
-@@ -675,6 +649,48 @@ int mtd_add_partition(struct mtd_info *m
- }
- EXPORT_SYMBOL_GPL(mtd_add_partition);
-+/**
-+ * __mtd_del_partition - delete MTD partition
-+ *
-+ * @priv: internal MTD struct for partition to be deleted
-+ *
-+ * This function must be called with the partitions mutex locked.
-+ */
-+static int __mtd_del_partition(struct mtd_part *priv)
-+{
-+      int err;
-+
-+      err = del_mtd_device(&priv->mtd);
-+      if (err)
-+              return err;
-+
-+      list_del(&priv->list);
-+      free_partition(priv);
-+
-+      return 0;
-+}
-+
-+/*
-+ * This function unregisters and destroy all slave MTD objects which are
-+ * attached to the given master MTD object.
-+ */
-+int del_mtd_partitions(struct mtd_info *master)
-+{
-+      struct mtd_part *slave, *next;
-+      int ret, err = 0;
-+
-+      mutex_lock(&mtd_partitions_mutex);
-+      list_for_each_entry_safe(slave, next, &mtd_partitions, list)
-+              if (slave->master == master) {
-+                      ret = __mtd_del_partition(slave);
-+                      if (ret < 0)
-+                              err = ret;
-+              }
-+      mutex_unlock(&mtd_partitions_mutex);
-+
-+      return err;
-+}
-+
- int mtd_del_partition(struct mtd_info *master, int partno)
- {
-       struct mtd_part *slave, *next;
-@@ -686,12 +702,7 @@ int mtd_del_partition(struct mtd_info *m
-                   (slave->mtd.index == partno)) {
-                       sysfs_remove_files(&slave->mtd.dev.kobj,
-                                          mtd_partition_attrs);
--                      ret = del_mtd_device(&slave->mtd);
--                      if (ret < 0)
--                              break;
--
--                      list_del(&slave->list);
--                      free_partition(slave);
-+                      ret = __mtd_del_partition(slave);
-                       break;
-               }
-       mutex_unlock(&mtd_partitions_mutex);
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch
deleted file mode 100644 (file)
index 0f1b502..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From c5ceaba74083daf619bdb34d4871e297a177eebf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 21 Jun 2017 08:26:43 +0200
-Subject: [PATCH] mtd: partitions: remove sysfs files when deleting all
- master's partitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When support for sysfs "offset" file was added it missed to update the
-del_mtd_partitions function. It deletes partitions just like
-mtd_del_partition does so both should also take care of removing sysfs
-files.
-
-This change moves sysfs_remove_files call to the shared function to fix
-this issue.
-
-Fixes: a62c24d755291 ("mtd: part: Add sysfs variable for offset of partition")
-Cc: Dan Ehrenberg <dehrenberg@chromium.org>
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -660,6 +660,8 @@ static int __mtd_del_partition(struct mt
- {
-       int err;
-+      sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs);
-+
-       err = del_mtd_device(&priv->mtd);
-       if (err)
-               return err;
-@@ -700,8 +702,6 @@ int mtd_del_partition(struct mtd_info *m
-       list_for_each_entry_safe(slave, next, &mtd_partitions, list)
-               if ((slave->master == master) &&
-                   (slave->mtd.index == partno)) {
--                      sysfs_remove_files(&slave->mtd.dev.kobj,
--                                         mtd_partition_attrs);
-                       ret = __mtd_del_partition(slave);
-                       break;
-               }
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch
deleted file mode 100644 (file)
index 7951227..0000000
+++ /dev/null
@@ -1,606 +0,0 @@
-From 0a9d72b69da6d8dae1abd7990c6c4c749846ef3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 21 Jun 2017 08:26:44 +0200
-Subject: [PATCH] mtd: partitions: rename "master" to the "parent" where
- appropriate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This prepares mtd subsystem for the new feature: subpartitions. In some
-cases flash device partition can be a container with extra subpartitions
-(volumes).
-
-So far there was a flat structure implemented. One master (flash device)
-could be partitioned into few partitions. Every partition got its master
-and it was enough to get things running.
-
-To support subpartitions we need to store pointer to the parent for each
-partition. This is required to implement more natural tree structure and
-handle all recursion and offsets calculation.
-
-To make code consistent this patch renamed "master" to the "parent" in
-places where we can be dealing with subpartitions.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c | 204 ++++++++++++++++++++++++++------------------------
- 1 file changed, 105 insertions(+), 99 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -37,10 +37,16 @@
- static LIST_HEAD(mtd_partitions);
- static DEFINE_MUTEX(mtd_partitions_mutex);
--/* Our partition node structure */
-+/**
-+ * struct mtd_part - our partition node structure
-+ *
-+ * @mtd: struct holding partition details
-+ * @parent: parent mtd - flash device or another partition
-+ * @offset: partition offset relative to the *flash device*
-+ */
- struct mtd_part {
-       struct mtd_info mtd;
--      struct mtd_info *master;
-+      struct mtd_info *parent;
-       uint64_t offset;
-       struct list_head list;
- };
-@@ -67,15 +73,15 @@ static int part_read(struct mtd_info *mt
-       struct mtd_ecc_stats stats;
-       int res;
--      stats = part->master->ecc_stats;
--      res = part->master->_read(part->master, from + part->offset, len,
-+      stats = part->parent->ecc_stats;
-+      res = part->parent->_read(part->parent, from + part->offset, len,
-                                 retlen, buf);
-       if (unlikely(mtd_is_eccerr(res)))
-               mtd->ecc_stats.failed +=
--                      part->master->ecc_stats.failed - stats.failed;
-+                      part->parent->ecc_stats.failed - stats.failed;
-       else
-               mtd->ecc_stats.corrected +=
--                      part->master->ecc_stats.corrected - stats.corrected;
-+                      part->parent->ecc_stats.corrected - stats.corrected;
-       return res;
- }
-@@ -84,7 +90,7 @@ static int part_point(struct mtd_info *m
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_point(part->master, from + part->offset, len,
-+      return part->parent->_point(part->parent, from + part->offset, len,
-                                   retlen, virt, phys);
- }
-@@ -92,7 +98,7 @@ static int part_unpoint(struct mtd_info
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_unpoint(part->master, from + part->offset, len);
-+      return part->parent->_unpoint(part->parent, from + part->offset, len);
- }
- static unsigned long part_get_unmapped_area(struct mtd_info *mtd,
-@@ -103,7 +109,7 @@ static unsigned long part_get_unmapped_a
-       struct mtd_part *part = mtd_to_part(mtd);
-       offset += part->offset;
--      return part->master->_get_unmapped_area(part->master, len, offset,
-+      return part->parent->_get_unmapped_area(part->parent, len, offset,
-                                               flags);
- }
-@@ -132,7 +138,7 @@ static int part_read_oob(struct mtd_info
-                       return -EINVAL;
-       }
--      res = part->master->_read_oob(part->master, from + part->offset, ops);
-+      res = part->parent->_read_oob(part->parent, from + part->offset, ops);
-       if (unlikely(res)) {
-               if (mtd_is_bitflip(res))
-                       mtd->ecc_stats.corrected++;
-@@ -146,7 +152,7 @@ static int part_read_user_prot_reg(struc
-               size_t len, size_t *retlen, u_char *buf)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_read_user_prot_reg(part->master, from, len,
-+      return part->parent->_read_user_prot_reg(part->parent, from, len,
-                                                retlen, buf);
- }
-@@ -154,7 +160,7 @@ static int part_get_user_prot_info(struc
-                                  size_t *retlen, struct otp_info *buf)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_get_user_prot_info(part->master, len, retlen,
-+      return part->parent->_get_user_prot_info(part->parent, len, retlen,
-                                                buf);
- }
-@@ -162,7 +168,7 @@ static int part_read_fact_prot_reg(struc
-               size_t len, size_t *retlen, u_char *buf)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_read_fact_prot_reg(part->master, from, len,
-+      return part->parent->_read_fact_prot_reg(part->parent, from, len,
-                                                retlen, buf);
- }
-@@ -170,7 +176,7 @@ static int part_get_fact_prot_info(struc
-                                  size_t *retlen, struct otp_info *buf)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_get_fact_prot_info(part->master, len, retlen,
-+      return part->parent->_get_fact_prot_info(part->parent, len, retlen,
-                                                buf);
- }
-@@ -178,7 +184,7 @@ static int part_write(struct mtd_info *m
-               size_t *retlen, const u_char *buf)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_write(part->master, to + part->offset, len,
-+      return part->parent->_write(part->parent, to + part->offset, len,
-                                   retlen, buf);
- }
-@@ -186,7 +192,7 @@ static int part_panic_write(struct mtd_i
-               size_t *retlen, const u_char *buf)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_panic_write(part->master, to + part->offset, len,
-+      return part->parent->_panic_write(part->parent, to + part->offset, len,
-                                         retlen, buf);
- }
-@@ -199,14 +205,14 @@ static int part_write_oob(struct mtd_inf
-               return -EINVAL;
-       if (ops->datbuf && to + ops->len > mtd->size)
-               return -EINVAL;
--      return part->master->_write_oob(part->master, to + part->offset, ops);
-+      return part->parent->_write_oob(part->parent, to + part->offset, ops);
- }
- static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from,
-               size_t len, size_t *retlen, u_char *buf)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_write_user_prot_reg(part->master, from, len,
-+      return part->parent->_write_user_prot_reg(part->parent, from, len,
-                                                 retlen, buf);
- }
-@@ -214,14 +220,14 @@ static int part_lock_user_prot_reg(struc
-               size_t len)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_lock_user_prot_reg(part->master, from, len);
-+      return part->parent->_lock_user_prot_reg(part->parent, from, len);
- }
- static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,
-               unsigned long count, loff_t to, size_t *retlen)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_writev(part->master, vecs, count,
-+      return part->parent->_writev(part->parent, vecs, count,
-                                    to + part->offset, retlen);
- }
-@@ -231,7 +237,7 @@ static int part_erase(struct mtd_info *m
-       int ret;
-       instr->addr += part->offset;
--      ret = part->master->_erase(part->master, instr);
-+      ret = part->parent->_erase(part->parent, instr);
-       if (ret) {
-               if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
-                       instr->fail_addr -= part->offset;
-@@ -257,51 +263,51 @@ EXPORT_SYMBOL_GPL(mtd_erase_callback);
- static int part_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_lock(part->master, ofs + part->offset, len);
-+      return part->parent->_lock(part->parent, ofs + part->offset, len);
- }
- static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_unlock(part->master, ofs + part->offset, len);
-+      return part->parent->_unlock(part->parent, ofs + part->offset, len);
- }
- static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_is_locked(part->master, ofs + part->offset, len);
-+      return part->parent->_is_locked(part->parent, ofs + part->offset, len);
- }
- static void part_sync(struct mtd_info *mtd)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      part->master->_sync(part->master);
-+      part->parent->_sync(part->parent);
- }
- static int part_suspend(struct mtd_info *mtd)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_suspend(part->master);
-+      return part->parent->_suspend(part->parent);
- }
- static void part_resume(struct mtd_info *mtd)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      part->master->_resume(part->master);
-+      part->parent->_resume(part->parent);
- }
- static int part_block_isreserved(struct mtd_info *mtd, loff_t ofs)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
-       ofs += part->offset;
--      return part->master->_block_isreserved(part->master, ofs);
-+      return part->parent->_block_isreserved(part->parent, ofs);
- }
- static int part_block_isbad(struct mtd_info *mtd, loff_t ofs)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
-       ofs += part->offset;
--      return part->master->_block_isbad(part->master, ofs);
-+      return part->parent->_block_isbad(part->parent, ofs);
- }
- static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)
-@@ -310,7 +316,7 @@ static int part_block_markbad(struct mtd
-       int res;
-       ofs += part->offset;
--      res = part->master->_block_markbad(part->master, ofs);
-+      res = part->parent->_block_markbad(part->parent, ofs);
-       if (!res)
-               mtd->ecc_stats.badblocks++;
-       return res;
-@@ -319,13 +325,13 @@ static int part_block_markbad(struct mtd
- static int part_get_device(struct mtd_info *mtd)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_get_device(part->master);
-+      return part->parent->_get_device(part->parent);
- }
- static void part_put_device(struct mtd_info *mtd)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      part->master->_put_device(part->master);
-+      part->parent->_put_device(part->parent);
- }
- static int part_ooblayout_ecc(struct mtd_info *mtd, int section,
-@@ -333,7 +339,7 @@ static int part_ooblayout_ecc(struct mtd
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return mtd_ooblayout_ecc(part->master, section, oobregion);
-+      return mtd_ooblayout_ecc(part->parent, section, oobregion);
- }
- static int part_ooblayout_free(struct mtd_info *mtd, int section,
-@@ -341,7 +347,7 @@ static int part_ooblayout_free(struct mt
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return mtd_ooblayout_free(part->master, section, oobregion);
-+      return mtd_ooblayout_free(part->parent, section, oobregion);
- }
- static const struct mtd_ooblayout_ops part_ooblayout_ops = {
-@@ -353,7 +359,7 @@ static int part_max_bad_blocks(struct mt
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->master->_max_bad_blocks(part->master,
-+      return part->parent->_max_bad_blocks(part->parent,
-                                            ofs + part->offset, len);
- }
-@@ -363,12 +369,12 @@ static inline void free_partition(struct
-       kfree(p);
- }
--static struct mtd_part *allocate_partition(struct mtd_info *master,
-+static struct mtd_part *allocate_partition(struct mtd_info *parent,
-                       const struct mtd_partition *part, int partno,
-                       uint64_t cur_offset)
- {
--      int wr_alignment = (master->flags & MTD_NO_ERASE) ? master->writesize:
--                                                          master->erasesize;
-+      int wr_alignment = (parent->flags & MTD_NO_ERASE) ? parent->writesize:
-+                                                          parent->erasesize;
-       struct mtd_part *slave;
-       u32 remainder;
-       char *name;
-@@ -379,25 +385,25 @@ static struct mtd_part *allocate_partiti
-       name = kstrdup(part->name, GFP_KERNEL);
-       if (!name || !slave) {
-               printk(KERN_ERR"memory allocation error while creating partitions for \"%s\"\n",
--                     master->name);
-+                     parent->name);
-               kfree(name);
-               kfree(slave);
-               return ERR_PTR(-ENOMEM);
-       }
-       /* set up the MTD object for this partition */
--      slave->mtd.type = master->type;
--      slave->mtd.flags = master->flags & ~part->mask_flags;
-+      slave->mtd.type = parent->type;
-+      slave->mtd.flags = parent->flags & ~part->mask_flags;
-       slave->mtd.size = part->size;
--      slave->mtd.writesize = master->writesize;
--      slave->mtd.writebufsize = master->writebufsize;
--      slave->mtd.oobsize = master->oobsize;
--      slave->mtd.oobavail = master->oobavail;
--      slave->mtd.subpage_sft = master->subpage_sft;
--      slave->mtd.pairing = master->pairing;
-+      slave->mtd.writesize = parent->writesize;
-+      slave->mtd.writebufsize = parent->writebufsize;
-+      slave->mtd.oobsize = parent->oobsize;
-+      slave->mtd.oobavail = parent->oobavail;
-+      slave->mtd.subpage_sft = parent->subpage_sft;
-+      slave->mtd.pairing = parent->pairing;
-       slave->mtd.name = name;
--      slave->mtd.owner = master->owner;
-+      slave->mtd.owner = parent->owner;
-       /* NOTE: Historically, we didn't arrange MTDs as a tree out of
-        * concern for showing the same data in multiple partitions.
-@@ -408,70 +414,70 @@ static struct mtd_part *allocate_partiti
-        * distinguish between the master and the partition in sysfs.
-        */
-       slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) ?
--                              &master->dev :
--                              master->dev.parent;
-+                              &parent->dev :
-+                              parent->dev.parent;
-       slave->mtd.dev.of_node = part->of_node;
-       slave->mtd._read = part_read;
-       slave->mtd._write = part_write;
--      if (master->_panic_write)
-+      if (parent->_panic_write)
-               slave->mtd._panic_write = part_panic_write;
--      if (master->_point && master->_unpoint) {
-+      if (parent->_point && parent->_unpoint) {
-               slave->mtd._point = part_point;
-               slave->mtd._unpoint = part_unpoint;
-       }
--      if (master->_get_unmapped_area)
-+      if (parent->_get_unmapped_area)
-               slave->mtd._get_unmapped_area = part_get_unmapped_area;
--      if (master->_read_oob)
-+      if (parent->_read_oob)
-               slave->mtd._read_oob = part_read_oob;
--      if (master->_write_oob)
-+      if (parent->_write_oob)
-               slave->mtd._write_oob = part_write_oob;
--      if (master->_read_user_prot_reg)
-+      if (parent->_read_user_prot_reg)
-               slave->mtd._read_user_prot_reg = part_read_user_prot_reg;
--      if (master->_read_fact_prot_reg)
-+      if (parent->_read_fact_prot_reg)
-               slave->mtd._read_fact_prot_reg = part_read_fact_prot_reg;
--      if (master->_write_user_prot_reg)
-+      if (parent->_write_user_prot_reg)
-               slave->mtd._write_user_prot_reg = part_write_user_prot_reg;
--      if (master->_lock_user_prot_reg)
-+      if (parent->_lock_user_prot_reg)
-               slave->mtd._lock_user_prot_reg = part_lock_user_prot_reg;
--      if (master->_get_user_prot_info)
-+      if (parent->_get_user_prot_info)
-               slave->mtd._get_user_prot_info = part_get_user_prot_info;
--      if (master->_get_fact_prot_info)
-+      if (parent->_get_fact_prot_info)
-               slave->mtd._get_fact_prot_info = part_get_fact_prot_info;
--      if (master->_sync)
-+      if (parent->_sync)
-               slave->mtd._sync = part_sync;
--      if (!partno && !master->dev.class && master->_suspend &&
--          master->_resume) {
-+      if (!partno && !parent->dev.class && parent->_suspend &&
-+          parent->_resume) {
-                       slave->mtd._suspend = part_suspend;
-                       slave->mtd._resume = part_resume;
-       }
--      if (master->_writev)
-+      if (parent->_writev)
-               slave->mtd._writev = part_writev;
--      if (master->_lock)
-+      if (parent->_lock)
-               slave->mtd._lock = part_lock;
--      if (master->_unlock)
-+      if (parent->_unlock)
-               slave->mtd._unlock = part_unlock;
--      if (master->_is_locked)
-+      if (parent->_is_locked)
-               slave->mtd._is_locked = part_is_locked;
--      if (master->_block_isreserved)
-+      if (parent->_block_isreserved)
-               slave->mtd._block_isreserved = part_block_isreserved;
--      if (master->_block_isbad)
-+      if (parent->_block_isbad)
-               slave->mtd._block_isbad = part_block_isbad;
--      if (master->_block_markbad)
-+      if (parent->_block_markbad)
-               slave->mtd._block_markbad = part_block_markbad;
--      if (master->_max_bad_blocks)
-+      if (parent->_max_bad_blocks)
-               slave->mtd._max_bad_blocks = part_max_bad_blocks;
--      if (master->_get_device)
-+      if (parent->_get_device)
-               slave->mtd._get_device = part_get_device;
--      if (master->_put_device)
-+      if (parent->_put_device)
-               slave->mtd._put_device = part_put_device;
-       slave->mtd._erase = part_erase;
--      slave->master = master;
-+      slave->parent = parent;
-       slave->offset = part->offset;
-       if (slave->offset == MTDPART_OFS_APPEND)
-@@ -489,25 +495,25 @@ static struct mtd_part *allocate_partiti
-       }
-       if (slave->offset == MTDPART_OFS_RETAIN) {
-               slave->offset = cur_offset;
--              if (master->size - slave->offset >= slave->mtd.size) {
--                      slave->mtd.size = master->size - slave->offset
-+              if (parent->size - slave->offset >= slave->mtd.size) {
-+                      slave->mtd.size = parent->size - slave->offset
-                                                       - slave->mtd.size;
-               } else {
-                       printk(KERN_ERR "mtd partition \"%s\" doesn't have enough space: %#llx < %#llx, disabled\n",
--                              part->name, master->size - slave->offset,
-+                              part->name, parent->size - slave->offset,
-                               slave->mtd.size);
-                       /* register to preserve ordering */
-                       goto out_register;
-               }
-       }
-       if (slave->mtd.size == MTDPART_SIZ_FULL)
--              slave->mtd.size = master->size - slave->offset;
-+              slave->mtd.size = parent->size - slave->offset;
-       printk(KERN_NOTICE "0x%012llx-0x%012llx : \"%s\"\n", (unsigned long long)slave->offset,
-               (unsigned long long)(slave->offset + slave->mtd.size), slave->mtd.name);
-       /* let's do some sanity checks */
--      if (slave->offset >= master->size) {
-+      if (slave->offset >= parent->size) {
-               /* let's register it anyway to preserve ordering */
-               slave->offset = 0;
-               slave->mtd.size = 0;
-@@ -515,16 +521,16 @@ static struct mtd_part *allocate_partiti
-                       part->name);
-               goto out_register;
-       }
--      if (slave->offset + slave->mtd.size > master->size) {
--              slave->mtd.size = master->size - slave->offset;
-+      if (slave->offset + slave->mtd.size > parent->size) {
-+              slave->mtd.size = parent->size - slave->offset;
-               printk(KERN_WARNING"mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#llx\n",
--                      part->name, master->name, (unsigned long long)slave->mtd.size);
-+                      part->name, parent->name, (unsigned long long)slave->mtd.size);
-       }
--      if (master->numeraseregions > 1) {
-+      if (parent->numeraseregions > 1) {
-               /* Deal with variable erase size stuff */
--              int i, max = master->numeraseregions;
-+              int i, max = parent->numeraseregions;
-               u64 end = slave->offset + slave->mtd.size;
--              struct mtd_erase_region_info *regions = master->eraseregions;
-+              struct mtd_erase_region_info *regions = parent->eraseregions;
-               /* Find the first erase regions which is part of this
-                * partition. */
-@@ -543,7 +549,7 @@ static struct mtd_part *allocate_partiti
-               BUG_ON(slave->mtd.erasesize == 0);
-       } else {
-               /* Single erase size */
--              slave->mtd.erasesize = master->erasesize;
-+              slave->mtd.erasesize = parent->erasesize;
-       }
-       tmp = slave->offset;
-@@ -566,17 +572,17 @@ static struct mtd_part *allocate_partiti
-       }
-       mtd_set_ooblayout(&slave->mtd, &part_ooblayout_ops);
--      slave->mtd.ecc_step_size = master->ecc_step_size;
--      slave->mtd.ecc_strength = master->ecc_strength;
--      slave->mtd.bitflip_threshold = master->bitflip_threshold;
-+      slave->mtd.ecc_step_size = parent->ecc_step_size;
-+      slave->mtd.ecc_strength = parent->ecc_strength;
-+      slave->mtd.bitflip_threshold = parent->bitflip_threshold;
--      if (master->_block_isbad) {
-+      if (parent->_block_isbad) {
-               uint64_t offs = 0;
-               while (offs < slave->mtd.size) {
--                      if (mtd_block_isreserved(master, offs + slave->offset))
-+                      if (mtd_block_isreserved(parent, offs + slave->offset))
-                               slave->mtd.ecc_stats.bbtblocks++;
--                      else if (mtd_block_isbad(master, offs + slave->offset))
-+                      else if (mtd_block_isbad(parent, offs + slave->offset))
-                               slave->mtd.ecc_stats.badblocks++;
-                       offs += slave->mtd.erasesize;
-               }
-@@ -610,7 +616,7 @@ static int mtd_add_partition_attrs(struc
-       return ret;
- }
--int mtd_add_partition(struct mtd_info *master, const char *name,
-+int mtd_add_partition(struct mtd_info *parent, const char *name,
-                     long long offset, long long length)
- {
-       struct mtd_partition part;
-@@ -623,7 +629,7 @@ int mtd_add_partition(struct mtd_info *m
-               return -EINVAL;
-       if (length == MTDPART_SIZ_FULL)
--              length = master->size - offset;
-+              length = parent->size - offset;
-       if (length <= 0)
-               return -EINVAL;
-@@ -633,7 +639,7 @@ int mtd_add_partition(struct mtd_info *m
-       part.size = length;
-       part.offset = offset;
--      new = allocate_partition(master, &part, -1, offset);
-+      new = allocate_partition(parent, &part, -1, offset);
-       if (IS_ERR(new))
-               return PTR_ERR(new);
-@@ -683,7 +689,7 @@ int del_mtd_partitions(struct mtd_info *
-       mutex_lock(&mtd_partitions_mutex);
-       list_for_each_entry_safe(slave, next, &mtd_partitions, list)
--              if (slave->master == master) {
-+              if (slave->parent == master) {
-                       ret = __mtd_del_partition(slave);
-                       if (ret < 0)
-                               err = ret;
-@@ -700,7 +706,7 @@ int mtd_del_partition(struct mtd_info *m
-       mutex_lock(&mtd_partitions_mutex);
-       list_for_each_entry_safe(slave, next, &mtd_partitions, list)
--              if ((slave->master == master) &&
-+              if ((slave->parent == master) &&
-                   (slave->mtd.index == partno)) {
-                       ret = __mtd_del_partition(slave);
-                       break;
-@@ -933,6 +939,6 @@ uint64_t mtd_get_device_size(const struc
-       if (!mtd_is_partition(mtd))
-               return mtd->size;
--      return mtd_to_part(mtd)->master->size;
-+      return mtd_to_part(mtd)->parent->size;
- }
- EXPORT_SYMBOL_GPL(mtd_get_device_size);
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch
deleted file mode 100644 (file)
index 0d3e10a..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-From 97519dc52b44af054d7654776e78eaa211cf1842 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 21 Jun 2017 08:26:45 +0200
-Subject: [PATCH] mtd: partitions: add support for subpartitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some flash device partitions can be containers with extra subpartitions
-(volumes). All callbacks are already capable of this additional level of
-indirection.
-
-This patch makes sure we always display subpartitions using a tree
-structure and takes care of deleting subpartitions when parent gets
-removed.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c | 23 ++++++++++++++++-------
- 1 file changed, 16 insertions(+), 7 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -413,7 +413,7 @@ static struct mtd_part *allocate_partiti
-        * parent conditional on that option. Note, this is a way to
-        * distinguish between the master and the partition in sysfs.
-        */
--      slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) ?
-+      slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) || mtd_is_partition(parent) ?
-                               &parent->dev :
-                               parent->dev.parent;
-       slave->mtd.dev.of_node = part->of_node;
-@@ -664,8 +664,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition);
-  */
- static int __mtd_del_partition(struct mtd_part *priv)
- {
-+      struct mtd_part *child, *next;
-       int err;
-+      list_for_each_entry_safe(child, next, &mtd_partitions, list) {
-+              if (child->parent == &priv->mtd) {
-+                      err = __mtd_del_partition(child);
-+                      if (err)
-+                              return err;
-+              }
-+      }
-+
-       sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs);
-       err = del_mtd_device(&priv->mtd);
-@@ -680,16 +689,16 @@ static int __mtd_del_partition(struct mt
- /*
-  * This function unregisters and destroy all slave MTD objects which are
-- * attached to the given master MTD object.
-+ * attached to the given MTD object.
-  */
--int del_mtd_partitions(struct mtd_info *master)
-+int del_mtd_partitions(struct mtd_info *mtd)
- {
-       struct mtd_part *slave, *next;
-       int ret, err = 0;
-       mutex_lock(&mtd_partitions_mutex);
-       list_for_each_entry_safe(slave, next, &mtd_partitions, list)
--              if (slave->parent == master) {
-+              if (slave->parent == mtd) {
-                       ret = __mtd_del_partition(slave);
-                       if (ret < 0)
-                               err = ret;
-@@ -699,14 +708,14 @@ int del_mtd_partitions(struct mtd_info *
-       return err;
- }
--int mtd_del_partition(struct mtd_info *master, int partno)
-+int mtd_del_partition(struct mtd_info *mtd, int partno)
- {
-       struct mtd_part *slave, *next;
-       int ret = -EINVAL;
-       mutex_lock(&mtd_partitions_mutex);
-       list_for_each_entry_safe(slave, next, &mtd_partitions, list)
--              if ((slave->parent == master) &&
-+              if ((slave->parent == mtd) &&
-                   (slave->mtd.index == partno)) {
-                       ret = __mtd_del_partition(slave);
-                       break;
-@@ -939,6 +948,6 @@ uint64_t mtd_get_device_size(const struc
-       if (!mtd_is_partition(mtd))
-               return mtd->size;
--      return mtd_to_part(mtd)->parent->size;
-+      return mtd_get_device_size(mtd_to_part(mtd)->parent);
- }
- EXPORT_SYMBOL_GPL(mtd_get_device_size);
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch
deleted file mode 100644 (file)
index a28ee31..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From 1a0915be192606fee64830b9c5d70b7ed59426b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 21 Jun 2017 08:26:46 +0200
-Subject: [PATCH] mtd: partitions: add support for partition parsers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some devices have partitions that are kind of containers with extra
-subpartitions / volumes instead of e.g. a simple filesystem data. To
-support such cases we need to first create normal flash device
-partitions and then take care of these special ones.
-
-It's very common case for home routers. Depending on the vendor there
-are formats like TRX, Seama, TP-Link, WRGG & more. All of them are used
-to embed few partitions into a single one / single firmware file.
-
-Ideally all vendors would use some well documented / standardized format
-like UBI (and some probably start doing so), but there are still
-countless devices on the market using these poor vendor specific
-formats.
-
-This patch extends MTD subsystem by allowing to specify list of parsers
-that should be tried for a given partition. Supporting such poor formats
-is highly unlikely to be the top priority so these changes try to
-minimize maintenance cost to the minimum. It reuses existing code for
-these new parsers and just adds a one property and one new function.
-
-This implementation requires setting partition parsers in a flash
-parser. A proper change of bcm47xxpart will follow and in the future we
-will hopefully also find a solution for doing it with ofpart
-("fixed-partitions").
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/mtdpart.c          | 31 +++++++++++++++++++++++++++++++
- include/linux/mtd/partitions.h |  7 +++++++
- 2 files changed, 38 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -369,6 +369,35 @@ static inline void free_partition(struct
-       kfree(p);
- }
-+/**
-+ * mtd_parse_part - parse MTD partition looking for subpartitions
-+ *
-+ * @slave: part that is supposed to be a container and should be parsed
-+ * @types: NULL-terminated array with names of partition parsers to try
-+ *
-+ * Some partitions are kind of containers with extra subpartitions (volumes).
-+ * There can be various formats of such containers. This function tries to use
-+ * specified parsers to analyze given partition and registers found
-+ * subpartitions on success.
-+ */
-+static int mtd_parse_part(struct mtd_part *slave, const char *const *types)
-+{
-+      struct mtd_partitions parsed;
-+      int err;
-+
-+      err = parse_mtd_partitions(&slave->mtd, types, &parsed, NULL);
-+      if (err)
-+              return err;
-+      else if (!parsed.nr_parts)
-+              return -ENOENT;
-+
-+      err = add_mtd_partitions(&slave->mtd, parsed.parts, parsed.nr_parts);
-+
-+      mtd_part_parser_cleanup(&parsed);
-+
-+      return err;
-+}
-+
- static struct mtd_part *allocate_partition(struct mtd_info *parent,
-                       const struct mtd_partition *part, int partno,
-                       uint64_t cur_offset)
-@@ -758,6 +787,8 @@ int add_mtd_partitions(struct mtd_info *
-               add_mtd_device(&slave->mtd);
-               mtd_add_partition_attrs(slave);
-+              if (parts[i].types)
-+                      mtd_parse_part(slave, parts[i].types);
-               cur_offset = slave->offset + slave->mtd.size;
-       }
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -20,6 +20,12 @@
-  *
-  * For each partition, these fields are available:
-  * name: string that will be used to label the partition's MTD device.
-+ * types: some partitions can be containers using specific format to describe
-+ *    embedded subpartitions / volumes. E.g. many home routers use "firmware"
-+ *    partition that contains at least kernel and rootfs. In such case an
-+ *    extra parser is needed that will detect these dynamic partitions and
-+ *    report them to the MTD subsystem. If set this property stores an array
-+ *    of parser names to use when looking for subpartitions.
-  * size: the partition size; if defined as MTDPART_SIZ_FULL, the partition
-  *    will extend to the end of the master MTD device.
-  * offset: absolute starting position within the master MTD device; if
-@@ -38,6 +44,7 @@
- struct mtd_partition {
-       const char *name;               /* identifier string */
-+      const char *const *types;       /* names of parsers to use if any */
-       uint64_t size;                  /* partition size */
-       uint64_t offset;                /* offset within the master MTD space */
-       uint32_t mask_flags;            /* master MTD flags to mask out for this partition */
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0008-mtd-extract-TRX-parser-out-of-bcm47xxpart-into-a-sep.patch b/target/linux/generic/backport-4.9/065-v4.13-0008-mtd-extract-TRX-parser-out-of-bcm47xxpart-into-a-sep.patch
deleted file mode 100644 (file)
index 3761a46..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-From 99352afe8f169c95b294b6b9a8d0e18cd9e3c2a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 21 Jun 2017 08:26:47 +0200
-Subject: [PATCH] mtd: extract TRX parser out of bcm47xxpart into a separated
- module
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This makes TRX parsing code reusable with other platforms and parsers.
-
-Please note this patch doesn't really change anything in the existing
-code, just moves it. There is still some place for improvement (e.g.
-working on non-hacky method of checking rootfs format) but it's not
-really a subject of this change.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/Kconfig              |   4 ++
- drivers/mtd/Makefile             |   1 +
- drivers/mtd/bcm47xxpart.c        |  99 ++----------------------------
- drivers/mtd/parsers/Kconfig      |   8 +++
- drivers/mtd/parsers/Makefile     |   1 +
- drivers/mtd/parsers/parser_trx.c | 126 +++++++++++++++++++++++++++++++++++++++
- 6 files changed, 145 insertions(+), 94 deletions(-)
- create mode 100644 drivers/mtd/parsers/Kconfig
- create mode 100644 drivers/mtd/parsers/Makefile
- create mode 100644 drivers/mtd/parsers/parser_trx.c
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -155,6 +155,10 @@ config MTD_BCM47XX_PARTS
-         This provides partitions parser for devices based on BCM47xx
-         boards.
-+menu "Partition parsers"
-+source "drivers/mtd/parsers/Kconfig"
-+endmenu
-+
- comment "User Modules And Translation Layers"
- #
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)  += afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
- obj-$(CONFIG_MTD_BCM63XX_PARTS)       += bcm63xxpart.o
- obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
-+obj-y                         += parsers/
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_BLKDEVS)     += mtd_blkdevs.o
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -43,7 +43,8 @@
- #define ML_MAGIC2                     0x26594131
- #define TRX_MAGIC                     0x30524448
- #define SHSQ_MAGIC                    0x71736873      /* shsq (weird ZTE H218N endianness) */
--#define UBI_EC_MAGIC                  0x23494255      /* UBI# */
-+
-+static const char * const trx_types[] = { "trx", NULL };
- struct trx_header {
-       uint32_t magic;
-@@ -62,89 +63,6 @@ static void bcm47xxpart_add_part(struct
-       part->mask_flags = mask_flags;
- }
--static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master,
--                                                size_t offset)
--{
--      uint32_t buf;
--      size_t bytes_read;
--      int err;
--
--      err  = mtd_read(master, offset, sizeof(buf), &bytes_read,
--                      (uint8_t *)&buf);
--      if (err && !mtd_is_bitflip(err)) {
--              pr_err("mtd_read error while parsing (offset: 0x%X): %d\n",
--                      offset, err);
--              goto out_default;
--      }
--
--      if (buf == UBI_EC_MAGIC)
--              return "ubi";
--
--out_default:
--      return "rootfs";
--}
--
--static int bcm47xxpart_parse_trx(struct mtd_info *master,
--                               struct mtd_partition *trx,
--                               struct mtd_partition *parts,
--                               size_t parts_len)
--{
--      struct trx_header header;
--      size_t bytes_read;
--      int curr_part = 0;
--      int i, err;
--
--      if (parts_len < 3) {
--              pr_warn("No enough space to add TRX partitions!\n");
--              return -ENOMEM;
--      }
--
--      err = mtd_read(master, trx->offset, sizeof(header), &bytes_read,
--                     (uint8_t *)&header);
--      if (err && !mtd_is_bitflip(err)) {
--              pr_err("mtd_read error while reading TRX header: %d\n", err);
--              return err;
--      }
--
--      i = 0;
--
--      /* We have LZMA loader if offset[2] points to sth */
--      if (header.offset[2]) {
--              bcm47xxpart_add_part(&parts[curr_part++], "loader",
--                                   trx->offset + header.offset[i], 0);
--              i++;
--      }
--
--      if (header.offset[i]) {
--              bcm47xxpart_add_part(&parts[curr_part++], "linux",
--                                   trx->offset + header.offset[i], 0);
--              i++;
--      }
--
--      if (header.offset[i]) {
--              size_t offset = trx->offset + header.offset[i];
--              const char *name = bcm47xxpart_trx_data_part_name(master,
--                                                                offset);
--
--              bcm47xxpart_add_part(&parts[curr_part++], name, offset, 0);
--              i++;
--      }
--
--      /*
--       * Assume that every partition ends at the beginning of the one it is
--       * followed by.
--       */
--      for (i = 0; i < curr_part; i++) {
--              u64 next_part_offset = (i < curr_part - 1) ?
--                                      parts[i + 1].offset :
--                                      trx->offset + trx->size;
--
--              parts[i].size = next_part_offset - parts[i].offset;
--      }
--
--      return curr_part;
--}
--
- /**
-  * bcm47xxpart_bootpartition - gets index of TRX partition used by bootloader
-  *
-@@ -362,17 +280,10 @@ static int bcm47xxpart_parse(struct mtd_
-       for (i = 0; i < trx_num; i++) {
-               struct mtd_partition *trx = &parts[trx_parts[i]];
--              if (i == bcm47xxpart_bootpartition()) {
--                      int num_parts;
--
--                      num_parts = bcm47xxpart_parse_trx(master, trx,
--                                                        parts + curr_part,
--                                                        BCM47XXPART_MAX_PARTS - curr_part);
--                      if (num_parts > 0)
--                              curr_part += num_parts;
--              } else {
-+              if (i == bcm47xxpart_bootpartition())
-+                      trx->types = trx_types;
-+              else
-                       trx->name = "failsafe";
--              }
-       }
-       *pparts = parts;
---- /dev/null
-+++ b/drivers/mtd/parsers/Kconfig
-@@ -0,0 +1,8 @@
-+config MTD_PARSER_TRX
-+      tristate "Parser for TRX format partitions"
-+      depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST)
-+      help
-+        TRX is a firmware format used by Broadcom on their devices. It
-+        may contain up to 3/4 partitions (depending on the version).
-+        This driver will parse TRX header and report at least two partitions:
-+        kernel and rootfs.
---- /dev/null
-+++ b/drivers/mtd/parsers/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_MTD_PARSER_TRX)          += parser_trx.o
---- /dev/null
-+++ b/drivers/mtd/parsers/parser_trx.c
-@@ -0,0 +1,126 @@
-+/*
-+ * Parser for TRX format partitions
-+ *
-+ * Copyright (C) 2012 - 2017 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-+ *
-+ * 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/module.h>
-+#include <linux/slab.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+
-+#define TRX_PARSER_MAX_PARTS          4
-+
-+/* Magics */
-+#define TRX_MAGIC                     0x30524448
-+#define UBI_EC_MAGIC                  0x23494255      /* UBI# */
-+
-+struct trx_header {
-+      uint32_t magic;
-+      uint32_t length;
-+      uint32_t crc32;
-+      uint16_t flags;
-+      uint16_t version;
-+      uint32_t offset[3];
-+} __packed;
-+
-+static const char *parser_trx_data_part_name(struct mtd_info *master,
-+                                           size_t offset)
-+{
-+      uint32_t buf;
-+      size_t bytes_read;
-+      int err;
-+
-+      err  = mtd_read(master, offset, sizeof(buf), &bytes_read,
-+                      (uint8_t *)&buf);
-+      if (err && !mtd_is_bitflip(err)) {
-+              pr_err("mtd_read error while parsing (offset: 0x%X): %d\n",
-+                      offset, err);
-+              goto out_default;
-+      }
-+
-+      if (buf == UBI_EC_MAGIC)
-+              return "ubi";
-+
-+out_default:
-+      return "rootfs";
-+}
-+
-+static int parser_trx_parse(struct mtd_info *mtd,
-+                          const struct mtd_partition **pparts,
-+                          struct mtd_part_parser_data *data)
-+{
-+      struct mtd_partition *parts;
-+      struct mtd_partition *part;
-+      struct trx_header trx;
-+      size_t bytes_read;
-+      uint8_t curr_part = 0, i = 0;
-+      int err;
-+
-+      parts = kzalloc(sizeof(struct mtd_partition) * TRX_PARSER_MAX_PARTS,
-+                      GFP_KERNEL);
-+      if (!parts)
-+              return -ENOMEM;
-+
-+      err = mtd_read(mtd, 0, sizeof(trx), &bytes_read, (uint8_t *)&trx);
-+      if (err) {
-+              pr_err("MTD reading error: %d\n", err);
-+              kfree(parts);
-+              return err;
-+      }
-+
-+      if (trx.magic != TRX_MAGIC) {
-+              kfree(parts);
-+              return -ENOENT;
-+      }
-+
-+      /* We have LZMA loader if there is address in offset[2] */
-+      if (trx.offset[2]) {
-+              part = &parts[curr_part++];
-+              part->name = "loader";
-+              part->offset = trx.offset[i];
-+              i++;
-+      }
-+
-+      if (trx.offset[i]) {
-+              part = &parts[curr_part++];
-+              part->name = "linux";
-+              part->offset = trx.offset[i];
-+              i++;
-+      }
-+
-+      if (trx.offset[i]) {
-+              part = &parts[curr_part++];
-+              part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
-+              part->offset = trx.offset[i];
-+              i++;
-+      }
-+
-+      /*
-+       * Assume that every partition ends at the beginning of the one it is
-+       * followed by.
-+       */
-+      for (i = 0; i < curr_part; i++) {
-+              u64 next_part_offset = (i < curr_part - 1) ?
-+                                     parts[i + 1].offset : mtd->size;
-+
-+              parts[i].size = next_part_offset - parts[i].offset;
-+      }
-+
-+      *pparts = parts;
-+      return i;
-+};
-+
-+static struct mtd_part_parser mtd_parser_trx = {
-+      .parse_fn = parser_trx_parse,
-+      .name = "trx",
-+};
-+module_mtd_part_parser(mtd_parser_trx);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_DESCRIPTION("Parser for TRX format partitions");
diff --git a/target/linux/generic/backport-4.9/066-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch b/target/linux/generic/backport-4.9/066-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch
deleted file mode 100644 (file)
index 07a456d..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From 2c77c57d22adb05b21cdb333a0c42bdfa0e19835 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 16 Jan 2018 16:45:41 +0100
-Subject: [PATCH] mtd: move code adding master MTD out of
- mtd_add_device_partitions()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This change is a small cleanup of mtd_device_parse_register(). When
-using MTD_PARTITIONED_MASTER it makes sure a master MTD is registered
-before dealing with partitions. The advantage of this is not mixing
-code handling master MTD with code handling partitions.
-
-This commit doesn't change any behavior except from a slightly different
-failure code path. The new code may need to call del_mtd_device when
-something goes wrong.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -631,20 +631,12 @@ static int mtd_add_device_partitions(str
- {
-       const struct mtd_partition *real_parts = parts->parts;
-       int nbparts = parts->nr_parts;
--      int ret;
--      if (nbparts == 0 || IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) {
--              ret = add_mtd_device(mtd);
--              if (ret)
--                      return ret;
--      }
-+      if (!nbparts && !device_is_registered(&mtd->dev))
-+              return add_mtd_device(mtd);
--      if (nbparts > 0) {
--              ret = add_mtd_partitions(mtd, real_parts, nbparts);
--              if (ret && IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER))
--                      del_mtd_device(mtd);
--              return ret;
--      }
-+      if (nbparts > 0)
-+              return add_mtd_partitions(mtd, real_parts, nbparts);
-       return 0;
- }
-@@ -704,6 +696,12 @@ int mtd_device_parse_register(struct mtd
-       mtd_set_dev_defaults(mtd);
-+      if (IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) {
-+              ret = add_mtd_device(mtd);
-+              if (ret)
-+                      return ret;
-+      }
-+
-       memset(&parsed, 0, sizeof(parsed));
-       ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
-@@ -743,6 +741,9 @@ int mtd_device_parse_register(struct mtd
- out:
-       /* Cleanup any parsed partitions */
-       mtd_part_parser_cleanup(&parsed);
-+      if (ret && device_is_registered(&mtd->dev))
-+              del_mtd_device(mtd);
-+
-       return ret;
- }
- EXPORT_SYMBOL_GPL(mtd_device_parse_register);
diff --git a/target/linux/generic/backport-4.9/066-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch b/target/linux/generic/backport-4.9/066-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch
deleted file mode 100644 (file)
index b629d43..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-From 0dbe4ea78d69756efeb0bba0764f6bd4a9ee9567 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 16 Jan 2018 16:45:42 +0100
-Subject: [PATCH] mtd: get rid of the mtd_add_device_partitions()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This simplifies code a bit by:
-1) Avoiding an extra (tiny) function
-2) Checking for amount of parsed (found) partitions just once
-3) Avoiding clearing/filling struct mtd_partitions manually
-
-With this commit proper functions are called directly from the
-mtd_device_parse_register(). It doesn't need to use minor tricks like
-memsetting struct to 0 to trigger an expected
-mtd_add_device_partitions() behavior.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c | 43 ++++++++++++-------------------------------
- 1 file changed, 12 insertions(+), 31 deletions(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -626,21 +626,6 @@ out_error:
-       return ret;
- }
--static int mtd_add_device_partitions(struct mtd_info *mtd,
--                                   struct mtd_partitions *parts)
--{
--      const struct mtd_partition *real_parts = parts->parts;
--      int nbparts = parts->nr_parts;
--
--      if (!nbparts && !device_is_registered(&mtd->dev))
--              return add_mtd_device(mtd);
--
--      if (nbparts > 0)
--              return add_mtd_partitions(mtd, real_parts, nbparts);
--
--      return 0;
--}
--
- /*
-  * Set a few defaults based on the parent devices, if not provided by the
-  * driver
-@@ -691,7 +676,7 @@ int mtd_device_parse_register(struct mtd
-                             const struct mtd_partition *parts,
-                             int nr_parts)
- {
--      struct mtd_partitions parsed;
-+      struct mtd_partitions parsed = { };
-       int ret;
-       mtd_set_dev_defaults(mtd);
-@@ -702,24 +687,20 @@ int mtd_device_parse_register(struct mtd
-                       return ret;
-       }
--      memset(&parsed, 0, sizeof(parsed));
--
-+      /* Prefer parsed partitions over driver-provided fallback */
-       ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
--      if ((ret < 0 || parsed.nr_parts == 0) && parts && nr_parts) {
--              /* Fall back to driver-provided partitions */
--              parsed = (struct mtd_partitions){
--                      .parts          = parts,
--                      .nr_parts       = nr_parts,
--              };
--      } else if (ret < 0) {
--              /* Didn't come up with parsed OR fallback partitions */
--              pr_info("mtd: failed to find partitions; one or more parsers reports errors (%d)\n",
--                      ret);
--              /* Don't abort on errors; we can still use unpartitioned MTD */
--              memset(&parsed, 0, sizeof(parsed));
-+      if (!ret && parsed.nr_parts) {
-+              parts = parsed.parts;
-+              nr_parts = parsed.nr_parts;
-       }
--      ret = mtd_add_device_partitions(mtd, &parsed);
-+      if (nr_parts)
-+              ret = add_mtd_partitions(mtd, parts, nr_parts);
-+      else if (!device_is_registered(&mtd->dev))
-+              ret = add_mtd_device(mtd);
-+      else
-+              ret = 0;
-+
-       if (ret)
-               goto out;
diff --git a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch
deleted file mode 100644 (file)
index 60eace2..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-From 5b644aa012f67fd211138a067b9f351f30bdcc60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 14 Mar 2018 13:10:42 +0100
-Subject: [PATCH] mtd: partitions: add of_match_table parser matching for the
- "ofpart" type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to properly support compatibility strings as described in the
-bindings/mtd/partition.txt "ofpart" type should be treated as an
-indication for looking into OF. MTD should check "compatible" property
-and search for a matching parser rather than blindly trying the one
-supporting "fixed-partitions".
-
-It also means that existing "fixed-partitions" parser should get renamed
-to use a more meaningful name.
-
-This commit achievies that aim by introducing a new mtd_part_of_parse().
-It works by looking for a matching parser for every string in the
-"compatibility" property (starting with the most specific one).
-
-Please note that driver-specified parsers still take a precedence. It's
-assumed that driver providing a parser type has a good reason for that
-(e.g. having platform data with device-specific info). Also doing
-otherwise could break existing setups. The same applies to using default
-parsers (including "cmdlinepart") as some overwrite DT data with cmdline
-argument.
-
-Partition parsers can now provide an of_match_table to enable
-flash<-->parser matching via device tree as documented in the
-mtd/partition.txt.
-
-This support is currently limited to built-in parsers as it uses
-request_module() and friends. This should be sufficient for most cases
-though as compiling parsers as modules isn't a common choice.
-
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Tested-by: Peter Rosin <peda@axentia.se>
-Reviewed-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c          | 116 +++++++++++++++++++++++++++++++++++++----
- include/linux/mtd/partitions.h |   1 +
- 2 files changed, 108 insertions(+), 9 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -30,6 +30,7 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/err.h>
-+#include <linux/of.h>
- #include "mtdcore.h"
-@@ -886,6 +887,92 @@ static int mtd_part_do_parse(struct mtd_
- }
- /**
-+ * mtd_part_get_compatible_parser - find MTD parser by a compatible string
-+ *
-+ * @compat: compatible string describing partitions in a device tree
-+ *
-+ * MTD parsers can specify supported partitions by providing a table of
-+ * compatibility strings. This function finds a parser that advertises support
-+ * for a passed value of "compatible".
-+ */
-+static struct mtd_part_parser *mtd_part_get_compatible_parser(const char *compat)
-+{
-+      struct mtd_part_parser *p, *ret = NULL;
-+
-+      spin_lock(&part_parser_lock);
-+
-+      list_for_each_entry(p, &part_parsers, list) {
-+              const struct of_device_id *matches;
-+
-+              matches = p->of_match_table;
-+              if (!matches)
-+                      continue;
-+
-+              for (; matches->compatible[0]; matches++) {
-+                      if (!strcmp(matches->compatible, compat) &&
-+                          try_module_get(p->owner)) {
-+                              ret = p;
-+                              break;
-+                      }
-+              }
-+
-+              if (ret)
-+                      break;
-+      }
-+
-+      spin_unlock(&part_parser_lock);
-+
-+      return ret;
-+}
-+
-+static int mtd_part_of_parse(struct mtd_info *master,
-+                           struct mtd_partitions *pparts)
-+{
-+      struct mtd_part_parser *parser;
-+      struct device_node *np;
-+      struct property *prop;
-+      const char *compat;
-+      const char *fixed = "ofpart";
-+      int ret, err = 0;
-+
-+      np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
-+      of_property_for_each_string(np, "compatible", prop, compat) {
-+              parser = mtd_part_get_compatible_parser(compat);
-+              if (!parser)
-+                      continue;
-+              ret = mtd_part_do_parse(parser, master, pparts, NULL);
-+              if (ret > 0) {
-+                      of_node_put(np);
-+                      return ret;
-+              }
-+              mtd_part_parser_put(parser);
-+              if (ret < 0 && !err)
-+                      err = ret;
-+      }
-+      of_node_put(np);
-+
-+      /*
-+       * For backward compatibility we have to try the "ofpart"
-+       * parser. It supports old DT format with partitions specified as a
-+       * direct subnodes of a flash device DT node without any compatibility
-+       * specified we could match.
-+       */
-+      parser = mtd_part_parser_get(fixed);
-+      if (!parser && !request_module("%s", fixed))
-+              parser = mtd_part_parser_get(fixed);
-+      if (parser) {
-+              ret = mtd_part_do_parse(parser, master, pparts, NULL);
-+              if (ret > 0)
-+                      return ret;
-+              mtd_part_parser_put(parser);
-+              if (ret < 0 && !err)
-+                      err = ret;
-+      }
-+
-+      return err;
-+}
-+
-+/**
-  * parse_mtd_partitions - parse MTD partitions
-  * @master: the master partition (describes whole MTD device)
-  * @types: names of partition parsers to try or %NULL
-@@ -917,19 +1004,30 @@ int parse_mtd_partitions(struct mtd_info
-               types = default_mtd_part_types;
-       for ( ; *types; types++) {
--              pr_debug("%s: parsing partitions %s\n", master->name, *types);
--              parser = mtd_part_parser_get(*types);
--              if (!parser && !request_module("%s", *types))
-+              /*
-+               * ofpart is a special type that means OF partitioning info
-+               * should be used. It requires a bit different logic so it is
-+               * handled in a separated function.
-+               */
-+              if (!strcmp(*types, "ofpart")) {
-+                      ret = mtd_part_of_parse(master, pparts);
-+              } else {
-+                      pr_debug("%s: parsing partitions %s\n", master->name,
-+                               *types);
-                       parser = mtd_part_parser_get(*types);
--              pr_debug("%s: got parser %s\n", master->name,
--                       parser ? parser->name : NULL);
--              if (!parser)
--                      continue;
--              ret = mtd_part_do_parse(parser, master, pparts, data);
-+                      if (!parser && !request_module("%s", *types))
-+                              parser = mtd_part_parser_get(*types);
-+                      pr_debug("%s: got parser %s\n", master->name,
-+                              parser ? parser->name : NULL);
-+                      if (!parser)
-+                              continue;
-+                      ret = mtd_part_do_parse(parser, master, pparts, data);
-+                      if (ret <= 0)
-+                              mtd_part_parser_put(parser);
-+              }
-               /* Found partitions! */
-               if (ret > 0)
-                       return 0;
--              mtd_part_parser_put(parser);
-               /*
-                * Stash the first error we see; only report it if no parser
-                * succeeds
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -77,6 +77,7 @@ struct mtd_part_parser {
-       struct list_head list;
-       struct module *owner;
-       const char *name;
-+      const struct of_device_id *of_match_table;
-       int (*parse_fn)(struct mtd_info *, const struct mtd_partition **,
-                       struct mtd_part_parser_data *);
-       void (*cleanup)(const struct mtd_partition *pparts, int nr_parts);
diff --git a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch
deleted file mode 100644 (file)
index 59f53df..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From c0faf43482e7f7dfb6d61847cb93d17748560b24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 14 Mar 2018 13:10:43 +0100
-Subject: [PATCH] mtd: rename "ofpart" parser to "fixed-partitions" as it fits
- it better
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Type "ofpart" means that OF should be used to get partitioning info and
-this driver supports "fixed-partitions" binding only. Renaming it should
-lead to less confusion especially when parsers for new compatibility
-strings start to appear.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c |  4 ++--
- drivers/mtd/ofpart.c  | 11 ++++++-----
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -932,7 +932,7 @@ static int mtd_part_of_parse(struct mtd_
-       struct device_node *np;
-       struct property *prop;
-       const char *compat;
--      const char *fixed = "ofpart";
-+      const char *fixed = "fixed-partitions";
-       int ret, err = 0;
-       np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
-@@ -952,7 +952,7 @@ static int mtd_part_of_parse(struct mtd_
-       of_node_put(np);
-       /*
--       * For backward compatibility we have to try the "ofpart"
-+       * For backward compatibility we have to try the "fixed-partitions"
-        * parser. It supports old DT format with partitions specified as a
-        * direct subnodes of a flash device DT node without any compatibility
-        * specified we could match.
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -25,9 +25,9 @@ static bool node_has_compatible(struct d
-       return of_get_property(pp, "compatible", NULL);
- }
--static int parse_ofpart_partitions(struct mtd_info *master,
--                                 const struct mtd_partition **pparts,
--                                 struct mtd_part_parser_data *data)
-+static int parse_fixed_partitions(struct mtd_info *master,
-+                                const struct mtd_partition **pparts,
-+                                struct mtd_part_parser_data *data)
- {
-       struct mtd_partition *parts;
-       struct device_node *mtd_node;
-@@ -141,8 +141,8 @@ ofpart_none:
- }
- static struct mtd_part_parser ofpart_parser = {
--      .parse_fn = parse_ofpart_partitions,
--      .name = "ofpart",
-+      .parse_fn = parse_fixed_partitions,
-+      .name = "fixed-partitions",
- };
- static int parse_ofoldpart_partitions(struct mtd_info *master,
-@@ -230,4 +230,5 @@ MODULE_AUTHOR("Vitaly Wool, David Gibson
-  * with the same name. Since we provide the ofoldpart parser, we should have
-  * the corresponding alias.
-  */
-+MODULE_ALIAS("fixed-partitions");
- MODULE_ALIAS("ofoldpart");
diff --git a/target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch b/target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch
deleted file mode 100644 (file)
index d6958c3..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 97b0c7c0df3efd7048ed39d7e2dee34cafd55887 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 14 Mar 2018 13:10:44 +0100
-Subject: [PATCH] mtd: ofpart: add of_match_table with "fixed-partitions"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows using this parser with any flash driver that takes care of
-setting of_node (using mtd_set_of_node helper) correctly. Up to now
-support for "fixed-partitions" DT compatibility string was working only
-with flash drivers that were specifying "ofpart" (manually or by letting
-mtd use the default set of parsers).
-
-This matches existing bindings documentation.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Brian Norris <computersforpeace@gmail.com>
-Tested-by: Brian Norris <computersforpeace@gmail.com>
-Reviewed-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/ofpart.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -140,9 +140,16 @@ ofpart_none:
-       return ret;
- }
-+static const struct of_device_id parse_ofpart_match_table[] = {
-+      { .compatible = "fixed-partitions" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, parse_ofpart_match_table);
-+
- static struct mtd_part_parser ofpart_parser = {
-       .parse_fn = parse_fixed_partitions,
-       .name = "fixed-partitions",
-+      .of_match_table = parse_ofpart_match_table,
- };
- static int parse_ofoldpart_partitions(struct mtd_info *master,
diff --git a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch
deleted file mode 100644 (file)
index 29aa3b9..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-From 5ac67ce36cfe38b4c104a42ce52c5c8d526f1c95 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 27 Mar 2018 22:35:41 +0200
-Subject: [PATCH] mtd: move code adding (registering) partitions to the
- parse_mtd_partitions()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This commit slightly simplifies the code. Every parse_mtd_partitions()
-caller (out of two existing ones) had to add partitions & cleanup parser
-on its own. This moves that responsibility into the function.
-
-That change also allows dropping struct mtd_partitions argument.
-
-There is one minor behavior change caused by this cleanup. If
-parse_mtd_partitions() fails to add partitions (add_mtd_partitions()
-return an error) then mtd_device_parse_register() will still try to
-add (register) fallback partitions. It's a real corner case affecting
-one of uncommon error paths and shouldn't cause any harm.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c | 14 ++++----------
- drivers/mtd/mtdcore.h |  1 -
- drivers/mtd/mtdpart.c | 44 ++++++++++++++++----------------------------
- 3 files changed, 20 insertions(+), 39 deletions(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -676,7 +676,6 @@ int mtd_device_parse_register(struct mtd
-                             const struct mtd_partition *parts,
-                             int nr_parts)
- {
--      struct mtd_partitions parsed = { };
-       int ret;
-       mtd_set_dev_defaults(mtd);
-@@ -688,13 +687,10 @@ int mtd_device_parse_register(struct mtd
-       }
-       /* Prefer parsed partitions over driver-provided fallback */
--      ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
--      if (!ret && parsed.nr_parts) {
--              parts = parsed.parts;
--              nr_parts = parsed.nr_parts;
--      }
--
--      if (nr_parts)
-+      ret = parse_mtd_partitions(mtd, types, parser_data);
-+      if (ret > 0)
-+              ret = 0;
-+      else if (nr_parts)
-               ret = add_mtd_partitions(mtd, parts, nr_parts);
-       else if (!device_is_registered(&mtd->dev))
-               ret = add_mtd_device(mtd);
-@@ -720,8 +716,6 @@ int mtd_device_parse_register(struct mtd
-       }
- out:
--      /* Cleanup any parsed partitions */
--      mtd_part_parser_cleanup(&parsed);
-       if (ret && device_is_registered(&mtd->dev))
-               del_mtd_device(mtd);
---- a/drivers/mtd/mtdcore.h
-+++ b/drivers/mtd/mtdcore.h
-@@ -14,7 +14,6 @@ int del_mtd_partitions(struct mtd_info *
- struct mtd_partitions;
- int parse_mtd_partitions(struct mtd_info *master, const char * const *types,
--                       struct mtd_partitions *pparts,
-                        struct mtd_part_parser_data *data);
- void mtd_part_parser_cleanup(struct mtd_partitions *parts);
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -383,20 +383,7 @@ static inline void free_partition(struct
-  */
- static int mtd_parse_part(struct mtd_part *slave, const char *const *types)
- {
--      struct mtd_partitions parsed;
--      int err;
--
--      err = parse_mtd_partitions(&slave->mtd, types, &parsed, NULL);
--      if (err)
--              return err;
--      else if (!parsed.nr_parts)
--              return -ENOENT;
--
--      err = add_mtd_partitions(&slave->mtd, parsed.parts, parsed.nr_parts);
--
--      mtd_part_parser_cleanup(&parsed);
--
--      return err;
-+      return parse_mtd_partitions(&slave->mtd, types, NULL);
- }
- static struct mtd_part *allocate_partition(struct mtd_info *parent,
-@@ -973,30 +960,27 @@ static int mtd_part_of_parse(struct mtd_
- }
- /**
-- * parse_mtd_partitions - parse MTD partitions
-+ * parse_mtd_partitions - parse and register MTD partitions
-+ *
-  * @master: the master partition (describes whole MTD device)
-  * @types: names of partition parsers to try or %NULL
-- * @pparts: info about partitions found is returned here
-  * @data: MTD partition parser-specific data
-  *
-- * This function tries to find partition on MTD device @master. It uses MTD
-- * partition parsers, specified in @types. However, if @types is %NULL, then
-- * the default list of parsers is used. The default list contains only the
-+ * This function tries to find & register partitions on MTD device @master. It
-+ * uses MTD partition parsers, specified in @types. However, if @types is %NULL,
-+ * then the default list of parsers is used. The default list contains only the
-  * "cmdlinepart" and "ofpart" parsers ATM.
-  * Note: If there are more then one parser in @types, the kernel only takes the
-  * partitions parsed out by the first parser.
-  *
-  * This function may return:
-  * o a negative error code in case of failure
-- * o zero otherwise, and @pparts will describe the partitions, number of
-- *   partitions, and the parser which parsed them. Caller must release
-- *   resources with mtd_part_parser_cleanup() when finished with the returned
-- *   data.
-+ * o number of found partitions otherwise
-  */
- int parse_mtd_partitions(struct mtd_info *master, const char *const *types,
--                       struct mtd_partitions *pparts,
-                        struct mtd_part_parser_data *data)
- {
-+      struct mtd_partitions pparts = { };
-       struct mtd_part_parser *parser;
-       int ret, err = 0;
-@@ -1010,7 +994,7 @@ int parse_mtd_partitions(struct mtd_info
-                * handled in a separated function.
-                */
-               if (!strcmp(*types, "ofpart")) {
--                      ret = mtd_part_of_parse(master, pparts);
-+                      ret = mtd_part_of_parse(master, &pparts);
-               } else {
-                       pr_debug("%s: parsing partitions %s\n", master->name,
-                                *types);
-@@ -1021,13 +1005,17 @@ int parse_mtd_partitions(struct mtd_info
-                               parser ? parser->name : NULL);
-                       if (!parser)
-                               continue;
--                      ret = mtd_part_do_parse(parser, master, pparts, data);
-+                      ret = mtd_part_do_parse(parser, master, &pparts, data);
-                       if (ret <= 0)
-                               mtd_part_parser_put(parser);
-               }
-               /* Found partitions! */
--              if (ret > 0)
--                      return 0;
-+              if (ret > 0) {
-+                      err = add_mtd_partitions(master, pparts.parts,
-+                                               pparts.nr_parts);
-+                      mtd_part_parser_cleanup(&pparts);
-+                      return err ? err : pparts.nr_parts;
-+              }
-               /*
-                * Stash the first error we see; only report it if no parser
-                * succeeds
diff --git a/target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
deleted file mode 100644 (file)
index e08f8da..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 12 Apr 2018 07:24:52 +0200
-Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When bcm47xxpart finds a TRX partition (container) it's supposed to jump
-to the end of it and keep looking for more partitions. TRX and its
-subpartitions are handled by a separate parser.
-
-The problem with old code was relying on the length specified in a TRX
-header. That isn't reliable as TRX is commonly modified to have checksum
-cover only non-changing subpartitions. Otherwise modifying e.g. a rootfs
-would result in CRC32 mismatch and bootloader refusing to boot a
-firmware.
-
-Fix it by trying better to figure out a real TRX size. We can securely
-assume that TRX has to cover all subpartitions and the last one is at
-least of a block size in size. Then compare it with a length field.
-
-This makes code more optimal & reliable thanks to skipping data that
-shouldn't be parsed.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -186,6 +186,8 @@ static int bcm47xxpart_parse(struct mtd_
-               /* TRX */
-               if (buf[0x000 / 4] == TRX_MAGIC) {
-                       struct trx_header *trx;
-+                      uint32_t last_subpart;
-+                      uint32_t trx_size;
-                       if (trx_num >= ARRAY_SIZE(trx_parts))
-                               pr_warn("No enough space to store another TRX found at 0x%X\n",
-@@ -195,11 +197,23 @@ static int bcm47xxpart_parse(struct mtd_
-                       bcm47xxpart_add_part(&parts[curr_part++], "firmware",
-                                            offset, 0);
--                      /* Jump to the end of TRX */
-+                      /*
-+                       * Try to find TRX size. The "length" field isn't fully
-+                       * reliable as it could be decreased to make CRC32 cover
-+                       * only part of TRX data. It's commonly used as checksum
-+                       * can't cover e.g. ever-changing rootfs partition.
-+                       * Use offsets as helpers for assuming min TRX size.
-+                       */
-                       trx = (struct trx_header *)buf;
--                      offset = roundup(offset + trx->length, blocksize);
--                      /* Next loop iteration will increase the offset */
--                      offset -= blocksize;
-+                      last_subpart = max3(trx->offset[0], trx->offset[1],
-+                                          trx->offset[2]);
-+                      trx_size = max(trx->length, last_subpart + blocksize);
-+
-+                      /*
-+                       * Skip the TRX data. Decrease offset by block size as
-+                       * the next loop iteration will increase it.
-+                       */
-+                      offset += roundup(trx_size, blocksize) - blocksize;
-                       continue;
-               }
diff --git a/target/linux/generic/backport-4.9/070-bcma-from-4.11.patch b/target/linux/generic/backport-4.9/070-bcma-from-4.11.patch
deleted file mode 100644 (file)
index a3b0321..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -136,17 +136,17 @@ static bool bcma_is_core_needed_early(u1
-       return false;
- }
--static struct device_node *bcma_of_find_child_device(struct platform_device *parent,
-+static struct device_node *bcma_of_find_child_device(struct device *parent,
-                                                    struct bcma_device *core)
- {
-       struct device_node *node;
-       u64 size;
-       const __be32 *reg;
--      if (!parent || !parent->dev.of_node)
-+      if (!parent->of_node)
-               return NULL;
--      for_each_child_of_node(parent->dev.of_node, node) {
-+      for_each_child_of_node(parent->of_node, node) {
-               reg = of_get_address(node, 0, &size, NULL);
-               if (!reg)
-                       continue;
-@@ -156,7 +156,7 @@ static struct device_node *bcma_of_find_
-       return NULL;
- }
--static int bcma_of_irq_parse(struct platform_device *parent,
-+static int bcma_of_irq_parse(struct device *parent,
-                            struct bcma_device *core,
-                            struct of_phandle_args *out_irq, int num)
- {
-@@ -169,7 +169,7 @@ static int bcma_of_irq_parse(struct plat
-                       return rc;
-       }
--      out_irq->np = parent->dev.of_node;
-+      out_irq->np = parent->of_node;
-       out_irq->args_count = 1;
-       out_irq->args[0] = num;
-@@ -177,13 +177,13 @@ static int bcma_of_irq_parse(struct plat
-       return of_irq_parse_raw(laddr, out_irq);
- }
--static unsigned int bcma_of_get_irq(struct platform_device *parent,
-+static unsigned int bcma_of_get_irq(struct device *parent,
-                                   struct bcma_device *core, int num)
- {
-       struct of_phandle_args out_irq;
-       int ret;
--      if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent || !parent->dev.of_node)
-+      if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent->of_node)
-               return 0;
-       ret = bcma_of_irq_parse(parent, core, &out_irq, num);
-@@ -196,7 +196,7 @@ static unsigned int bcma_of_get_irq(stru
-       return irq_create_of_mapping(&out_irq);
- }
--static void bcma_of_fill_device(struct platform_device *parent,
-+static void bcma_of_fill_device(struct device *parent,
-                               struct bcma_device *core)
- {
-       struct device_node *node;
-@@ -227,7 +227,7 @@ unsigned int bcma_core_irq(struct bcma_d
-                       return mips_irq <= 4 ? mips_irq + 2 : 0;
-               }
-               if (bus->host_pdev)
--                      return bcma_of_get_irq(bus->host_pdev, core, num);
-+                      return bcma_of_get_irq(&bus->host_pdev->dev, core, num);
-               return 0;
-       case BCMA_HOSTTYPE_SDIO:
-               return 0;
-@@ -253,7 +253,8 @@ void bcma_prepare_core(struct bcma_bus *
-               if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {
-                       core->dma_dev = &bus->host_pdev->dev;
-                       core->dev.parent = &bus->host_pdev->dev;
--                      bcma_of_fill_device(bus->host_pdev, core);
-+                      if (core->dev.parent)
-+                              bcma_of_fill_device(core->dev.parent, core);
-               } else {
-                       core->dev.dma_mask = &core->dev.coherent_dma_mask;
-                       core->dma_dev = &core->dev;
diff --git a/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch b/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch
deleted file mode 100644 (file)
index 4b667bc..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-From 34a5102c3235c470a6c77fba16cb971964d9c136 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 31 Jan 2017 19:37:54 +0100
-Subject: [PATCH 1/3] net: bgmac: allocate struct bgmac just once & don't copy
- it
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So far were were allocating struct bgmac in 3 places: platform code,
-bcma code and shared bgmac_enet_probe function. The reason for this was
-bgmac_enet_probe:
-1) Requiring early-filled struct bgmac
-2) Calling alloc_etherdev on its own in order to use netdev_priv later
-
-This solution got few drawbacks:
-1) Was duplicating allocating code
-2) Required copying early-filled struct
-3) Resulted in platform/bcma code having access only to unused struct
-
-Solve this situation by simply extracting some probe code into the new
-bgmac_alloc function.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/broadcom/bgmac-bcma.c     |  4 +---
- drivers/net/ethernet/broadcom/bgmac-platform.c |  2 +-
- drivers/net/ethernet/broadcom/bgmac.c          | 25 +++++++++++++++++--------
- drivers/net/ethernet/broadcom/bgmac.h          |  3 ++-
- 4 files changed, 21 insertions(+), 13 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
-@@ -100,12 +100,11 @@ static int bgmac_probe(struct bcma_devic
-       const u8 *mac = NULL;
-       int err;
--      bgmac = kzalloc(sizeof(*bgmac), GFP_KERNEL);
-+      bgmac = bgmac_alloc(&core->dev);
-       if (!bgmac)
-               return -ENOMEM;
-       bgmac->bcma.core = core;
--      bgmac->dev = &core->dev;
-       bgmac->dma_dev = core->dma_dev;
-       bgmac->irq = core->irq;
-@@ -292,7 +291,6 @@ static int bgmac_probe(struct bcma_devic
- err1:
-       bcma_mdio_mii_unregister(bgmac->mii_bus);
- err:
--      kfree(bgmac);
-       bcma_set_drvdata(core, NULL);
-       return err;
---- a/drivers/net/ethernet/broadcom/bgmac-platform.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
-@@ -93,7 +93,7 @@ static int bgmac_probe(struct platform_d
-       struct resource *regs;
-       const u8 *mac_addr;
--      bgmac = devm_kzalloc(&pdev->dev, sizeof(*bgmac), GFP_KERNEL);
-+      bgmac = bgmac_alloc(&pdev->dev);
-       if (!bgmac)
-               return -ENOMEM;
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1460,22 +1460,32 @@ static int bgmac_phy_connect(struct bgma
-       return 0;
- }
--int bgmac_enet_probe(struct bgmac *info)
-+struct bgmac *bgmac_alloc(struct device *dev)
- {
-       struct net_device *net_dev;
-       struct bgmac *bgmac;
--      int err;
-       /* Allocation and references */
--      net_dev = alloc_etherdev(sizeof(*bgmac));
-+      net_dev = devm_alloc_etherdev(dev, sizeof(*bgmac));
-       if (!net_dev)
--              return -ENOMEM;
-+              return NULL;
-       net_dev->netdev_ops = &bgmac_netdev_ops;
-       net_dev->ethtool_ops = &bgmac_ethtool_ops;
-+
-       bgmac = netdev_priv(net_dev);
--      memcpy(bgmac, info, sizeof(*bgmac));
-+      bgmac->dev = dev;
-       bgmac->net_dev = net_dev;
-+
-+      return bgmac;
-+}
-+EXPORT_SYMBOL_GPL(bgmac_alloc);
-+
-+int bgmac_enet_probe(struct bgmac *bgmac)
-+{
-+      struct net_device *net_dev = bgmac->net_dev;
-+      int err;
-+
-       net_dev->irq = bgmac->irq;
-       SET_NETDEV_DEV(net_dev, bgmac->dev);
-@@ -1502,7 +1512,7 @@ int bgmac_enet_probe(struct bgmac *info)
-       err = bgmac_dma_alloc(bgmac);
-       if (err) {
-               dev_err(bgmac->dev, "Unable to alloc memory for DMA\n");
--              goto err_netdev_free;
-+              goto err_out;
-       }
-       bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK;
-@@ -1538,8 +1548,7 @@ err_phy_disconnect:
-       phy_disconnect(net_dev->phydev);
- err_dma_free:
-       bgmac_dma_free(bgmac);
--err_netdev_free:
--      free_netdev(net_dev);
-+err_out:
-       return err;
- }
---- a/drivers/net/ethernet/broadcom/bgmac.h
-+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -515,7 +515,8 @@ struct bgmac {
-                             u32 set);
- };
--int bgmac_enet_probe(struct bgmac *info);
-+struct bgmac *bgmac_alloc(struct device *dev);
-+int bgmac_enet_probe(struct bgmac *bgmac);
- void bgmac_enet_remove(struct bgmac *bgmac);
- struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr);
diff --git a/target/linux/generic/backport-4.9/071-v4.10-0002-net-bgmac-drop-struct-bcma_mdio-we-don-t-need-anymor.patch b/target/linux/generic/backport-4.9/071-v4.10-0002-net-bgmac-drop-struct-bcma_mdio-we-don-t-need-anymor.patch
deleted file mode 100644 (file)
index 5e3d333..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 31 Jan 2017 19:37:55 +0100
-Subject: [PATCH] net: bgmac: drop struct bcma_mdio we don't need anymore
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Adding struct bcma_mdio was a workaround for bcma code not having access
-to the struct bgmac used in the core code. Now we don't duplicate this
-struct we can just use it internally in bcma code.
-
-This simplifies code & allows access to all bgmac driver details from
-all places in bcma code.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
-@@ -166,7 +166,7 @@ static int bgmac_probe(struct bcma_devic
-       if (!bgmac_is_bcm4707_family(core) &&
-           !(ci->id == BCMA_CHIP_ID_BCM53573 && core->core_unit == 1)) {
--              mii_bus = bcma_mdio_mii_register(core, bgmac->phyaddr);
-+              mii_bus = bcma_mdio_mii_register(bgmac);
-               if (IS_ERR(mii_bus)) {
-                       err = PTR_ERR(mii_bus);
-                       goto err;
---- a/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c
-@@ -12,11 +12,6 @@
- #include <linux/brcmphy.h>
- #include "bgmac.h"
--struct bcma_mdio {
--      struct bcma_device *core;
--      u8 phyaddr;
--};
--
- static bool bcma_mdio_wait_value(struct bcma_device *core, u16 reg, u32 mask,
-                                u32 value, int timeout)
- {
-@@ -37,7 +32,7 @@ static bool bcma_mdio_wait_value(struct
-  * PHY ops
-  **************************************************/
--static u16 bcma_mdio_phy_read(struct bcma_mdio *bcma_mdio, u8 phyaddr, u8 reg)
-+static u16 bcma_mdio_phy_read(struct bgmac *bgmac, u8 phyaddr, u8 reg)
- {
-       struct bcma_device *core;
-       u16 phy_access_addr;
-@@ -56,12 +51,12 @@ static u16 bcma_mdio_phy_read(struct bcm
-       BUILD_BUG_ON(BGMAC_PC_MCT_SHIFT != BCMA_GMAC_CMN_PC_MCT_SHIFT);
-       BUILD_BUG_ON(BGMAC_PC_MTE != BCMA_GMAC_CMN_PC_MTE);
--      if (bcma_mdio->core->id.id == BCMA_CORE_4706_MAC_GBIT) {
--              core = bcma_mdio->core->bus->drv_gmac_cmn.core;
-+      if (bgmac->bcma.core->id.id == BCMA_CORE_4706_MAC_GBIT) {
-+              core = bgmac->bcma.core->bus->drv_gmac_cmn.core;
-               phy_access_addr = BCMA_GMAC_CMN_PHY_ACCESS;
-               phy_ctl_addr = BCMA_GMAC_CMN_PHY_CTL;
-       } else {
--              core = bcma_mdio->core;
-+              core = bgmac->bcma.core;
-               phy_access_addr = BGMAC_PHY_ACCESS;
-               phy_ctl_addr = BGMAC_PHY_CNTL;
-       }
-@@ -87,7 +82,7 @@ static u16 bcma_mdio_phy_read(struct bcm
- }
- /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphywr */
--static int bcma_mdio_phy_write(struct bcma_mdio *bcma_mdio, u8 phyaddr, u8 reg,
-+static int bcma_mdio_phy_write(struct bgmac *bgmac, u8 phyaddr, u8 reg,
-                              u16 value)
- {
-       struct bcma_device *core;
-@@ -95,12 +90,12 @@ static int bcma_mdio_phy_write(struct bc
-       u16 phy_ctl_addr;
-       u32 tmp;
--      if (bcma_mdio->core->id.id == BCMA_CORE_4706_MAC_GBIT) {
--              core = bcma_mdio->core->bus->drv_gmac_cmn.core;
-+      if (bgmac->bcma.core->id.id == BCMA_CORE_4706_MAC_GBIT) {
-+              core = bgmac->bcma.core->bus->drv_gmac_cmn.core;
-               phy_access_addr = BCMA_GMAC_CMN_PHY_ACCESS;
-               phy_ctl_addr = BCMA_GMAC_CMN_PHY_CTL;
-       } else {
--              core = bcma_mdio->core;
-+              core = bgmac->bcma.core;
-               phy_access_addr = BGMAC_PHY_ACCESS;
-               phy_ctl_addr = BGMAC_PHY_CNTL;
-       }
-@@ -110,8 +105,8 @@ static int bcma_mdio_phy_write(struct bc
-       tmp |= phyaddr;
-       bcma_write32(core, phy_ctl_addr, tmp);
--      bcma_write32(bcma_mdio->core, BGMAC_INT_STATUS, BGMAC_IS_MDIO);
--      if (bcma_read32(bcma_mdio->core, BGMAC_INT_STATUS) & BGMAC_IS_MDIO)
-+      bcma_write32(bgmac->bcma.core, BGMAC_INT_STATUS, BGMAC_IS_MDIO);
-+      if (bcma_read32(bgmac->bcma.core, BGMAC_INT_STATUS) & BGMAC_IS_MDIO)
-               dev_warn(&core->dev, "Error setting MDIO int\n");
-       tmp = BGMAC_PA_START;
-@@ -132,39 +127,39 @@ static int bcma_mdio_phy_write(struct bc
- }
- /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyinit */
--static void bcma_mdio_phy_init(struct bcma_mdio *bcma_mdio)
-+static void bcma_mdio_phy_init(struct bgmac *bgmac)
- {
--      struct bcma_chipinfo *ci = &bcma_mdio->core->bus->chipinfo;
-+      struct bcma_chipinfo *ci = &bgmac->bcma.core->bus->chipinfo;
-       u8 i;
-       if (ci->id == BCMA_CHIP_ID_BCM5356) {
-               for (i = 0; i < 5; i++) {
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x008b);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x15, 0x0100);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000f);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x12, 0x2aaa);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000b);
-+                      bcma_mdio_phy_write(bgmac, i, 0x1f, 0x008b);
-+                      bcma_mdio_phy_write(bgmac, i, 0x15, 0x0100);
-+                      bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000f);
-+                      bcma_mdio_phy_write(bgmac, i, 0x12, 0x2aaa);
-+                      bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b);
-               }
-       }
-       if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg != 10) ||
-           (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg != 10) ||
-           (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg != 9)) {
--              struct bcma_drv_cc *cc = &bcma_mdio->core->bus->drv_cc;
-+              struct bcma_drv_cc *cc = &bgmac->bcma.core->bus->drv_cc;
-               bcma_chipco_chipctl_maskset(cc, 2, ~0xc0000000, 0);
-               bcma_chipco_chipctl_maskset(cc, 4, ~0x80000000, 0);
-               for (i = 0; i < 5; i++) {
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000f);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x16, 0x5284);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000b);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x0010);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000f);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x16, 0x5296);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x1073);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x9073);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x16, 0x52b6);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x9273);
--                      bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000b);
-+                      bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000f);
-+                      bcma_mdio_phy_write(bgmac, i, 0x16, 0x5284);
-+                      bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b);
-+                      bcma_mdio_phy_write(bgmac, i, 0x17, 0x0010);
-+                      bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000f);
-+                      bcma_mdio_phy_write(bgmac, i, 0x16, 0x5296);
-+                      bcma_mdio_phy_write(bgmac, i, 0x17, 0x1073);
-+                      bcma_mdio_phy_write(bgmac, i, 0x17, 0x9073);
-+                      bcma_mdio_phy_write(bgmac, i, 0x16, 0x52b6);
-+                      bcma_mdio_phy_write(bgmac, i, 0x17, 0x9273);
-+                      bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b);
-               }
-       }
- }
-@@ -172,17 +167,17 @@ static void bcma_mdio_phy_init(struct bc
- /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyreset */
- static int bcma_mdio_phy_reset(struct mii_bus *bus)
- {
--      struct bcma_mdio *bcma_mdio = bus->priv;
--      u8 phyaddr = bcma_mdio->phyaddr;
-+      struct bgmac *bgmac = bus->priv;
-+      u8 phyaddr = bgmac->phyaddr;
--      if (bcma_mdio->phyaddr == BGMAC_PHY_NOREGS)
-+      if (phyaddr == BGMAC_PHY_NOREGS)
-               return 0;
--      bcma_mdio_phy_write(bcma_mdio, phyaddr, MII_BMCR, BMCR_RESET);
-+      bcma_mdio_phy_write(bgmac, phyaddr, MII_BMCR, BMCR_RESET);
-       udelay(100);
--      if (bcma_mdio_phy_read(bcma_mdio, phyaddr, MII_BMCR) & BMCR_RESET)
--              dev_err(&bcma_mdio->core->dev, "PHY reset failed\n");
--      bcma_mdio_phy_init(bcma_mdio);
-+      if (bcma_mdio_phy_read(bgmac, phyaddr, MII_BMCR) & BMCR_RESET)
-+              dev_err(bgmac->dev, "PHY reset failed\n");
-+      bcma_mdio_phy_init(bgmac);
-       return 0;
- }
-@@ -202,16 +197,12 @@ static int bcma_mdio_mii_write(struct mi
-       return bcma_mdio_phy_write(bus->priv, mii_id, regnum, value);
- }
--struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr)
-+struct mii_bus *bcma_mdio_mii_register(struct bgmac *bgmac)
- {
--      struct bcma_mdio *bcma_mdio;
-+      struct bcma_device *core = bgmac->bcma.core;
-       struct mii_bus *mii_bus;
-       int err;
--      bcma_mdio = kzalloc(sizeof(*bcma_mdio), GFP_KERNEL);
--      if (!bcma_mdio)
--              return ERR_PTR(-ENOMEM);
--
-       mii_bus = mdiobus_alloc();
-       if (!mii_bus) {
-               err = -ENOMEM;
-@@ -221,15 +212,12 @@ struct mii_bus *bcma_mdio_mii_register(s
-       mii_bus->name = "bcma_mdio mii bus";
-       sprintf(mii_bus->id, "%s-%d-%d", "bcma_mdio", core->bus->num,
-               core->core_unit);
--      mii_bus->priv = bcma_mdio;
-+      mii_bus->priv = bgmac;
-       mii_bus->read = bcma_mdio_mii_read;
-       mii_bus->write = bcma_mdio_mii_write;
-       mii_bus->reset = bcma_mdio_phy_reset;
-       mii_bus->parent = &core->dev;
--      mii_bus->phy_mask = ~(1 << phyaddr);
--
--      bcma_mdio->core = core;
--      bcma_mdio->phyaddr = phyaddr;
-+      mii_bus->phy_mask = ~(1 << bgmac->phyaddr);
-       err = mdiobus_register(mii_bus);
-       if (err) {
-@@ -242,23 +230,17 @@ struct mii_bus *bcma_mdio_mii_register(s
- err_free_bus:
-       mdiobus_free(mii_bus);
- err:
--      kfree(bcma_mdio);
-       return ERR_PTR(err);
- }
- EXPORT_SYMBOL_GPL(bcma_mdio_mii_register);
- void bcma_mdio_mii_unregister(struct mii_bus *mii_bus)
- {
--      struct bcma_mdio *bcma_mdio;
--
-       if (!mii_bus)
-               return;
--      bcma_mdio = mii_bus->priv;
--
-       mdiobus_unregister(mii_bus);
-       mdiobus_free(mii_bus);
--      kfree(bcma_mdio);
- }
- EXPORT_SYMBOL_GPL(bcma_mdio_mii_unregister);
---- a/drivers/net/ethernet/broadcom/bgmac.h
-+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -519,7 +519,7 @@ struct bgmac *bgmac_alloc(struct device
- int bgmac_enet_probe(struct bgmac *bgmac);
- void bgmac_enet_remove(struct bgmac *bgmac);
--struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr);
-+struct mii_bus *bcma_mdio_mii_register(struct bgmac *bgmac);
- void bcma_mdio_mii_unregister(struct mii_bus *mii_bus);
- static inline u32 bgmac_read(struct bgmac *bgmac, u16 offset)
diff --git a/target/linux/generic/backport-4.9/071-v4.10-0003-net-bgmac-use-PHY-subsystem-for-initializing-PHY.patch b/target/linux/generic/backport-4.9/071-v4.10-0003-net-bgmac-use-PHY-subsystem-for-initializing-PHY.patch
deleted file mode 100644 (file)
index d1be3e3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8e6f31baba7e2c13ab7e954fe6179420a7545a8b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 31 Jan 2017 19:37:56 +0100
-Subject: [PATCH 3/3] net: bgmac: use PHY subsystem for initializing PHY
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This adds support for using bgmac with PHYs supported by standalone PHY
-drivers. Having any PHY initialization in bgmac is hacky and shouldn't
-be extended but rather removed if anyone has hardware to test it.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c
-@@ -132,6 +132,10 @@ static void bcma_mdio_phy_init(struct bg
-       struct bcma_chipinfo *ci = &bgmac->bcma.core->bus->chipinfo;
-       u8 i;
-+      /* For some legacy hardware we do chipset-based PHY initialization here
-+       * without even detecting PHY ID. It's hacky and should be cleaned as
-+       * soon as someone can test it.
-+       */
-       if (ci->id == BCMA_CHIP_ID_BCM5356) {
-               for (i = 0; i < 5; i++) {
-                       bcma_mdio_phy_write(bgmac, i, 0x1f, 0x008b);
-@@ -140,6 +144,7 @@ static void bcma_mdio_phy_init(struct bg
-                       bcma_mdio_phy_write(bgmac, i, 0x12, 0x2aaa);
-                       bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b);
-               }
-+              return;
-       }
-       if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg != 10) ||
-           (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg != 10) ||
-@@ -161,7 +166,12 @@ static void bcma_mdio_phy_init(struct bg
-                       bcma_mdio_phy_write(bgmac, i, 0x17, 0x9273);
-                       bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b);
-               }
-+              return;
-       }
-+
-+      /* For all other hw do initialization using PHY subsystem. */
-+      if (bgmac->net_dev && bgmac->net_dev->phydev)
-+              phy_init_hw(bgmac->net_dev->phydev);
- }
- /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyreset */
diff --git a/target/linux/generic/backport-4.9/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch b/target/linux/generic/backport-4.9/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch
deleted file mode 100644 (file)
index 772ee61..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From 12acd136913ccdf394eeb2bc8686ff5505368119 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 12 Oct 2017 10:21:26 +0200
-Subject: [PATCH] net: bgmac: enable master mode for BCM54210E and B50212E PHYs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are 4 very similar PHYs:
-0x600d84a1: BCM54210E (rev B0)
-0x600d84a2: BCM54210E (rev B1)
-0x600d84a5: B50212E (rev B0)
-0x600d84a6: B50212E (rev B1)
-that need setting master mode manually. It's because they run in slave
-mode by default with Automatic Slave/Master configuration disabled which
-can lead to unreliable connection with massive ping loss.
-
-So far it was reported for a board with BCM47189 SoC and B50212E B1 PHY
-connected to the bgmac supported ethernet device. Telling PHY driver to
-setup PHY properly solves this issue.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/broadcom/bgmac-bcma.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
-@@ -166,13 +166,19 @@ static int bgmac_probe(struct bcma_devic
-       if (!bgmac_is_bcm4707_family(core) &&
-           !(ci->id == BCMA_CHIP_ID_BCM53573 && core->core_unit == 1)) {
-+              struct phy_device *phydev;
-+
-               mii_bus = bcma_mdio_mii_register(bgmac);
-               if (IS_ERR(mii_bus)) {
-                       err = PTR_ERR(mii_bus);
-                       goto err;
-               }
--
-               bgmac->mii_bus = mii_bus;
-+
-+              phydev = mdiobus_get_phy(bgmac->mii_bus, bgmac->phyaddr);
-+              if (ci->id == BCMA_CHIP_ID_BCM53573 && phydev &&
-+                  (phydev->drv->phy_id & phydev->drv->phy_id_mask) == PHY_ID_BCM54210E)
-+                      phydev->dev_flags |= PHY_BRCM_EN_MASTER_MODE;
-       }
-       if (core->bus->hosttype == BCMA_HOSTTYPE_PCI) {
diff --git a/target/linux/generic/backport-4.9/072-bcma-from-4.12.patch b/target/linux/generic/backport-4.9/072-bcma-from-4.12.patch
deleted file mode 100644 (file)
index 23f2656..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/drivers/bcma/driver_gpio.c
-+++ b/drivers/bcma/driver_gpio.c
-@@ -185,8 +185,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
-       chip->owner             = THIS_MODULE;
-       chip->parent            = bcma_bus_get_host_dev(bus);
- #if IS_BUILTIN(CONFIG_OF)
--      if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
--              chip->of_node   = cc->core->dev.of_node;
-+      chip->of_node           = cc->core->dev.of_node;
- #endif
-       switch (bus->chipinfo.id) {
-       case BCMA_CHIP_ID_BCM4707:
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -201,9 +201,6 @@ static void bcma_of_fill_device(struct d
- {
-       struct device_node *node;
--      if (!IS_ENABLED(CONFIG_OF_IRQ))
--              return;
--
-       node = bcma_of_find_child_device(parent, core);
-       if (node)
-               core->dev.of_node = node;
-@@ -242,19 +239,18 @@ void bcma_prepare_core(struct bcma_bus *
-       core->dev.release = bcma_release_core_dev;
-       core->dev.bus = &bcma_bus_type;
-       dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
-+      core->dev.parent = bcma_bus_get_host_dev(bus);
-+      if (core->dev.parent)
-+              bcma_of_fill_device(core->dev.parent, core);
-       switch (bus->hosttype) {
-       case BCMA_HOSTTYPE_PCI:
--              core->dev.parent = &bus->host_pci->dev;
-               core->dma_dev = &bus->host_pci->dev;
-               core->irq = bus->host_pci->irq;
-               break;
-       case BCMA_HOSTTYPE_SOC:
-               if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {
-                       core->dma_dev = &bus->host_pdev->dev;
--                      core->dev.parent = &bus->host_pdev->dev;
--                      if (core->dev.parent)
--                              bcma_of_fill_device(core->dev.parent, core);
-               } else {
-                       core->dev.dma_mask = &core->dev.coherent_dma_mask;
-                       core->dma_dev = &core->dev;
diff --git a/target/linux/generic/backport-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch b/target/linux/generic/backport-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch
deleted file mode 100644 (file)
index 9279a7c..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Xo Wang <xow@google.com>
-Date: Fri, 21 Oct 2016 10:20:12 -0700
-Subject: [PATCH] net: phy: broadcom: Update Auxiliary Control Register macros
-
-Add the RXD-to-RXC skew (delay) time bit in the Miscellaneous Control
-shadow register and a mask for the shadow selector field.
-
-Remove a re-definition of MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL.
-
-Signed-off-by: Xo Wang <xow@google.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Reviewed-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -101,6 +101,7 @@
-  * AUXILIARY CONTROL SHADOW ACCESS REGISTERS.  (PHY REG 0x18)
-  */
- #define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL     0x0000
-+#define MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW  0x0100
- #define MII_BCM54XX_AUXCTL_ACTL_TX_6DB                0x0400
- #define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA     0x0800
-@@ -109,7 +110,7 @@
- #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC    0x7000
- #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC       0x0007
--#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL     0x0000
-+#define MII_BCM54XX_AUXCTL_SHDWSEL_MASK       0x0007
- /*
-  * Broadcom LED source encodings.  These are used in BCM5461, BCM5481,
diff --git a/target/linux/generic/backport-4.9/075-v4.10-0002-net-phy-broadcom-Add-support-for-BCM54612E.patch b/target/linux/generic/backport-4.9/075-v4.10-0002-net-phy-broadcom-Add-support-for-BCM54612E.patch
deleted file mode 100644 (file)
index 4caa7b1..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Xo Wang <xow@google.com>
-Date: Fri, 21 Oct 2016 10:20:13 -0700
-Subject: [PATCH] net: phy: broadcom: Add support for BCM54612E
-
-This PHY has internal delays enabled after reset. This clears the
-internal delay enables unless the interface specifically requests them.
-
-Signed-off-by: Xo Wang <xow@google.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Reviewed-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -337,6 +337,41 @@ static int bcm5481_config_aneg(struct ph
-       return ret;
- }
-+static int bcm54612e_config_aneg(struct phy_device *phydev)
-+{
-+      int ret;
-+
-+      /* First, auto-negotiate. */
-+      ret = genphy_config_aneg(phydev);
-+
-+      /* Clear TX internal delay unless requested. */
-+      if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
-+          (phydev->interface != PHY_INTERFACE_MODE_RGMII_TXID)) {
-+              /* Disable TXD to GTXCLK clock delay (default set) */
-+              /* Bit 9 is the only field in shadow register 00011 */
-+              bcm_phy_write_shadow(phydev, 0x03, 0);
-+      }
-+
-+      /* Clear RX internal delay unless requested. */
-+      if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
-+          (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) {
-+              u16 reg;
-+
-+              /* Errata: reads require filling in the write selector field */
-+              bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
-+                                   MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC);
-+              reg = phy_read(phydev, MII_BCM54XX_AUX_CTL);
-+              /* Disable RXD to RXC delay (default set) */
-+              reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW;
-+              /* Clear shadow selector field */
-+              reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK;
-+              bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
-+                                   MII_BCM54XX_AUXCTL_MISC_WREN | reg);
-+      }
-+
-+      return ret;
-+}
-+
- static int brcm_phy_setbits(struct phy_device *phydev, int reg, int set)
- {
-       int val;
-@@ -485,6 +520,18 @@ static struct phy_driver broadcom_driver
-       .ack_interrupt  = bcm_phy_ack_intr,
-       .config_intr    = bcm_phy_config_intr,
- }, {
-+      .phy_id         = PHY_ID_BCM54612E,
-+      .phy_id_mask    = 0xfffffff0,
-+      .name           = "Broadcom BCM54612E",
-+      .features       = PHY_GBIT_FEATURES |
-+                        SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-+      .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-+      .config_init    = bcm54xx_config_init,
-+      .config_aneg    = bcm54612e_config_aneg,
-+      .read_status    = genphy_read_status,
-+      .ack_interrupt  = bcm_phy_ack_intr,
-+      .config_intr    = bcm_phy_config_intr,
-+}, {
-       .phy_id         = PHY_ID_BCM54616S,
-       .phy_id_mask    = 0xfffffff0,
-       .name           = "Broadcom BCM54616S",
-@@ -600,6 +647,7 @@ static struct mdio_device_id __maybe_unu
-       { PHY_ID_BCM5411, 0xfffffff0 },
-       { PHY_ID_BCM5421, 0xfffffff0 },
-       { PHY_ID_BCM5461, 0xfffffff0 },
-+      { PHY_ID_BCM54612E, 0xfffffff0 },
-       { PHY_ID_BCM54616S, 0xfffffff0 },
-       { PHY_ID_BCM5464, 0xfffffff0 },
-       { PHY_ID_BCM5481, 0xfffffff0 },
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -18,6 +18,7 @@
- #define PHY_ID_BCM5421                        0x002060e0
- #define PHY_ID_BCM5464                        0x002060b0
- #define PHY_ID_BCM5461                        0x002060c0
-+#define PHY_ID_BCM54612E              0x03625e60
- #define PHY_ID_BCM54616S              0x03625d10
- #define PHY_ID_BCM57780                       0x03625d90
diff --git a/target/linux/generic/backport-4.9/075-v4.10-0003-net-phy-broadcom-add-bcm54xx_auxctl_read.patch b/target/linux/generic/backport-4.9/075-v4.10-0003-net-phy-broadcom-add-bcm54xx_auxctl_read.patch
deleted file mode 100644 (file)
index c9b3b59..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Jon Mason <jon.mason@broadcom.com>
-Date: Fri, 4 Nov 2016 01:10:56 -0400
-Subject: [PATCH] net: phy: broadcom: add bcm54xx_auxctl_read
-
-Add a helper function to read the AUXCTL register for the BCM54xx.  This
-mirrors the bcm54xx_auxctl_write function already present in the code.
-
-Signed-off-by: Jon Mason <jon.mason@broadcom.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -30,6 +30,16 @@ MODULE_DESCRIPTION("Broadcom PHY driver"
- MODULE_AUTHOR("Maciej W. Rozycki");
- MODULE_LICENSE("GPL");
-+static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)
-+{
-+      /* The register must be written to both the Shadow Register Select and
-+       * the Shadow Read Register Selector
-+       */
-+      phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum |
-+                regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT);
-+      return phy_read(phydev, MII_BCM54XX_AUX_CTL);
-+}
-+
- static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val)
- {
-       return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val);
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -110,6 +110,7 @@
- #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX   0x0200
- #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC    0x7000
- #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC       0x0007
-+#define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12
- #define MII_BCM54XX_AUXCTL_SHDWSEL_MASK       0x0007
diff --git a/target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch b/target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch
deleted file mode 100644 (file)
index 3d61ec6..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-From: Jon Mason <jon.mason@broadcom.com>
-Date: Fri, 4 Nov 2016 01:10:58 -0400
-Subject: [PATCH] net: phy: broadcom: Add BCM54810 PHY entry
-
-The BCM54810 PHY requires some semi-unique configuration, which results
-in some additional configuration in addition to the standard config.
-Also, some users of the BCM54810 require the PHY lanes to be swapped.
-Since there is no way to detect this, add a device tree query to see if
-it is applicable.
-
-Inspired-by: Vikas Soni <vsoni@broadcom.com>
-Signed-off-by: Jon Mason <jon.mason@broadcom.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -18,7 +18,7 @@
- #include <linux/module.h>
- #include <linux/phy.h>
- #include <linux/brcmphy.h>
--
-+#include <linux/of.h>
- #define BRCM_PHY_MODEL(phydev) \
-       ((phydev)->drv->phy_id & (phydev)->drv->phy_id_mask)
-@@ -45,6 +45,34 @@ static int bcm54xx_auxctl_write(struct p
-       return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val);
- }
-+static int bcm54810_config(struct phy_device *phydev)
-+{
-+      int rc, val;
-+
-+      val = bcm_phy_read_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL);
-+      val &= ~BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN;
-+      rc = bcm_phy_write_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL,
-+                             val);
-+      if (rc < 0)
-+              return rc;
-+
-+      val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
-+      val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;
-+      val |= MII_BCM54XX_AUXCTL_MISC_WREN;
-+      rc = bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
-+                                val);
-+      if (rc < 0)
-+              return rc;
-+
-+      val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
-+      val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
-+      rc = bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
-+      if (rc < 0)
-+              return rc;
-+
-+      return 0;
-+}
-+
- /* Needs SMDSP clock enabled via bcm54xx_phydsp_config() */
- static int bcm50610_a0_workaround(struct phy_device *phydev)
- {
-@@ -217,6 +245,12 @@ static int bcm54xx_config_init(struct ph
-           (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE))
-               bcm54xx_adjust_rxrefclk(phydev);
-+      if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
-+              err = bcm54810_config(phydev);
-+              if (err)
-+                      return err;
-+      }
-+
-       bcm54xx_phydsp_config(phydev);
-       return 0;
-@@ -314,6 +348,7 @@ static int bcm5482_read_status(struct ph
- static int bcm5481_config_aneg(struct phy_device *phydev)
- {
-+      struct device_node *np = phydev->mdio.dev.of_node;
-       int ret;
-       /* Aneg firsly. */
-@@ -344,6 +379,14 @@ static int bcm5481_config_aneg(struct ph
-               phy_write(phydev, 0x18, reg);
-       }
-+      if (of_property_read_bool(np, "enet-phy-lane-swap")) {
-+              /* Lane Swap - Undocumented register...magic! */
-+              ret = bcm_phy_write_exp(phydev, MII_BCM54XX_EXP_SEL_ER + 0x9,
-+                                      0x11B);
-+              if (ret < 0)
-+                      return ret;
-+      }
-+
-       return ret;
- }
-@@ -578,6 +621,18 @@ static struct phy_driver broadcom_driver
-       .ack_interrupt  = bcm_phy_ack_intr,
-       .config_intr    = bcm_phy_config_intr,
- }, {
-+      .phy_id         = PHY_ID_BCM54810,
-+      .phy_id_mask    = 0xfffffff0,
-+      .name           = "Broadcom BCM54810",
-+      .features       = PHY_GBIT_FEATURES |
-+                        SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-+      .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-+      .config_init    = bcm54xx_config_init,
-+      .config_aneg    = bcm5481_config_aneg,
-+      .read_status    = genphy_read_status,
-+      .ack_interrupt  = bcm_phy_ack_intr,
-+      .config_intr    = bcm_phy_config_intr,
-+}, {
-       .phy_id         = PHY_ID_BCM5482,
-       .phy_id_mask    = 0xfffffff0,
-       .name           = "Broadcom BCM5482",
-@@ -661,6 +716,7 @@ static struct mdio_device_id __maybe_unu
-       { PHY_ID_BCM54616S, 0xfffffff0 },
-       { PHY_ID_BCM5464, 0xfffffff0 },
-       { PHY_ID_BCM5481, 0xfffffff0 },
-+      { PHY_ID_BCM54810, 0xfffffff0 },
-       { PHY_ID_BCM5482, 0xfffffff0 },
-       { PHY_ID_BCM50610, 0xfffffff0 },
-       { PHY_ID_BCM50610M, 0xfffffff0 },
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -204,7 +204,7 @@ config BROADCOM_PHY
-       select BCM_NET_PHYLIB
-       ---help---
-         Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464,
--        BCM5481 and BCM5482 PHYs.
-+        BCM5481, BCM54810 and BCM5482 PHYs.
- config CICADA_PHY
-       tristate "Cicada PHYs"
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -13,6 +13,7 @@
- #define PHY_ID_BCM5241                        0x0143bc30
- #define PHY_ID_BCMAC131                       0x0143bc70
- #define PHY_ID_BCM5481                        0x0143bca0
-+#define PHY_ID_BCM54810                       0x03625d00
- #define PHY_ID_BCM5482                        0x0143bcb0
- #define PHY_ID_BCM5411                        0x00206070
- #define PHY_ID_BCM5421                        0x002060e0
-@@ -56,6 +57,7 @@
- #define PHY_BRCM_EXT_IBND_TX_ENABLE   0x00002000
- #define PHY_BRCM_CLEAR_RGMII_MODE     0x00004000
- #define PHY_BRCM_DIS_TXCRXC_NOENRGY   0x00008000
-+
- /* Broadcom BCM7xxx specific workarounds */
- #define PHY_BRCM_7XXX_REV(x)          (((x) >> 8) & 0xff)
- #define PHY_BRCM_7XXX_PATCH(x)                ((x) & 0xff)
-@@ -111,6 +113,7 @@
- #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC    0x7000
- #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC       0x0007
- #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12
-+#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN (1 << 8)
- #define MII_BCM54XX_AUXCTL_SHDWSEL_MASK       0x0007
-@@ -192,6 +195,12 @@
- #define BCM5482_SSD_SGMII_SLAVE_EN    0x0002  /* Slave mode enable */
- #define BCM5482_SSD_SGMII_SLAVE_AD    0x0001  /* Slave auto-detection */
-+/* BCM54810 Registers */
-+#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL  (MII_BCM54XX_EXP_SEL_ER + 0x90)
-+#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN       (1 << 0)
-+#define BCM54810_SHD_CLK_CTL                  0x3
-+#define BCM54810_SHD_CLK_CTL_GTXCLK_EN                (1 << 9)
-+
- /*****************************************************************************/
- /* Fast Ethernet Transceiver definitions. */
diff --git a/target/linux/generic/backport-4.9/075-v4.10-0005-net-phy-broadcom-Move-bcm54xx_auxctl_-read-write-to-.patch b/target/linux/generic/backport-4.9/075-v4.10-0005-net-phy-broadcom-Move-bcm54xx_auxctl_-read-write-to-.patch
deleted file mode 100644 (file)
index c8bf54c..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Tue, 22 Nov 2016 11:40:54 -0800
-Subject: [PATCH] net: phy: broadcom: Move bcm54xx_auxctl_{read, write} to
- common library
-
-We are going to need these functions to implement support for Broadcom
-Wirespeed, aka downshift.
-
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/bcm-phy-lib.c
-+++ b/drivers/net/phy/bcm-phy-lib.c
-@@ -50,6 +50,23 @@ int bcm_phy_read_exp(struct phy_device *
- }
- EXPORT_SYMBOL_GPL(bcm_phy_read_exp);
-+int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)
-+{
-+      /* The register must be written to both the Shadow Register Select and
-+       * the Shadow Read Register Selector
-+       */
-+      phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum |
-+                regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT);
-+      return phy_read(phydev, MII_BCM54XX_AUX_CTL);
-+}
-+EXPORT_SYMBOL_GPL(bcm54xx_auxctl_read);
-+
-+int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val)
-+{
-+      return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val);
-+}
-+EXPORT_SYMBOL(bcm54xx_auxctl_write);
-+
- int bcm_phy_write_misc(struct phy_device *phydev,
-                      u16 reg, u16 chl, u16 val)
- {
---- a/drivers/net/phy/bcm-phy-lib.h
-+++ b/drivers/net/phy/bcm-phy-lib.h
-@@ -26,6 +26,9 @@ static inline int bcm_phy_write_exp_sel(
-       return bcm_phy_write_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER, val);
- }
-+int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val);
-+int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum);
-+
- int bcm_phy_write_misc(struct phy_device *phydev,
-                      u16 reg, u16 chl, u16 value);
- int bcm_phy_read_misc(struct phy_device *phydev,
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -30,21 +30,6 @@ MODULE_DESCRIPTION("Broadcom PHY driver"
- MODULE_AUTHOR("Maciej W. Rozycki");
- MODULE_LICENSE("GPL");
--static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)
--{
--      /* The register must be written to both the Shadow Register Select and
--       * the Shadow Read Register Selector
--       */
--      phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum |
--                regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT);
--      return phy_read(phydev, MII_BCM54XX_AUX_CTL);
--}
--
--static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val)
--{
--      return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val);
--}
--
- static int bcm54810_config(struct phy_device *phydev)
- {
-       int rc, val;
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch b/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch
deleted file mode 100644 (file)
index 35eee77..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Tue, 22 Nov 2016 11:40:56 -0800
-Subject: [PATCH] net: phy: broadcom: Allow enabling or disabling of EEE
-
-In preparation for adding support for Wirespeed/downshift, we need to
-change bcm_phy_eee_enable() to allow enabling or disabling EEE, so make
-the function take an extra enable/disable boolean parameter and rename
-it to illustrate it sets EEE, not necessarily just enables it.
-
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/bcm7xxx.c
-+++ b/drivers/net/phy/bcm7xxx.c
-@@ -199,7 +199,7 @@ static int bcm7xxx_28nm_config_init(stru
-       if (ret)
-               return ret;
--      ret = bcm_phy_enable_eee(phydev);
-+      ret = bcm_phy_set_eee(phydev, true);
-       if (ret)
-               return ret;
---- a/drivers/net/phy/bcm-cygnus.c
-+++ b/drivers/net/phy/bcm-cygnus.c
-@@ -104,7 +104,7 @@ static int bcm_cygnus_config_init(struct
-               return rc;
-       /* Advertise EEE */
--      rc = bcm_phy_enable_eee(phydev);
-+      rc = bcm_phy_set_eee(phydev, true);
-       if (rc)
-               return rc;
---- a/drivers/net/phy/bcm-phy-lib.c
-+++ b/drivers/net/phy/bcm-phy-lib.c
-@@ -195,7 +195,7 @@ int bcm_phy_enable_apd(struct phy_device
- }
- EXPORT_SYMBOL_GPL(bcm_phy_enable_apd);
--int bcm_phy_enable_eee(struct phy_device *phydev)
-+int bcm_phy_set_eee(struct phy_device *phydev, bool enable)
- {
-       int val;
-@@ -205,7 +205,10 @@ int bcm_phy_enable_eee(struct phy_device
-       if (val < 0)
-               return val;
--      val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X;
-+      if (enable)
-+              val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X;
-+      else
-+              val &= ~(LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X);
-       phy_write_mmd_indirect(phydev, BRCM_CL45VEN_EEE_CONTROL,
-                              MDIO_MMD_AN, (u32)val);
-@@ -216,14 +219,17 @@ int bcm_phy_enable_eee(struct phy_device
-       if (val < 0)
-               return val;
--      val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
-+      if (enable)
-+              val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
-+      else
-+              val &= ~(MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
-       phy_write_mmd_indirect(phydev, BCM_CL45VEN_EEE_ADV,
-                              MDIO_MMD_AN, (u32)val);
-       return 0;
- }
--EXPORT_SYMBOL_GPL(bcm_phy_enable_eee);
-+EXPORT_SYMBOL_GPL(bcm_phy_set_eee);
- MODULE_DESCRIPTION("Broadcom PHY Library");
- MODULE_LICENSE("GPL v2");
---- a/drivers/net/phy/bcm-phy-lib.h
-+++ b/drivers/net/phy/bcm-phy-lib.h
-@@ -43,5 +43,5 @@ int bcm_phy_config_intr(struct phy_devic
- int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down);
--int bcm_phy_enable_eee(struct phy_device *phydev);
-+int bcm_phy_set_eee(struct phy_device *phydev, bool enable);
- #endif /* _LINUX_BCM_PHY_LIB_H */
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0002-net-phy-broadcom-Add-support-code-for-reading-PHY-co.patch b/target/linux/generic/backport-4.9/076-v4.11-0002-net-phy-broadcom-Add-support-code-for-reading-PHY-co.patch
deleted file mode 100644 (file)
index 83cfe1f..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Tue, 29 Nov 2016 09:57:17 -0800
-Subject: [PATCH] net: phy: broadcom: Add support code for reading PHY counters
-
-Broadcom PHYs expose a number of PHY error counters: receive errors,
-false carrier sense, SerDes BER count, local and remote receive errors.
-Add support code to allow retrieving these error counters. Since the
-Broadcom PHY library code is used by several drivers, make it possible
-for them to specify the storage for the software copy of the statistics.
-
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/bcm-phy-lib.c
-+++ b/drivers/net/phy/bcm-phy-lib.c
-@@ -17,6 +17,7 @@
- #include <linux/mdio.h>
- #include <linux/module.h>
- #include <linux/phy.h>
-+#include <linux/ethtool.h>
- #define MII_BCM_CHANNEL_WIDTH     0x2000
- #define BCM_CL45VEN_EEE_ADV       0x3c
-@@ -231,6 +232,75 @@ int bcm_phy_set_eee(struct phy_device *p
- }
- EXPORT_SYMBOL_GPL(bcm_phy_set_eee);
-+struct bcm_phy_hw_stat {
-+      const char *string;
-+      u8 reg;
-+      u8 shift;
-+      u8 bits;
-+};
-+
-+/* Counters freeze at either 0xffff or 0xff, better than nothing */
-+static const struct bcm_phy_hw_stat bcm_phy_hw_stats[] = {
-+      { "phy_receive_errors", MII_BRCM_CORE_BASE12, 0, 16 },
-+      { "phy_serdes_ber_errors", MII_BRCM_CORE_BASE13, 8, 8 },
-+      { "phy_false_carrier_sense_errors", MII_BRCM_CORE_BASE13, 0, 8 },
-+      { "phy_local_rcvr_nok", MII_BRCM_CORE_BASE14, 8, 8 },
-+      { "phy_remote_rcv_nok", MII_BRCM_CORE_BASE14, 0, 8 },
-+};
-+
-+int bcm_phy_get_sset_count(struct phy_device *phydev)
-+{
-+      return ARRAY_SIZE(bcm_phy_hw_stats);
-+}
-+EXPORT_SYMBOL_GPL(bcm_phy_get_sset_count);
-+
-+void bcm_phy_get_strings(struct phy_device *phydev, u8 *data)
-+{
-+      unsigned int i;
-+
-+      for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++)
-+              memcpy(data + i * ETH_GSTRING_LEN,
-+                     bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN);
-+}
-+EXPORT_SYMBOL_GPL(bcm_phy_get_strings);
-+
-+#ifndef UINT64_MAX
-+#define UINT64_MAX              (u64)(~((u64)0))
-+#endif
-+
-+/* Caller is supposed to provide appropriate storage for the library code to
-+ * access the shadow copy
-+ */
-+static u64 bcm_phy_get_stat(struct phy_device *phydev, u64 *shadow,
-+                          unsigned int i)
-+{
-+      struct bcm_phy_hw_stat stat = bcm_phy_hw_stats[i];
-+      int val;
-+      u64 ret;
-+
-+      val = phy_read(phydev, stat.reg);
-+      if (val < 0) {
-+              ret = UINT64_MAX;
-+      } else {
-+              val >>= stat.shift;
-+              val = val & ((1 << stat.bits) - 1);
-+              shadow[i] += val;
-+              ret = shadow[i];
-+      }
-+
-+      return ret;
-+}
-+
-+void bcm_phy_get_stats(struct phy_device *phydev, u64 *shadow,
-+                     struct ethtool_stats *stats, u64 *data)
-+{
-+      unsigned int i;
-+
-+      for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++)
-+              data[i] = bcm_phy_get_stat(phydev, shadow, i);
-+}
-+EXPORT_SYMBOL_GPL(bcm_phy_get_stats);
-+
- MODULE_DESCRIPTION("Broadcom PHY Library");
- MODULE_LICENSE("GPL v2");
- MODULE_AUTHOR("Broadcom Corporation");
---- a/drivers/net/phy/bcm-phy-lib.h
-+++ b/drivers/net/phy/bcm-phy-lib.h
-@@ -44,4 +44,10 @@ int bcm_phy_config_intr(struct phy_devic
- int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down);
- int bcm_phy_set_eee(struct phy_device *phydev, bool enable);
-+
-+int bcm_phy_get_sset_count(struct phy_device *phydev);
-+void bcm_phy_get_strings(struct phy_device *phydev, u8 *data);
-+void bcm_phy_get_stats(struct phy_device *phydev, u64 *shadow,
-+                     struct ethtool_stats *stats, u64 *data);
-+
- #endif /* _LINUX_BCM_PHY_LIB_H */
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -234,6 +234,9 @@
- #define LPI_FEATURE_EN_DIG1000X               0x4000
- /* Core register definitions*/
-+#define MII_BRCM_CORE_BASE12  0x12
-+#define MII_BRCM_CORE_BASE13  0x13
-+#define MII_BRCM_CORE_BASE14  0x14
- #define MII_BRCM_CORE_BASE1E  0x1E
- #define MII_BRCM_CORE_EXPB0   0xB0
- #define MII_BRCM_CORE_EXPB1   0xB1
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0003-net-phy-bcm7xxx-Add-entry-for-BCM7278.patch b/target/linux/generic/backport-4.9/076-v4.11-0003-net-phy-bcm7xxx-Add-entry-for-BCM7278.patch
deleted file mode 100644 (file)
index 8034f4b..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Fri, 20 Jan 2017 12:36:33 -0800
-Subject: [PATCH] net: phy: bcm7xxx: Add entry for BCM7278
-
-Add support for the BCM7278 28nm process Gigabit Ethernet PHY.
-
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/bcm7xxx.c
-+++ b/drivers/net/phy/bcm7xxx.c
-@@ -334,6 +334,7 @@ static int bcm7xxx_suspend(struct phy_de
- static struct phy_driver bcm7xxx_driver[] = {
-       BCM7XXX_28NM_GPHY(PHY_ID_BCM7250, "Broadcom BCM7250"),
-+      BCM7XXX_28NM_GPHY(PHY_ID_BCM7278, "Broadcom BCM7278"),
-       BCM7XXX_28NM_GPHY(PHY_ID_BCM7364, "Broadcom BCM7364"),
-       BCM7XXX_28NM_GPHY(PHY_ID_BCM7366, "Broadcom BCM7366"),
-       BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
-@@ -348,6 +349,7 @@ static struct phy_driver bcm7xxx_driver[
- static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = {
-       { PHY_ID_BCM7250, 0xfffffff0, },
-+      { PHY_ID_BCM7278, 0xfffffff0, },
-       { PHY_ID_BCM7364, 0xfffffff0, },
-       { PHY_ID_BCM7366, 0xfffffff0, },
-       { PHY_ID_BCM7346, 0xfffffff0, },
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -24,6 +24,7 @@
- #define PHY_ID_BCM57780                       0x03625d90
- #define PHY_ID_BCM7250                        0xae025280
-+#define PHY_ID_BCM7278                        0xae0251a0
- #define PHY_ID_BCM7364                        0xae025260
- #define PHY_ID_BCM7366                        0x600d8490
- #define PHY_ID_BCM7346                        0x600d8650
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0004-net-phy-bcm7xxx-Implement-EGPHY-workaround-for-7278.patch b/target/linux/generic/backport-4.9/076-v4.11-0004-net-phy-bcm7xxx-Implement-EGPHY-workaround-for-7278.patch
deleted file mode 100644 (file)
index 7aa4ee2..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Fri, 20 Jan 2017 12:36:34 -0800
-Subject: [PATCH] net: phy: bcm7xxx: Implement EGPHY workaround for 7278
-
-Implement the HW design team recommended workaround in for 7278. Since
-the GPHY now returns its revision information in MII_PHYS_ID[23] we need
-to check whether the revision provided in flags is 0 or not.
-
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/bcm7xxx.c
-+++ b/drivers/net/phy/bcm7xxx.c
-@@ -163,12 +163,43 @@ static int bcm7xxx_28nm_e0_plus_afe_conf
-       return 0;
- }
-+static int bcm7xxx_28nm_a0_patch_afe_config_init(struct phy_device *phydev)
-+{
-+      /* +1 RC_CAL codes for RL centering for both LT and HT conditions */
-+      bcm_phy_write_misc(phydev, AFE_RXCONFIG_2, 0xd003);
-+
-+      /* Cut master bias current by 2% to compensate for RC_CAL offset */
-+      bcm_phy_write_misc(phydev, DSP_TAP10, 0x791b);
-+
-+      /* Improve hybrid leakage */
-+      bcm_phy_write_misc(phydev, AFE_HPF_TRIM_OTHERS, 0x10e3);
-+
-+      /* Change rx_on_tune 8 to 0xf */
-+      bcm_phy_write_misc(phydev, 0x21, 0x2, 0x87f6);
-+
-+      /* Change 100Tx EEE bandwidth */
-+      bcm_phy_write_misc(phydev, 0x22, 0x2, 0x017d);
-+
-+      /* Enable ffe zero detection for Vitesse interoperability */
-+      bcm_phy_write_misc(phydev, 0x26, 0x2, 0x0015);
-+
-+      r_rc_cal_reset(phydev);
-+
-+      return 0;
-+}
-+
- static int bcm7xxx_28nm_config_init(struct phy_device *phydev)
- {
-       u8 rev = PHY_BRCM_7XXX_REV(phydev->dev_flags);
-       u8 patch = PHY_BRCM_7XXX_PATCH(phydev->dev_flags);
-       int ret = 0;
-+      /* Newer devices have moved the revision information back into a
-+       * standard location in MII_PHYS_ID[23]
-+       */
-+      if (rev == 0)
-+              rev = phydev->phy_id & ~phydev->drv->phy_id_mask;
-+
-       pr_info_once("%s: %s PHY revision: 0x%02x, patch: %d\n",
-                    phydev_name(phydev), phydev->drv->name, rev, patch);
-@@ -192,6 +223,9 @@ static int bcm7xxx_28nm_config_init(stru
-       case 0x10:
-               ret = bcm7xxx_28nm_e0_plus_afe_config_init(phydev);
-               break;
-+      case 0x01:
-+              ret = bcm7xxx_28nm_a0_patch_afe_config_init(phydev);
-+              break;
-       default:
-               break;
-       }
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0005-net-phy-broadcom-use-auxctl-reading-helper-in-BCM546.patch b/target/linux/generic/backport-4.9/076-v4.11-0005-net-phy-broadcom-use-auxctl-reading-helper-in-BCM546.patch
deleted file mode 100644 (file)
index 554e311..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 25 Jan 2017 21:00:25 +0100
-Subject: [PATCH] net: phy: broadcom: use auxctl reading helper in BCM54612E
- code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with commit 5b4e29005123 ("net: phy: broadcom: add
-bcm54xx_auxctl_read") we have a reading helper so use it and avoid code
-duplication.
-It also means we don't need MII_BCM54XX_AUXCTL_SHDWSEL_MISC define as
-it's the same as MII_BCM54XX_AUXCTL_SHDWSEL_MISC just for reading needs
-(same value shifted by 12 bits).
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -395,10 +395,8 @@ static int bcm54612e_config_aneg(struct
-           (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) {
-               u16 reg;
--              /* Errata: reads require filling in the write selector field */
--              bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
--                                   MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC);
--              reg = phy_read(phydev, MII_BCM54XX_AUX_CTL);
-+              reg = bcm54xx_auxctl_read(phydev,
-+                                        MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
-               /* Disable RXD to RXC delay (default set) */
-               reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW;
-               /* Clear shadow selector field */
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -111,7 +111,6 @@
- #define MII_BCM54XX_AUXCTL_MISC_WREN  0x8000
- #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX   0x0200
--#define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC    0x7000
- #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC       0x0007
- #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12
- #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN (1 << 8)
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0006-net-phy-broadcom-add-support-for-BCM54210E.patch b/target/linux/generic/backport-4.9/076-v4.11-0006-net-phy-broadcom-add-support-for-BCM54210E.patch
deleted file mode 100644 (file)
index 5fa7e88..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 27 Jan 2017 14:07:01 +0100
-Subject: [PATCH] net: phy: broadcom: add support for BCM54210E
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's Broadcom PHY simply described as single-port
-RGMII 10/100/1000BASE-T PHY. It requires disabling delay skew and GTXCLK
-bits.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -30,6 +30,22 @@ MODULE_DESCRIPTION("Broadcom PHY driver"
- MODULE_AUTHOR("Maciej W. Rozycki");
- MODULE_LICENSE("GPL");
-+static int bcm54210e_config_init(struct phy_device *phydev)
-+{
-+      int val;
-+
-+      val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
-+      val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;
-+      val |= MII_BCM54XX_AUXCTL_MISC_WREN;
-+      bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val);
-+
-+      val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
-+      val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
-+      bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
-+
-+      return 0;
-+}
-+
- static int bcm54810_config(struct phy_device *phydev)
- {
-       int rc, val;
-@@ -230,7 +246,11 @@ static int bcm54xx_config_init(struct ph
-           (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE))
-               bcm54xx_adjust_rxrefclk(phydev);
--      if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
-+      if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
-+              err = bcm54210e_config_init(phydev);
-+              if (err)
-+                      return err;
-+      } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
-               err = bcm54810_config(phydev);
-               if (err)
-                       return err;
-@@ -544,6 +564,17 @@ static struct phy_driver broadcom_driver
-       .ack_interrupt  = bcm_phy_ack_intr,
-       .config_intr    = bcm_phy_config_intr,
- }, {
-+      .phy_id         = PHY_ID_BCM54210E,
-+      .phy_id_mask    = 0xfffffff0,
-+      .name           = "Broadcom BCM54210E",
-+      .features       = PHY_GBIT_FEATURES,
-+      .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-+      .config_init    = bcm54xx_config_init,
-+      .config_aneg    = genphy_config_aneg,
-+      .read_status    = genphy_read_status,
-+      .ack_interrupt  = bcm_phy_ack_intr,
-+      .config_intr    = bcm_phy_config_intr,
-+}, {
-       .phy_id         = PHY_ID_BCM5461,
-       .phy_id_mask    = 0xfffffff0,
-       .name           = "Broadcom BCM5461",
-@@ -694,6 +725,7 @@ module_phy_driver(broadcom_drivers);
- static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
-       { PHY_ID_BCM5411, 0xfffffff0 },
-       { PHY_ID_BCM5421, 0xfffffff0 },
-+      { PHY_ID_BCM54210E, 0xfffffff0 },
-       { PHY_ID_BCM5461, 0xfffffff0 },
-       { PHY_ID_BCM54612E, 0xfffffff0 },
-       { PHY_ID_BCM54616S, 0xfffffff0 },
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -17,6 +17,7 @@
- #define PHY_ID_BCM5482                        0x0143bcb0
- #define PHY_ID_BCM5411                        0x00206070
- #define PHY_ID_BCM5421                        0x002060e0
-+#define PHY_ID_BCM54210E              0x600d84a0
- #define PHY_ID_BCM5464                        0x002060b0
- #define PHY_ID_BCM5461                        0x002060c0
- #define PHY_ID_BCM54612E              0x03625e60
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0007-net-phy-broadcom-rehook-BCM54612E-specific-init.patch b/target/linux/generic/backport-4.9/076-v4.11-0007-net-phy-broadcom-rehook-BCM54612E-specific-init.patch
deleted file mode 100644 (file)
index b7326c3..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 31 Jan 2017 22:54:54 +0100
-Subject: [PATCH] net: phy: broadcom: rehook BCM54612E specific init
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This extra BCM54612E code in PHY driver isn't really aneg specific. Even
-without it aneg works OK but the problem is no packets pass through PHY.
-
-Moreover putting this code inside config_aneg callback didn't allow
-resuming PHY correctly. When driver called phy_stop and phy_start it was
-putting PHY machine into RESUMING state. After that machine was
-switching into AN and NOLINK without ever calling phy_start_aneg. This
-prevented this extra setup from being called and PHY didn't work.
-
-This change has been verified to fix network on BCM47186B0 SoC device
-with BCM54612E.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -46,6 +46,34 @@ static int bcm54210e_config_init(struct
-       return 0;
- }
-+static int bcm54612e_config_init(struct phy_device *phydev)
-+{
-+      /* Clear TX internal delay unless requested. */
-+      if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
-+          (phydev->interface != PHY_INTERFACE_MODE_RGMII_TXID)) {
-+              /* Disable TXD to GTXCLK clock delay (default set) */
-+              /* Bit 9 is the only field in shadow register 00011 */
-+              bcm_phy_write_shadow(phydev, 0x03, 0);
-+      }
-+
-+      /* Clear RX internal delay unless requested. */
-+      if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
-+          (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) {
-+              u16 reg;
-+
-+              reg = bcm54xx_auxctl_read(phydev,
-+                                        MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
-+              /* Disable RXD to RXC delay (default set) */
-+              reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;
-+              /* Clear shadow selector field */
-+              reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK;
-+              bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
-+                                   MII_BCM54XX_AUXCTL_MISC_WREN | reg);
-+      }
-+
-+      return 0;
-+}
-+
- static int bcm54810_config(struct phy_device *phydev)
- {
-       int rc, val;
-@@ -250,6 +278,10 @@ static int bcm54xx_config_init(struct ph
-               err = bcm54210e_config_init(phydev);
-               if (err)
-                       return err;
-+      } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54612E) {
-+              err = bcm54612e_config_init(phydev);
-+              if (err)
-+                      return err;
-       } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
-               err = bcm54810_config(phydev);
-               if (err)
-@@ -395,39 +427,6 @@ static int bcm5481_config_aneg(struct ph
-       return ret;
- }
--static int bcm54612e_config_aneg(struct phy_device *phydev)
--{
--      int ret;
--
--      /* First, auto-negotiate. */
--      ret = genphy_config_aneg(phydev);
--
--      /* Clear TX internal delay unless requested. */
--      if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
--          (phydev->interface != PHY_INTERFACE_MODE_RGMII_TXID)) {
--              /* Disable TXD to GTXCLK clock delay (default set) */
--              /* Bit 9 is the only field in shadow register 00011 */
--              bcm_phy_write_shadow(phydev, 0x03, 0);
--      }
--
--      /* Clear RX internal delay unless requested. */
--      if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
--          (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) {
--              u16 reg;
--
--              reg = bcm54xx_auxctl_read(phydev,
--                                        MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
--              /* Disable RXD to RXC delay (default set) */
--              reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW;
--              /* Clear shadow selector field */
--              reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK;
--              bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
--                                   MII_BCM54XX_AUXCTL_MISC_WREN | reg);
--      }
--
--      return ret;
--}
--
- static int brcm_phy_setbits(struct phy_device *phydev, int reg, int set)
- {
-       int val;
-@@ -594,7 +593,7 @@ static struct phy_driver broadcom_driver
-                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-       .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-       .config_init    = bcm54xx_config_init,
--      .config_aneg    = bcm54612e_config_aneg,
-+      .config_aneg    = genphy_config_aneg,
-       .read_status    = genphy_read_status,
-       .ack_interrupt  = bcm_phy_ack_intr,
-       .config_intr    = bcm_phy_config_intr,
diff --git a/target/linux/generic/backport-4.9/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch b/target/linux/generic/backport-4.9/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch
deleted file mode 100644 (file)
index 334c444..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 2355a6546a053b1c16ebefd6ce1f0cccc00e1da5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 12 Oct 2017 10:21:25 +0200
-Subject: [PATCH] net: phy: broadcom: support new device flag for setting
- master mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some of Broadcom's PHYs run by default in slave mode with Automatic
-Slave/Master configuration disabled. It stops them from working properly
-with some devices.
-
-So far it has been verified for BCM54210E and BCM50212E which don't
-work well with Intel's I217-LM and I218-LM:
-http://ark.intel.com/products/60019/Intel-Ethernet-Connection-I217-LM
-http://ark.intel.com/products/71307/Intel-Ethernet-Connection-I218-LM
-I was told there is massive ping loss.
-
-This commit adds support for a new flag which can be set by an ethernet
-driver to fixup PHY setup.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/phy/broadcom.c | 6 ++++++
- include/linux/brcmphy.h    | 1 +
- 2 files changed, 7 insertions(+)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -43,6 +43,12 @@ static int bcm54210e_config_init(struct
-       val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
-       bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
-+      if (phydev->dev_flags & PHY_BRCM_EN_MASTER_MODE) {
-+              val = phy_read(phydev, MII_CTRL1000);
-+              val |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER;
-+              phy_write(phydev, MII_CTRL1000, val);
-+      }
-+
-       return 0;
- }
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -59,6 +59,7 @@
- #define PHY_BRCM_EXT_IBND_TX_ENABLE   0x00002000
- #define PHY_BRCM_CLEAR_RGMII_MODE     0x00004000
- #define PHY_BRCM_DIS_TXCRXC_NOENRGY   0x00008000
-+#define PHY_BRCM_EN_MASTER_MODE               0x00010000
- /* Broadcom BCM7xxx specific workarounds */
- #define PHY_BRCM_7XXX_REV(x)          (((x) >> 8) & 0xff)
diff --git a/target/linux/generic/backport-4.9/080-0001-leds-core-add-OF-variants-of-LED-registering-functio.patch b/target/linux/generic/backport-4.9/080-0001-leds-core-add-OF-variants-of-LED-registering-functio.patch
deleted file mode 100644 (file)
index 5b1b307..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 6 Mar 2017 06:19:44 +0100
-Subject: [PATCH] leds: core: add OF variants of LED registering functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These new functions allow passing an additional device_node argument
-that will be internally set for created LED device. Thanks to this LED
-core code and triggers will be able to access DT node for reading extra
-info.
-
-The easiest solution for achieving this was reworking old functions to
-more generic ones & adding simple defines for API compatibility.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Pavel Machek <pavel@ucw.cz>
-Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
----
- drivers/leds/led-class.c | 26 ++++++++++++++++----------
- include/linux/leds.h     | 14 ++++++++++----
- 2 files changed, 26 insertions(+), 14 deletions(-)
-
---- a/drivers/leds/led-class.c
-+++ b/drivers/leds/led-class.c
-@@ -181,11 +181,14 @@ static int led_classdev_next_name(const
- }
- /**
-- * led_classdev_register - register a new object of led_classdev class.
-- * @parent: The device to register.
-+ * of_led_classdev_register - register a new object of led_classdev class.
-+ *
-+ * @parent: parent of LED device
-  * @led_cdev: the led_classdev structure for this device.
-+ * @np: DT node describing this LED
-  */
--int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
-+int of_led_classdev_register(struct device *parent, struct device_node *np,
-+                          struct led_classdev *led_cdev)
- {
-       char name[64];
-       int ret;
-@@ -198,6 +201,7 @@ int led_classdev_register(struct device
-                               led_cdev, led_cdev->groups, "%s", name);
-       if (IS_ERR(led_cdev->dev))
-               return PTR_ERR(led_cdev->dev);
-+      led_cdev->dev->of_node = np;
-       if (ret)
-               dev_warn(parent, "Led %s renamed to %s due to name collision",
-@@ -228,7 +232,7 @@ int led_classdev_register(struct device
-       return 0;
- }
--EXPORT_SYMBOL_GPL(led_classdev_register);
-+EXPORT_SYMBOL_GPL(of_led_classdev_register);
- /**
-  * led_classdev_unregister - unregisters a object of led_properties class.
-@@ -270,12 +274,14 @@ static void devm_led_classdev_release(st
- }
- /**
-- * devm_led_classdev_register - resource managed led_classdev_register()
-- * @parent: The device to register.
-+ * devm_of_led_classdev_register - resource managed led_classdev_register()
-+ *
-+ * @parent: parent of LED device
-  * @led_cdev: the led_classdev structure for this device.
-  */
--int devm_led_classdev_register(struct device *parent,
--                             struct led_classdev *led_cdev)
-+int devm_of_led_classdev_register(struct device *parent,
-+                                struct device_node *np,
-+                                struct led_classdev *led_cdev)
- {
-       struct led_classdev **dr;
-       int rc;
-@@ -284,7 +290,7 @@ int devm_led_classdev_register(struct de
-       if (!dr)
-               return -ENOMEM;
--      rc = led_classdev_register(parent, led_cdev);
-+      rc = of_led_classdev_register(parent, np, led_cdev);
-       if (rc) {
-               devres_free(dr);
-               return rc;
-@@ -295,7 +301,7 @@ int devm_led_classdev_register(struct de
-       return 0;
- }
--EXPORT_SYMBOL_GPL(devm_led_classdev_register);
-+EXPORT_SYMBOL_GPL(devm_of_led_classdev_register);
- static int devm_led_classdev_match(struct device *dev, void *res, void *data)
- {
---- a/include/linux/leds.h
-+++ b/include/linux/leds.h
-@@ -109,10 +109,16 @@ struct led_classdev {
-       struct mutex            led_access;
- };
--extern int led_classdev_register(struct device *parent,
--                               struct led_classdev *led_cdev);
--extern int devm_led_classdev_register(struct device *parent,
--                                    struct led_classdev *led_cdev);
-+extern int of_led_classdev_register(struct device *parent,
-+                                  struct device_node *np,
-+                                  struct led_classdev *led_cdev);
-+#define led_classdev_register(parent, led_cdev)                               \
-+      of_led_classdev_register(parent, NULL, led_cdev)
-+extern int devm_of_led_classdev_register(struct device *parent,
-+                                       struct device_node *np,
-+                                       struct led_classdev *led_cdev);
-+#define devm_led_classdev_register(parent, led_cdev)                  \
-+      devm_of_led_classdev_register(parent, NULL, led_cdev)
- extern void led_classdev_unregister(struct led_classdev *led_cdev);
- extern void devm_led_classdev_unregister(struct device *parent,
-                                        struct led_classdev *led_cdev);
diff --git a/target/linux/generic/backport-4.9/080-0002-leds-gpio-use-OF-variant-of-LED-registering-function.patch b/target/linux/generic/backport-4.9/080-0002-leds-gpio-use-OF-variant-of-LED-registering-function.patch
deleted file mode 100644 (file)
index 0247fff..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 6 Mar 2017 06:19:45 +0100
-Subject: [PATCH] leds: gpio: use OF variant of LED registering function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In leds-gpio we support LEDs specified in DT so we should use
-(devm_)of_led_classdev_register. This allows passing DT node as argument
-for use by the LED subsystem.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Acked-by: Pavel Machek <pavel@ucw.cz>
-Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
----
- drivers/leds/leds-gpio.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/leds/leds-gpio.c
-+++ b/drivers/leds/leds-gpio.c
-@@ -77,7 +77,7 @@ static int gpio_blink_set(struct led_cla
- static int create_gpio_led(const struct gpio_led *template,
-       struct gpio_led_data *led_dat, struct device *parent,
--      gpio_blink_set_t blink_set)
-+      struct device_node *np, gpio_blink_set_t blink_set)
- {
-       int ret, state;
-@@ -139,7 +139,7 @@ static int create_gpio_led(const struct
-       if (ret < 0)
-               return ret;
--      return devm_led_classdev_register(parent, &led_dat->cdev);
-+      return devm_of_led_classdev_register(parent, np, &led_dat->cdev);
- }
- struct gpio_leds_priv {
-@@ -206,7 +206,7 @@ static struct gpio_leds_priv *gpio_leds_
-               if (fwnode_property_present(child, "panic-indicator"))
-                       led.panic_indicator = 1;
--              ret = create_gpio_led(&led, led_dat, dev, NULL);
-+              ret = create_gpio_led(&led, led_dat, dev, np, NULL);
-               if (ret < 0) {
-                       fwnode_handle_put(child);
-                       return ERR_PTR(ret);
-@@ -240,9 +240,9 @@ static int gpio_led_probe(struct platfor
-               priv->num_leds = pdata->num_leds;
-               for (i = 0; i < priv->num_leds; i++) {
--                      ret = create_gpio_led(&pdata->leds[i],
--                                            &priv->leds[i],
--                                            &pdev->dev, pdata->gpio_blink_set);
-+                      ret = create_gpio_led(&pdata->leds[i], &priv->leds[i],
-+                                            &pdev->dev, NULL,
-+                                            pdata->gpio_blink_set);
-                       if (ret < 0)
-                               return ret;
-               }
diff --git a/target/linux/generic/backport-4.9/081-0001-thermal-bcm2835-add-thermal-driver-for-bcm2835-SoC.patch b/target/linux/generic/backport-4.9/081-0001-thermal-bcm2835-add-thermal-driver-for-bcm2835-SoC.patch
deleted file mode 100644 (file)
index d1ef21e..0000000
+++ /dev/null
@@ -1,365 +0,0 @@
-From bcb7dd9ef206f7d646ed8dac6fe7772083714253 Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <stefan.wahren@i2se.com>
-Date: Fri, 31 Mar 2017 20:03:06 +0000
-Subject: [PATCH] thermal: bcm2835: add thermal driver for bcm2835 SoC
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add basic thermal driver for bcm2835 SoC.
-
-This driver currently make sure that tsense HW block is set up
-correctly.
-
-Tested-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
-Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
-Acked-by: Eric Anholt <eric@anholt.net>
-Acked-by: Eduardo Valentin <edubezval@gmail.com>
-Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
----
- drivers/thermal/Kconfig           |   8 +
- drivers/thermal/Makefile          |   1 +
- drivers/thermal/bcm2835_thermal.c | 314 ++++++++++++++++++++++++++++++++++++++
- 3 files changed, 323 insertions(+)
- create mode 100644 drivers/thermal/bcm2835_thermal.c
-
---- a/drivers/thermal/Kconfig
-+++ b/drivers/thermal/Kconfig
-@@ -434,4 +434,12 @@ depends on (ARCH_QCOM && OF) || COMPILE_
- source "drivers/thermal/qcom/Kconfig"
- endmenu
-+config BCM2835_THERMAL
-+      tristate "Thermal sensors on bcm2835 SoC"
-+      depends on ARCH_BCM2835 || COMPILE_TEST
-+      depends on HAS_IOMEM
-+      depends on THERMAL_OF
-+      help
-+        Support for thermal sensors on Broadcom bcm2835 SoCs.
-+
- endif
---- a/drivers/thermal/Makefile
-+++ b/drivers/thermal/Makefile
-@@ -55,3 +55,4 @@ obj-$(CONFIG_TEGRA_SOCTHERM) += tegra/
- obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o
- obj-$(CONFIG_MTK_THERMAL)     += mtk_thermal.o
- obj-$(CONFIG_GENERIC_ADC_THERMAL)     += thermal-generic-adc.o
-+obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o
---- /dev/null
-+++ b/drivers/thermal/bcm2835_thermal.c
-@@ -0,0 +1,314 @@
-+/*
-+ * Driver for Broadcom BCM2835 SoC temperature sensor
-+ *
-+ * Copyright (C) 2016 Martin Sperl
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/debugfs.h>
-+#include <linux/device.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/thermal.h>
-+
-+#define BCM2835_TS_TSENSCTL                   0x00
-+#define BCM2835_TS_TSENSSTAT                  0x04
-+
-+#define BCM2835_TS_TSENSCTL_PRWDW             BIT(0)
-+#define BCM2835_TS_TSENSCTL_RSTB              BIT(1)
-+
-+/*
-+ * bandgap reference voltage in 6 mV increments
-+ * 000b = 1178 mV, 001b = 1184 mV, ... 111b = 1220 mV
-+ */
-+#define BCM2835_TS_TSENSCTL_CTRL_BITS         3
-+#define BCM2835_TS_TSENSCTL_CTRL_SHIFT                2
-+#define BCM2835_TS_TSENSCTL_CTRL_MASK             \
-+      GENMASK(BCM2835_TS_TSENSCTL_CTRL_BITS +     \
-+              BCM2835_TS_TSENSCTL_CTRL_SHIFT - 1, \
-+              BCM2835_TS_TSENSCTL_CTRL_SHIFT)
-+#define BCM2835_TS_TSENSCTL_CTRL_DEFAULT      1
-+#define BCM2835_TS_TSENSCTL_EN_INT            BIT(5)
-+#define BCM2835_TS_TSENSCTL_DIRECT            BIT(6)
-+#define BCM2835_TS_TSENSCTL_CLR_INT           BIT(7)
-+#define BCM2835_TS_TSENSCTL_THOLD_SHIFT               8
-+#define BCM2835_TS_TSENSCTL_THOLD_BITS                10
-+#define BCM2835_TS_TSENSCTL_THOLD_MASK                     \
-+      GENMASK(BCM2835_TS_TSENSCTL_THOLD_BITS +     \
-+              BCM2835_TS_TSENSCTL_THOLD_SHIFT - 1, \
-+              BCM2835_TS_TSENSCTL_THOLD_SHIFT)
-+/*
-+ * time how long the block to be asserted in reset
-+ * which based on a clock counter (TSENS clock assumed)
-+ */
-+#define BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT    18
-+#define BCM2835_TS_TSENSCTL_RSTDELAY_BITS     8
-+#define BCM2835_TS_TSENSCTL_REGULEN           BIT(26)
-+
-+#define BCM2835_TS_TSENSSTAT_DATA_BITS                10
-+#define BCM2835_TS_TSENSSTAT_DATA_SHIFT               0
-+#define BCM2835_TS_TSENSSTAT_DATA_MASK                     \
-+      GENMASK(BCM2835_TS_TSENSSTAT_DATA_BITS +     \
-+              BCM2835_TS_TSENSSTAT_DATA_SHIFT - 1, \
-+              BCM2835_TS_TSENSSTAT_DATA_SHIFT)
-+#define BCM2835_TS_TSENSSTAT_VALID            BIT(10)
-+#define BCM2835_TS_TSENSSTAT_INTERRUPT                BIT(11)
-+
-+struct bcm2835_thermal_data {
-+      struct thermal_zone_device *tz;
-+      void __iomem *regs;
-+      struct clk *clk;
-+      struct dentry *debugfsdir;
-+};
-+
-+static int bcm2835_thermal_adc2temp(u32 adc, int offset, int slope)
-+{
-+      return offset + slope * adc;
-+}
-+
-+static int bcm2835_thermal_temp2adc(int temp, int offset, int slope)
-+{
-+      temp -= offset;
-+      temp /= slope;
-+
-+      if (temp < 0)
-+              temp = 0;
-+      if (temp >= BIT(BCM2835_TS_TSENSSTAT_DATA_BITS))
-+              temp = BIT(BCM2835_TS_TSENSSTAT_DATA_BITS) - 1;
-+
-+      return temp;
-+}
-+
-+static int bcm2835_thermal_get_temp(void *d, int *temp)
-+{
-+      struct bcm2835_thermal_data *data = d;
-+      u32 val = readl(data->regs + BCM2835_TS_TSENSSTAT);
-+
-+      if (!(val & BCM2835_TS_TSENSSTAT_VALID))
-+              return -EIO;
-+
-+      val &= BCM2835_TS_TSENSSTAT_DATA_MASK;
-+
-+      *temp = bcm2835_thermal_adc2temp(
-+              val,
-+              thermal_zone_get_offset(data->tz),
-+              thermal_zone_get_slope(data->tz));
-+
-+      return 0;
-+}
-+
-+static const struct debugfs_reg32 bcm2835_thermal_regs[] = {
-+      {
-+              .name = "ctl",
-+              .offset = 0
-+      },
-+      {
-+              .name = "stat",
-+              .offset = 4
-+      }
-+};
-+
-+static void bcm2835_thermal_debugfs(struct platform_device *pdev)
-+{
-+      struct thermal_zone_device *tz = platform_get_drvdata(pdev);
-+      struct bcm2835_thermal_data *data = tz->devdata;
-+      struct debugfs_regset32 *regset;
-+
-+      data->debugfsdir = debugfs_create_dir("bcm2835_thermal", NULL);
-+      if (!data->debugfsdir)
-+              return;
-+
-+      regset = devm_kzalloc(&pdev->dev, sizeof(*regset), GFP_KERNEL);
-+      if (!regset)
-+              return;
-+
-+      regset->regs = bcm2835_thermal_regs;
-+      regset->nregs = ARRAY_SIZE(bcm2835_thermal_regs);
-+      regset->base = data->regs;
-+
-+      debugfs_create_regset32("regset", 0444, data->debugfsdir, regset);
-+}
-+
-+static struct thermal_zone_of_device_ops bcm2835_thermal_ops = {
-+      .get_temp = bcm2835_thermal_get_temp,
-+};
-+
-+/*
-+ * Note: as per Raspberry Foundation FAQ
-+ * (https://www.raspberrypi.org/help/faqs/#performanceOperatingTemperature)
-+ * the recommended temperature range for the SoC -40C to +85C
-+ * so the trip limit is set to 80C.
-+ * this applies to all the BCM283X SoC
-+ */
-+
-+static const struct of_device_id bcm2835_thermal_of_match_table[] = {
-+      {
-+              .compatible = "brcm,bcm2835-thermal",
-+      },
-+      {
-+              .compatible = "brcm,bcm2836-thermal",
-+      },
-+      {
-+              .compatible = "brcm,bcm2837-thermal",
-+      },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, bcm2835_thermal_of_match_table);
-+
-+static int bcm2835_thermal_probe(struct platform_device *pdev)
-+{
-+      const struct of_device_id *match;
-+      struct thermal_zone_device *tz;
-+      struct bcm2835_thermal_data *data;
-+      struct resource *res;
-+      int err = 0;
-+      u32 val;
-+      unsigned long rate;
-+
-+      data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-+      if (!data)
-+              return -ENOMEM;
-+
-+      match = of_match_device(bcm2835_thermal_of_match_table,
-+                              &pdev->dev);
-+      if (!match)
-+              return -EINVAL;
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      data->regs = devm_ioremap_resource(&pdev->dev, res);
-+      if (IS_ERR(data->regs)) {
-+              err = PTR_ERR(data->regs);
-+              dev_err(&pdev->dev, "Could not get registers: %d\n", err);
-+              return err;
-+      }
-+
-+      data->clk = devm_clk_get(&pdev->dev, NULL);
-+      if (IS_ERR(data->clk)) {
-+              err = PTR_ERR(data->clk);
-+              if (err != -EPROBE_DEFER)
-+                      dev_err(&pdev->dev, "Could not get clk: %d\n", err);
-+              return err;
-+      }
-+
-+      err = clk_prepare_enable(data->clk);
-+      if (err)
-+              return err;
-+
-+      rate = clk_get_rate(data->clk);
-+      if ((rate < 1920000) || (rate > 5000000))
-+              dev_warn(&pdev->dev,
-+                       "Clock %pCn running at %pCr Hz is outside of the recommended range: 1.92 to 5MHz\n",
-+                       data->clk, data->clk);
-+
-+      /* register of thermal sensor and get info from DT */
-+      tz = thermal_zone_of_sensor_register(&pdev->dev, 0, data,
-+                                           &bcm2835_thermal_ops);
-+      if (IS_ERR(tz)) {
-+              err = PTR_ERR(tz);
-+              dev_err(&pdev->dev,
-+                      "Failed to register the thermal device: %d\n",
-+                      err);
-+              goto err_clk;
-+      }
-+
-+      /*
-+       * right now the FW does set up the HW-block, so we are not
-+       * touching the configuration registers.
-+       * But if the HW is not enabled, then set it up
-+       * using "sane" values used by the firmware right now.
-+       */
-+      val = readl(data->regs + BCM2835_TS_TSENSCTL);
-+      if (!(val & BCM2835_TS_TSENSCTL_RSTB)) {
-+              int trip_temp, offset, slope;
-+
-+              slope = thermal_zone_get_slope(tz);
-+              offset = thermal_zone_get_offset(tz);
-+              /*
-+               * For now we deal only with critical, otherwise
-+               * would need to iterate
-+               */
-+              err = tz->ops->get_trip_temp(tz, 0, &trip_temp);
-+              if (err < 0) {
-+                      err = PTR_ERR(tz);
-+                      dev_err(&pdev->dev,
-+                              "Not able to read trip_temp: %d\n",
-+                              err);
-+                      goto err_tz;
-+              }
-+
-+              /* set bandgap reference voltage and enable voltage regulator */
-+              val = (BCM2835_TS_TSENSCTL_CTRL_DEFAULT <<
-+                     BCM2835_TS_TSENSCTL_CTRL_SHIFT) |
-+                    BCM2835_TS_TSENSCTL_REGULEN;
-+
-+              /* use the recommended reset duration */
-+              val |= (0xFE << BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT);
-+
-+              /*  trip_adc value from info */
-+              val |= bcm2835_thermal_temp2adc(trip_temp,
-+                                              offset,
-+                                              slope)
-+                      << BCM2835_TS_TSENSCTL_THOLD_SHIFT;
-+
-+              /* write the value back to the register as 2 steps */
-+              writel(val, data->regs + BCM2835_TS_TSENSCTL);
-+              val |= BCM2835_TS_TSENSCTL_RSTB;
-+              writel(val, data->regs + BCM2835_TS_TSENSCTL);
-+      }
-+
-+      data->tz = tz;
-+
-+      platform_set_drvdata(pdev, tz);
-+
-+      bcm2835_thermal_debugfs(pdev);
-+
-+      return 0;
-+err_tz:
-+      thermal_zone_of_sensor_unregister(&pdev->dev, tz);
-+err_clk:
-+      clk_disable_unprepare(data->clk);
-+
-+      return err;
-+}
-+
-+static int bcm2835_thermal_remove(struct platform_device *pdev)
-+{
-+      struct thermal_zone_device *tz = platform_get_drvdata(pdev);
-+      struct bcm2835_thermal_data *data = tz->devdata;
-+
-+      debugfs_remove_recursive(data->debugfsdir);
-+      thermal_zone_of_sensor_unregister(&pdev->dev, tz);
-+      clk_disable_unprepare(data->clk);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver bcm2835_thermal_driver = {
-+      .probe = bcm2835_thermal_probe,
-+      .remove = bcm2835_thermal_remove,
-+      .driver = {
-+              .name = "bcm2835_thermal",
-+              .of_match_table = bcm2835_thermal_of_match_table,
-+      },
-+};
-+module_platform_driver(bcm2835_thermal_driver);
-+
-+MODULE_AUTHOR("Martin Sperl");
-+MODULE_DESCRIPTION("Thermal driver for bcm2835 chip");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic/backport-4.9/081-0002-thermal-broadcom-add-Northstar-thermal-driver.patch b/target/linux/generic/backport-4.9/081-0002-thermal-broadcom-add-Northstar-thermal-driver.patch
deleted file mode 100644 (file)
index 8ba8cb5..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-From a94cb7eeecc4104a6874339f90c5d0647359c102 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 3 Apr 2017 17:48:29 +0200
-Subject: [PATCH] thermal: broadcom: add Northstar thermal driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Northstar is a SoC family commonly used in home routers. This commit
-adds a driver for checking CPU temperature. As Northstar Plus seems to
-also have this IP block this new symbol gets ARCH_BCM_IPROC dependency.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Jon Mason <jon.mason@broadcom.com>
-Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
----
- drivers/thermal/Kconfig               |   5 ++
- drivers/thermal/Makefile              |   1 +
- drivers/thermal/broadcom/Kconfig      |   8 +++
- drivers/thermal/broadcom/Makefile     |   1 +
- drivers/thermal/broadcom/ns-thermal.c | 105 ++++++++++++++++++++++++++++++++++
- 5 files changed, 120 insertions(+)
- create mode 100644 drivers/thermal/broadcom/Kconfig
- create mode 100644 drivers/thermal/broadcom/Makefile
- create mode 100644 drivers/thermal/broadcom/ns-thermal.c
-
---- a/drivers/thermal/Kconfig
-+++ b/drivers/thermal/Kconfig
-@@ -381,6 +381,11 @@ config MTK_THERMAL
-         Enable this option if you want to have support for thermal management
-         controller present in Mediatek SoCs
-+menu "Broadcom thermal drivers"
-+depends on ARCH_BCM || COMPILE_TEST
-+source "drivers/thermal/broadcom/Kconfig"
-+endmenu
-+
- menu "Texas Instruments thermal drivers"
- depends on ARCH_HAS_BANDGAP || COMPILE_TEST
- depends on HAS_IOMEM
---- a/drivers/thermal/Makefile
-+++ b/drivers/thermal/Makefile
-@@ -26,6 +26,7 @@ thermal_sys-$(CONFIG_CLOCK_THERMAL)  += c
- thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
- # platform thermal drivers
-+obj-y                         += broadcom/
- obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)    += qcom-spmi-temp-alarm.o
- obj-$(CONFIG_SPEAR_THERMAL)   += spear_thermal.o
- obj-$(CONFIG_ROCKCHIP_THERMAL)        += rockchip_thermal.o
---- /dev/null
-+++ b/drivers/thermal/broadcom/Kconfig
-@@ -0,0 +1,8 @@
-+config BCM_NS_THERMAL
-+      tristate "Northstar thermal driver"
-+      depends on ARCH_BCM_IPROC || COMPILE_TEST
-+      help
-+        Northstar is a family of SoCs that includes e.g. BCM4708, BCM47081,
-+        BCM4709 and BCM47094. It contains DMU (Device Management Unit) block
-+        with a thermal sensor that allows checking CPU temperature. This
-+        driver provides support for it.
---- /dev/null
-+++ b/drivers/thermal/broadcom/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_BCM_NS_THERMAL)          += ns-thermal.o
---- /dev/null
-+++ b/drivers/thermal/broadcom/ns-thermal.c
-@@ -0,0 +1,105 @@
-+/*
-+ * Copyright (C) 2017 RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-+ *
-+ * 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/module.h>
-+#include <linux/of_address.h>
-+#include <linux/platform_device.h>
-+#include <linux/thermal.h>
-+
-+#define PVTMON_CONTROL0                                       0x00
-+#define PVTMON_CONTROL0_SEL_MASK                      0x0000000e
-+#define PVTMON_CONTROL0_SEL_TEMP_MONITOR              0x00000000
-+#define PVTMON_CONTROL0_SEL_TEST_MODE                 0x0000000e
-+#define PVTMON_STATUS                                 0x08
-+
-+struct ns_thermal {
-+      struct thermal_zone_device *tz;
-+      void __iomem *pvtmon;
-+};
-+
-+static int ns_thermal_get_temp(void *data, int *temp)
-+{
-+      struct ns_thermal *ns_thermal = data;
-+      int offset = thermal_zone_get_offset(ns_thermal->tz);
-+      int slope = thermal_zone_get_slope(ns_thermal->tz);
-+      u32 val;
-+
-+      val = readl(ns_thermal->pvtmon + PVTMON_CONTROL0);
-+      if ((val & PVTMON_CONTROL0_SEL_MASK) != PVTMON_CONTROL0_SEL_TEMP_MONITOR) {
-+              /* Clear current mode selection */
-+              val &= ~PVTMON_CONTROL0_SEL_MASK;
-+
-+              /* Set temp monitor mode (it's the default actually) */
-+              val |= PVTMON_CONTROL0_SEL_TEMP_MONITOR;
-+
-+              writel(val, ns_thermal->pvtmon + PVTMON_CONTROL0);
-+      }
-+
-+      val = readl(ns_thermal->pvtmon + PVTMON_STATUS);
-+      *temp = slope * val + offset;
-+
-+      return 0;
-+}
-+
-+static const struct thermal_zone_of_device_ops ns_thermal_ops = {
-+      .get_temp = ns_thermal_get_temp,
-+};
-+
-+static int ns_thermal_probe(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      struct ns_thermal *ns_thermal;
-+
-+      ns_thermal = devm_kzalloc(dev, sizeof(*ns_thermal), GFP_KERNEL);
-+      if (!ns_thermal)
-+              return -ENOMEM;
-+
-+      ns_thermal->pvtmon = of_iomap(dev_of_node(dev), 0);
-+      if (WARN_ON(!ns_thermal->pvtmon))
-+              return -ENOENT;
-+
-+      ns_thermal->tz = devm_thermal_zone_of_sensor_register(dev, 0,
-+                                                            ns_thermal,
-+                                                            &ns_thermal_ops);
-+      if (IS_ERR(ns_thermal->tz)) {
-+              iounmap(ns_thermal->pvtmon);
-+              return PTR_ERR(ns_thermal->tz);
-+      }
-+
-+      platform_set_drvdata(pdev, ns_thermal);
-+
-+      return 0;
-+}
-+
-+static int ns_thermal_remove(struct platform_device *pdev)
-+{
-+      struct ns_thermal *ns_thermal = platform_get_drvdata(pdev);
-+
-+      iounmap(ns_thermal->pvtmon);
-+
-+      return 0;
-+}
-+
-+static const struct of_device_id ns_thermal_of_match[] = {
-+      { .compatible = "brcm,ns-thermal", },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, ns_thermal_of_match);
-+
-+static struct platform_driver ns_thermal_driver = {
-+      .probe          = ns_thermal_probe,
-+      .remove         = ns_thermal_remove,
-+      .driver = {
-+              .name = "ns-thermal",
-+              .of_match_table = ns_thermal_of_match,
-+      },
-+};
-+module_platform_driver(ns_thermal_driver);
-+
-+MODULE_DESCRIPTION("Northstar thermal driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/generic/backport-4.9/082-0001-usb-core-read-USB-ports-from-DT-in-the-usbport-LED-t.patch b/target/linux/generic/backport-4.9/082-0001-usb-core-read-USB-ports-from-DT-in-the-usbport-LED-t.patch
deleted file mode 100644 (file)
index 65d17c8..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-From 4f04c210d031667e503d6538a72345a36f3b5d71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 8 Jun 2017 18:08:32 +0200
-Subject: [PATCH] usb: core: read USB ports from DT in the usbport LED trigger
- driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This uses DT info to read relation description of LEDs and USB ports. If
-DT has properly described LEDs, trigger will know when to turn them on.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/core/ledtrig-usbport.c | 56 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 56 insertions(+)
-
---- a/drivers/usb/core/ledtrig-usbport.c
-+++ b/drivers/usb/core/ledtrig-usbport.c
-@@ -11,8 +11,10 @@
- #include <linux/device.h>
- #include <linux/leds.h>
- #include <linux/module.h>
-+#include <linux/of.h>
- #include <linux/slab.h>
- #include <linux/usb.h>
-+#include <linux/usb/of.h>
- struct usbport_trig_data {
-       struct led_classdev *led_cdev;
-@@ -123,6 +125,57 @@ static const struct attribute_group port
-  * Adding & removing ports
-  ***************************************/
-+/**
-+ * usbport_trig_port_observed - Check if port should be observed
-+ */
-+static bool usbport_trig_port_observed(struct usbport_trig_data *usbport_data,
-+                                     struct usb_device *usb_dev, int port1)
-+{
-+      struct device *dev = usbport_data->led_cdev->dev;
-+      struct device_node *led_np = dev->of_node;
-+      struct of_phandle_args args;
-+      struct device_node *port_np;
-+      int count, i;
-+
-+      if (!led_np)
-+              return false;
-+
-+      /* Get node of port being added */
-+      port_np = usb_of_get_child_node(usb_dev->dev.of_node, port1);
-+      if (!port_np)
-+              return false;
-+
-+      /* Amount of trigger sources for this LED */
-+      count = of_count_phandle_with_args(led_np, "trigger-sources",
-+                                         "#trigger-source-cells");
-+      if (count < 0) {
-+              dev_warn(dev, "Failed to get trigger sources for %s\n",
-+                       led_np->full_name);
-+              return false;
-+      }
-+
-+      /* Check list of sources for this specific port */
-+      for (i = 0; i < count; i++) {
-+              int err;
-+
-+              err = of_parse_phandle_with_args(led_np, "trigger-sources",
-+                                               "#trigger-source-cells", i,
-+                                               &args);
-+              if (err) {
-+                      dev_err(dev, "Failed to get trigger source phandle at index %d: %d\n",
-+                              i, err);
-+                      continue;
-+              }
-+
-+              of_node_put(args.np);
-+
-+              if (args.np == port_np)
-+                      return true;
-+      }
-+
-+      return false;
-+}
-+
- static int usbport_trig_add_port(struct usbport_trig_data *usbport_data,
-                                struct usb_device *usb_dev,
-                                const char *hub_name, int portnum)
-@@ -141,6 +194,8 @@ static int usbport_trig_add_port(struct
-       port->data = usbport_data;
-       port->hub = usb_dev;
-       port->portnum = portnum;
-+      port->observed = usbport_trig_port_observed(usbport_data, usb_dev,
-+                                                  portnum);
-       len = strlen(hub_name) + 8;
-       port->port_name = kzalloc(len, GFP_KERNEL);
-@@ -255,6 +310,7 @@ static void usbport_trig_activate(struct
-       if (err)
-               goto err_free;
-       usb_for_each_dev(usbport_data, usbport_trig_add_usb_dev_ports);
-+      usbport_trig_update_count(usbport_data);
-       /* Notifications */
-       usbport_data->nb.notifier_call = usbport_trig_notify,
diff --git a/target/linux/generic/backport-4.9/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch b/target/linux/generic/backport-4.9/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch
deleted file mode 100644 (file)
index ead6675..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From f11a04464ae57e8db1bb7634547842b43e36a898 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
-Date: Fri, 22 Dec 2017 22:47:16 +0100
-Subject: i2c: gpio: Enable working over slow can_sleep GPIOs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-"Slow" GPIOs (usually those connected over an SPI or an I2C bus) are,
-well, slow in their operation. It is generally a good idea to avoid
-using them for time-critical operation, but sometimes the hardware just
-sucks, and the software has to cope. In addition to that, the I2C bus
-itself does not actually define any strict timing limits; the bus is
-free to go all the way down to DC. The timeouts (and therefore the
-slowest acceptable frequency) are present only in SMBus.
-
-The `can_sleep` is IMHO a wrong concept to use here. My SPI-to-quad-UART
-chip (MAX14830) is connected via a 26MHz SPI bus, and it happily drives
-SCL at 200kHz (5µs pulses) during my benchmarks. That's faster than the
-maximal allowed speed of the traditional I2C.
-
-The previous version of this code did not really block operation over
-slow GPIO pins, anyway. Instead, it just resorted to printing a warning
-with a backtrace each time a GPIO pin was accessed, thereby slowing
-things down even more.
-
-Finally, it's not just me. A similar patch was originally submitted in
-2015 [1].
-
-[1] https://patchwork.ozlabs.org/patch/450956/
-
-Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
-Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
----
- drivers/i2c/busses/i2c-gpio.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -44,7 +44,7 @@ static void i2c_gpio_setsda_val(void *da
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      gpio_set_value(pdata->sda_pin, state);
-+      gpio_set_value_cansleep(pdata->sda_pin, state);
- }
- /* Toggle SCL by changing the direction of the pin. */
-@@ -68,21 +68,21 @@ static void i2c_gpio_setscl_val(void *da
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      gpio_set_value(pdata->scl_pin, state);
-+      gpio_set_value_cansleep(pdata->scl_pin, state);
- }
- static int i2c_gpio_getsda(void *data)
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      return gpio_get_value(pdata->sda_pin);
-+      return gpio_get_value_cansleep(pdata->sda_pin);
- }
- static int i2c_gpio_getscl(void *data)
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      return gpio_get_value(pdata->scl_pin);
-+      return gpio_get_value_cansleep(pdata->scl_pin);
- }
- static int of_i2c_gpio_get_pins(struct device_node *np,
-@@ -175,6 +175,9 @@ static int i2c_gpio_probe(struct platfor
-               memcpy(pdata, dev_get_platdata(&pdev->dev), sizeof(*pdata));
-       }
-+      if (gpiod_cansleep(gpio_to_desc(pdata->sda_pin)) || gpiod_cansleep(gpio_to_desc(pdata->scl_pin)))
-+              dev_warn(&pdev->dev, "Slow GPIO pins might wreak havoc into I2C/SMBus bus timing");
-+
-       if (pdata->sda_is_open_drain) {
-               gpio_direction_output(pdata->sda_pin, 1);
-               bit_data->setsda = i2c_gpio_setsda_val;
diff --git a/target/linux/generic/backport-4.9/087-regmap-make-LZO-cache-optional.patch b/target/linux/generic/backport-4.9/087-regmap-make-LZO-cache-optional.patch
deleted file mode 100644 (file)
index c26994e..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From de88e9b0354c2e3ff8eae3f97afe43a34f5ed239 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Sat, 13 May 2017 13:03:21 +0200
-Subject: [PATCH] regmap: make LZO cache optional
-
-Commit 2cbbb579bcbe3 ("regmap: Add the LZO cache support") added support
-for LZO compression in regcache, but there were never any users added
-afterwards. Since LZO support itself has its own size, it currently is
-rather a deoptimization.
-
-So make it optional by introducing a symbol that can be selected by
-drivers wanting to make use of it.
-
-Saves e.g. ~46 kB on MIPS (size of LZO support + regcache LZO code).
-
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
-I tried using google to find any users (even out-of-tree ones), but at
-best I found a single driver submission that was switched to RBTREE in
-subsequent resubmissions (MFD_SMSC).
-
-One could maybe also just drop the code because of no users for 5 years,
-but that would be up to the maintainer(s) to decide.
-
- drivers/base/regmap/Kconfig    | 5 ++++-
- drivers/base/regmap/Makefile   | 3 ++-
- drivers/base/regmap/regcache.c | 2 ++
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
---- a/drivers/base/regmap/Kconfig
-+++ b/drivers/base/regmap/Kconfig
-@@ -4,9 +4,12 @@
- config REGMAP
-       default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
-+      select IRQ_DOMAIN if REGMAP_IRQ
-+      bool
-+
-+config REGCACHE_COMPRESSED
-       select LZO_COMPRESS
-       select LZO_DECOMPRESS
--      select IRQ_DOMAIN if REGMAP_IRQ
-       bool
- config REGMAP_AC97
---- a/drivers/base/regmap/Makefile
-+++ b/drivers/base/regmap/Makefile
-@@ -2,7 +2,8 @@
- CFLAGS_regmap.o := -I$(src)
- obj-$(CONFIG_REGMAP) += regmap.o regcache.o
--obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
-+obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o
-+obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o
- obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
- obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o
- obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
---- a/drivers/base/regmap/regcache.c
-+++ b/drivers/base/regmap/regcache.c
-@@ -21,7 +21,9 @@
- static const struct regcache_ops *cache_types[] = {
-       &regcache_rbtree_ops,
-+#if IS_ENABLED(CONFIG_REGCACHE_COMPRESSED)
-       &regcache_lzo_ops,
-+#endif
-       &regcache_flat_ops,
- };
diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
deleted file mode 100644 (file)
index f2f1f6f..0000000
+++ /dev/null
@@ -1,1412 +0,0 @@
-From 6ad20165d376fa07919a70e4f43dfae564601829 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Mon, 30 Jan 2017 08:22:01 -0800
-Subject: drivers: net: generalize napi_complete_done()
-
-napi_complete_done() allows to opt-in for gro_flush_timeout,
-added back in linux-3.19, commit 3b47d30396ba
-("net: gro: add a per device gro flush timer")
-
-This allows for more efficient GRO aggregation without
-sacrifying latencies.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/can/at91_can.c                          |  2 +-
- drivers/net/can/c_can/c_can.c                       |  2 +-
- drivers/net/can/flexcan.c                           |  2 +-
- drivers/net/can/ifi_canfd/ifi_canfd.c               |  2 +-
- drivers/net/can/janz-ican3.c                        |  2 +-
- drivers/net/can/m_can/m_can.c                       |  2 +-
- drivers/net/can/rcar/rcar_can.c                     |  2 +-
- drivers/net/can/rcar/rcar_canfd.c                   |  2 +-
- drivers/net/can/xilinx_can.c                        |  2 +-
- drivers/net/ethernet/3com/typhoon.c                 |  2 +-
- drivers/net/ethernet/adi/bfin_mac.c                 |  2 +-
- drivers/net/ethernet/agere/et131x.c                 |  2 +-
- drivers/net/ethernet/altera/altera_tse_main.c       |  2 +-
- drivers/net/ethernet/apm/xgene/xgene_enet_main.c    |  2 +-
- drivers/net/ethernet/aquantia/atlantic/aq_vec.c     |  2 +-
- drivers/net/ethernet/arc/emac_main.c                |  2 +-
- drivers/net/ethernet/atheros/alx/main.c             |  2 +-
- drivers/net/ethernet/atheros/atl1c/atl1c_main.c     |  2 +-
- drivers/net/ethernet/atheros/atl1e/atl1e_main.c     |  2 +-
- drivers/net/ethernet/atheros/atlx/atl1.c            |  2 +-
- drivers/net/ethernet/broadcom/b44.c                 |  2 +-
- drivers/net/ethernet/broadcom/bcm63xx_enet.c        |  2 +-
- drivers/net/ethernet/broadcom/bgmac.c               |  2 +-
- drivers/net/ethernet/broadcom/bnx2.c                |  4 ++--
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c     |  2 +-
- drivers/net/ethernet/broadcom/bnxt/bnxt.c           |  2 +-
- drivers/net/ethernet/broadcom/sb1250-mac.c          |  2 +-
- drivers/net/ethernet/brocade/bna/bnad.c             |  2 +-
- drivers/net/ethernet/cadence/macb.c                 |  2 +-
- drivers/net/ethernet/calxeda/xgmac.c                |  2 +-
- drivers/net/ethernet/cavium/liquidio/lio_main.c     |  2 +-
- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c  |  2 +-
- drivers/net/ethernet/cavium/octeon/octeon_mgmt.c    |  2 +-
- drivers/net/ethernet/cavium/thunder/nicvf_main.c    |  2 +-
- drivers/net/ethernet/chelsio/cxgb/sge.c             |  2 +-
- drivers/net/ethernet/chelsio/cxgb3/sge.c            |  4 ++--
- drivers/net/ethernet/chelsio/cxgb4vf/sge.c          |  2 +-
- drivers/net/ethernet/cisco/enic/enic_main.c         |  4 ++--
- drivers/net/ethernet/dec/tulip/interrupt.c          |  6 +++---
- drivers/net/ethernet/dnet.c                         |  2 +-
- drivers/net/ethernet/emulex/benet/be_main.c         |  2 +-
- drivers/net/ethernet/ethoc.c                        |  2 +-
- drivers/net/ethernet/ezchip/nps_enet.c              |  2 +-
- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c      |  2 +-
- drivers/net/ethernet/freescale/fec_main.c           |  2 +-
- .../net/ethernet/freescale/fs_enet/fs_enet-main.c   |  2 +-
- drivers/net/ethernet/freescale/gianfar.c            |  4 ++--
- drivers/net/ethernet/freescale/ucc_geth.c           |  2 +-
- drivers/net/ethernet/hisilicon/hip04_eth.c          |  2 +-
- drivers/net/ethernet/hisilicon/hisi_femac.c         |  2 +-
- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c       |  2 +-
- drivers/net/ethernet/ibm/ibmveth.c                  |  2 +-
- drivers/net/ethernet/ibm/ibmvnic.c                  |  2 +-
- drivers/net/ethernet/intel/e100.c                   |  2 +-
- drivers/net/ethernet/intel/ixgb/ixgb_main.c         |  2 +-
- drivers/net/ethernet/korina.c                       |  2 +-
- drivers/net/ethernet/lantiq_etop.c                  | 21 +++++++++------------
- drivers/net/ethernet/marvell/mv643xx_eth.c          |  2 +-
- drivers/net/ethernet/marvell/mvneta.c               |  6 ++----
- drivers/net/ethernet/marvell/mvpp2.c                |  2 +-
- drivers/net/ethernet/marvell/pxa168_eth.c           |  2 +-
- drivers/net/ethernet/moxa/moxart_ether.c            |  2 +-
- drivers/net/ethernet/myricom/myri10ge/myri10ge.c    |  2 +-
- drivers/net/ethernet/natsemi/natsemi.c              |  2 +-
- drivers/net/ethernet/neterion/s2io.c                |  4 ++--
- drivers/net/ethernet/neterion/vxge/vxge-main.c      |  6 +++---
- drivers/net/ethernet/nvidia/forcedeth.c             |  2 +-
- drivers/net/ethernet/nxp/lpc_eth.c                  |  2 +-
- .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c    |  2 +-
- drivers/net/ethernet/pasemi/pasemi_mac.c            |  2 +-
- .../net/ethernet/qlogic/netxen/netxen_nic_main.c    |  2 +-
- drivers/net/ethernet/qlogic/qede/qede_fp.c          |  2 +-
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c      | 10 +++++-----
- drivers/net/ethernet/qlogic/qlge/qlge_main.c        |  2 +-
- drivers/net/ethernet/qualcomm/emac/emac.c           |  2 +-
- drivers/net/ethernet/realtek/r8169.c                |  2 +-
- drivers/net/ethernet/rocker/rocker_main.c           |  2 +-
- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c     |  2 +-
- drivers/net/ethernet/sfc/efx.c                      |  2 +-
- drivers/net/ethernet/sfc/falcon/efx.c               |  2 +-
- drivers/net/ethernet/smsc/smsc9420.c                |  2 +-
- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c   |  2 +-
- drivers/net/ethernet/sun/niu.c                      |  2 +-
- drivers/net/ethernet/sun/sungem.c                   |  2 +-
- drivers/net/ethernet/sun/sunvnet_common.c           |  2 +-
- drivers/net/ethernet/tehuti/tehuti.c                |  2 +-
- drivers/net/ethernet/ti/cpsw.c                      |  2 +-
- drivers/net/ethernet/ti/davinci_emac.c              |  2 +-
- drivers/net/ethernet/ti/netcp_core.c                |  2 +-
- drivers/net/ethernet/tile/tilegx.c                  |  2 +-
- drivers/net/ethernet/tile/tilepro.c                 |  2 +-
- drivers/net/ethernet/toshiba/ps3_gelic_net.c        |  2 +-
- drivers/net/ethernet/toshiba/spider_net.c           |  2 +-
- drivers/net/ethernet/toshiba/tc35815.c              |  2 +-
- drivers/net/ethernet/tundra/tsi108_eth.c            |  2 +-
- drivers/net/ethernet/via/via-rhine.c                |  2 +-
- drivers/net/ethernet/via/via-velocity.c             |  2 +-
- drivers/net/ethernet/wiznet/w5100.c                 |  2 +-
- drivers/net/ethernet/wiznet/w5300.c                 |  2 +-
- drivers/net/fjes/fjes_main.c                        |  2 +-
- drivers/net/vmxnet3/vmxnet3_drv.c                   |  4 ++--
- drivers/net/wan/fsl_ucc_hdlc.c                      |  2 +-
- drivers/net/wan/hd64572.c                           |  2 +-
- drivers/net/wireless/ath/ath10k/pci.c               |  2 +-
- drivers/net/wireless/ath/wil6210/netdev.c           |  2 +-
- drivers/net/xen-netback/interface.c                 |  2 +-
- drivers/net/xen-netfront.c                          |  2 +-
- drivers/staging/octeon/ethernet-rx.c                |  2 +-
- drivers/staging/unisys/visornic/visornic_main.c     |  2 +-
- 109 files changed, 132 insertions(+), 137 deletions(-)
-
---- a/drivers/net/can/at91_can.c
-+++ b/drivers/net/can/at91_can.c
-@@ -813,7 +813,7 @@ static int at91_poll(struct napi_struct
-               u32 reg_ier = AT91_IRQ_ERR_FRAME;
-               reg_ier |= get_irq_mb_rx(priv) & ~AT91_MB_MASK(priv->rx_next);
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               at91_write(priv, AT91_IER, reg_ier);
-       }
---- a/drivers/net/can/c_can/c_can.c
-+++ b/drivers/net/can/c_can/c_can.c
-@@ -1070,7 +1070,7 @@ static int c_can_poll(struct napi_struct
- end:
-       if (work_done < quota) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* enable all IRQs if we are not in bus off state */
-               if (priv->can.state != CAN_STATE_BUS_OFF)
-                       c_can_irq_control(priv, true);
---- a/drivers/net/can/flexcan.c
-+++ b/drivers/net/can/flexcan.c
-@@ -703,7 +703,7 @@ static int flexcan_poll(struct napi_stru
-               work_done += flexcan_poll_bus_err(dev, reg_esr);
-       if (work_done < quota) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* enable IRQs */
-               flexcan_write(FLEXCAN_IFLAG_DEFAULT, &regs->imask1);
-               flexcan_write(priv->reg_ctrl_default, &regs->ctrl);
---- a/drivers/net/can/ifi_canfd/ifi_canfd.c
-+++ b/drivers/net/can/ifi_canfd/ifi_canfd.c
-@@ -589,7 +589,7 @@ static int ifi_canfd_poll(struct napi_st
-               work_done += ifi_canfd_do_rx_poll(ndev, quota - work_done);
-       if (work_done < quota) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               ifi_canfd_irq_enable(ndev, 1);
-       }
---- a/drivers/net/can/janz-ican3.c
-+++ b/drivers/net/can/janz-ican3.c
-@@ -1475,7 +1475,7 @@ static int ican3_napi(struct napi_struct
-       /* We have processed all packets that the adapter had, but it
-        * was less than our budget, stop polling */
-       if (received < budget)
--              napi_complete(napi);
-+              napi_complete_done(napi, received);
-       spin_lock_irqsave(&mod->lock, flags);
---- a/drivers/net/can/m_can/m_can.c
-+++ b/drivers/net/can/m_can/m_can.c
-@@ -730,7 +730,7 @@ static int m_can_poll(struct napi_struct
-               work_done += m_can_do_rx_poll(dev, (quota - work_done));
-       if (work_done < quota) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               m_can_enable_all_interrupts(priv);
-       }
---- a/drivers/net/can/rcar/rcar_can.c
-+++ b/drivers/net/can/rcar/rcar_can.c
-@@ -698,7 +698,7 @@ static int rcar_can_rx_poll(struct napi_
-       }
-       /* All packets processed */
-       if (num_pkts < quota) {
--              napi_complete(napi);
-+              napi_complete_done(napi, num_pkts);
-               priv->ier |= RCAR_CAN_IER_RXFIE;
-               writeb(priv->ier, &priv->regs->ier);
-       }
---- a/drivers/net/can/rcar/rcar_canfd.c
-+++ b/drivers/net/can/rcar/rcar_canfd.c
-@@ -1512,7 +1512,7 @@ static int rcar_canfd_rx_poll(struct nap
-       /* All packets processed */
-       if (num_pkts < quota) {
--              napi_complete(napi);
-+              napi_complete_done(napi, num_pkts);
-               /* Enable Rx FIFO interrupts */
-               rcar_canfd_set_bit(priv->base, RCANFD_RFCC(ridx),
-                                  RCANFD_RFCC_RFIE);
---- a/drivers/net/can/xilinx_can.c
-+++ b/drivers/net/can/xilinx_can.c
-@@ -838,7 +838,7 @@ static int xcan_rx_poll(struct napi_stru
-       }
-       if (work_done < quota) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               ier = priv->read_reg(priv, XCAN_IER_OFFSET);
-               ier |= XCAN_IXR_RXNEMP_MASK;
-               priv->write_reg(priv, XCAN_IER_OFFSET, ier);
---- a/drivers/net/ethernet/3com/typhoon.c
-+++ b/drivers/net/ethernet/3com/typhoon.c
-@@ -1748,7 +1748,7 @@ typhoon_poll(struct napi_struct *napi, i
-       }
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               iowrite32(TYPHOON_INTR_NONE,
-                               tp->ioaddr + TYPHOON_REG_INTR_MASK);
-               typhoon_post_pci_writes(tp->ioaddr);
---- a/drivers/net/ethernet/adi/bfin_mac.c
-+++ b/drivers/net/ethernet/adi/bfin_mac.c
-@@ -1274,7 +1274,7 @@ static int bfin_mac_poll(struct napi_str
-       }
-       if (i < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, i);
-               if (test_and_clear_bit(BFIN_MAC_RX_IRQ_DISABLED, &lp->flags))
-                       enable_irq(IRQ_MAC_RX);
-       }
---- a/drivers/net/ethernet/agere/et131x.c
-+++ b/drivers/net/ethernet/agere/et131x.c
-@@ -3573,7 +3573,7 @@ static int et131x_poll(struct napi_struc
-       et131x_handle_send_pkts(adapter);
-       if (work_done < budget) {
--              napi_complete(&adapter->napi);
-+              napi_complete_done(&adapter->napi, work_done);
-               et131x_enable_interrupts(adapter);
-       }
---- a/drivers/net/ethernet/altera/altera_tse_main.c
-+++ b/drivers/net/ethernet/altera/altera_tse_main.c
-@@ -491,7 +491,7 @@ static int tse_poll(struct napi_struct *
-       if (rxcomplete < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rxcomplete);
-               netdev_dbg(priv->dev,
-                          "NAPI Complete, did %d packets with budget %d\n",
---- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-@@ -655,7 +655,7 @@ static int xgene_enet_napi(struct napi_s
-       processed = xgene_enet_process_ring(ring, budget);
-       if (processed != budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, processed);
-               enable_irq(ring->irq);
-       }
---- a/drivers/net/ethernet/arc/emac_main.c
-+++ b/drivers/net/ethernet/arc/emac_main.c
-@@ -284,7 +284,7 @@ static int arc_emac_poll(struct napi_str
-       work_done = arc_emac_rx(ndev, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               arc_reg_or(priv, R_ENABLE, RXINT_MASK | TXINT_MASK);
-       }
---- a/drivers/net/ethernet/atheros/alx/main.c
-+++ b/drivers/net/ethernet/atheros/alx/main.c
-@@ -292,7 +292,7 @@ static int alx_poll(struct napi_struct *
-       if (!tx_complete || work == budget)
-               return budget;
--      napi_complete(&alx->napi);
-+      napi_complete_done(&alx->napi, work);
-       /* enable interrupt */
-       if (alx->flags & ALX_FLAG_USING_MSIX) {
---- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -1886,7 +1886,7 @@ static int atl1c_clean(struct napi_struc
-       if (work_done < budget) {
- quit_polling:
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               adapter->hw.intr_mask |= ISR_RX_PKT;
-               AT_WRITE_REG(&adapter->hw, REG_IMR, adapter->hw.intr_mask);
-       }
---- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-@@ -1532,7 +1532,7 @@ static int atl1e_clean(struct napi_struc
-       /* If no Tx and not enough Rx work done, exit the polling mode */
-       if (work_done < budget) {
- quit_polling:
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               imr_data = AT_READ_REG(&adapter->hw, REG_IMR);
-               AT_WRITE_REG(&adapter->hw, REG_IMR, imr_data | ISR_RX_EVENT);
-               /* test debug */
---- a/drivers/net/ethernet/atheros/atlx/atl1.c
-+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2457,7 +2457,7 @@ static int atl1_rings_clean(struct napi_
-       if (work_done >= budget)
-               return work_done;
--      napi_complete(napi);
-+      napi_complete_done(napi, work_done);
-       /* re-enable Interrupt */
-       if (likely(adapter->int_enabled))
-               atlx_imr_set(adapter, IMR_NORMAL_MASK);
---- a/drivers/net/ethernet/broadcom/b44.c
-+++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -902,7 +902,7 @@ static int b44_poll(struct napi_struct *
-       }
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               b44_enable_ints(bp);
-       }
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -511,7 +511,7 @@ static int bcm_enet_poll(struct napi_str
-       /* no more packet in rx/tx queue, remove device from poll
-        * queue */
--      napi_complete(napi);
-+      napi_complete_done(napi, rx_work_done);
-       /* restore rx/tx interrupt */
-       enet_dmac_writel(priv, priv->dma_chan_int_mask,
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1146,7 +1146,7 @@ static int bgmac_poll(struct napi_struct
-               return weight;
-       if (handled < weight) {
--              napi_complete(napi);
-+              napi_complete_done(napi, handled);
-               bgmac_chip_intrs_on(bgmac);
-       }
---- a/drivers/net/ethernet/broadcom/bnx2.c
-+++ b/drivers/net/ethernet/broadcom/bnx2.c
-@@ -3522,7 +3522,7 @@ static int bnx2_poll_msix(struct napi_st
-               rmb();
-               if (likely(!bnx2_has_fast_work(bnapi))) {
--                      napi_complete(napi);
-+                      napi_complete_done(napi, work_done);
-                       BNX2_WR(bp, BNX2_PCICFG_INT_ACK_CMD, bnapi->int_num |
-                               BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
-                               bnapi->last_status_idx);
-@@ -3559,7 +3559,7 @@ static int bnx2_poll(struct napi_struct
-               rmb();
-               if (likely(!bnx2_has_work(bnapi))) {
--                      napi_complete(napi);
-+                      napi_complete_done(napi, work_done);
-                       if (likely(bp->flags & BNX2_FLAG_USING_MSI_OR_MSIX)) {
-                               BNX2_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
-                                       BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
-@@ -3236,7 +3236,7 @@ static int bnx2x_poll(struct napi_struct
-                * has been updated when NAPI was scheduled.
-                */
-               if (IS_FCOE_FP(fp)) {
--                      napi_complete(napi);
-+                      napi_complete_done(napi, rx_work_done);
-               } else {
-                       bnx2x_update_fpsb_idx(fp);
-                       /* bnx2x_has_rx_work() reads the status block,
---- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
-+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
-@@ -1797,7 +1797,7 @@ static int bnxt_poll_nitroa0(struct napi
-       }
-       if (!bnxt_has_work(bp, cpr) && rx_pkts < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_pkts);
-               BNXT_CP_DB_REARM(cpr->cp_doorbell, cpr->cp_raw_cons);
-       }
-       return rx_pkts;
---- a/drivers/net/ethernet/broadcom/sb1250-mac.c
-+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
-@@ -2545,7 +2545,7 @@ static int sbmac_poll(struct napi_struct
-       sbdma_tx_process(sc, &(sc->sbm_txdma), 1);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
- #ifdef CONFIG_SBMAC_COALESCE
-               __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) |
---- a/drivers/net/ethernet/brocade/bna/bnad.c
-+++ b/drivers/net/ethernet/brocade/bna/bnad.c
-@@ -1881,7 +1881,7 @@ bnad_napi_poll_rx(struct napi_struct *na
-               return rcvd;
- poll_exit:
--      napi_complete(napi);
-+      napi_complete_done(napi, rcvd);
-       rx_ctrl->rx_complete++;
---- a/drivers/net/ethernet/cadence/macb.c
-+++ b/drivers/net/ethernet/cadence/macb.c
-@@ -1069,7 +1069,7 @@ static int macb_poll(struct napi_struct
-       work_done = bp->macbgem_ops.mog_rx(bp, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* Packets received while interrupts were disabled */
-               status = macb_readl(bp, RSR);
---- a/drivers/net/ethernet/calxeda/xgmac.c
-+++ b/drivers/net/ethernet/calxeda/xgmac.c
-@@ -1247,7 +1247,7 @@ static int xgmac_poll(struct napi_struct
-       work_done = xgmac_rx(priv, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               __raw_writel(DMA_INTR_DEFAULT_MASK, priv->base + XGMAC_DMA_INTR_ENA);
-       }
-       return work_done;
---- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
-+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
-@@ -2433,7 +2433,7 @@ static int liquidio_napi_poll(struct nap
-       }
-       if ((work_done < budget) && (tx_done)) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               octeon_process_droq_poll_cmd(droq->oct_dev, droq->q_no,
-                                            POLL_EVENT_ENABLE_INTR, 0);
-               return 0;
---- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
-+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
-@@ -501,7 +501,7 @@ static int octeon_mgmt_napi_poll(struct
-       if (work_done < budget) {
-               /* We stopped because no more packets were available. */
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               octeon_mgmt_enable_rx_irq(p);
-       }
-       octeon_mgmt_update_rx_stats(netdev);
---- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
-+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
-@@ -748,7 +748,7 @@ static int nicvf_poll(struct napi_struct
-       if (work_done < budget) {
-               /* Slow packet rate, exit polling */
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* Re-enable interrupts */
-               cq_head = nicvf_queue_reg_read(nic, NIC_QSET_CQ_0_7_HEAD,
-                                              cq->cq_idx);
---- a/drivers/net/ethernet/chelsio/cxgb/sge.c
-+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
-@@ -1605,7 +1605,7 @@ int t1_poll(struct napi_struct *napi, in
-       int work_done = process_responses(adapter, budget);
-       if (likely(work_done < budget)) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               writel(adapter->sge->respQ.cidx,
-                      adapter->regs + A_SG_SLEEPING);
-       }
---- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
-+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
-@@ -1843,7 +1843,7 @@ static int ofld_poll(struct napi_struct
-               __skb_queue_head_init(&queue);
-               skb_queue_splice_init(&q->rx_queue, &queue);
-               if (skb_queue_empty(&queue)) {
--                      napi_complete(napi);
-+                      napi_complete_done(napi, work_done);
-                       spin_unlock_irq(&q->lock);
-                       return work_done;
-               }
-@@ -2414,7 +2414,7 @@ static int napi_rx_handler(struct napi_s
-       int work_done = process_responses(adap, qs, budget);
-       if (likely(work_done < budget)) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /*
-                * Because we don't atomically flush the following
---- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
-+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
-@@ -1889,7 +1889,7 @@ static int napi_rx_handler(struct napi_s
-       u32 val;
-       if (likely(work_done < budget)) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               intr_params = rspq->next_intr_params;
-               rspq->next_intr_params = rspq->intr_params;
-       } else
---- a/drivers/net/ethernet/cisco/enic/enic_main.c
-+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
-@@ -1339,7 +1339,7 @@ static int enic_poll(struct napi_struct
-                * exit polling
-                */
--              napi_complete(napi);
-+              napi_complete_done(napi, rq_work_done);
-               if (enic->rx_coalesce_setting.use_adaptive_rx_coalesce)
-                       enic_set_int_moderation(enic, &enic->rq[0]);
-               vnic_intr_unmask(&enic->intr[intr]);
-@@ -1496,7 +1496,7 @@ static int enic_poll_msix_rq(struct napi
-                * exit polling
-                */
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               if (enic->rx_coalesce_setting.use_adaptive_rx_coalesce)
-                       enic_set_int_moderation(enic, &enic->rq[rq]);
-               vnic_intr_unmask(&enic->intr[intr]);
---- a/drivers/net/ethernet/dec/tulip/interrupt.c
-+++ b/drivers/net/ethernet/dec/tulip/interrupt.c
-@@ -319,8 +319,8 @@ int tulip_poll(struct napi_struct *napi,
-          /* Remove us from polling list and enable RX intr. */
--         napi_complete(napi);
--         iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7);
-+      napi_complete_done(napi, work_done);
-+      iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7);
-          /* The last op happens after poll completion. Which means the following:
-           * 1. it can race with disabling irqs in irq handler
-@@ -355,7 +355,7 @@ int tulip_poll(struct napi_struct *napi,
-           * before we did napi_complete(). See? We would lose it. */
-          /* remove ourselves from the polling list */
--         napi_complete(napi);
-+         napi_complete_done(napi, work_done);
-          return work_done;
- }
---- a/drivers/net/ethernet/dnet.c
-+++ b/drivers/net/ethernet/dnet.c
-@@ -415,7 +415,7 @@ static int dnet_poll(struct napi_struct
-               /* We processed all packets available.  Tell NAPI it can
-                * stop polling then re-enable rx interrupts.
-                */
--              napi_complete(napi);
-+              napi_complete_done(napi, npackets);
-               int_enable = dnet_readl(bp, INTR_ENB);
-               int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF;
-               dnet_writel(bp, int_enable, INTR_ENB);
---- a/drivers/net/ethernet/emulex/benet/be_main.c
-+++ b/drivers/net/ethernet/emulex/benet/be_main.c
-@@ -3344,7 +3344,7 @@ int be_poll(struct napi_struct *napi, in
-               be_process_mcc(adapter);
-       if (max_work < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, max_work);
-               /* Skyhawk EQ_DB has a provision to set the rearm to interrupt
-                * delay via a delay multiplier encoding value
---- a/drivers/net/ethernet/ethoc.c
-+++ b/drivers/net/ethernet/ethoc.c
-@@ -614,7 +614,7 @@ static int ethoc_poll(struct napi_struct
-       tx_work_done = ethoc_tx(priv->netdev, budget);
-       if (rx_work_done < budget && tx_work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_work_done);
-               ethoc_enable_irq(priv, INT_MASK_TX | INT_MASK_RX);
-       }
---- a/drivers/net/ethernet/ezchip/nps_enet.c
-+++ b/drivers/net/ethernet/ezchip/nps_enet.c
-@@ -192,7 +192,7 @@ static int nps_enet_poll(struct napi_str
-       if (work_done < budget) {
-               u32 buf_int_enable_value = 0;
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* set tx_done and rx_rdy bits */
-               buf_int_enable_value |= NPS_ENET_ENABLE << RX_RDY_SHIFT;
---- a/drivers/net/ethernet/freescale/fec_main.c
-+++ b/drivers/net/ethernet/freescale/fec_main.c
-@@ -1623,7 +1623,7 @@ static int fec_enet_rx_napi(struct napi_
-       fec_enet_tx(ndev);
-       if (pkts < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, pkts);
-               writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
-       }
-       return pkts;
---- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
-+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
-@@ -301,7 +301,7 @@ static int fs_enet_napi(struct napi_stru
-       if (received < budget && tx_left) {
-               /* done */
--              napi_complete(napi);
-+              napi_complete_done(napi, received);
-               (*fep->ops->napi_enable)(dev);
-               return received;
---- a/drivers/net/ethernet/freescale/gianfar.c
-+++ b/drivers/net/ethernet/freescale/gianfar.c
-@@ -3197,7 +3197,7 @@ static int gfar_poll_rx_sq(struct napi_s
-       if (work_done < budget) {
-               u32 imask;
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* Clear the halt bit in RSTAT */
-               gfar_write(&regs->rstat, gfargrp->rstat);
-@@ -3286,7 +3286,7 @@ static int gfar_poll_rx(struct napi_stru
-       if (!num_act_queues) {
-               u32 imask;
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* Clear the halt bit in RSTAT */
-               gfar_write(&regs->rstat, gfargrp->rstat);
---- a/drivers/net/ethernet/freescale/ucc_geth.c
-+++ b/drivers/net/ethernet/freescale/ucc_geth.c
-@@ -3303,7 +3303,7 @@ static int ucc_geth_poll(struct napi_str
-               howmany += ucc_geth_rx(ugeth, i, budget - howmany);
-       if (howmany < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, howmany);
-               setbits32(ugeth->uccf->p_uccm, UCCE_RX_EVENTS | UCCE_TX_EVENTS);
-       }
---- a/drivers/net/ethernet/hisilicon/hip04_eth.c
-+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
-@@ -555,7 +555,7 @@ refill:
-               priv->reg_inten |= RCV_INT;
-               writel_relaxed(priv->reg_inten, priv->base + PPE_INTEN);
-       }
--      napi_complete(napi);
-+      napi_complete_done(napi, rx);
- done:
-       /* clean up tx descriptors and start a new timer if necessary */
-       tx_remaining = hip04_tx_reclaim(ndev, false);
---- a/drivers/net/ethernet/hisilicon/hisi_femac.c
-+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
-@@ -330,7 +330,7 @@ static int hisi_femac_poll(struct napi_s
-       } while (ints & DEF_INT_MASK);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               hisi_femac_irq_enable(priv, DEF_INT_MASK &
-                                       (~IRQ_INT_TX_PER_PACKET));
-       }
---- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
-+++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
-@@ -578,7 +578,7 @@ static int hix5hd2_poll(struct napi_stru
-       } while (ints & DEF_INT_MASK);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               hix5hd2_irq_enable(priv);
-       }
---- a/drivers/net/ethernet/ibm/ibmveth.c
-+++ b/drivers/net/ethernet/ibm/ibmveth.c
-@@ -1323,7 +1323,7 @@ static int ibmveth_poll(struct napi_stru
-       ibmveth_replenish_task(adapter);
-       if (frames_processed < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, frames_processed);
-               /* We think we are done - reenable interrupts,
-                * then check once more to make sure we are done.
---- a/drivers/net/ethernet/ibm/ibmvnic.c
-+++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -1028,7 +1028,7 @@ restart_poll:
-       if (frames_processed < budget) {
-               enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);
--              napi_complete(napi);
-+              napi_complete_done(napi, frames_processed);
-               if (pending_scrq(adapter, adapter->rx_scrq[scrq_num]) &&
-                   napi_reschedule(napi)) {
-                       disable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);
---- a/drivers/net/ethernet/intel/e100.c
-+++ b/drivers/net/ethernet/intel/e100.c
-@@ -2253,7 +2253,7 @@ static int e100_poll(struct napi_struct
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               e100_enable_irq(nic);
-       }
---- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
-+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
-@@ -1825,7 +1825,7 @@ ixgb_clean(struct napi_struct *napi, int
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               if (!test_bit(__IXGB_DOWN, &adapter->flags))
-                       ixgb_irq_enable(adapter);
-       }
---- a/drivers/net/ethernet/korina.c
-+++ b/drivers/net/ethernet/korina.c
-@@ -464,7 +464,7 @@ static int korina_poll(struct napi_struc
-       work_done = korina_rx(dev, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               writel(readl(&lp->rx_dma_regs->dmasm) &
-                       ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR),
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -156,24 +156,21 @@ ltq_etop_poll_rx(struct napi_struct *nap
- {
-       struct ltq_etop_chan *ch = container_of(napi,
-                               struct ltq_etop_chan, napi);
--      int rx = 0;
--      int complete = 0;
-+      int work_done = 0;
--      while ((rx < budget) && !complete) {
-+      while (work_done < budget) {
-               struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc];
--              if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) == LTQ_DMA_C) {
--                      ltq_etop_hw_receive(ch);
--                      rx++;
--              } else {
--                      complete = 1;
--              }
-+              if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) != LTQ_DMA_C)
-+                      break;
-+              ltq_etop_hw_receive(ch);
-+              work_done++;
-       }
--      if (complete || !rx) {
--              napi_complete(&ch->napi);
-+      if (work_done < budget) {
-+              napi_complete_done(&ch->napi, work_done);
-               ltq_dma_ack_irq(&ch->dma);
-       }
--      return rx;
-+      return work_done;
- }
- static int
---- a/drivers/net/ethernet/marvell/mv643xx_eth.c
-+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
-@@ -2312,7 +2312,7 @@ static int mv643xx_eth_poll(struct napi_
-       if (work_done < budget) {
-               if (mp->oom)
-                       mod_timer(&mp->rx_oom, jiffies + (HZ / 10));
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               wrlp(mp, INT_MASK, mp->int_mask);
-       }
---- a/drivers/net/ethernet/marvell/mvneta.c
-+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -2702,11 +2702,9 @@ static int mvneta_poll(struct napi_struc
-                       rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]);
-       }
--      budget -= rx_done;
--
--      if (budget > 0) {
-+      if (rx_done < budget) {
-               cause_rx_tx = 0;
--              napi_complete(&port->napi);
-+              napi_complete_done(&port->napi, rx_done);
-               enable_percpu_irq(pp->dev->irq, 0);
-       }
---- a/drivers/net/ethernet/marvell/mvpp2.c
-+++ b/drivers/net/ethernet/marvell/mvpp2.c
-@@ -5406,7 +5406,7 @@ static int mvpp2_poll(struct napi_struct
-       if (budget > 0) {
-               cause_rx = 0;
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_done);
-               mvpp2_interrupts_enable(port);
-       }
---- a/drivers/net/ethernet/marvell/pxa168_eth.c
-+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
-@@ -1264,7 +1264,7 @@ static int pxa168_rx_poll(struct napi_st
-       }
-       work_done = rxq_process(dev, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               wrl(pep, INT_MASK, ALL_INTS);
-       }
---- a/drivers/net/ethernet/moxa/moxart_ether.c
-+++ b/drivers/net/ethernet/moxa/moxart_ether.c
-@@ -270,7 +270,7 @@ rx_next:
-       }
-       if (rx < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rx);
-       }
-       priv->reg_imr |= RPKT_FINISH_M;
---- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
-+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
-@@ -1678,7 +1678,7 @@ static int myri10ge_poll(struct napi_str
-       myri10ge_ss_unlock_napi(ss);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               put_be32(htonl(3), ss->irq_claim);
-       }
-       return work_done;
---- a/drivers/net/ethernet/natsemi/natsemi.c
-+++ b/drivers/net/ethernet/natsemi/natsemi.c
-@@ -2261,7 +2261,7 @@ static int natsemi_poll(struct napi_stru
-               np->intr_status = readl(ioaddr + IntrStatus);
-       } while (np->intr_status);
--      napi_complete(napi);
-+      napi_complete_done(napi, work_done);
-       /* Reenable interrupts providing nothing is trying to shut
-        * the chip down. */
---- a/drivers/net/ethernet/neterion/s2io.c
-+++ b/drivers/net/ethernet/neterion/s2io.c
-@@ -2783,7 +2783,7 @@ static int s2io_poll_msix(struct napi_st
-       s2io_chk_rx_buffers(nic, ring);
-       if (pkts_processed < budget_org) {
--              napi_complete(napi);
-+              napi_complete_done(napi, pkts_processed);
-               /*Re Enable MSI-Rx Vector*/
-               addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
-               addr += 7 - ring->ring_no;
-@@ -2817,7 +2817,7 @@ static int s2io_poll_inta(struct napi_st
-                       break;
-       }
-       if (pkts_processed < budget_org) {
--              napi_complete(napi);
-+              napi_complete_done(napi, pkts_processed);
-               /* Re enable the Rx interrupts for the ring */
-               writeq(0, &bar0->rx_traffic_mask);
-               readl(&bar0->rx_traffic_mask);
---- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
-+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
-@@ -1823,8 +1823,8 @@ static int vxge_poll_msix(struct napi_st
-       vxge_hw_vpath_poll_rx(ring->handle);
-       pkts_processed = ring->pkts_processed;
--      if (ring->pkts_processed < budget_org) {
--              napi_complete(napi);
-+      if (pkts_processed < budget_org) {
-+              napi_complete_done(napi, pkts_processed);
-               /* Re enable the Rx interrupts for the vpath */
-               vxge_hw_channel_msix_unmask(
-@@ -1863,7 +1863,7 @@ static int vxge_poll_inta(struct napi_st
-       VXGE_COMPLETE_ALL_TX(vdev);
-       if (pkts_processed < budget_org) {
--              napi_complete(napi);
-+              napi_complete_done(napi, pkts_processed);
-               /* Re enable the Rx interrupts for the ring */
-               vxge_hw_device_unmask_all(hldev);
-               vxge_hw_device_flush_io(hldev);
---- a/drivers/net/ethernet/nvidia/forcedeth.c
-+++ b/drivers/net/ethernet/nvidia/forcedeth.c
-@@ -3756,7 +3756,7 @@ static int nv_napi_poll(struct napi_stru
-       if (rx_work < budget) {
-               /* re-enable interrupts
-                  (msix not enabled in napi) */
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_work);
-               writel(np->irqmask, base + NvRegIrqMask);
-       }
---- a/drivers/net/ethernet/nxp/lpc_eth.c
-+++ b/drivers/net/ethernet/nxp/lpc_eth.c
-@@ -999,7 +999,7 @@ static int lpc_eth_poll(struct napi_stru
-       rx_done = __lpc_handle_recv(ndev, budget);
-       if (rx_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_done);
-               lpc_eth_enable_int(pldat->net_base);
-       }
---- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
-+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
-@@ -2391,7 +2391,7 @@ static int pch_gbe_napi_poll(struct napi
-               poll_end_flag = true;
-       if (poll_end_flag) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               pch_gbe_irq_enable(adapter);
-       }
---- a/drivers/net/ethernet/pasemi/pasemi_mac.c
-+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
-@@ -1575,7 +1575,7 @@ static int pasemi_mac_poll(struct napi_s
-       pkts = pasemi_mac_clean_rx(rx_ring(mac), budget);
-       if (pkts < budget) {
-               /* all done, no more packets present */
--              napi_complete(napi);
-+              napi_complete_done(napi, pkts);
-               pasemi_mac_restart_rx_intr(mac);
-               pasemi_mac_restart_tx_intr(mac);
---- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
-+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
-@@ -2391,7 +2391,7 @@ static int netxen_nic_poll(struct napi_s
-               work_done = budget;
-       if (work_done < budget) {
--              napi_complete(&sds_ring->napi);
-+              napi_complete_done(&sds_ring->napi, work_done);
-               if (test_bit(__NX_DEV_UP, &adapter->state))
-                       netxen_nic_enable_int(sds_ring);
-       }
---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
-+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
-@@ -975,7 +975,7 @@ static int qlcnic_poll(struct napi_struc
-               work_done = budget;
-       if (work_done < budget) {
--              napi_complete(&sds_ring->napi);
-+              napi_complete_done(&sds_ring->napi, work_done);
-               if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
-                       qlcnic_enable_sds_intr(adapter, sds_ring);
-                       qlcnic_enable_tx_intr(adapter, tx_ring);
-@@ -1019,7 +1019,7 @@ static int qlcnic_rx_poll(struct napi_st
-       work_done = qlcnic_process_rcv_ring(sds_ring, budget);
-       if (work_done < budget) {
--              napi_complete(&sds_ring->napi);
-+              napi_complete_done(&sds_ring->napi, work_done);
-               if (test_bit(__QLCNIC_DEV_UP, &adapter->state))
-                       qlcnic_enable_sds_intr(adapter, sds_ring);
-       }
-@@ -1966,7 +1966,7 @@ static int qlcnic_83xx_msix_sriov_vf_pol
-               work_done = budget;
-       if (work_done < budget) {
--              napi_complete(&sds_ring->napi);
-+              napi_complete_done(&sds_ring->napi, work_done);
-               qlcnic_enable_sds_intr(adapter, sds_ring);
-       }
-@@ -1994,7 +1994,7 @@ static int qlcnic_83xx_poll(struct napi_
-               work_done = budget;
-       if (work_done < budget) {
--              napi_complete(&sds_ring->napi);
-+              napi_complete_done(&sds_ring->napi, work_done);
-               qlcnic_enable_sds_intr(adapter, sds_ring);
-       }
-@@ -2032,7 +2032,7 @@ static int qlcnic_83xx_rx_poll(struct na
-       adapter = sds_ring->adapter;
-       work_done = qlcnic_83xx_process_rcv_ring(sds_ring, budget);
-       if (work_done < budget) {
--              napi_complete(&sds_ring->napi);
-+              napi_complete_done(&sds_ring->napi, work_done);
-               if (test_bit(__QLCNIC_DEV_UP, &adapter->state))
-                       qlcnic_enable_sds_intr(adapter, sds_ring);
-       }
---- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
-+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
-@@ -2334,7 +2334,7 @@ static int ql_napi_poll_msix(struct napi
-       }
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               ql_enable_completion_interrupt(qdev, rx_ring->irq);
-       }
-       return work_done;
---- a/drivers/net/ethernet/qualcomm/emac/emac.c
-+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
-@@ -129,7 +129,7 @@ static int emac_napi_rtx(struct napi_str
-       emac_mac_rx_process(adpt, rx_q, &work_done, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               irq->mask |= rx_q->intr;
-               writel(irq->mask, adpt->base + EMAC_INT_MASK);
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -7578,7 +7578,7 @@ static int rtl8169_poll(struct napi_stru
-       }
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               rtl_irq_enable(tp, enable_mask);
-               mmiowb();
---- a/drivers/net/ethernet/rocker/rocker_main.c
-+++ b/drivers/net/ethernet/rocker/rocker_main.c
-@@ -2480,7 +2480,7 @@ static int rocker_port_poll_rx(struct na
-       }
-       if (credits < budget)
--              napi_complete(napi);
-+              napi_complete_done(napi, credits);
-       rocker_dma_ring_credits_set(rocker, &rocker_port->rx_ring, credits);
---- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
-+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
-@@ -1578,7 +1578,7 @@ static int sxgbe_poll(struct napi_struct
-       work_done = sxgbe_rx(priv, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               priv->hw->dma->enable_dma_irq(priv->ioaddr, qnum);
-       }
---- a/drivers/net/ethernet/sfc/efx.c
-+++ b/drivers/net/ethernet/sfc/efx.c
-@@ -332,7 +332,7 @@ static int efx_poll(struct napi_struct *
-                * since efx_nic_eventq_read_ack() will have no effect if
-                * interrupts have already been disabled.
-                */
--              napi_complete(napi);
-+              napi_complete_done(napi, spent);
-               efx_nic_eventq_read_ack(channel);
-       }
---- a/drivers/net/ethernet/smsc/smsc9420.c
-+++ b/drivers/net/ethernet/smsc/smsc9420.c
-@@ -869,7 +869,7 @@ static int smsc9420_rx_poll(struct napi_
-       smsc9420_pci_flush_write(pd);
-       if (work_done < budget) {
--              napi_complete(&pd->napi);
-+              napi_complete_done(&pd->napi, work_done);
-               /* re-enable RX DMA interrupts */
-               dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA);
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -2700,7 +2700,7 @@ static int stmmac_poll(struct napi_struc
-       work_done = stmmac_rx(priv, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               stmmac_enable_dma_irq(priv);
-       }
-       return work_done;
---- a/drivers/net/ethernet/sun/niu.c
-+++ b/drivers/net/ethernet/sun/niu.c
-@@ -3785,7 +3785,7 @@ static int niu_poll(struct napi_struct *
-       work_done = niu_poll_core(np, lp, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               niu_ldg_rearm(np, lp, 1);
-       }
-       return work_done;
---- a/drivers/net/ethernet/sun/sungem.c
-+++ b/drivers/net/ethernet/sun/sungem.c
-@@ -924,7 +924,7 @@ static int gem_poll(struct napi_struct *
-               gp->status = readl(gp->regs + GREG_STAT);
-       } while (gp->status & GREG_STAT_NAPI);
--      napi_complete(napi);
-+      napi_complete_done(napi, work_done);
-       gem_enable_ints(gp);
-       return work_done;
---- a/drivers/net/ethernet/sun/sunvnet_common.c
-+++ b/drivers/net/ethernet/sun/sunvnet_common.c
-@@ -850,7 +850,7 @@ int sunvnet_poll_common(struct napi_stru
-       int processed = vnet_event_napi(port, budget);
-       if (processed < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, processed);
-               port->rx_event &= ~LDC_EVENT_DATA_READY;
-               vio_set_intr(vio->vdev->rx_ino, HV_INTR_ENABLED);
-       }
---- a/drivers/net/ethernet/tehuti/tehuti.c
-+++ b/drivers/net/ethernet/tehuti/tehuti.c
-@@ -303,7 +303,7 @@ static int bdx_poll(struct napi_struct *
-                * device lock and allow waiting tasks (eg rmmod) to advance) */
-               priv->napi_stop = 0;
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               bdx_enable_interrupts(priv);
-       }
-       return work_done;
---- a/drivers/net/ethernet/ti/cpsw.c
-+++ b/drivers/net/ethernet/ti/cpsw.c
-@@ -843,7 +843,7 @@ static int cpsw_rx_poll(struct napi_stru
-       }
-       if (num_rx < budget) {
--              napi_complete(napi_rx);
-+              napi_complete_done(napi_rx, num_rx);
-               writel(0xff, &cpsw->wr_regs->rx_en);
-               if (cpsw->quirk_irq && cpsw->rx_irq_disabled) {
-                       cpsw->rx_irq_disabled = false;
---- a/drivers/net/ethernet/ti/davinci_emac.c
-+++ b/drivers/net/ethernet/ti/davinci_emac.c
-@@ -1295,7 +1295,7 @@ static int emac_poll(struct napi_struct
-                                       &emac_rxhost_errcodes[cause][0], ch);
-               }
-       } else if (num_rx_pkts < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, num_rx_pkts);
-               emac_int_enable(priv);
-       }
---- a/drivers/net/ethernet/ti/netcp_core.c
-+++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -939,7 +939,7 @@ static int netcp_rx_poll(struct napi_str
-       netcp_rxpool_refill(netcp);
-       if (packets < budget) {
--              napi_complete(&netcp->rx_napi);
-+              napi_complete_done(&netcp->rx_napi, packets);
-               knav_queue_enable_notify(netcp->rx_queue);
-       }
---- a/drivers/net/ethernet/tile/tilegx.c
-+++ b/drivers/net/ethernet/tile/tilegx.c
-@@ -678,7 +678,7 @@ static int tile_net_poll(struct napi_str
-       }
-       /* There are no packets left. */
--      napi_complete(&info_mpipe->napi);
-+      napi_complete_done(&info_mpipe->napi, work);
-       md = &mpipe_data[instance];
-       /* Re-enable hypervisor interrupts. */
---- a/drivers/net/ethernet/tile/tilepro.c
-+++ b/drivers/net/ethernet/tile/tilepro.c
-@@ -842,7 +842,7 @@ static int tile_net_poll(struct napi_str
-               }
-       }
--      napi_complete(&info->napi);
-+      napi_complete_done(&info->napi, work);
-       if (!priv->active)
-               goto done;
---- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
-+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
-@@ -1109,7 +1109,7 @@ static int gelic_net_poll(struct napi_st
-       }
-       if (packets_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, packets_done);
-               gelic_card_rx_irq_on(card);
-       }
-       return packets_done;
---- a/drivers/net/ethernet/toshiba/spider_net.c
-+++ b/drivers/net/ethernet/toshiba/spider_net.c
-@@ -1270,7 +1270,7 @@ static int spider_net_poll(struct napi_s
-       /* if all packets are in the stack, enable interrupts and return 0 */
-       /* if not, return 1 */
-       if (packets_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, packets_done);
-               spider_net_rx_irq_on(card);
-               card->ignore_rx_ramfull = 0;
-       }
---- a/drivers/net/ethernet/toshiba/tc35815.c
-+++ b/drivers/net/ethernet/toshiba/tc35815.c
-@@ -1639,7 +1639,7 @@ static int tc35815_poll(struct napi_stru
-       spin_unlock(&lp->rx_lock);
-       if (received < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, received);
-               /* enable interrupts */
-               tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl);
-       }
---- a/drivers/net/ethernet/tundra/tsi108_eth.c
-+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
-@@ -887,7 +887,7 @@ static int tsi108_poll(struct napi_struc
-       if (num_received < budget) {
-               data->rxpending = 0;
--              napi_complete(napi);
-+              napi_complete_done(napi, num_received);
-               TSI_WRITE(TSI108_EC_INTMASK,
-                                    TSI_READ(TSI108_EC_INTMASK)
---- a/drivers/net/ethernet/via/via-rhine.c
-+++ b/drivers/net/ethernet/via/via-rhine.c
-@@ -861,7 +861,7 @@ static int rhine_napipoll(struct napi_st
-       }
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               iowrite16(enable_mask, ioaddr + IntrEnable);
-               mmiowb();
-       }
---- a/drivers/net/ethernet/via/via-velocity.c
-+++ b/drivers/net/ethernet/via/via-velocity.c
-@@ -2160,7 +2160,7 @@ static int velocity_poll(struct napi_str
-       velocity_tx_srv(vptr);
-       /* If budget not fully consumed, exit the polling mode */
-       if (rx_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_done);
-               mac_enable_int(vptr->mac_regs);
-       }
-       spin_unlock_irqrestore(&vptr->lock, flags);
---- a/drivers/net/ethernet/wiznet/w5100.c
-+++ b/drivers/net/ethernet/wiznet/w5100.c
-@@ -915,7 +915,7 @@ static int w5100_napi_poll(struct napi_s
-       }
-       if (rx_count < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_count);
-               w5100_enable_intr(priv);
-       }
---- a/drivers/net/ethernet/wiznet/w5300.c
-+++ b/drivers/net/ethernet/wiznet/w5300.c
-@@ -417,7 +417,7 @@ static int w5300_napi_poll(struct napi_s
-       }
-       if (rx_count < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_count);
-               w5300_write(priv, W5300_IMR, IR_S0);
-               mmiowb();
-       }
---- a/drivers/net/fjes/fjes_main.c
-+++ b/drivers/net/fjes/fjes_main.c
-@@ -1122,7 +1122,7 @@ static int fjes_poll(struct napi_struct
-       }
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               if (adapter->unset_rx_last) {
-                       adapter->rx_last_jiffies = jiffies;
---- a/drivers/net/vmxnet3/vmxnet3_drv.c
-+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
-@@ -1873,7 +1873,7 @@ vmxnet3_poll(struct napi_struct *napi, i
-       rxd_done = vmxnet3_do_poll(rx_queue->adapter, budget);
-       if (rxd_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rxd_done);
-               vmxnet3_enable_all_intrs(rx_queue->adapter);
-       }
-       return rxd_done;
-@@ -1904,7 +1904,7 @@ vmxnet3_poll_rx_only(struct napi_struct
-       rxd_done = vmxnet3_rq_rx_complete(rq, adapter, budget);
-       if (rxd_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, rxd_done);
-               vmxnet3_enable_intr(adapter, rq->comp_ring.intr_idx);
-       }
-       return rxd_done;
---- a/drivers/net/wan/fsl_ucc_hdlc.c
-+++ b/drivers/net/wan/fsl_ucc_hdlc.c
-@@ -573,7 +573,7 @@ static int ucc_hdlc_poll(struct napi_str
-       howmany += hdlc_rx_done(priv, budget - howmany);
-       if (howmany < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, howmany);
-               qe_setbits32(priv->uccf->p_uccm,
-                            (UCCE_HDLC_RX_EVENTS | UCCE_HDLC_TX_EVENTS) << 16);
-       }
---- a/drivers/net/wan/hd64572.c
-+++ b/drivers/net/wan/hd64572.c
-@@ -341,7 +341,7 @@ static int sca_poll(struct napi_struct *
-               received = sca_rx_done(port, budget);
-       if (received < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, received);
-               enable_intr(port);
-       }
---- a/drivers/net/wireless/ath/ath10k/pci.c
-+++ b/drivers/net/wireless/ath/ath10k/pci.c
-@@ -2804,7 +2804,7 @@ static int ath10k_pci_napi_poll(struct n
-       done = ath10k_htt_txrx_compl_task(ar, budget);
-       if (done < budget) {
--              napi_complete(ctx);
-+              napi_complete_done(ctx, done);
-               /* In case of MSI, it is possible that interrupts are received
-                * while NAPI poll is inprogress. So pending interrupts that are
-                * received after processing all copy engine pipes by NAPI poll
---- a/drivers/net/wireless/ath/wil6210/netdev.c
-+++ b/drivers/net/wireless/ath/wil6210/netdev.c
-@@ -84,7 +84,7 @@ static int wil6210_netdev_poll_rx(struct
-       done = budget - quota;
-       if (done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, done);
-               wil6210_unmask_irq_rx(wil);
-               wil_dbg_txrx(wil, "NAPI RX complete\n");
-       }
---- a/drivers/net/xen-netback/interface.c
-+++ b/drivers/net/xen-netback/interface.c
-@@ -104,7 +104,7 @@ static int xenvif_poll(struct napi_struc
-       work_done = xenvif_tx_action(queue, budget);
-       if (work_done < budget) {
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               /* If the queue is rate-limited, it shall be
-                * rescheduled in the timer callback.
-                */
---- a/drivers/net/xen-netfront.c
-+++ b/drivers/net/xen-netfront.c
-@@ -1070,7 +1070,7 @@ err:
-       if (work_done < budget) {
-               int more_to_do = 0;
--              napi_complete(napi);
-+              napi_complete_done(napi, work_done);
-               RING_FINAL_CHECK_FOR_RESPONSES(&queue->rx, more_to_do);
-               if (more_to_do)
---- a/drivers/staging/octeon/ethernet-rx.c
-+++ b/drivers/staging/octeon/ethernet-rx.c
-@@ -429,7 +429,7 @@ static int cvm_oct_napi_poll(struct napi
-       if (rx_count < budget) {
-               /* No more work */
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_count);
-               enable_irq(rx_group->irq);
-       }
-       return rx_count;
---- a/drivers/staging/unisys/visornic/visornic_main.c
-+++ b/drivers/staging/unisys/visornic/visornic_main.c
-@@ -1657,7 +1657,7 @@ static int visornic_poll(struct napi_str
-       /* If there aren't any more packets to receive stop the poll */
-       if (rx_count < budget)
--              napi_complete(napi);
-+              napi_complete_done(napi, rx_count);
-       return rx_count;
- }
diff --git a/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch b/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch
deleted file mode 100644 (file)
index 7c3c560..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From 89a23c8b528bd2c89f3981573d6cd7d23840c8a6 Mon Sep 17 00:00:00 2001
-From: Craig Gallek <cgallek@google.com>
-Date: Wed, 26 Apr 2017 14:37:45 -0400
-Subject: [PATCH] ip6_tunnel: Fix missing tunnel encapsulation limit option
-
-The IPv6 tunneling code tries to insert IPV6_TLV_TNL_ENCAP_LIMIT and
-IPV6_TLV_PADN options when an encapsulation limit is defined (the
-default is a limit of 4).  An MTU adjustment is done to account for
-these options as well.  However, the options are never present in the
-generated packets.
-
-The issue appears to be a subtlety between IPV6_DSTOPTS and
-IPV6_RTHDRDSTOPTS defined in RFC 3542.  When the IPIP tunnel driver was
-written, the encap limit options were included as IPV6_RTHDRDSTOPTS in
-dst0opt of struct ipv6_txoptions.  Later, ipv6_push_nfrags_opts was
-(correctly) updated to require IPV6_RTHDR options when IPV6_RTHDRDSTOPTS
-are to be used.  This caused the options to no longer be included in v6
-encapsulated packets.
-
-The fix is to use IPV6_DSTOPTS (in dst1opt of struct ipv6_txoptions)
-instead.  IPV6_DSTOPTS do not have the additional IPV6_RTHDR requirement.
-
-Fixes: 1df64a8569c7: ("[IPV6]: Add ip6ip6 tunnel driver.")
-Fixes: 333fad5364d6: ("[IPV6]: Support several new sockopt / ancillary data in Advanced API (RFC3542)")
-Signed-off-by: Craig Gallek <kraig@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv6/ip6_tunnel.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -958,7 +958,7 @@ static void init_tel_txopt(struct ipv6_t
-       opt->dst_opt[5] = IPV6_TLV_PADN;
-       opt->dst_opt[6] = 1;
--      opt->ops.dst0opt = (struct ipv6_opt_hdr *) opt->dst_opt;
-+      opt->ops.dst1opt = (struct ipv6_opt_hdr *) opt->dst_opt;
-       opt->ops.opt_nflen = 8;
- }
-@@ -1200,7 +1200,7 @@ route_lookup:
-       if (encap_limit >= 0) {
-               init_tel_txopt(&opt, encap_limit);
--              ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
-+              ipv6_push_frag_opts(skb, &opt.ops, &proto);
-       }
-       skb_push(skb, sizeof(struct ipv6hdr));
diff --git a/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch b/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch
deleted file mode 100644 (file)
index d102e7b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5b8481fa42ac58484d633b558579e302aead64c1 Mon Sep 17 00:00:00 2001
-From: "David S. Miller" <davem@davemloft.net>
-Date: Mon, 1 May 2017 15:10:20 -0400
-Subject: [PATCH] ipv6: Need to export ipv6_push_frag_opts for tunneling now.
-
-Since that change also made the nfrag function not necessary
-for exports, remove it.
-
-Fixes: 89a23c8b528b ("ip6_tunnel: Fix missing tunnel encapsulation limit option")
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv6/exthdrs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv6/exthdrs.c
-+++ b/net/ipv6/exthdrs.c
-@@ -729,13 +729,13 @@ void ipv6_push_nfrag_opts(struct sk_buff
-       if (opt->hopopt)
-               ipv6_push_exthdr(skb, proto, NEXTHDR_HOP, opt->hopopt);
- }
--EXPORT_SYMBOL(ipv6_push_nfrag_opts);
- void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto)
- {
-       if (opt->dst1opt)
-               ipv6_push_exthdr(skb, proto, NEXTHDR_DEST, opt->dst1opt);
- }
-+EXPORT_SYMBOL(ipv6_push_frag_opts);
- struct ipv6_txoptions *
- ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt)
diff --git a/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch
deleted file mode 100644 (file)
index 38ae076..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-From 46bf067870156abd61fe24d14c2486d15b8b502c Mon Sep 17 00:00:00 2001
-From: Dave Taht <dave@taht.net>
-Date: Fri, 14 Dec 2018 18:38:40 +0000
-Subject: [PATCH 1/1] Allow class-e address assignment in ifconfig and early
- boot
-
-While the linux kernel became mostly "class-e clean" a decade ago,
-and most distributions long ago switched to the iproute2 suite
-of utilities, which allow class-e (240.0.0.0/4) address assignment,
-distributions relying on busybox, toybox and other forms of
-ifconfig cannot assign class-e addresses without this kernel patch.
-
-With this patch, also, a boot command line on these addresses is feasible:
-(ip=248.0.1.2::248.0.1.1:255.255.255.0).
-
-While CIDR has been obsolete for 2 decades, and a survey of all the
-userspace open source code in the world shows most IN_whatever macros
-are also obsolete... rather than obsolete CIDR from this ioctl entirely,
-this patch merely enables class-e assignment, sanely.
-
-H/T to Vince Fuller and his original patch here:
-    https://lkml.org/lkml/2008/1/7/370
-
-Signed-off-by: Dave Taht <dave.taht@gmail.com>
-Reviewed-by: John Gilmore <gnu@toad.com>
----
- include/uapi/linux/in.h | 8 ++++++--
- net/ipv4/devinet.c      | 4 +++-
- net/ipv4/ipconfig.c     | 2 ++
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
---- a/include/uapi/linux/in.h
-+++ b/include/uapi/linux/in.h
-@@ -266,8 +266,12 @@ struct sockaddr_in {
- #define       IN_MULTICAST(a)         IN_CLASSD(a)
- #define IN_MULTICAST_NET      0xF0000000
--#define       IN_EXPERIMENTAL(a)      ((((long int) (a)) & 0xf0000000) == 0xf0000000)
--#define       IN_BADCLASS(a)          IN_EXPERIMENTAL((a))
-+#define       IN_BADCLASS(a)          (((long int) (a) ) == (long int)0xffffffff)
-+#define       IN_EXPERIMENTAL(a)      IN_BADCLASS((a))
-+
-+#define       IN_CLASSE(a)            ((((long int) (a)) & 0xf0000000) == 0xf0000000)
-+#define       IN_CLASSE_NET           0xffffffff
-+#define       IN_CLASSE_NSHIFT        0
- /* Address to accept any incoming messages. */
- #define       INADDR_ANY              ((unsigned long int) 0x00000000)
---- a/net/ipv4/devinet.c
-+++ b/net/ipv4/devinet.c
-@@ -898,7 +898,7 @@ static int inet_abc_len(__be32 addr)
- {
-       int rc = -1;    /* Something else, probably a multicast. */
--      if (ipv4_is_zeronet(addr))
-+      if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr))
-               rc = 0;
-       else {
-               __u32 haddr = ntohl(addr);
-@@ -909,6 +909,8 @@ static int inet_abc_len(__be32 addr)
-                       rc = 16;
-               else if (IN_CLASSC(haddr))
-                       rc = 24;
-+              else if (IN_CLASSE(haddr))
-+                      rc = 32;
-       }
-       return rc;
---- a/net/ipv4/ipconfig.c
-+++ b/net/ipv4/ipconfig.c
-@@ -455,6 +455,8 @@ static int __init ic_defaults(void)
-                       ic_netmask = htonl(IN_CLASSB_NET);
-               else if (IN_CLASSC(ntohl(ic_myaddr)))
-                       ic_netmask = htonl(IN_CLASSC_NET);
-+              else if (IN_CLASSE(ntohl(ic_myaddr)))
-+                      ic_netmask = htonl(IN_CLASSE_NET);
-               else {
-                       pr_err("IP-Config: Unable to guess netmask for address %pI4\n",
-                              &ic_myaddr);
diff --git a/target/linux/generic/backport-4.9/095-v4.13-0001-rtc-ds1307-add-ds1308-variant.patch b/target/linux/generic/backport-4.9/095-v4.13-0001-rtc-ds1307-add-ds1308-variant.patch
deleted file mode 100644 (file)
index 9634661..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 300a7735becf55f7fd18f8cd3dc3b945a0cab712 Mon Sep 17 00:00:00 2001
-From: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
-Date: Thu, 8 Jun 2017 12:36:54 +0200
-Subject: rtc: ds1307: add ds1308 variant
-
-The ds1308 variant is very similar to the already supported ds1338
-variant, it have more debug registers and a square wave clock output.
-
-Signed-off-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
-Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
----
- drivers/rtc/rtc-ds1307.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/rtc/rtc-ds1307.c
-+++ b/drivers/rtc/rtc-ds1307.c
-@@ -31,6 +31,7 @@
-  */
- enum ds_type {
-       ds_1307,
-+      ds_1308,
-       ds_1337,
-       ds_1338,
-       ds_1339,
-@@ -144,6 +145,10 @@ static struct chip_desc chips[last_ds_ty
-               .nvram_offset   = 8,
-               .nvram_size     = 56,
-       },
-+      [ds_1308] = {
-+              .nvram_offset   = 8,
-+              .nvram_size     = 56,
-+      },
-       [ds_1337] = {
-               .alarm          = 1,
-       },
-@@ -175,6 +180,7 @@ static struct chip_desc chips[last_ds_ty
- static const struct i2c_device_id ds1307_id[] = {
-       { "ds1307", ds_1307 },
-+      { "ds1308", ds_1308 },
-       { "ds1337", ds_1337 },
-       { "ds1338", ds_1338 },
-       { "ds1339", ds_1339 },
-@@ -1488,6 +1494,7 @@ read_rtc:
-                       goto read_rtc;
-               }
-               break;
-+      case ds_1308:
-       case ds_1338:
-               /* clock halted?  turn it on, so clock can tick. */
-               if (tmp & DS1307_BIT_CH)
diff --git a/target/linux/generic/backport-4.9/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch b/target/linux/generic/backport-4.9/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch
deleted file mode 100644 (file)
index bfb7690..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 508b09046c0f21678652fb66fd1e9959d55591d2 Mon Sep 17 00:00:00 2001
-From: Alin Nastac <alin.nastac@gmail.com>
-Date: Wed, 21 Nov 2018 14:00:30 +0100
-Subject: [PATCH] netfilter: ipv6: Preserve link scope traffic original oif
-
-When ip6_route_me_harder is invoked, it resets outgoing interface of:
-  - link-local scoped packets sent by neighbor discovery
-  - multicast packets sent by MLD host
-  - multicast packets send by MLD proxy daemon that sets outgoing
-    interface through IPV6_PKTINFO ipi6_ifindex
-
-Link-local and multicast packets must keep their original oif after
-ip6_route_me_harder is called.
-
-Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/ipv6/netfilter.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/ipv6/netfilter.c
-+++ b/net/ipv6/netfilter.c
-@@ -24,7 +24,8 @@ int ip6_route_me_harder(struct net *net,
-       unsigned int hh_len;
-       struct dst_entry *dst;
-       struct flowi6 fl6 = {
--              .flowi6_oif = skb->sk ? skb->sk->sk_bound_dev_if : 0,
-+              .flowi6_oif = skb->sk && skb->sk->sk_bound_dev_if ? skb->sk->sk_bound_dev_if :
-+                      rt6_need_strict(&iph->daddr) ? skb_dst(skb)->dev->ifindex : 0,
-               .flowi6_mark = skb->mark,
-               .daddr = iph->daddr,
-               .saddr = iph->saddr,
diff --git a/target/linux/generic/backport-4.9/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch b/target/linux/generic/backport-4.9/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch
deleted file mode 100644 (file)
index 2b33843..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4cc30de79d293f1e8c5f50ae3a9c005def9564a0 Mon Sep 17 00:00:00 2001
-From: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Date: Mon, 7 Jan 2019 14:14:27 +0100
-Subject: [PATCH 2/2] arm: cns3xxx: use actual size reads for PCIe
-
-commit 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
-reimplemented cns3xxx_pci_read_config() using pci_generic_config_read32(),
-which preserved the property of only doing 32-bit reads.
-
-It also replaced cns3xxx_pci_write_config() with pci_generic_config_write(),
-so it changed writes from always being 32 bits to being the actual size,
-which works just fine.
-
-Due to:
-- The documentation does not mention that only 32 bit access is allowed.
-- Writes are already executed using the actual size
-- Extensive testing shows that 8b, 16b and 32b reads work as intended
-
-It makes perfectly sense to also swap 32 bit reading in favor of actual size.
-
-Fixes: 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
-Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-CC: Arnd Bergmann <arnd@arndb.de>
-CC: Krzysztof Halasa <khalasa@piap.pl>
-CC: Olof Johansson <olof@lixom.net>
-CC: Robin Leblon <robin.leblon@ncentric.com>
-CC: Rob Herring <robh@kernel.org>
-CC: Russell King <linux@armlinux.org.uk>
-CC: Tim Harvey <tharvey@gateworks.com>
-CC: stable@vger.kernel.org # v4.0+
----
- arch/arm/mach-cns3xxx/pcie.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -93,7 +93,7 @@ static int cns3xxx_pci_read_config(struc
-       u32 mask = (0x1ull << (size * 8)) - 1;
-       int shift = (where % 4) * 8;
--      ret = pci_generic_config_read32(bus, devfn, where, size, val);
-+      ret = pci_generic_config_read(bus, devfn, where, size, val);
-       if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn &&
-           (where & 0xffc) == PCI_CLASS_REVISION)
diff --git a/target/linux/generic/backport-4.9/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch b/target/linux/generic/backport-4.9/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch
deleted file mode 100644 (file)
index bd58df6..0000000
+++ /dev/null
@@ -1,588 +0,0 @@
-From 06f502f57d0d7728f9fa0f157ec5e4111ddb98f6 Mon Sep 17 00:00:00 2001
-From: Ben Whitten <ben.whitten@gmail.com>
-Date: Sun, 10 Dec 2017 21:17:55 +0000
-Subject: [PATCH] leds: trigger: Introduce a NETDEV trigger
-
-This commit introduces a NETDEV trigger for named device
-activity. Available triggers are link, rx, and tx.
-
-Signed-off-by: Ben Whitten <ben.whitten@gmail.com>
-Acked-by: Pavel Machek <pavel@ucw.cz>
-Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
----
- .../ABI/testing/sysfs-class-led-trigger-netdev     |  45 ++
- drivers/leds/trigger/Kconfig                       |   7 +
- drivers/leds/trigger/Makefile                      |   1 +
- drivers/leds/trigger/ledtrig-netdev.c              | 496 +++++++++++++++++++++
- 4 files changed, 549 insertions(+)
- create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-netdev
- create mode 100644 drivers/leds/trigger/ledtrig-netdev.c
-
---- /dev/null
-+++ b/Documentation/ABI/testing/sysfs-class-led-trigger-netdev
-@@ -0,0 +1,45 @@
-+What:         /sys/class/leds/<led>/device_name
-+Date:         Dec 2017
-+KernelVersion:        4.16
-+Contact:      linux-leds@vger.kernel.org
-+Description:
-+              Specifies the network device name to monitor.
-+
-+What:         /sys/class/leds/<led>/interval
-+Date:         Dec 2017
-+KernelVersion:        4.16
-+Contact:      linux-leds@vger.kernel.org
-+Description:
-+              Specifies the duration of the LED blink in milliseconds.
-+              Defaults to 50 ms.
-+
-+What:         /sys/class/leds/<led>/link
-+Date:         Dec 2017
-+KernelVersion:        4.16
-+Contact:      linux-leds@vger.kernel.org
-+Description:
-+              Signal the link state of the named network device.
-+              If set to 0 (default), the LED's normal state is off.
-+              If set to 1, the LED's normal state reflects the link state
-+              of the named network device.
-+              Setting this value also immediately changes the LED state.
-+
-+What:         /sys/class/leds/<led>/tx
-+Date:         Dec 2017
-+KernelVersion:        4.16
-+Contact:      linux-leds@vger.kernel.org
-+Description:
-+              Signal transmission of data on the named network device.
-+              If set to 0 (default), the LED will not blink on transmission.
-+              If set to 1, the LED will blink for the milliseconds specified
-+              in interval to signal transmission.
-+
-+What:         /sys/class/leds/<led>/rx
-+Date:         Dec 2017
-+KernelVersion:        4.16
-+Contact:      linux-leds@vger.kernel.org
-+Description:
-+              Signal reception of data on the named network device.
-+              If set to 0 (default), the LED will not blink on reception.
-+              If set to 1, the LED will blink for the milliseconds specified
-+              in interval to signal reception.
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -126,4 +126,11 @@ config LEDS_TRIGGER_PANIC
-         a different trigger.
-         If unsure, say Y.
-+config LEDS_TRIGGER_NETDEV
-+      tristate "LED Netdev Trigger"
-+      depends on NET && LEDS_TRIGGERS
-+      help
-+        This allows LEDs to be controlled by network device activity.
-+        If unsure, say Y.
-+
- endif # LEDS_TRIGGERS
---- a/drivers/leds/trigger/Makefile
-+++ b/drivers/leds/trigger/Makefile
-@@ -10,3 +10,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)        +=
- obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)  += ledtrig-transient.o
- obj-$(CONFIG_LEDS_TRIGGER_CAMERA)     += ledtrig-camera.o
- obj-$(CONFIG_LEDS_TRIGGER_PANIC)      += ledtrig-panic.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
---- /dev/null
-+++ b/drivers/leds/trigger/ledtrig-netdev.c
-@@ -0,0 +1,496 @@
-+// SPDX-License-Identifier: GPL-2.0
-+// Copyright 2017 Ben Whitten <ben.whitten@gmail.com>
-+// Copyright 2007 Oliver Jowett <oliver@opencloud.com>
-+//
-+// LED Kernel Netdev Trigger
-+//
-+// Toggles the LED to reflect the link and traffic state of a named net device
-+//
-+// Derived from ledtrig-timer.c which is:
-+//  Copyright 2005-2006 Openedhand Ltd.
-+//  Author: Richard Purdie <rpurdie@openedhand.com>
-+
-+#include <linux/atomic.h>
-+#include <linux/ctype.h>
-+#include <linux/device.h>
-+#include <linux/init.h>
-+#include <linux/jiffies.h>
-+#include <linux/kernel.h>
-+#include <linux/leds.h>
-+#include <linux/list.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/spinlock.h>
-+#include <linux/timer.h>
-+#include "../leds.h"
-+
-+/*
-+ * Configurable sysfs attributes:
-+ *
-+ * device_name - network device name to monitor
-+ * interval - duration of LED blink, in milliseconds
-+ * link -  LED's normal state reflects whether the link is up
-+ *         (has carrier) or not
-+ * tx -  LED blinks on transmitted data
-+ * rx -  LED blinks on receive data
-+ *
-+ */
-+
-+struct led_netdev_data {
-+      spinlock_t lock;
-+
-+      struct delayed_work work;
-+      struct notifier_block notifier;
-+
-+      struct led_classdev *led_cdev;
-+      struct net_device *net_dev;
-+
-+      char device_name[IFNAMSIZ];
-+      atomic_t interval;
-+      unsigned int last_activity;
-+
-+      unsigned long mode;
-+#define NETDEV_LED_LINK       0
-+#define NETDEV_LED_TX 1
-+#define NETDEV_LED_RX 2
-+#define NETDEV_LED_MODE_LINKUP        3
-+};
-+
-+enum netdev_led_attr {
-+      NETDEV_ATTR_LINK,
-+      NETDEV_ATTR_TX,
-+      NETDEV_ATTR_RX
-+};
-+
-+static void set_baseline_state(struct led_netdev_data *trigger_data)
-+{
-+      int current_brightness;
-+      struct led_classdev *led_cdev = trigger_data->led_cdev;
-+
-+      current_brightness = led_cdev->brightness;
-+      if (current_brightness)
-+              led_cdev->blink_brightness = current_brightness;
-+      if (!led_cdev->blink_brightness)
-+              led_cdev->blink_brightness = led_cdev->max_brightness;
-+
-+      if (!test_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode))
-+              led_set_brightness(led_cdev, LED_OFF);
-+      else {
-+              if (test_bit(NETDEV_LED_LINK, &trigger_data->mode))
-+                      led_set_brightness(led_cdev,
-+                                         led_cdev->blink_brightness);
-+              else
-+                      led_set_brightness(led_cdev, LED_OFF);
-+
-+              /* If we are looking for RX/TX start periodically
-+               * checking stats
-+               */
-+              if (test_bit(NETDEV_LED_TX, &trigger_data->mode) ||
-+                  test_bit(NETDEV_LED_RX, &trigger_data->mode))
-+                      schedule_delayed_work(&trigger_data->work, 0);
-+      }
-+}
-+
-+static ssize_t device_name_show(struct device *dev,
-+                              struct device_attribute *attr, char *buf)
-+{
-+      struct led_classdev *led_cdev = dev_get_drvdata(dev);
-+      struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-+      ssize_t len;
-+
-+      spin_lock_bh(&trigger_data->lock);
-+      len = sprintf(buf, "%s\n", trigger_data->device_name);
-+      spin_unlock_bh(&trigger_data->lock);
-+
-+      return len;
-+}
-+
-+static ssize_t device_name_store(struct device *dev,
-+                               struct device_attribute *attr, const char *buf,
-+                               size_t size)
-+{
-+      struct led_classdev *led_cdev = dev_get_drvdata(dev);
-+      struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-+
-+      if (size >= IFNAMSIZ)
-+              return -EINVAL;
-+
-+      cancel_delayed_work_sync(&trigger_data->work);
-+
-+      spin_lock_bh(&trigger_data->lock);
-+
-+      if (trigger_data->net_dev) {
-+              dev_put(trigger_data->net_dev);
-+              trigger_data->net_dev = NULL;
-+      }
-+
-+      strncpy(trigger_data->device_name, buf, size);
-+      if (size > 0 && trigger_data->device_name[size - 1] == '\n')
-+              trigger_data->device_name[size - 1] = 0;
-+
-+      if (trigger_data->device_name[0] != 0)
-+              trigger_data->net_dev =
-+                  dev_get_by_name(&init_net, trigger_data->device_name);
-+
-+      clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
-+      if (trigger_data->net_dev != NULL)
-+              if (netif_carrier_ok(trigger_data->net_dev))
-+                      set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
-+
-+      trigger_data->last_activity = 0;
-+
-+      set_baseline_state(trigger_data);
-+      spin_unlock_bh(&trigger_data->lock);
-+
-+      return size;
-+}
-+
-+static DEVICE_ATTR_RW(device_name);
-+
-+static ssize_t netdev_led_attr_show(struct device *dev, char *buf,
-+      enum netdev_led_attr attr)
-+{
-+      struct led_classdev *led_cdev = dev_get_drvdata(dev);
-+      struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-+      int bit;
-+
-+      switch (attr) {
-+      case NETDEV_ATTR_LINK:
-+              bit = NETDEV_LED_LINK;
-+              break;
-+      case NETDEV_ATTR_TX:
-+              bit = NETDEV_LED_TX;
-+              break;
-+      case NETDEV_ATTR_RX:
-+              bit = NETDEV_LED_RX;
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return sprintf(buf, "%u\n", test_bit(bit, &trigger_data->mode));
-+}
-+
-+static ssize_t netdev_led_attr_store(struct device *dev, const char *buf,
-+      size_t size, enum netdev_led_attr attr)
-+{
-+      struct led_classdev *led_cdev = dev_get_drvdata(dev);
-+      struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-+      unsigned long state;
-+      int ret;
-+      int bit;
-+
-+      ret = kstrtoul(buf, 0, &state);
-+      if (ret)
-+              return ret;
-+
-+      switch (attr) {
-+      case NETDEV_ATTR_LINK:
-+              bit = NETDEV_LED_LINK;
-+              break;
-+      case NETDEV_ATTR_TX:
-+              bit = NETDEV_LED_TX;
-+              break;
-+      case NETDEV_ATTR_RX:
-+              bit = NETDEV_LED_RX;
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      cancel_delayed_work_sync(&trigger_data->work);
-+
-+      if (state)
-+              set_bit(bit, &trigger_data->mode);
-+      else
-+              clear_bit(bit, &trigger_data->mode);
-+
-+      set_baseline_state(trigger_data);
-+
-+      return size;
-+}
-+
-+static ssize_t link_show(struct device *dev,
-+      struct device_attribute *attr, char *buf)
-+{
-+      return netdev_led_attr_show(dev, buf, NETDEV_ATTR_LINK);
-+}
-+
-+static ssize_t link_store(struct device *dev,
-+      struct device_attribute *attr, const char *buf, size_t size)
-+{
-+      return netdev_led_attr_store(dev, buf, size, NETDEV_ATTR_LINK);
-+}
-+
-+static DEVICE_ATTR_RW(link);
-+
-+static ssize_t tx_show(struct device *dev,
-+      struct device_attribute *attr, char *buf)
-+{
-+      return netdev_led_attr_show(dev, buf, NETDEV_ATTR_TX);
-+}
-+
-+static ssize_t tx_store(struct device *dev,
-+      struct device_attribute *attr, const char *buf, size_t size)
-+{
-+      return netdev_led_attr_store(dev, buf, size, NETDEV_ATTR_TX);
-+}
-+
-+static DEVICE_ATTR_RW(tx);
-+
-+static ssize_t rx_show(struct device *dev,
-+      struct device_attribute *attr, char *buf)
-+{
-+      return netdev_led_attr_show(dev, buf, NETDEV_ATTR_RX);
-+}
-+
-+static ssize_t rx_store(struct device *dev,
-+      struct device_attribute *attr, const char *buf, size_t size)
-+{
-+      return netdev_led_attr_store(dev, buf, size, NETDEV_ATTR_RX);
-+}
-+
-+static DEVICE_ATTR_RW(rx);
-+
-+static ssize_t interval_show(struct device *dev,
-+                           struct device_attribute *attr, char *buf)
-+{
-+      struct led_classdev *led_cdev = dev_get_drvdata(dev);
-+      struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-+
-+      return sprintf(buf, "%u\n",
-+                     jiffies_to_msecs(atomic_read(&trigger_data->interval)));
-+}
-+
-+static ssize_t interval_store(struct device *dev,
-+                            struct device_attribute *attr, const char *buf,
-+                            size_t size)
-+{
-+      struct led_classdev *led_cdev = dev_get_drvdata(dev);
-+      struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-+      unsigned long value;
-+      int ret;
-+
-+      ret = kstrtoul(buf, 0, &value);
-+      if (ret)
-+              return ret;
-+
-+      /* impose some basic bounds on the timer interval */
-+      if (value >= 5 && value <= 10000) {
-+              cancel_delayed_work_sync(&trigger_data->work);
-+
-+              atomic_set(&trigger_data->interval, msecs_to_jiffies(value));
-+              set_baseline_state(trigger_data);       /* resets timer */
-+      }
-+
-+      return size;
-+}
-+
-+static DEVICE_ATTR_RW(interval);
-+
-+static int netdev_trig_notify(struct notifier_block *nb,
-+                            unsigned long evt, void *dv)
-+{
-+      struct net_device *dev =
-+              netdev_notifier_info_to_dev((struct netdev_notifier_info *)dv);
-+      struct led_netdev_data *trigger_data = container_of(nb,
-+                                                          struct
-+                                                          led_netdev_data,
-+                                                          notifier);
-+
-+      if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE
-+          && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER
-+          && evt != NETDEV_CHANGENAME)
-+              return NOTIFY_DONE;
-+
-+      if (strcmp(dev->name, trigger_data->device_name))
-+              return NOTIFY_DONE;
-+
-+      cancel_delayed_work_sync(&trigger_data->work);
-+
-+      spin_lock_bh(&trigger_data->lock);
-+
-+      clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
-+      switch (evt) {
-+      case NETDEV_REGISTER:
-+              if (trigger_data->net_dev)
-+                      dev_put(trigger_data->net_dev);
-+              dev_hold(dev);
-+              trigger_data->net_dev = dev;
-+              break;
-+      case NETDEV_CHANGENAME:
-+      case NETDEV_UNREGISTER:
-+              if (trigger_data->net_dev) {
-+                      dev_put(trigger_data->net_dev);
-+                      trigger_data->net_dev = NULL;
-+              }
-+              break;
-+      case NETDEV_UP:
-+      case NETDEV_CHANGE:
-+              if (netif_carrier_ok(dev))
-+                      set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
-+              break;
-+      }
-+
-+      set_baseline_state(trigger_data);
-+
-+      spin_unlock_bh(&trigger_data->lock);
-+
-+      return NOTIFY_DONE;
-+}
-+
-+/* here's the real work! */
-+static void netdev_trig_work(struct work_struct *work)
-+{
-+      struct led_netdev_data *trigger_data = container_of(work,
-+                                                          struct
-+                                                          led_netdev_data,
-+                                                          work.work);
-+      struct rtnl_link_stats64 *dev_stats;
-+      unsigned int new_activity;
-+      struct rtnl_link_stats64 temp;
-+      unsigned long interval;
-+      int invert;
-+
-+      /* If we dont have a device, insure we are off */
-+      if (!trigger_data->net_dev) {
-+              led_set_brightness(trigger_data->led_cdev, LED_OFF);
-+              return;
-+      }
-+
-+      /* If we are not looking for RX/TX then return  */
-+      if (!test_bit(NETDEV_LED_TX, &trigger_data->mode) &&
-+          !test_bit(NETDEV_LED_RX, &trigger_data->mode))
-+              return;
-+
-+      dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
-+      new_activity =
-+          (test_bit(NETDEV_LED_TX, &trigger_data->mode) ?
-+              dev_stats->tx_packets : 0) +
-+          (test_bit(NETDEV_LED_RX, &trigger_data->mode) ?
-+              dev_stats->rx_packets : 0);
-+
-+      if (trigger_data->last_activity != new_activity) {
-+              led_stop_software_blink(trigger_data->led_cdev);
-+
-+              invert = test_bit(NETDEV_LED_LINK, &trigger_data->mode);
-+              interval = jiffies_to_msecs(
-+                              atomic_read(&trigger_data->interval));
-+              /* base state is ON (link present) */
-+              led_blink_set_oneshot(trigger_data->led_cdev,
-+                                    &interval,
-+                                    &interval,
-+                                    invert);
-+              trigger_data->last_activity = new_activity;
-+      }
-+
-+      schedule_delayed_work(&trigger_data->work,
-+                      (atomic_read(&trigger_data->interval)*2));
-+}
-+
-+static void netdev_trig_activate(struct led_classdev *led_cdev)
-+{
-+      struct led_netdev_data *trigger_data;
-+      int rc;
-+
-+      trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
-+      if (!trigger_data)
-+              return;
-+
-+      spin_lock_init(&trigger_data->lock);
-+
-+      trigger_data->notifier.notifier_call = netdev_trig_notify;
-+      trigger_data->notifier.priority = 10;
-+
-+      INIT_DELAYED_WORK(&trigger_data->work, netdev_trig_work);
-+
-+      trigger_data->led_cdev = led_cdev;
-+      trigger_data->net_dev = NULL;
-+      trigger_data->device_name[0] = 0;
-+
-+      trigger_data->mode = 0;
-+      atomic_set(&trigger_data->interval, msecs_to_jiffies(50));
-+      trigger_data->last_activity = 0;
-+
-+      led_cdev->trigger_data = trigger_data;
-+
-+      rc = device_create_file(led_cdev->dev, &dev_attr_device_name);
-+      if (rc)
-+              goto err_out;
-+      rc = device_create_file(led_cdev->dev, &dev_attr_link);
-+      if (rc)
-+              goto err_out_device_name;
-+      rc = device_create_file(led_cdev->dev, &dev_attr_rx);
-+      if (rc)
-+              goto err_out_link;
-+      rc = device_create_file(led_cdev->dev, &dev_attr_tx);
-+      if (rc)
-+              goto err_out_rx;
-+      rc = device_create_file(led_cdev->dev, &dev_attr_interval);
-+      if (rc)
-+              goto err_out_tx;
-+      rc = register_netdevice_notifier(&trigger_data->notifier);
-+      if (rc)
-+              goto err_out_interval;
-+      return;
-+
-+err_out_interval:
-+      device_remove_file(led_cdev->dev, &dev_attr_interval);
-+err_out_tx:
-+      device_remove_file(led_cdev->dev, &dev_attr_tx);
-+err_out_rx:
-+      device_remove_file(led_cdev->dev, &dev_attr_rx);
-+err_out_link:
-+      device_remove_file(led_cdev->dev, &dev_attr_link);
-+err_out_device_name:
-+      device_remove_file(led_cdev->dev, &dev_attr_device_name);
-+err_out:
-+      led_cdev->trigger_data = NULL;
-+      kfree(trigger_data);
-+}
-+
-+static void netdev_trig_deactivate(struct led_classdev *led_cdev)
-+{
-+      struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-+
-+      if (trigger_data) {
-+              unregister_netdevice_notifier(&trigger_data->notifier);
-+
-+              device_remove_file(led_cdev->dev, &dev_attr_device_name);
-+              device_remove_file(led_cdev->dev, &dev_attr_link);
-+              device_remove_file(led_cdev->dev, &dev_attr_rx);
-+              device_remove_file(led_cdev->dev, &dev_attr_tx);
-+              device_remove_file(led_cdev->dev, &dev_attr_interval);
-+
-+              cancel_delayed_work_sync(&trigger_data->work);
-+
-+              if (trigger_data->net_dev)
-+                      dev_put(trigger_data->net_dev);
-+
-+              kfree(trigger_data);
-+      }
-+}
-+
-+static struct led_trigger netdev_led_trigger = {
-+      .name = "netdev",
-+      .activate = netdev_trig_activate,
-+      .deactivate = netdev_trig_deactivate,
-+};
-+
-+static int __init netdev_trig_init(void)
-+{
-+      return led_trigger_register(&netdev_led_trigger);
-+}
-+
-+static void __exit netdev_trig_exit(void)
-+{
-+      led_trigger_unregister(&netdev_led_trigger);
-+}
-+
-+module_init(netdev_trig_init);
-+module_exit(netdev_trig_exit);
-+
-+MODULE_AUTHOR("Ben Whitten <ben.whitten@gmail.com>");
-+MODULE_AUTHOR("Oliver Jowett <oliver@opencloud.com>");
-+MODULE_DESCRIPTION("Netdev LED trigger");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/generic/backport-4.9/400-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch b/target/linux/generic/backport-4.9/400-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch
deleted file mode 100644 (file)
index 94a4776..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From cf589ce71e84d3b8811c65740645af254c5248c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 9 May 2018 10:17:29 +0200
-Subject: [PATCH] mtd: bcm47xxpart: add of_match_table with a new DT binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows using bcm47xxpart parser to find partitions on flash
-described in DT using the "brcm,bcm947xx-cfe-partitions" compatible
-property. It means this parser doesn't have to be explicitly selected by
-a flash driver anymore. It can be used e.g. together with a generic
-m25p80 / spi-nor if device is just properly described.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/bcm47xxpart.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -15,6 +15,7 @@
- #include <linux/slab.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-+#include <linux/mod_devicetable.h>
- #include <uapi/linux/magic.h>
-@@ -304,9 +305,16 @@ static int bcm47xxpart_parse(struct mtd_
-       return curr_part;
- };
-+static const struct of_device_id bcm47xxpart_of_match_table[] = {
-+      { .compatible = "brcm,bcm947xx-cfe-partitions" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table);
-+
- static struct mtd_part_parser bcm47xxpart_mtd_parser = {
-       .parse_fn = bcm47xxpart_parse,
-       .name = "bcm47xxpart",
-+      .of_match_table = bcm47xxpart_of_match_table,
- };
- module_mtd_part_parser(bcm47xxpart_mtd_parser);
diff --git a/target/linux/generic/backport-4.9/401-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch b/target/linux/generic/backport-4.9/401-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch
deleted file mode 100644 (file)
index b92382c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From 98534a58c8a40cdc9e3bcb04d74719fbcedfeb52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 26 Jun 2018 00:05:08 +0200
-Subject: [PATCH] mtd: parsers: trx: add of_match_table with the new DT binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows using TRX parser to find TRX partitions on flash device
-described in DT using a proper binding. It's useful for devices storing
-firmware on a separated flash and having rootfs partition in it.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/parsers/parser_trx.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/parsers/parser_trx.c
-+++ b/drivers/mtd/parsers/parser_trx.c
-@@ -13,6 +13,7 @@
- #include <linux/slab.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-+#include <linux/mod_devicetable.h>
- #define TRX_PARSER_MAX_PARTS          4
-@@ -116,9 +117,16 @@ static int parser_trx_parse(struct mtd_i
-       return i;
- };
-+static const struct of_device_id mtd_parser_trx_of_match_table[] = {
-+      { .compatible = "brcm,trx" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, mtd_parser_trx_of_match_table);
-+
- static struct mtd_part_parser mtd_parser_trx = {
-       .parse_fn = parser_trx_parse,
-       .name = "trx",
-+      .of_match_table = mtd_parser_trx_of_match_table,
- };
- module_mtd_part_parser(mtd_parser_trx);
diff --git a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch
deleted file mode 100644 (file)
index 4186f55..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-From 76a832254ab05502c9394cc51ded6f0abe0e0bee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 13 Jul 2018 16:32:21 +0200
-Subject: [PATCH] mtd: partitions: use DT info for parsing partitions with
- "compatible" prop
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So far only flash devices could be described in DT regarding partitions
-parsing. That could be done with "partitions" subnode and a proper
-"compatible" string.
-
-Some devices may use hierarchical (multi-level) layouts and may mix used
-layouts (fixed and dynamic). Describing that in DT is done by specifying
-"compatible" for DT-represented partition plus optionally more
-properties and/or subnodes.
-
-To support such layouts each DT partition has to be checked for
-additional description.
-
-Please note this implementation will work in parallel with support for
-partition type specified for non-DT setups. That already works since
-commit 1a0915be1926 ("mtd: partitions: add support for partition
-parsers").
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c | 33 +++++++++++++--------------------
- 1 file changed, 13 insertions(+), 20 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -370,22 +370,6 @@ static inline void free_partition(struct
-       kfree(p);
- }
--/**
-- * mtd_parse_part - parse MTD partition looking for subpartitions
-- *
-- * @slave: part that is supposed to be a container and should be parsed
-- * @types: NULL-terminated array with names of partition parsers to try
-- *
-- * Some partitions are kind of containers with extra subpartitions (volumes).
-- * There can be various formats of such containers. This function tries to use
-- * specified parsers to analyze given partition and registers found
-- * subpartitions on success.
-- */
--static int mtd_parse_part(struct mtd_part *slave, const char *const *types)
--{
--      return parse_mtd_partitions(&slave->mtd, types, NULL);
--}
--
- static struct mtd_part *allocate_partition(struct mtd_info *parent,
-                       const struct mtd_partition *part, int partno,
-                       uint64_t cur_offset)
-@@ -775,8 +759,8 @@ int add_mtd_partitions(struct mtd_info *
-               add_mtd_device(&slave->mtd);
-               mtd_add_partition_attrs(slave);
--              if (parts[i].types)
--                      mtd_parse_part(slave, parts[i].types);
-+              /* Look for subpartitions */
-+              parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
-               cur_offset = slave->offset + slave->mtd.size;
-       }
-@@ -852,6 +836,12 @@ static const char * const default_mtd_pa
-       NULL
- };
-+/* Check DT only when looking for subpartitions. */
-+static const char * const default_subpartition_types[] = {
-+      "ofpart",
-+      NULL
-+};
-+
- static int mtd_part_do_parse(struct mtd_part_parser *parser,
-                            struct mtd_info *master,
-                            struct mtd_partitions *pparts,
-@@ -922,7 +912,9 @@ static int mtd_part_of_parse(struct mtd_
-       const char *fixed = "fixed-partitions";
-       int ret, err = 0;
--      np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
-+      np = mtd_get_of_node(master);
-+      if (!mtd_is_partition(master))
-+              np = of_get_child_by_name(np, "partitions");
-       of_property_for_each_string(np, "compatible", prop, compat) {
-               parser = mtd_part_get_compatible_parser(compat);
-               if (!parser)
-@@ -985,7 +977,8 @@ int parse_mtd_partitions(struct mtd_info
-       int ret, err = 0;
-       if (!types)
--              types = default_mtd_part_types;
-+              types = mtd_is_partition(master) ? default_subpartition_types :
-+                      default_mtd_part_types;
-       for ( ; *types; types++) {
-               /*
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
deleted file mode 100644 (file)
index a2d7988..0000000
+++ /dev/null
@@ -1,6078 +0,0 @@
-# CONFIG_104_QUAD_8 is not set
-CONFIG_32BIT=y
-# CONFIG_6LOWPAN is not set
-# CONFIG_6LOWPAN_DEBUGFS is not set
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_AB8500_CORE is not set
-# CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACERHDF is not set
-# CONFIG_ACER_WIRELESS is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ACPI_ALS is not set
-# CONFIG_ACPI_APEI is not set
-# CONFIG_ACPI_BUTTON is not set
-# CONFIG_ACPI_CONFIGFS is not set
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_EXTLOG is not set
-# CONFIG_ACPI_HED is not set
-# CONFIG_ACPI_NFIT is not set
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-# CONFIG_ACPI_TABLE_UPGRADE is not set
-# CONFIG_ACPI_VIDEO is not set
-# CONFIG_AD2S1200 is not set
-# CONFIG_AD2S1210 is not set
-# CONFIG_AD2S90 is not set
-# CONFIG_AD5064 is not set
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_AD5272 is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5449 is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5624R_SPI is not set
-# CONFIG_AD5686 is not set
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-# CONFIG_AD5755 is not set
-# CONFIG_AD5758 is not set
-# CONFIG_AD5761 is not set
-# CONFIG_AD5764 is not set
-# CONFIG_AD5791 is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7192 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7280 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7298 is not set
-# CONFIG_AD7303 is not set
-# CONFIG_AD7476 is not set
-# CONFIG_AD7606 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD7766 is not set
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7816 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-# CONFIG_AD799X is not set
-# CONFIG_AD8366 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_AD9523 is not set
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADE7753 is not set
-# CONFIG_ADE7754 is not set
-# CONFIG_ADE7758 is not set
-# CONFIG_ADE7759 is not set
-# CONFIG_ADE7854 is not set
-# CONFIG_ADF4350 is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADIS16060 is not set
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16204 is not set
-# CONFIG_ADIS16209 is not set
-# CONFIG_ADIS16220 is not set
-# CONFIG_ADIS16240 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADIS16400 is not set
-# CONFIG_ADIS16480 is not set
-# CONFIG_ADJD_S311 is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_ADT7316 is not set
-CONFIG_ADVISE_SYSCALLS=y
-# CONFIG_ADXL345_I2C is not set
-# CONFIG_ADXL345_SPI is not set
-# CONFIG_ADXRS450 is not set
-CONFIG_AEABI=y
-# CONFIG_AFE4403 is not set
-# CONFIG_AFE4404 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AF_KCM is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_IPV6 is not set
-# CONFIG_AGP is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_IMX is not set
-# CONFIG_AHCI_MVEBU is not set
-# CONFIG_AHCI_QORIQ is not set
-CONFIG_AIO=y
-# CONFIG_AIRO is not set
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_AK09911 is not set
-# CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
-# CONFIG_AL3320A is not set
-# CONFIG_ALIM7101_WDT is not set
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_ALTERA_MBOX is not set
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_ALTERA_STAPL is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_ALX is not set
-# CONFIG_AM2315 is not set
-# CONFIG_AM335X_PHY_USB is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMD_MEM_ENCRYPT is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AMD_XGBE is not set
-# CONFIG_AMD_XGBE_HAVE_ECC is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_AMILO_RFKILL is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_APDS9960 is not set
-# CONFIG_APM8018X is not set
-# CONFIG_APM_EMULATION is not set
-# CONFIG_APPLE_GMUX is not set
-# CONFIG_APPLE_PROPERTIES is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_AQTION is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AR5523 is not set
-# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR8216_PHY_LEDS is not set
-# CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_ALPINE is not set
-# CONFIG_ARCH_ARTPEC is not set
-# CONFIG_ARCH_ASPEED is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_BCM_21664 is not set
-# CONFIG_ARCH_BCM_23550 is not set
-# CONFIG_ARCH_BCM_281XX is not set
-# CONFIG_ARCH_BCM_5301X is not set
-# CONFIG_ARCH_BCM_53573 is not set
-# CONFIG_ARCH_BCM_63XX is not set
-# CONFIG_ARCH_BCM_CYGNUS is not set
-# CONFIG_ARCH_BCM_IPROC is not set
-# CONFIG_ARCH_BCM_NSP is not set
-# CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CNS3XXX is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGICOLOR is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_EXYNOS is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_ARCH_HI3xxx is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_HISI is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
-# CONFIG_ARCH_KEYSTONE is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
-# CONFIG_ARCH_LG1K is not set
-# CONFIG_ARCH_LPC32XX is not set
-# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
-CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MULTIPLATFORM is not set
-# CONFIG_ARCH_MULTI_V6 is not set
-# CONFIG_ARCH_MULTI_V7 is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NPCM is not set
-# CONFIG_ARCH_NSPIRE is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_OMAP1 is not set
-# CONFIG_ARCH_OMAP2 is not set
-# CONFIG_ARCH_OMAP2PLUS is not set
-# CONFIG_ARCH_OMAP3 is not set
-# CONFIG_ARCH_OMAP4 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_OXNAS is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_PICOXCELL is not set
-# CONFIG_ARCH_PRIMA2 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_QCOM is not set
-# CONFIG_ARCH_REALTEK is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SEATTLE is not set
-# CONFIG_ARCH_SHMOBILE is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
-# CONFIG_ARCH_SIRF is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_SPRD is not set
-# CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_STM32 is not set
-# CONFIG_ARCH_STRATIX10 is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_SYNQUACER is not set
-# CONFIG_ARCH_TANGO is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_THUNDER is not set
-# CONFIG_ARCH_THUNDER2 is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_UNIPHIER is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_VIRT is not set
-# CONFIG_ARCH_VT8500 is not set
-# CONFIG_ARCH_VULCAN is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
-# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
-# CONFIG_ARCH_WM8505 is not set
-# CONFIG_ARCH_WM8750 is not set
-# CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_XGENE is not set
-# CONFIG_ARCH_ZX is not set
-# CONFIG_ARCH_ZYNQ is not set
-# CONFIG_ARCH_ZYNQMP is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARC_EMAC is not set
-# CONFIG_ARC_IRQ_NO_AUTOSAVE is not set
-# CONFIG_ARM64_ERRATUM_1024718 is not set
-# CONFIG_ARM64_ERRATUM_819472 is not set
-# CONFIG_ARM64_ERRATUM_824069 is not set
-# CONFIG_ARM64_ERRATUM_826319 is not set
-# CONFIG_ARM64_ERRATUM_827319 is not set
-# CONFIG_ARM64_ERRATUM_832075 is not set
-# CONFIG_ARM64_ERRATUM_834220 is not set
-# CONFIG_ARM64_ERRATUM_843419 is not set
-# CONFIG_ARM64_ERRATUM_845719 is not set
-# CONFIG_ARM64_ERRATUM_858921 is not set
-# CONFIG_ARM64_RAS_EXTN is not set
-# CONFIG_ARM64_RELOC_TEST is not set
-CONFIG_ARM64_SW_TTBR0_PAN=y
-# CONFIG_ARM_APPENDED_DTB is not set
-# CONFIG_ARM_ARCH_TIMER is not set
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
-# CONFIG_ARM_CCI is not set
-# CONFIG_ARM_CCI400_PMU is not set
-# CONFIG_ARM_CCI5xx_PMU is not set
-# CONFIG_ARM_CCI_PMU is not set
-# CONFIG_ARM_CCN is not set
-# CONFIG_ARM_CPUIDLE is not set
-CONFIG_ARM_CPU_TOPOLOGY=y
-# CONFIG_ARM_CRYPTO is not set
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-# CONFIG_ARM_DSU_PMU is not set
-# CONFIG_ARM_ERRATA_326103 is not set
-# CONFIG_ARM_ERRATA_364296 is not set
-# CONFIG_ARM_ERRATA_411920 is not set
-# CONFIG_ARM_ERRATA_430973 is not set
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_ARM_ERRATA_643719 is not set
-# CONFIG_ARM_ERRATA_720789 is not set
-# CONFIG_ARM_ERRATA_742230 is not set
-# CONFIG_ARM_ERRATA_742231 is not set
-# CONFIG_ARM_ERRATA_743622 is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_ARM_ERRATA_754322 is not set
-# CONFIG_ARM_ERRATA_754327 is not set
-# CONFIG_ARM_ERRATA_764369 is not set
-# CONFIG_ARM_ERRATA_773022 is not set
-# CONFIG_ARM_ERRATA_775420 is not set
-# CONFIG_ARM_ERRATA_798181 is not set
-# CONFIG_ARM_ERRATA_818325_852422 is not set
-# CONFIG_ARM_ERRATA_821420 is not set
-# CONFIG_ARM_ERRATA_825619 is not set
-# CONFIG_ARM_ERRATA_852421 is not set
-# CONFIG_ARM_ERRATA_852423 is not set
-CONFIG_ARM_GIC_MAX_NR=1
-# CONFIG_ARM_KERNMEM_PERMS is not set
-# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
-# CONFIG_ARM_KPROBES_TEST is not set
-# CONFIG_ARM_MHU is not set
-# CONFIG_ARM_MODULE_PLTS is not set
-# CONFIG_ARM_PATCH_PHYS_VIRT is not set
-# CONFIG_ARM_PSCI is not set
-# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_PTDUMP_DEBUGFS is not set
-# CONFIG_ARM_SBSA_WATCHDOG is not set
-# CONFIG_ARM_SCPI_PROTOCOL is not set
-# CONFIG_ARM_SDE_INTERFACE is not set
-# CONFIG_ARM_SPE_PMU is not set
-# CONFIG_ARM_TIMER_SP804 is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_ARM_VIRT_EXT is not set
-# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
-# CONFIG_ASM9260_TIMER is not set
-# CONFIG_ASUS_LAPTOP is not set
-# CONFIG_ASUS_WIRELESS is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
-# CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set
-# CONFIG_ASYNC_RAID6_TEST is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_AT91_SAMA5D2_ADC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATAGS is not set
-CONFIG_ATAGS_PROC=y
-# CONFIG_ATALK is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_ATA_ACPI is not set
-CONFIG_ATA_BMDMA=y
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K is not set
-# CONFIG_ATH25 is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH6KL is not set
-# CONFIG_ATH79 is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATH9K_HTC is not set
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATLAS_PH_SENSOR is not set
-# CONFIG_ATM is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_ATMEL_SSC is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_BR2684 is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_ATP is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_AURORA_NB8800 is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTO_ZRELADDR is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX88796 is not set
-# CONFIG_AXP20X_ADC is not set
-# CONFIG_AXP20X_POWER is not set
-# CONFIG_AXP288_ADC is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_APPLE is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_GENERIC is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_PANDORA is not set
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_PWM is not set
-# CONFIG_BACKLIGHT_RPI is not set
-# CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_BQ27XXX_HDQ is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1721X is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-# CONFIG_BCACHE is not set
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-# CONFIG_BCM63XX_PHY is not set
-# CONFIG_BCM7038_WDT is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BCMA is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMGENET is not set
-# CONFIG_BCM_IPROC_ADC is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_BCM_SBA_RAID is not set
-# CONFIG_BDI_SWITCH is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BE2NET is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BGMAC is not set
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_BIG_KEYS is not set
-# CONFIG_BIG_LITTLE is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_ELF_FDPIC is not set
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEBUG_FS is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DRBD is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDE_AU1XXX is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_NULL_BLK is not set
-# CONFIG_BLK_DEV_NVME is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_PMEM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_ZONED is not set
-# CONFIG_BLK_SED_OPAL is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLOCK=y
-# CONFIG_BMA180 is not set
-# CONFIG_BMA220 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMC150_MAGN is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_BME680 is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
-# CONFIG_BMIPS_GENERIC is not set
-# CONFIG_BMP085 is not set
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
-# CONFIG_BMP280 is not set
-# CONFIG_BNA is not set
-# CONFIG_BNX2 is not set
-# CONFIG_BNX2X is not set
-# CONFIG_BNXT is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOKE_WDT is not set
-CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_BOOT_RAW=y
-CONFIG_BPF=y
-# CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_JIT_ALWAYS_ON is not set
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_BPF_SYSCALL=y
-# CONFIG_BPQETHER is not set
-CONFIG_BQL=y
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_BRCMSTB_GISB_ARB is not set
-CONFIG_BRIDGE=y
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE_VLAN_FILTERING=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-# CONFIG_BT is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BTRFS_FS_POSIX_ACL is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_BREDR is not set
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
-# CONFIG_BT_HCIBTUSB_RTL is not set
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_3WIRE is not set
-# CONFIG_BT_HCIUART_AG6XX is not set
-# CONFIG_BT_HCIUART_ATH3K is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUART_MRVL is not set
-# CONFIG_BT_HCIUART_QCA is not set
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT_HS is not set
-# CONFIG_BT_LE is not set
-# CONFIG_BT_LEDS is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_SELFTEST is not set
-CONFIG_BUG=y
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-# CONFIG_BUILD_BIN2C is not set
-CONFIG_BUILD_SALT=""
-# CONFIG_C2PORT is not set
-CONFIG_CACHE_L2X0_PMU=y
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
-# CONFIG_CAN is not set
-# CONFIG_CAN_BCM is not set
-# CONFIG_CAN_DEBUG_DEVICES is not set
-# CONFIG_CAN_DEV is not set
-# CONFIG_CAN_GS_USB is not set
-# CONFIG_CAN_GW is not set
-# CONFIG_CAN_HI311X is not set
-# CONFIG_CAN_IFI_CANFD is not set
-# CONFIG_CAN_MCBA_USB is not set
-# CONFIG_CAN_M_CAN is not set
-# CONFIG_CAN_PEAK_PCIEFD is not set
-# CONFIG_CAN_RAW is not set
-# CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_RCAR_CANFD is not set
-# CONFIG_CAN_SLCAN is not set
-# CONFIG_CAN_SUN4I is not set
-# CONFIG_CAN_UCAN is not set
-# CONFIG_CAN_VCAN is not set
-# CONFIG_CAN_VXCAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CARL9170 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CAVIUM_CPT is not set
-# CONFIG_CAVIUM_ERRATUM_22375 is not set
-# CONFIG_CAVIUM_ERRATUM_23144 is not set
-# CONFIG_CAVIUM_ERRATUM_23154 is not set
-# CONFIG_CAVIUM_ERRATUM_27456 is not set
-# CONFIG_CAVIUM_ERRATUM_30115 is not set
-# CONFIG_CAVIUM_OCTEON_SOC is not set
-# CONFIG_CAVIUM_PTP is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC10001_ADC is not set
-# CONFIG_CCS811 is not set
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_CC_IS_GCC=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CEPH_FS is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CGROUP_BPF is not set
-# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_NET_CLASSID is not set
-# CONFIG_CGROUP_NET_PRIO is not set
-# CONFIG_CGROUP_RDMA is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_LTC3651 is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_RT9455 is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_CHARGER_TWL4030 is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHELSIO_T4 is not set
-# CONFIG_CHELSIO_T4VF is not set
-# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS is not set
-# CONFIG_CIFS_ACL is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_FSCACHE is not set
-# CONFIG_CIFS_NFSD_EXPORT is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIO_DAC is not set
-CONFIG_CLANG_VERSION=0
-# CONFIG_CLEANCACHE is not set
-# CONFIG_CLKSRC_VERSATILE is not set
-# CONFIG_CLK_HSDK is not set
-# CONFIG_CLK_QORIQ is not set
-# CONFIG_CLOCK_THERMAL is not set
-CONFIG_CLS_U32_MARK=y
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM3605 is not set
-# CONFIG_CM36651 is not set
-# CONFIG_CMA is not set
-CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_BOOL is not set
-# CONFIG_CMDLINE_EXTEND is not set
-# CONFIG_CMDLINE_FORCE is not set
-# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_IPROC is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_NXP is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_QCOM is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_VERSATILE is not set
-# CONFIG_COMMON_CLK_XGENE is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-CONFIG_COMPACTION=y
-# CONFIG_COMPAL_LAPTOP is not set
-# CONFIG_COMPAT is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONFIG_KVM_AMD_SEV is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_COPS is not set
-# CONFIG_CORDIC is not set
-# CONFIG_COREDUMP is not set
-# CONFIG_CORESIGHT is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CORTINA_PHY is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CPU_IDLE_GOV_MENU is not set
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-# CONFIG_CPU_ISOLATION is not set
-# CONFIG_CPU_NO_EFFICIENT_FFS is not set
-CONFIG_CPU_SW_DOMAIN_PAN=y
-# CONFIG_CRAMFS is not set
-CONFIG_CRAMFS_BLOCKDEV=y
-# CONFIG_CRAMFS_MTD is not set
-CONFIG_CRASHLOG=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC32_SARWATE=y
-# CONFIG_CRC32_SELFTEST is not set
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SLICEBY8 is not set
-# CONFIG_CRC4 is not set
-# CONFIG_CRC64 is not set
-# CONFIG_CRC7 is not set
-# CONFIG_CRC8 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSS_COMPILE=""
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_CRYPTO=y
-# CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
-# CONFIG_CRYPTO_AEGIS128L is not set
-# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
-# CONFIG_CRYPTO_AEGIS256 is not set
-# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES_ARM is not set
-# CONFIG_CRYPTO_AES_ARM_BS is not set
-# CONFIG_CRYPTO_AES_NI_INTEL is not set
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=y
-# CONFIG_CRYPTO_AUTHENC is not set
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CFB is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_CMAC is not set
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
-# CONFIG_CRYPTO_DEV_ATMEL_AUTHENC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
-# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
-# CONFIG_CRYPTO_DEV_CCP is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_HISI_SEC is not set
-# CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set
-# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
-# CONFIG_CRYPTO_DEV_MV_CESA is not set
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C62X is not set
-# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
-# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
-# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
-# CONFIG_CRYPTO_DEV_QCE is not set
-# CONFIG_CRYPTO_DEV_S5P is not set
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_SAHARA is not set
-# CONFIG_CRYPTO_DEV_SP_PSP is not set
-# CONFIG_CRYPTO_DEV_TALITOS is not set
-# CONFIG_CRYPTO_DEV_VIRTIO is not set
-# CONFIG_CRYPTO_DH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_MENU is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_ECDH is not set
-# CONFIG_CRYPTO_ECHAINIV is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_JITTERENTROPY is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-# CONFIG_CRYPTO_MCRYPTD is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_MORUS1280 is not set
-# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-# CONFIG_CRYPTO_MORUS640 is not set
-# CONFIG_CRYPTO_MORUS640_SSE2 is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_PCOMP is not set
-# CONFIG_CRYPTO_PCOMP2 is not set
-CONFIG_CRYPTO_PCRYPT=y
-# CONFIG_CRYPTO_POLY1305 is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_RSA is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA1_ARM is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA3 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_SM4 is not set
-# CONFIG_CRYPTO_SPECK is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_USER is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CRYPTO_ZSTD is not set
-# CONFIG_CS5535_MFGPT is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_CUSE is not set
-# CONFIG_CW1200 is not set
-# CONFIG_CXL_AFU_DRIVER_OPS is not set
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_EEH is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CXL_LIB is not set
-# CONFIG_CYPRESS_FIRMWARE is not set
-# CONFIG_DA280 is not set
-# CONFIG_DA311 is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DAX is not set
-# CONFIG_DCB is not set
-# CONFIG_DDR is not set
-# CONFIG_DEBUG_ALIGN_RODATA is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_DEBUG_ICEDCC is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-CONFIG_DEBUG_INFO_REDUCED=y
-# CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_KOBJECT_RELEASE is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LL_UART_8250 is not set
-# CONFIG_DEBUG_LL_UART_PL01X is not set
-# CONFIG_DEBUG_LOCKDEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_PINCTRL is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_DEBUG_SEMIHOSTING is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_DEBUG_UART_8250_PALMCHIP is not set
-# CONFIG_DEBUG_UART_BCM63XX is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_ZBOOT is not set
-# CONFIG_DECNET is not set
-CONFIG_DEFAULT_CUBIC=y
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_DELL_LAPTOP is not set
-# CONFIG_DELL_RBTN is not set
-# CONFIG_DELL_SMBIOS is not set
-# CONFIG_DELL_SMO8800 is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVMEM is not set
-CONFIG_DEVPORT=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEV_DAX is not set
-# CONFIG_DGAP is not set
-# CONFIG_DGNC is not set
-# CONFIG_DHT11 is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
-# CONFIG_DISPLAY_CONNECTOR_DVI is not set
-# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
-# CONFIG_DISPLAY_ENCODER_TFP410 is not set
-# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
-# CONFIG_DISPLAY_PANEL_DPI is not set
-# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set
-# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMADEVICES_DEBUG is not set
-# CONFIG_DMARD06 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMARD10 is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMA_FENCE_TRACE is not set
-# CONFIG_DMA_NOOP_OPS is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_DMA_VIRT_OPS is not set
-# CONFIG_DM_CACHE is not set
-# CONFIG_DM_DEBUG is not set
-# CONFIG_DM_DELAY is not set
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_FLAKEY is not set
-# CONFIG_DM_INTEGRITY is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DM_LOG_WRITES is not set
-# CONFIG_DM_MQ_DEFAULT is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_RAID is not set
-# CONFIG_DM_SWITCH is not set
-# CONFIG_DM_THIN_PROVISIONING is not set
-# CONFIG_DM_UEVENT is not set
-# CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY is not set
-# CONFIG_DM_WRITECACHE is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DNS_RESOLVER is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPOT_DAC is not set
-CONFIG_DQL=y
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DRM_AMDGPU is not set
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
-# CONFIG_DRM_AMD_ACP is not set
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_ARMADA is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_BOCHS is not set
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_DW_HDMI_CEC is not set
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_DRM_FBDEV_EMULATION is not set
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_FSL_DCU is not set
-# CONFIG_DRM_GMA500 is not set
-# CONFIG_DRM_HDLCD is not set
-# CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HISI_KIRIN is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I915 is not set
-# CONFIG_DRM_LEGACY is not set
-# CONFIG_DRM_LIB_RANDOM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MALI_DISPLAY is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_OMAP is not set
-# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
-# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
-# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_PL111 is not set
-# CONFIG_DRM_QXL is not set
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_RADEON_USERPTR is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_STI is not set
-# CONFIG_DRM_STM is not set
-# CONFIG_DRM_SUN4I is not set
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TILCDC is not set
-# CONFIG_DRM_TINYDRM is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_VBOXVIDEO is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VIRTIO_GPU is not set
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_VMWGFX is not set
-# CONFIG_DRM_XEN is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DS1803 is not set
-# CONFIG_DS4424 is not set
-# CONFIG_DST_CACHE is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-# CONFIG_DWC_XLGMAC is not set
-# CONFIG_DWMAC_IPQ806X is not set
-# CONFIG_DWMAC_LPC18XX is not set
-# CONFIG_DWMAC_MESON is not set
-# CONFIG_DWMAC_ROCKCHIP is not set
-# CONFIG_DWMAC_SOCFPGA is not set
-# CONFIG_DWMAC_STI is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_E100 is not set
-# CONFIG_E1000 is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000E_HWTS is not set
-# CONFIG_EARLY_PRINTK_8250 is not set
-# CONFIG_EARLY_PRINTK_USB_XDBC is not set
-# CONFIG_EBC_C384_WDT is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEEPC_LAPTOP is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_EFS_FS is not set
-CONFIG_ELFCORE=y
-# CONFIG_ELF_CORE is not set
-# CONFIG_EMAC_ROCKCHIP is not set
-CONFIG_EMBEDDED=y
-# CONFIG_EM_TIMER_STI is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENA_ETHERNET is not set
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_ENCX24J600 is not set
-# CONFIG_ENIC is not set
-# CONFIG_ENVELOPE_DETECTOR is not set
-# CONFIG_EPAPR_PARAVIRT is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_EROFS_FS is not set
-# CONFIG_ET131X is not set
-CONFIG_ETHERNET=y
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-CONFIG_EXPERT=y
-CONFIG_EXPORTFS=y
-# CONFIG_EXPORTFS_BLOCK_OPS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4_ENCRYPTION is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-CONFIG_EXT4_USE_FOR_EXT2=y
-# CONFIG_EXTCON is not set
-# CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_AXP288 is not set
-# CONFIG_EXTCON_GPIO is not set
-# CONFIG_EXTCON_INTEL_INT3496 is not set
-# CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-# CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USB_GPIO is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EXYNOS_ADC is not set
-# CONFIG_EXYNOS_VIDEO is not set
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
-# CONFIG_F2FS_FS_POSIX_ACL is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_FAILOVER is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FANOTIFY is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_FAT_FS is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FB is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ARMCLCD is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_AUO_K190X is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BIG_ENDIAN is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BOTH_ENDIAN is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_FLEX is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_IMX is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LITTLE_ENDIAN is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_MXS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-CONFIG_FB_NOTIFY=y
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_OMAP2 is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SM712 is not set
-# CONFIG_FB_SM750 is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TFT is not set
-# CONFIG_FB_TFT_AGM1264K_FL is not set
-# CONFIG_FB_TFT_BD663474 is not set
-# CONFIG_FB_TFT_FBTFT_DEVICE is not set
-# CONFIG_FB_TFT_HX8340BN is not set
-# CONFIG_FB_TFT_HX8347D is not set
-# CONFIG_FB_TFT_HX8353D is not set
-# CONFIG_FB_TFT_HX8357D is not set
-# CONFIG_FB_TFT_ILI9163 is not set
-# CONFIG_FB_TFT_ILI9320 is not set
-# CONFIG_FB_TFT_ILI9325 is not set
-# CONFIG_FB_TFT_ILI9340 is not set
-# CONFIG_FB_TFT_ILI9341 is not set
-# CONFIG_FB_TFT_ILI9481 is not set
-# CONFIG_FB_TFT_ILI9486 is not set
-# CONFIG_FB_TFT_PCD8544 is not set
-# CONFIG_FB_TFT_RA8875 is not set
-# CONFIG_FB_TFT_S6D02A1 is not set
-# CONFIG_FB_TFT_S6D1121 is not set
-# CONFIG_FB_TFT_SH1106 is not set
-# CONFIG_FB_TFT_SSD1289 is not set
-# CONFIG_FB_TFT_SSD1305 is not set
-# CONFIG_FB_TFT_SSD1306 is not set
-# CONFIG_FB_TFT_SSD1325 is not set
-# CONFIG_FB_TFT_SSD1331 is not set
-# CONFIG_FB_TFT_SSD1351 is not set
-# CONFIG_FB_TFT_ST7735R is not set
-# CONFIG_FB_TFT_ST7789V is not set
-# CONFIG_FB_TFT_TINYLCD is not set
-# CONFIG_FB_TFT_TLS8204 is not set
-# CONFIG_FB_TFT_UC1611 is not set
-# CONFIG_FB_TFT_UC1701 is not set
-# CONFIG_FB_TFT_UPD161704 is not set
-# CONFIG_FB_TFT_WATTEROTT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
-# CONFIG_FCOE is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_FENCE_TRACE is not set
-# CONFIG_FHANDLE is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# CONFIG_FIREWIRE_SERIAL is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FM10K is not set
-# CONFIG_FMC is not set
-# CONFIG_FORCEDETH is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FREEZER is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_FSCACHE is not set
-# CONFIG_FSI is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ERRATUM_A008585 is not set
-# CONFIG_FSL_MC_BUS is not set
-# CONFIG_FSL_PQ_MDIO is not set
-# CONFIG_FSL_XGMAC_MDIO is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_DAX is not set
-# CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTGMAC100 is not set
-# CONFIG_FTL is not set
-# CONFIG_FTMAC100 is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTR_FIXUP_SELFTEST is not set
-# CONFIG_FTWDT010_WATCHDOG is not set
-# CONFIG_FUJITSU_ES is not set
-# CONFIG_FUJITSU_LAPTOP is not set
-# CONFIG_FUJITSU_TABLET is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-# CONFIG_FW_CFG_SYSFS is not set
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_GACT_PROB=y
-# CONFIG_GADGET_UAC1 is not set
-# CONFIG_GAMEPORT is not set
-# CONFIG_GATEWORKS_GW16083 is not set
-# CONFIG_GCC_PLUGINS is not set
-CONFIG_GCC_VERSION=70400
-# CONFIG_GCOV is not set
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_GDB_SCRIPTS is not set
-# CONFIG_GEMINI_ETHERNET is not set
-# CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_GENERIC_ADC_THERMAL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_GENERIC_HWEIGHT=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_NET_UTILS=y
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_GENEVE is not set
-# CONFIG_GENWQE is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GIGASET_CAPI is not set
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-# CONFIG_GLOB_SELFTEST is not set
-# CONFIG_GNSS is not set
-# CONFIG_GOLDFISH is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-# CONFIG_GP2AP020A00F is not set
-# CONFIG_GPD_POCKET_FAN is not set
-# CONFIG_GPIOLIB is not set
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-# CONFIG_GPIO_104_DIO_48E is not set
-# CONFIG_GPIO_104_IDIO_16 is not set
-# CONFIG_GPIO_104_IDI_48 is not set
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_AMD8111 is not set
-# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_BCM_KONA is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EM is not set
-# CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_GPIO_MM is not set
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HLWD is not set
-# CONFIG_GPIO_ICH is not set
-# CONFIG_GPIO_IT87 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_MAX3191X is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MB86S7X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_RCAR is not set
-# CONFIG_GPIO_RDC321X is not set
-# CONFIG_GPIO_SCH is not set
-# CONFIG_GPIO_SCH311X is not set
-# CONFIG_GPIO_SX150X is not set
-# CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TS4900 is not set
-# CONFIG_GPIO_TS5500 is not set
-# CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_GPIO_WINBOND is not set
-# CONFIG_GPIO_WS16C48 is not set
-# CONFIG_GPIO_XGENE is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_XRA1403 is not set
-# CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GREYBUS is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_GTP is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_HAPPYMEAL is not set
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_HARDEN_EL2_VECTORS=y
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
-# CONFIG_HAVE_ARCH_HASH is not set
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-# CONFIG_HAVE_ARCH_VMAP_STACK is not set
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-# CONFIG_HAVE_ARM_ARCH_TIMER is not set
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_CAT=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_STACKPROTECTOR=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDC100X is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDMI_LPE_AUDIO is not set
-# CONFIG_HDQ_MASTER_OMAP is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFS_FS_POSIX_ACL is not set
-# CONFIG_HI8435 is not set
-# CONFIG_HIBERNATION is not set
-# CONFIG_HID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_ACRUX_FF is not set
-# CONFIG_HID_ALPS is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BATTERY_STRENGTH is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_ELAN is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GENERIC is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_GOOGLE_HAMMER is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_LOGITECH_DJ is not set
-# CONFIG_HID_LOGITECH_HIDPP is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_REDRAGON is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HINIC is not set
-# CONFIG_HIP04_ETH is not set
-# CONFIG_HIPPI is not set
-# CONFIG_HISILICON_ERRATUM_161010101 is not set
-# CONFIG_HISILICON_ERRATUM_161600802 is not set
-# CONFIG_HISI_FEMAC is not set
-# CONFIG_HIX5HD2_GMAC is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_HNS is not set
-# CONFIG_HNS3 is not set
-# CONFIG_HNS_DSAF is not set
-# CONFIG_HNS_ENET is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-# CONFIG_HP03 is not set
-# CONFIG_HP100 is not set
-# CONFIG_HP206C is not set
-CONFIG_HPET_MMAP_DEFAULT=y
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HP_WIRELESS is not set
-# CONFIG_HSI is not set
-# CONFIG_HSR is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTS221 is not set
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_DCC is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HWSPINLOCK is not set
-# CONFIG_HWSPINLOCK_OMAP is not set
-CONFIG_HW_PERF_EVENTS=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_ATMEL is not set
-# CONFIG_HW_RANDOM_CAVIUM is not set
-# CONFIG_HW_RANDOM_EXYNOS is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
-# CONFIG_HW_RANDOM_OMAP is not set
-# CONFIG_HW_RANDOM_OMAP3_ROM is not set
-# CONFIG_HW_RANDOM_PPC4XX is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM_TPM=y
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HX711 is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYPERV_TSCPAGE is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_200 is not set
-# CONFIG_HZ_24 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_500 is not set
-# CONFIG_HZ_PERIODIC is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_AU1550 is not set
-# CONFIG_I2C_BCM2835 is not set
-# CONFIG_I2C_BCM_IPROC is not set
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_EG20T is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_HID is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_IMG is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_ISMT is not set
-# CONFIG_I2C_MLXCPLD is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_MUX is not set
-# CONFIG_I2C_MUX_GPIO is not set
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# CONFIG_I2C_MUX_PCA9541 is not set
-# CONFIG_I2C_MUX_PCA954x is not set
-# CONFIG_I2C_MUX_PINCTRL is not set
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_MV64XXX is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NOMADIK is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_OCTEON is not set
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PXA_PCI is not set
-# CONFIG_I2C_RCAR is not set
-# CONFIG_I2C_RK3X is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_S3C2410 is not set
-# CONFIG_I2C_SCMI is not set
-# CONFIG_I2C_SH_MOBILE is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_SMBUS is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_THUNDERX is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VERSATILE is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I40E is not set
-# CONFIG_I40EVF is not set
-# CONFIG_I6300ESB_WDT is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IAQCORE is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_EMAC_DEBUG is not set
-# CONFIG_IBM_EMAC_EMAC4 is not set
-# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_EMAC_RGMII is not set
-# CONFIG_IBM_EMAC_TAH is not set
-# CONFIG_IBM_EMAC_ZMII is not set
-# CONFIG_ICE is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDE is not set
-# CONFIG_IDEAPAD_LAPTOP is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE_PROC_FS is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IEEE802154_ADF7242 is not set
-# CONFIG_IEEE802154_ATUSB is not set
-# CONFIG_IEEE802154_CA8210 is not set
-# CONFIG_IEEE802154_HWSIM is not set
-# CONFIG_IEEE802154_MCR20A is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_IIO_BUFFER_CB is not set
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-# CONFIG_IIO_CONFIGFS is not set
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-# CONFIG_IIO_MUX is not set
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-# CONFIG_IIO_RESCALE is not set
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_SSP_SENSORHUB is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_LSM6DSX is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_IIO_SW_DEVICE is not set
-# CONFIG_IIO_SW_TRIGGER is not set
-# CONFIG_IIO_SYSFS_TRIGGER is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMGPDC_WDT is not set
-# CONFIG_IMG_MDC_DMA is not set
-# CONFIG_IMX7D_ADC is not set
-# CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_IMX_THERMAL is not set
-# CONFIG_INA2XX_ADC is not set
-# CONFIG_INDIRECT_PIO is not set
-CONFIG_INET=y
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_AXP20X_PEK is not set
-# CONFIG_INPUT_BMA150 is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_CMA3000 is not set
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-# CONFIG_INPUT_DRV2665_HAPTICS is not set
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-# CONFIG_INPUT_E3X0_BUTTON is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
-# CONFIG_INPUT_IMS_PCU is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_KXTJ9 is not set
-# CONFIG_INPUT_LEDS is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-# CONFIG_INPUT_MAX8997_HAPTIC is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MMA8450 is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MPU3050 is not set
-# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
-# CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_PWM_BEEPER is not set
-# CONFIG_INPUT_PWM_VIBRA is not set
-# CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
-# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
-# CONFIG_INPUT_TWL4030_VIBRA is not set
-# CONFIG_INPUT_TWL6040_VIBRA is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INT340X_THERMAL is not set
-# CONFIG_INTEL_ATOMISP2_PM is not set
-# CONFIG_INTEL_CHT_INT33FE is not set
-# CONFIG_INTEL_HID_EVENT is not set
-# CONFIG_INTEL_IDLE is not set
-# CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_IOATDMA is not set
-# CONFIG_INTEL_ISH_HID is not set
-# CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MEI_ME is not set
-# CONFIG_INTEL_MEI_TXE is not set
-# CONFIG_INTEL_MIC_CARD is not set
-# CONFIG_INTEL_MIC_HOST is not set
-# CONFIG_INTEL_MID_PTI is not set
-# CONFIG_INTEL_OAKTRAIL is not set
-# CONFIG_INTEL_PMC_CORE is not set
-# CONFIG_INTEL_PUNIT_IPC is not set
-# CONFIG_INTEL_RST is not set
-# CONFIG_INTEL_SMARTCONNECT is not set
-# CONFIG_INTEL_SOC_PMIC is not set
-# CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
-# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
-# CONFIG_INTEL_TH is not set
-# CONFIG_INTEL_VBTN is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_INV_MPU6050_IIO is not set
-# CONFIG_INV_MPU6050_SPI is not set
-# CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_IOSCHED_BFQ is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_MATCH_SRH is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_SECURITY is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-# CONFIG_IPACK_BUS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_FOU is not set
-# CONFIG_IPV6_FOU_TUNNEL is not set
-# CONFIG_IPV6_ILA is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_VTI is not set
-# CONFIG_IPVLAN is not set
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200 is not set
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_FIB_TRIE_STATS is not set
-# CONFIG_IP_MROUTE is not set
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_SYNPROXY is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-# CONFIG_IP_SET is not set
-# CONFIG_IP_SET_HASH_IPMAC is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IP_VS_MH is not set
-CONFIG_IP_VS_MH_TAB_INDEX=10
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_IRQ_ALL_CPUS is not set
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-# CONFIG_IRQ_POLL is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_IR_GPIO_CIR is not set
-# CONFIG_IR_HIX5HD2 is not set
-# CONFIG_IR_IGORPLUGUSB is not set
-# CONFIG_IR_IGUANA is not set
-# CONFIG_IR_IMG is not set
-# CONFIG_IR_IMON is not set
-# CONFIG_IR_JVC_DECODER is not set
-# CONFIG_IR_LIRC_CODEC is not set
-# CONFIG_IR_MCEUSB is not set
-# CONFIG_IR_NEC_DECODER is not set
-# CONFIG_IR_RC5_DECODER is not set
-# CONFIG_IR_RC6_DECODER is not set
-# CONFIG_IR_REDRAT3 is not set
-# CONFIG_IR_SONY_DECODER is not set
-# CONFIG_IR_STREAMZAP is not set
-# CONFIG_IR_TTUSBIR is not set
-# CONFIG_ISA_BUS is not set
-# CONFIG_ISA_BUS_API is not set
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_I4L is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_ISL29125 is not set
-# CONFIG_ISL29501 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_ISS4xx is not set
-# CONFIG_ITG3200 is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
-# CONFIG_IXGBEVF is not set
-# CONFIG_JAILHOUSE_GUEST is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_POSIX_ACL is not set
-# CONFIG_JFFS2_FS_SECURITY is not set
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_LZMA=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_ZLIB is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-# CONFIG_KALLSYMS_UNCOMPRESSED is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KASAN is not set
-# CONFIG_KCOV is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_CAT is not set
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_LZO is not set
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_KERNEL_XZ=y
-CONFIG_KERNFS=y
-# CONFIG_KEXEC is not set
-# CONFIG_KEXEC_FILE is not set
-# CONFIG_KEYBOARD_ADC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_BCM is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PXA27x is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_SH_KEYSC is not set
-# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
-# CONFIG_KEYBOARD_STMPE is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_TEGRA is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_TWL4030 is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYS is not set
-# CONFIG_KEY_DH_OPERATIONS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMCHECK is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_KS7010 is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_KSZ884X_PCI is not set
-CONFIG_KUSER_HELPERS=y
-# CONFIG_KVM_AMD is not set
-# CONFIG_KVM_GUEST is not set
-# CONFIG_KVM_INTEL is not set
-# CONFIG_KXCJK1013 is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_L2TP is not set
-# CONFIG_L2TP_ETH is not set
-# CONFIG_L2TP_IP is not set
-# CONFIG_L2TP_V3 is not set
-# CONFIG_LAN743X is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LANTIQ is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-CONFIG_LBDAF=y
-# CONFIG_LCD_AMS369FG06 is not set
-# CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LMS501KF03 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_OTM3225A is not set
-# CONFIG_LCD_S6E63M0 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-CONFIG_LDISC_AUTOLOAD=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y
-# CONFIG_LEDS_APU is not set
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_BLINKM is not set
-CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_CR0014114 is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS_INTEL_SS4200 is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_MLXCPLD is not set
-# CONFIG_LEDS_MLXREG is not set
-# CONFIG_LEDS_NIC78BX is not set
-# CONFIG_LEDS_NS2 is not set
-# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PWM is not set
-# CONFIG_LEDS_REGULATOR is not set
-# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-CONFIG_LEDS_TRIGGERS=y
-# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_DISK is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MTD is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-# CONFIG_LEDS_TRIGGER_ONESHOT is not set
-# CONFIG_LEDS_TRIGGER_PANIC is not set
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
-# CONFIG_LEDS_USER is not set
-# CONFIG_LED_TRIGGER_PHY is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LGUEST is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LIBNVDIMM is not set
-# CONFIG_LIDAR_LITE_V2 is not set
-# CONFIG_LIQUIDIO is not set
-# CONFIG_LIQUIDIO_VF is not set
-# CONFIG_LIS3L02DQ is not set
-# CONFIG_LKDTM is not set
-CONFIG_LLC=y
-# CONFIG_LLC2 is not set
-# CONFIG_LMP91000 is not set
-# CONFIG_LNET is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_LOCKD is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_LOGFS is not set
-# CONFIG_LOGIG940_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIWHEELS_FF is not set
-# CONFIG_LOGO is not set
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-# CONFIG_LOONGSON_MC146818 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTC2471 is not set
-# CONFIG_LTC2485 is not set
-# CONFIG_LTC2497 is not set
-# CONFIG_LTC2632 is not set
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_LTPC is not set
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_LV0104CS is not set
-# CONFIG_LWTUNNEL is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_LZ4HC_COMPRESS is not set
-# CONFIG_LZ4_COMPRESS is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-CONFIG_LZMA_COMPRESS=y
-CONFIG_LZMA_DECOMPRESS=y
-# CONFIG_LZO_COMPRESS is not set
-# CONFIG_LZO_DECOMPRESS is not set
-# CONFIG_M62332 is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_MACB is not set
-# CONFIG_MACH_ASM9260 is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_INGENIC is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_JZ4740 is not set
-# CONFIG_MACH_LOONGSON32 is not set
-# CONFIG_MACH_LOONGSON64 is not set
-# CONFIG_MACH_PIC32 is not set
-# CONFIG_MACH_PISTACHIO is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MACH_XILFPGA is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MACSEC is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MACVTAP is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MAG3110 is not set
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-# CONFIG_MAGIC_SYSRQ_SERIAL is not set
-# CONFIG_MAILBOX is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-# CONFIG_MANGLE_BOOTARGS is not set
-# CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MAX1027 is not set
-# CONFIG_MAX11100 is not set
-# CONFIG_MAX1118 is not set
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX30102 is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MAX5481 is not set
-# CONFIG_MAX5487 is not set
-# CONFIG_MAX5821 is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_MAX9611 is not set
-# CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_MAY_USE_DEVLINK=y
-# CONFIG_MC3230 is not set
-# CONFIG_MCB is not set
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4018 is not set
-# CONFIG_MCP4131 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-# CONFIG_MCPM is not set
-# CONFIG_MD is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_DEVICE is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_THUNDER is not set
-# CONFIG_MD_FAULTY is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_CEC_SUPPORT is not set
-# CONFIG_MEDIA_CONTROLLER is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_PCI_SUPPORT is not set
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_USB_SUPPORT is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_MEMBARRIER=y
-# CONFIG_MEMORY is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_SM is not set
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_CS5535 is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_EXYNOS_LPASS is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MC13XXX is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_OMAP_USB_HOST is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8921_CORE is not set
-# CONFIG_MFD_PM8XXX is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RTSX_PCI is not set
-# CONFIG_MFD_RTSX_USB is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS68470 is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MICREL_KS8995MA is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_KSZ is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-# CONFIG_MIKROTIK_RB532 is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_MIPS_CDMM is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_FPU_EMULATOR is not set
-# CONFIG_MIPS_GENERIC is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_O32_FP64_SUPPORT is not set
-# CONFIG_MIPS_PARAVIRT is not set
-# CONFIG_MIPS_PLATFORM_DEVICES is not set
-# CONFIG_MIPS_SEAD3 is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MLX4_CORE is not set
-# CONFIG_MLX4_EN is not set
-# CONFIG_MLX5_CORE is not set
-# CONFIG_MLX90614 is not set
-# CONFIG_MLX90632 is not set
-# CONFIG_MLXFW is not set
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLX_CPLD_PLATFORM is not set
-# CONFIG_MLX_PLATFORM is not set
-# CONFIG_MMA7455_I2C is not set
-# CONFIG_MMA7455_SPI is not set
-# CONFIG_MMA7660 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC35240 is not set
-# CONFIG_MMC_ARMMMCI is not set
-# CONFIG_MMC_AU1X is not set
-# CONFIG_MMC_BLOCK is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK_MINORS=8
-# CONFIG_MMC_CAVIUM_THUNDERX is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_CQHCI is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_DW is not set
-# CONFIG_MMC_MTK is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDHCI_ACPI is not set
-# CONFIG_MMC_SDHCI_BCM_KONA is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
-# CONFIG_MMC_SDHCI_F_SDH30 is not set
-# CONFIG_MMC_SDHCI_IPROC is not set
-# CONFIG_MMC_SDHCI_MSM is not set
-# CONFIG_MMC_SDHCI_OF_ARASAN is not set
-# CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF_HLWD is not set
-# CONFIG_MMC_SDHCI_OMAP is not set
-# CONFIG_MMC_SDHCI_PXAV2 is not set
-# CONFIG_MMC_SDHCI_PXAV3 is not set
-# CONFIG_MMC_SDHCI_S3C is not set
-# CONFIG_MMC_SDHCI_XENON is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_TOSHIBA_PCI is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-# CONFIG_MMC_VUB300 is not set
-# CONFIG_MMIOTRACE is not set
-CONFIG_MMU=y
-CONFIG_MODULES=y
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_STRIPPED=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOST is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_FOCALTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_MPL115 is not set
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL115_SPI is not set
-# CONFIG_MPL3115 is not set
-# CONFIG_MPLS is not set
-# CONFIG_MPU3050_I2C is not set
-# CONFIG_MQ_IOSCHED_DEADLINE is not set
-# CONFIG_MQ_IOSCHED_KYBER is not set
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-# CONFIG_MSCC_OCELOT_SWITCH is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MSI_BITMAP_SELFTEST is not set
-# CONFIG_MSI_LAPTOP is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LATCH_ADDR is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_LPDDR2_NVM is not set
-# CONFIG_MTD_M25P80 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_MT81xx_NOR is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_AMS_DELTA is not set
-# CONFIG_MTD_NAND_AR934X is not set
-# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
-# CONFIG_MTD_NAND_ATMEL is not set
-# CONFIG_MTD_NAND_AU1550 is not set
-# CONFIG_MTD_NAND_BCH is not set
-# CONFIG_MTD_NAND_BF5XX is not set
-# CONFIG_MTD_NAND_BRCMNAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_CM_X270 is not set
-# CONFIG_MTD_NAND_CS553X is not set
-# CONFIG_MTD_NAND_DAVINCI is not set
-# CONFIG_MTD_NAND_DENALI is not set
-# CONFIG_MTD_NAND_DENALI_DT is not set
-# CONFIG_MTD_NAND_DENALI_PCI is not set
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_DOCG4 is not set
-# CONFIG_MTD_NAND_ECC is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_FSL_ELBC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
-# CONFIG_MTD_NAND_FSL_UPM is not set
-# CONFIG_MTD_NAND_FSMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-# CONFIG_MTD_NAND_GPMI_NAND is not set
-# CONFIG_MTD_NAND_HISI504 is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_JZ4740 is not set
-# CONFIG_MTD_NAND_MPC5121_NFC is not set
-# CONFIG_MTD_NAND_MTK is not set
-# CONFIG_MTD_NAND_MXC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_NDFC is not set
-# CONFIG_MTD_NAND_NUC900 is not set
-# CONFIG_MTD_NAND_OMAP2 is not set
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-# CONFIG_MTD_NAND_ORION is not set
-# CONFIG_MTD_NAND_PASEMI is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_PXA3xx is not set
-# CONFIG_MTD_NAND_RB4XX is not set
-# CONFIG_MTD_NAND_RB750 is not set
-# CONFIG_MTD_NAND_RICOH is not set
-# CONFIG_MTD_NAND_S3C2410 is not set
-# CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_SH_FLCTL is not set
-# CONFIG_MTD_NAND_SOCRATES is not set
-# CONFIG_MTD_NAND_TMIO is not set
-# CONFIG_MTD_NAND_TXX9NDFMC is not set
-CONFIG_MTD_OF_PARTS=y
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MTD_PHYSMAP_OF_GEMINI is not set
-# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_SPINAND_MT29F is not set
-# CONFIG_MTD_SPI_NAND is not set
-# CONFIG_MTD_SPI_NOR is not set
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096
-CONFIG_MTD_SPLIT=y
-# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
-# CONFIG_MTD_SPLIT_EVA_FW is not set
-# CONFIG_MTD_SPLIT_FIRMWARE is not set
-CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
-# CONFIG_MTD_SPLIT_FIT_FW is not set
-# CONFIG_MTD_SPLIT_JIMAGE_FW is not set
-# CONFIG_MTD_SPLIT_LZMA_FW is not set
-# CONFIG_MTD_SPLIT_MINOR_FW is not set
-# CONFIG_MTD_SPLIT_SEAMA_FW is not set
-CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
-CONFIG_MTD_SPLIT_SUPPORT=y
-# CONFIG_MTD_SPLIT_TPLINK_FW is not set
-# CONFIG_MTD_SPLIT_TRX_FW is not set
-# CONFIG_MTD_SPLIT_UIMAGE_FW is not set
-# CONFIG_MTD_SPLIT_WRGG_FW is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-# CONFIG_MTD_UIMAGE_SPLIT is not set
-# CONFIG_MTD_VIRT_CONCAT is not set
-# CONFIG_MTK_MMC is not set
-CONFIG_MULTIUSER=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVMDIO is not set
-# CONFIG_MVNETA_BM is not set
-# CONFIG_MVSW61XX_PHY is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MV_XOR_V2 is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NAU7802 is not set
-# CONFIG_NBPFAXI_DMA is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2000 is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-CONFIG_NET=y
-# CONFIG_NETCONSOLE is not set
-CONFIG_NETDEVICES=y
-# CONFIG_NETDEVSIM is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_NETFILTER_ADVANCED is not set
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_INGRESS is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_OSF is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_BPF is not set
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ECN is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_LOG is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-# CONFIG_NETLINK_DIAG is not set
-# CONFIG_NETLINK_MMAP is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NETROM is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_BPF is not set
-# CONFIG_NET_ACT_CSUM is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IFE is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SAMPLE is not set
-# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_SKBMOD is not set
-# CONFIG_NET_ACT_TUNNEL_KEY is not set
-# CONFIG_NET_ACT_VLAN is not set
-CONFIG_NET_CADENCE=y
-# CONFIG_NET_CALXEDA_XGMAC is not set
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_BASIC is not set
-# CONFIG_NET_CLS_BPF is not set
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FLOWER is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_MATCHALL is not set
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CORE=y
-# CONFIG_NET_DEVLINK is not set
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_DSA_BCM_SF2 is not set
-# CONFIG_NET_DSA_LEGACY is not set
-# CONFIG_NET_DSA_LOOP is not set
-# CONFIG_NET_DSA_MT7530 is not set
-# CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6171 is not set
-# CONFIG_NET_DSA_MV88E6352 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-# CONFIG_NET_DSA_QCA8K is not set
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_TAG_DSA is not set
-# CONFIG_NET_DSA_TAG_EDSA is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_CANID is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH_IPT is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-# CONFIG_NET_FAILOVER is not set
-# CONFIG_NET_FC is not set
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_IFE is not set
-# CONFIG_NET_IPGRE is not set
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPVTI is not set
-# CONFIG_NET_IP_TUNNEL is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-# CONFIG_NET_L3_MASTER_DEV is not set
-# CONFIG_NET_MPLS_GSO is not set
-# CONFIG_NET_NCSI is not set
-# CONFIG_NET_NSH is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NET_PTP_CLASSIFY is not set
-CONFIG_NET_RX_BUSY_POLL=y
-# CONFIG_NET_SB1000 is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CAKE is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CBS is not set
-# CONFIG_NET_SCH_CHOKE is not set
-# CONFIG_NET_SCH_CODEL is not set
-# CONFIG_NET_SCH_DEFAULT is not set
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-# CONFIG_NET_SCH_ETF is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_FQ is not set
-CONFIG_NET_SCH_FQ_CODEL=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HHF is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MQPRIO is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PIE is not set
-# CONFIG_NET_SCH_PLUG is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_QFQ is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_SFB is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_SCTPPROBE is not set
-# CONFIG_NET_SWITCHDEV is not set
-# CONFIG_NET_TCPPROBE is not set
-# CONFIG_NET_TEAM is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_UDP_TUNNEL is not set
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_NET_VENDOR_8390=y
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_NET_VENDOR_AGERE=y
-CONFIG_NET_VENDOR_ALACRITECH=y
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_FARADAY=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_NET_VENDOR_HISILICON=y
-CONFIG_NET_VENDOR_HP=y
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_IBM=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_NET_VENDOR_MICROSEMI=y
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_NET_VENDOR_SOCIONEXT=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_NET_VENDOR_TI=y
-CONFIG_NET_VENDOR_TOSHIBA=y
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_NET_VENDOR_XILINX=y
-CONFIG_NET_VENDOR_XIRCOM=y
-# CONFIG_NET_VRF is not set
-# CONFIG_NET_XGENE is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NFC is not set
-# CONFIG_NFP is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFSD_V2_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_FSCACHE is not set
-# CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V2 is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NFT_BRIDGE_META is not set
-# CONFIG_NFT_BRIDGE_REJECT is not set
-# CONFIG_NFT_CONNLIMIT is not set
-# CONFIG_NFT_DUP_IPV4 is not set
-# CONFIG_NFT_DUP_IPV6 is not set
-# CONFIG_NFT_FIB_IPV4 is not set
-# CONFIG_NFT_FIB_IPV6 is not set
-# CONFIG_NFT_FIB_NETDEV is not set
-# CONFIG_NFT_FLOW_OFFLOAD is not set
-# CONFIG_NFT_OBJREF is not set
-# CONFIG_NFT_OSF is not set
-# CONFIG_NFT_RT is not set
-# CONFIG_NFT_SET_BITMAP is not set
-# CONFIG_NFT_SOCKET is not set
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
-# CONFIG_NF_CONNTRACK is not set
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK_LABELS is not set
-# CONFIG_NF_CONNTRACK_MARK is not set
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROCFS=y
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_NF_CONNTRACK_SNMP is not set
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-# CONFIG_NF_CONNTRACK_ZONES is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_DUP_IPV4 is not set
-# CONFIG_NF_DUP_IPV6 is not set
-# CONFIG_NF_FLOW_TABLE is not set
-# CONFIG_NF_LOG_ARP is not set
-# CONFIG_NF_LOG_BRIDGE is not set
-# CONFIG_NF_LOG_IPV4 is not set
-# CONFIG_NF_LOG_NETDEV is not set
-# CONFIG_NF_NAT is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IPV6 is not set
-# CONFIG_NF_NAT_IRC is not set
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
-CONFIG_NF_NAT_MASQUERADE_IPV6=y
-# CONFIG_NF_NAT_NEEDED is not set
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NF_REJECT_IPV4 is not set
-# CONFIG_NF_REJECT_IPV6 is not set
-# CONFIG_NF_SOCKET_IPV4 is not set
-# CONFIG_NF_SOCKET_IPV6 is not set
-# CONFIG_NF_TABLES is not set
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NF_TABLES_NETDEV=y
-# CONFIG_NF_TABLES_SET is not set
-# CONFIG_NF_TPROXY_IPV4 is not set
-# CONFIG_NF_TPROXY_IPV6 is not set
-# CONFIG_NI65 is not set
-# CONFIG_NI903X_WDT is not set
-# CONFIG_NIC7018_WDT is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_NIU is not set
-CONFIG_NLATTR=y
-# CONFIG_NLMON is not set
-# CONFIG_NLM_XLP_BOARD is not set
-# CONFIG_NLM_XLR_BOARD is not set
-# CONFIG_NLS is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_MAC_CELTIC is not set
-# CONFIG_NLS_MAC_CENTEURO is not set
-# CONFIG_NLS_MAC_CROATIAN is not set
-# CONFIG_NLS_MAC_CYRILLIC is not set
-# CONFIG_NLS_MAC_GAELIC is not set
-# CONFIG_NLS_MAC_GREEK is not set
-# CONFIG_NLS_MAC_ICELAND is not set
-# CONFIG_NLS_MAC_INUIT is not set
-# CONFIG_NLS_MAC_ROMAN is not set
-# CONFIG_NLS_MAC_ROMANIAN is not set
-# CONFIG_NLS_MAC_TURKISH is not set
-# CONFIG_NLS_UTF8 is not set
-CONFIG_NMI_LOG_BUF_SHIFT=13
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NO_BOOTMEM is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NO_HZ_FULL is not set
-# CONFIG_NO_HZ_IDLE is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTB is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NTP_PPS is not set
-# CONFIG_NVM is not set
-# CONFIG_NVMEM is not set
-# CONFIG_NVMEM_BCM_OCOTP is not set
-# CONFIG_NVMEM_IMX_OCOTP is not set
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TARGET is not set
-# CONFIG_NVRAM is not set
-# CONFIG_NV_TCO is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-# CONFIG_N_GSM is not set
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_OBS600 is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OF_OVERLAY is not set
-# CONFIG_OF_UNITTEST is not set
-# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_OMAP2_DSS_DEBUGFS is not set
-# CONFIG_OMAP2_DSS_SDI is not set
-# CONFIG_OMAP_OCP2SCP is not set
-# CONFIG_OMAP_USB2 is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_OPROFILE is not set
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-# CONFIG_OPT3001 is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=y
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_XINO_AUTO=y
-# CONFIG_OWL_LOADER is not set
-# CONFIG_P54_COMMON is not set
-# CONFIG_PA12203001 is not set
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PALMAS_GPADC is not set
-# CONFIG_PANASONIC_LAPTOP is not set
-# CONFIG_PANEL is not set
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_ON_OOPS_VALUE=1
-CONFIG_PANIC_TIMEOUT=1
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARAVIRT is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_1284 is not set
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARASAN_CF is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IMX is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OCTEON_CF is not set
-# CONFIG_PATA_OF_PLATFORM is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC104 is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCH_DMA is not set
-# CONFIG_PCH_GBE is not set
-# CONFIG_PCH_PHUB is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_PCIE_ALTERA is not set
-# CONFIG_PCIE_ARMADA_8K is not set
-# CONFIG_PCIE_CADENCE_HOST is not set
-# CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_DW_PLAT is not set
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIE_IPROC is not set
-# CONFIG_PCIE_KIRIN is not set
-# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_XILINX is not set
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCI_ENDPOINT is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_HISI is not set
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LAYERSCAPE is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCI_PASID is not set
-# CONFIG_PCI_PRI is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_SW_SWITCHTEC is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCI_XGENE is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_AXNET is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_PCNET is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PERF_EVENTS_AMD_POWER is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
-# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_DWC3 is not set
-# CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_SAMSUNG_USB2 is not set
-# CONFIG_PHY_TUSB1210 is not set
-# CONFIG_PHY_XGENE is not set
-# CONFIG_PI433 is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_PID_NS is not set
-CONFIG_PINCONF=y
-# CONFIG_PINCTRL is not set
-# CONFIG_PINCTRL_AMD is not set
-# CONFIG_PINCTRL_AXP209 is not set
-# CONFIG_PINCTRL_CEDARFORK is not set
-# CONFIG_PINCTRL_EXYNOS is not set
-# CONFIG_PINCTRL_EXYNOS5440 is not set
-# CONFIG_PINCTRL_ICELAKE is not set
-# CONFIG_PINCTRL_MCP23S08 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-CONFIG_PINCTRL_SINGLE=y
-# CONFIG_PINCTRL_SX150X is not set
-CONFIG_PINMUX=y
-# CONFIG_PKCS7_MESSAGE_PARSER is not set
-# CONFIG_PL320_MBOX is not set
-# CONFIG_PL330_DMA is not set
-# CONFIG_PLATFORM_MHU is not set
-# CONFIG_PLAT_SPEAR is not set
-# CONFIG_PLIP is not set
-CONFIG_PLUGIN_HOSTCC=""
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PM is not set
-# CONFIG_PMBUS is not set
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_PM_WAKELOCKS is not set
-# CONFIG_POSIX_MQUEUE is not set
-CONFIG_POSIX_TIMERS=y
-# CONFIG_POWERCAP is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-# CONFIG_POWER_RESET_BRCMKONA is not set
-# CONFIG_POWER_RESET_BRCMSTB is not set
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_PIIX4_POWEROFF is not set
-# CONFIG_POWER_RESET_RESTART is not set
-# CONFIG_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_POWER_RESET_VERSATILE is not set
-# CONFIG_POWER_RESET_XGENE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PPC4xx_GPIO is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
-# CONFIG_PPP is not set
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_PARPORT is not set
-# CONFIG_PPS_DEBUG is not set
-# CONFIG_PPTP is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_STRIPPED=y
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_PROVE_RCU is not set
-# CONFIG_PROVE_RCU_REPEATEDLY is not set
-# CONFIG_PSAMPLE is not set
-# CONFIG_PSB6970_PHY is not set
-# CONFIG_PSTORE is not set
-# CONFIG_PTP_1588_CLOCK is not set
-# CONFIG_PTP_1588_CLOCK_IXP46X is not set
-# CONFIG_PTP_1588_CLOCK_KVM is not set
-# CONFIG_PTP_1588_CLOCK_PCH is not set
-# CONFIG_PUBLIC_KEY_ALGO_RSA is not set
-# CONFIG_PWM is not set
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_PCA9685 is not set
-CONFIG_PWRSEQ_EMMC=y
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=y
-# CONFIG_QCA7000 is not set
-# CONFIG_QCA7000_SPI is not set
-# CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_EMAC is not set
-# CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set
-# CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set
-# CONFIG_QCOM_FALKOR_ERRATUM_E1041 is not set
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-# CONFIG_QED is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QLCNIC is not set
-# CONFIG_QLGE is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_QORIQ_CPUFREQ is not set
-# CONFIG_QORIQ_THERMAL is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUEUED_LOCK_STAT is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-# CONFIG_QUOTA_DEBUG is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_R8188EU is not set
-# CONFIG_R8712U is not set
-# CONFIG_R8723AU is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_RALINK is not set
-# CONFIG_RANDOM32_SELFTEST is not set
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RAPIDIO is not set
-# CONFIG_RAS is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RBTREE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_RCU_EXPEDITE_BOOT is not set
-CONFIG_RCU_EXPERT=y
-CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FAST_NO_HZ is not set
-CONFIG_RCU_KTHREAD_PRIO=0
-# CONFIG_RCU_NOCB_CPU is not set
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RC_ATI_REMOTE is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_RC_DECODERS is not set
-# CONFIG_RC_LOOPBACK is not set
-# CONFIG_RC_MAP is not set
-# CONFIG_RDS is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_GZIP is not set
-# CONFIG_RD_LZ4 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_READABLE_ASM is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REFCOUNT_FULL is not set
-# CONFIG_REGMAP is not set
-# CONFIG_REGMAP_I2C is not set
-# CONFIG_REGMAP_MMIO is not set
-# CONFIG_REGMAP_SPI is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_ANATOP is not set
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_GPIO is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_ISL9305 is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-# CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_PFUZE100 is not set
-# CONFIG_REGULATOR_PV88060 is not set
-# CONFIG_REGULATOR_PV88080 is not set
-# CONFIG_REGULATOR_PV88090 is not set
-# CONFIG_REGULATOR_PWM is not set
-# CONFIG_REGULATOR_SY8106A is not set
-# CONFIG_REGULATOR_TI_ABB is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
-# CONFIG_REGULATOR_TPS6524X is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_VCTRL is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_POSIX_ACL is not set
-# CONFIG_REISERFS_FS_SECURITY is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RELOCATABLE is not set
-# CONFIG_REMOTEPROC is not set
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RESET_IMX7 is not set
-# CONFIG_RESET_LANTIQ is not set
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
-# CONFIG_RESET_TEGRA_BPMP is not set
-# CONFIG_RESET_TI_SYSCON is not set
-# CONFIG_RESET_ZYNQ is not set
-# CONFIG_RFD77402 is not set
-# CONFIG_RFD_FTL is not set
-CONFIG_RFKILL=y
-# CONFIG_RFKILL_FULL is not set
-# CONFIG_RFKILL_GPIO is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL_LEDS is not set
-# CONFIG_RFKILL_REGULATOR is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RMI4_CORE is not set
-# CONFIG_RMNET is not set
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_ROCKER is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-# CONFIG_RPMSG_VIRTIO is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_RSEQ is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_ARMADA38X is not set
-# CONFIG_RTC_DRV_AU1XXX is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1302 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-# CONFIG_RTC_DRV_DS1307_HWMON is not set
-# CONFIG_RTC_DRV_DS1343 is not set
-# CONFIG_RTC_DRV_DS1347 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_GENERIC is not set
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_ISL12057 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_MAX6916 is not set
-# CONFIG_RTC_DRV_MCP795 is not set
-# CONFIG_RTC_DRV_MOXART is not set
-# CONFIG_RTC_DRV_MPC5121 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_OMAP is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
-# CONFIG_RTC_DRV_PS3 is not set
-# CONFIG_RTC_DRV_PT7C4338 is not set
-# CONFIG_RTC_DRV_R7301 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_RX4581 is not set
-# CONFIG_RTC_DRV_RX6110 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_SUN6I is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_XGENE is not set
-# CONFIG_RTC_DRV_ZYNQMP is not set
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTC_NVMEM is not set
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366_SMI_DEBUG_FS is not set
-# CONFIG_RTL8367B_PHY is not set
-# CONFIG_RTL8367_PHY is not set
-# CONFIG_RTLLIB is not set
-# CONFIG_RTL_CARDS is not set
-# CONFIG_RTS5208 is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RUNTIME_TESTING_MENU=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_RXKAD=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SAMSUNG_LAPTOP is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_SATA_DWC is not set
-# CONFIG_SATA_FSL is not set
-# CONFIG_SATA_HIGHBANK is not set
-# CONFIG_SATA_INIC162X is not set
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_RCAR is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-CONFIG_SBITMAP=y
-# CONFIG_SC92031 is not set
-# CONFIG_SCA3000 is not set
-# CONFIG_SCACHE_DEBUGFS is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_SCHED_HRTICK=y
-# CONFIG_SCHED_MC is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCHED_SMT is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCR24X is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2X_FCOE is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HISI_SAS is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCI is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-# CONFIG_SCSI_LPFC is not set
-CONFIG_SCSI_MOD=y
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MQ_DEFAULT is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SMARTPQI is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_VIRTIO is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCx200_ACB is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SD_ADC_MODULATOR is not set
-# CONFIG_SECCOMP is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ACPI_POWER is not set
-# CONFIG_SENSORS_AD7314 is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM1275 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS1015 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADS7871 is not set
-# CONFIG_SENSORS_ADT7310 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_BH1780 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DELL_SMM is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FAM15H_POWER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FTSTEUTATES is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_GSC is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_HMC5843 is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-# CONFIG_SENSORS_HTU21 is not set
-# CONFIG_SENSORS_I5500 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IBM_CFFPS is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_IR35221 is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM25066 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2978 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC3815 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX16064 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX20751 is not set
-# CONFIG_SENSORS_MAX31722 is not set
-# CONFIG_SENSORS_MAX31785 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MAX34440 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX8688 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_NSA320 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_PMBUS is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_PWM_FAN is not set
-# CONFIG_SENSORS_SCH5627 is not set
-# CONFIG_SENSORS_SCH5636 is not set
-# CONFIG_SENSORS_SCH56XX_COMMON is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TPS40422 is not set
-# CONFIG_SENSORS_TPS53679 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_SENSORS_UCD9000 is not set
-# CONFIG_SENSORS_UCD9200 is not set
-# CONFIG_SENSORS_VEXPRESS is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VIA_CPUTEMP is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_XGENE is not set
-# CONFIG_SENSORS_ZL6100 is not set
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_ACCENT is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-# CONFIG_SERIAL_8250_BOCA is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_DMA=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_EM is not set
-# CONFIG_SERIAL_8250_EXAR is not set
-# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_FINTEK is not set
-# CONFIG_SERIAL_8250_FOURPORT is not set
-# CONFIG_SERIAL_8250_HUB6 is not set
-# CONFIG_SERIAL_8250_INGENIC is not set
-# CONFIG_SERIAL_8250_LPSS is not set
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_MID is not set
-# CONFIG_SERIAL_8250_MOXA is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-# CONFIG_SERIAL_8250_RSA is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_AMBA_PL010 is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_DEV_BUS is not set
-CONFIG_SERIAL_EARLYCON=y
-# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_PCH_UART is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SH_SCI is not set
-# CONFIG_SERIAL_STM32 is not set
-# CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIO is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_AMBAKMI is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_SUN4I_PS2 is not set
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
-# CONFIG_SFI is not set
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SG_POOL is not set
-# CONFIG_SG_SPLIT is not set
-CONFIG_SHMEM=y
-# CONFIG_SH_ETH is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_SI1133 is not set
-# CONFIG_SI1145 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SIGNALFD=y
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIMPLE_PM_BUS is not set
-# CONFIG_SIOX is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SLAB is not set
-CONFIG_SLABINFO=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_FREELIST_RANDOM is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC9194 is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_SND is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALOOP is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ASIHPI is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_ATMEL_AC97C is not set
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BCD2000 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_DESIGNWARE_I2S is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EDMA_SOC is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_FIREWIRE is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDA_PREALLOC_SIZE=64
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND_KIRKWOOD_SOC is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LOLA is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-CONFIG_SND_MAX_CARDS=16
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_MTS64 is not set
-# CONFIG_SND_MXS_SOC is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCM_TIMER is not set
-# CONFIG_SND_PCM_XRUN_DEBUG is not set
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_PORTMAN2X4 is not set
-# CONFIG_SND_POWERPC_SOC is not set
-# CONFIG_SND_PPC is not set
-CONFIG_SND_PROC_FS=y
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_SE6X is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIMPLE_CARD is not set
-# CONFIG_SND_SIMPLE_SCU_CARD is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-# CONFIG_SND_SOC_ADAU7002 is not set
-# CONFIG_SND_SOC_AK4104 is not set
-# CONFIG_SND_SOC_AK4458 is not set
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-# CONFIG_SND_SOC_AK5558 is not set
-# CONFIG_SND_SOC_ALC5623 is not set
-# CONFIG_SND_SOC_AMD_ACP is not set
-# CONFIG_SND_SOC_AU1XAUDIO is not set
-# CONFIG_SND_SOC_AU1XPSC is not set
-# CONFIG_SND_SOC_BD28623 is not set
-# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS35L34 is not set
-# CONFIG_SND_SOC_CS35L35 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
-# CONFIG_SND_SOC_CS43130 is not set
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_DIO2125 is not set
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
-# CONFIG_SND_SOC_ES8328 is not set
-# CONFIG_SND_SOC_ES8328_I2C is not set
-# CONFIG_SND_SOC_ES8328_SPI is not set
-# CONFIG_SND_SOC_EUKREA_TLV320 is not set
-# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
-# CONFIG_SND_SOC_FSL_ASRC is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
-# CONFIG_SND_SOC_FSL_SAI is not set
-# CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
-# CONFIG_SND_SOC_GTM601 is not set
-# CONFIG_SND_SOC_ICS43432 is not set
-# CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
-# CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_SPDIF is not set
-# CONFIG_SND_SOC_IMX_WM8962 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
-# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH is not set
-# CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH is not set
-# CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH is not set
-# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH is not set
-# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH is not set
-# CONFIG_SND_SOC_INTEL_HASWELL is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
-# CONFIG_SND_SOC_INTEL_SST is not set
-CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-# CONFIG_SND_SOC_MAX9759 is not set
-# CONFIG_SND_SOC_MAX98373 is not set
-# CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MAX9867 is not set
-# CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MEDIATEK is not set
-# CONFIG_SND_SOC_MPC5200_AC97 is not set
-# CONFIG_SND_SOC_MPC5200_I2S is not set
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-# CONFIG_SND_SOC_MT2701 is not set
-# CONFIG_SND_SOC_MT6351 is not set
-# CONFIG_SND_SOC_MT8173 is not set
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8824 is not set
-# CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1789_I2C is not set
-# CONFIG_SND_SOC_PCM1792A is not set
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-# CONFIG_SND_SOC_PCM186X_I2C is not set
-# CONFIG_SND_SOC_PCM186X_SPI is not set
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_QCOM is not set
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
-# CONFIG_SND_SOC_RT5677_SPI is not set
-# CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-# CONFIG_SND_SOC_SPDIF is not set
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-# CONFIG_SND_SOC_TAS6424 is not set
-# CONFIG_SND_SOC_TDA7419 is not set
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TPA6130A2 is not set
-# CONFIG_SND_SOC_TS3A227E is not set
-# CONFIG_SND_SOC_TSCS42XX is not set
-# CONFIG_SND_SOC_TSCS454 is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
-# CONFIG_SND_SOC_WM8524 is not set
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI is not set
-# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_USB_6FIRE is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_HIFACE is not set
-# CONFIG_SND_USB_POD is not set
-# CONFIG_SND_USB_PODHD is not set
-# CONFIG_SND_USB_TONEPORT is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-# CONFIG_SND_USB_VARIAX is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-CONFIG_SND_X86=y
-# CONFIG_SND_XEN_FRONTEND is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
-# CONFIG_SOCK_CGROUP_DATA is not set
-# CONFIG_SOC_AM33XX is not set
-# CONFIG_SOC_AM43XX is not set
-# CONFIG_SOC_BRCMSTB is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOC_DRA7XX is not set
-# CONFIG_SOC_HAS_OMAP2_SDRC is not set
-# CONFIG_SOC_OMAP5 is not set
-# CONFIG_SOC_TI is not set
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUNDWIRE is not set
-# CONFIG_SOUND_OSS_CORE is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SP5100_TCO is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPARSE_IRQ is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_SPEAKUP is not set
-# CONFIG_SPI is not set
-# CONFIG_SPINLOCK_TEST is not set
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AU1550 is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-# CONFIG_SPI_BCM2835 is not set
-# CONFIG_SPI_BCM_QSPI is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_FSL_DSPI is not set
-# CONFIG_SPI_FSL_ESPI is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI_IMG_SPFI is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_LOOPBACK_TEST is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_MEM is not set
-# CONFIG_SPI_MPC52xx is not set
-# CONFIG_SPI_MPC52xx_PSC is not set
-# CONFIG_SPI_OCTEON is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_PPC4xx is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_PXA2XX_PCI is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_S3C64XX is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_THUNDERX is not set
-# CONFIG_SPI_TI_QSPI is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_XWAY is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SPMI is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_EMBEDDED=y
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_LZ4 is not set
-# CONFIG_SQUASHFS_LZO is not set
-# CONFIG_SQUASHFS_XATTR is not set
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZLIB is not set
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SRAM is not set
-# CONFIG_SRF04 is not set
-# CONFIG_SRF08 is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB_DRIVER_GPIO is not set
-# CONFIG_SSB_HOST_SOC is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACKPROTECTOR is not set
-# CONFIG_STACKPROTECTOR_STRONG is not set
-# CONFIG_STACKTRACE is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STACK_TRACER is not set
-# CONFIG_STACK_VALIDATION is not set
-CONFIG_STAGING=y
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STANDALONE=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-# CONFIG_STE_MODEM_RPROC is not set
-# CONFIG_STK3310 is not set
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-# CONFIG_STM is not set
-# CONFIG_STMMAC_ETH is not set
-# CONFIG_STMMAC_PCI is not set
-# CONFIG_STMMAC_PLATFORM is not set
-# CONFIG_STM_DUMMY is not set
-# CONFIG_STM_SOURCE_CONSOLE is not set
-CONFIG_STP=y
-# CONFIG_STREAM_PARSER is not set
-# CONFIG_STRICT_DEVMEM is not set
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-# CONFIG_STRING_SELFTEST is not set
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STX104 is not set
-# CONFIG_ST_UVIS25 is not set
-# CONFIG_SUN4I_GPADC is not set
-# CONFIG_SUN50I_DE2_BUS is not set
-# CONFIG_SUN50I_ERRATUM_UNKNOWN1 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_DEBUG is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNXI_SRAM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SURFACE_3_BUTTON is not set
-# CONFIG_SUSPEND is not set
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SWCONFIG_B53 is not set
-# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
-# CONFIG_SWCONFIG_LEDS is not set
-# CONFIG_SW_SYNC is not set
-# CONFIG_SX9500 is not set
-# CONFIG_SXGBE_ETH is not set
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_SYNC_FILE is not set
-# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_SYSCTL=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYSFS=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSTEMPORT is not set
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_T5403 is not set
-# CONFIG_TARGET_CORE is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_TASKS_RCU is not set
-# CONFIG_TASK_XACCT is not set
-# CONFIG_TC35815 is not set
-# CONFIG_TCG_ATMEL is not set
-# CONFIG_TCG_CRB is not set
-# CONFIG_TCG_INFINEON is not set
-# CONFIG_TCG_NSC is not set
-# CONFIG_TCG_ST33_I2C is not set
-# CONFIG_TCG_TIS is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_XEN is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BBR is not set
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CDG is not set
-CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TCP_CONG_DCTCP is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_NV is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_WESTWOOD is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_TEE is not set
-# CONFIG_TEGRA_AHB is not set
-# CONFIG_TEGRA_HOST1X is not set
-# CONFIG_TEHUTI is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-# CONFIG_TEST_BITFIELD is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_IDA is not set
-# CONFIG_TEST_KMOD is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_OVERFLOW is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_UUID is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL_STATISTICS is not set
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-# CONFIG_THINKPAD_ACPI is not set
-CONFIG_THIN_ARCHIVES=y
-# CONFIG_THRUSTMASTER_FF is not set
-# CONFIG_THUNDERBOLT is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_TICK_CPU_ACCOUNTING is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_TIMB_DMA is not set
-CONFIG_TIMERFD=y
-# CONFIG_TIMER_STATS is not set
-CONFIG_TINY_RCU=y
-# CONFIG_TIPC is not set
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC084S021 is not set
-# CONFIG_TI_ADC108S102 is not set
-# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
-# CONFIG_TI_ADS8688 is not set
-# CONFIG_TI_AM335X_ADC is not set
-# CONFIG_TI_CPSW is not set
-# CONFIG_TI_CPSW_ALE is not set
-# CONFIG_TI_CPTS is not set
-# CONFIG_TI_DAC082S085 is not set
-# CONFIG_TI_DAC5571 is not set
-# CONFIG_TI_DAC7512 is not set
-# CONFIG_TI_DAVINCI_CPDMA is not set
-# CONFIG_TI_DAVINCI_MDIO is not set
-# CONFIG_TI_ST is not set
-# CONFIG_TI_SYSCON_RESET is not set
-# CONFIG_TI_TLC4541 is not set
-# CONFIG_TLAN is not set
-# CONFIG_TLS is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMP006 is not set
-# CONFIG_TMP007 is not set
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS_XATTR=y
-# CONFIG_TOPSTAR_LAPTOP is not set
-# CONFIG_TORTURE_TEST is not set
-# CONFIG_TOSHIBA_HAPS is not set
-# CONFIG_TOUCHSCREEN_88PM860X is not set
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
-# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-# CONFIG_TOUCHSCREEN_BU21013 is not set
-# CONFIG_TOUCHSCREEN_BU21029 is not set
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
-# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_I2C is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_SPI is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_I2C is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
-# CONFIG_TOUCHSCREEN_DA9034 is not set
-# CONFIG_TOUCHSCREEN_DA9052 is not set
-# CONFIG_TOUCHSCREEN_DYNAPRO is not set
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_EGALAX is not set
-# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
-# CONFIG_TOUCHSCREEN_ELAN is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_EXC3000 is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GOODIX is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
-# CONFIG_TOUCHSCREEN_HIDEEP is not set
-# CONFIG_TOUCHSCREEN_HP600 is not set
-# CONFIG_TOUCHSCREEN_HP7XX is not set
-# CONFIG_TOUCHSCREEN_HTCPEN is not set
-# CONFIG_TOUCHSCREEN_ILI210X is not set
-# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_IPAQ_MICRO is not set
-# CONFIG_TOUCHSCREEN_IPROC is not set
-# CONFIG_TOUCHSCREEN_LPC32XX is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MC13783 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-# CONFIG_TOUCHSCREEN_MIGOR is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_MX25 is not set
-# CONFIG_TOUCHSCREEN_MXS_LRADC is not set
-# CONFIG_TOUCHSCREEN_PCAP is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_PIXCIR is not set
-# CONFIG_TOUCHSCREEN_PROPERTIES is not set
-# CONFIG_TOUCHSCREEN_RM_TS is not set
-# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_S6SY761 is not set
-# CONFIG_TOUCHSCREEN_SILEAD is not set
-# CONFIG_TOUCHSCREEN_SIS_I2C is not set
-# CONFIG_TOUCHSCREEN_ST1232 is not set
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-# CONFIG_TOUCHSCREEN_STMPE is not set
-# CONFIG_TOUCHSCREEN_SUN4I is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
-# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TPS6507X is not set
-# CONFIG_TOUCHSCREEN_TS4800 is not set
-# CONFIG_TOUCHSCREEN_TSC2004 is not set
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-# CONFIG_TOUCHSCREEN_TSC200X_CORE is not set
-# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
-# CONFIG_TOUCHSCREEN_USB_3M is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
-# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
-# CONFIG_TOUCHSCREEN_USB_EGALAX is not set
-# CONFIG_TOUCHSCREEN_USB_ELO is not set
-# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set
-# CONFIG_TOUCHSCREEN_USB_ETURBO is not set
-# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set
-# CONFIG_TOUCHSCREEN_USB_GOTOP is not set
-# CONFIG_TOUCHSCREEN_USB_GUNZE is not set
-# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set
-# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set
-# CONFIG_TOUCHSCREEN_USB_ITM is not set
-# CONFIG_TOUCHSCREEN_USB_JASTEC is not set
-# CONFIG_TOUCHSCREEN_USB_NEXIO is not set
-# CONFIG_TOUCHSCREEN_USB_PANJIT is not set
-# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-# CONFIG_TOUCHSCREEN_WM831X is not set
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
-# CONFIG_TOUCHSCREEN_WM97XX is not set
-# CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set
-# CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE is not set
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
-# CONFIG_TOUCHSCREEN_ZFORCE is not set
-# CONFIG_TPL0102 is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
-CONFIG_TRACING_SUPPORT=y
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-# CONFIG_TRUSTED_KEYS is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_TTPCI_EEPROM is not set
-CONFIG_TTY=y
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_TUN is not set
-# CONFIG_TUN_VNET_CROSS_LE is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL4030_MADC is not set
-# CONFIG_TWL6030_GPADC is not set
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_TYPEC is not set
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
-# CONFIG_TYPHOON is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-# CONFIG_UBIFS_FS_ENCRYPTION is not set
-CONFIG_UBIFS_FS_FORMAT4=y
-# CONFIG_UBIFS_FS_SECURITY is not set
-# CONFIG_UBIFS_FS_XATTR is not set
-# CONFIG_UBSAN is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UCSI is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UHID is not set
-CONFIG_UID16=y
-# CONFIG_UIO is not set
-# CONFIG_ULTRA is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
-CONFIG_UNIX=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_UPROBES is not set
-# CONFIG_UPROBE_EVENTS is not set
-# CONFIG_US5182D is not set
-# CONFIG_USB is not set
-# CONFIG_USBIP_CORE is not set
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-# CONFIG_USBIP_VUDC is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-CONFIG_USB_ALI_M5632=y
-# CONFIG_USB_AMD5536UDC is not set
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_BDC_UDC is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_CHAOSKEY is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CONFIGFS is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DUMMY_HCD is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_DWC2_DEBUG is not set
-# CONFIG_USB_DWC2_DUAL_ROLE is not set
-# CONFIG_USB_DWC2_HOST is not set
-# CONFIG_USB_DWC2_PERIPHERAL is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC3_EXYNOS is not set
-# CONFIG_USB_DWC3_HAPS is not set
-# CONFIG_USB_DWC3_KEYSTONE is not set
-# CONFIG_USB_DWC3_OF_SIMPLE is not set
-# CONFIG_USB_DWC3_PCI is not set
-# CONFIG_USB_DWC3_QCOM is not set
-# CONFIG_USB_DWC3_ULPI is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EG20T is not set
-# CONFIG_USB_EHCI_ATH79 is not set
-# CONFIG_USB_EHCI_HCD_AT91 is not set
-# CONFIG_USB_EHCI_HCD_OMAP is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-# CONFIG_USB_EHCI_MSM is not set
-# CONFIG_USB_EHCI_MV is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_FOTG210_UDC is not set
-# CONFIG_USB_FSL_USB2 is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FUSB300 is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_GADGET_XILINX is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GOKU is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GR_UDC is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_BENQ is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_CPIA1 is not set
-# CONFIG_USB_GSPCA_DTCS033 is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_JL2005BCD is not set
-# CONFIG_USB_GSPCA_KINECT is not set
-# CONFIG_USB_GSPCA_KONICA is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_NW80X is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_OV534_9 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-# CONFIG_USB_GSPCA_SE401 is not set
-# CONFIG_USB_GSPCA_SN9C2028 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ930X is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STK1135 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TOPRO is not set
-# CONFIG_USB_GSPCA_TOUPTEK is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_VICAM is not set
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_NCM is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_G_WEBCAM is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IMX21_HCD is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760 is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_LAN78XX is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
-# CONFIG_USB_LED_TRIG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_M66592 is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MAX3421_HCD is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MSM_OTG is not set
-# CONFIG_USB_MTU3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_USB_MXS_PHY is not set
-# CONFIG_USB_NET2272 is not set
-# CONFIG_USB_NET2280 is not set
-# CONFIG_USB_NET_AX88179_178A is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
-# CONFIG_USB_NET_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_CH9200 is not set
-# CONFIG_USB_NET_CX82310_ETH is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_DRIVERS is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_KALMIA is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_QMI_WWAN is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC75XX is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_SR9700 is not set
-# CONFIG_USB_NET_SR9800 is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_PCI is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHY is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_PXA27X is not set
-# CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RCAR_PHY is not set
-# CONFIG_USB_RENESAS_USBHS is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_RTL8152 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_F8153X is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_METRO is not set
-# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MXUPORT is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QCAUX is not set
-# CONFIG_USB_SERIAL_QT2 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SIMPLE is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_XSENS_MT is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SIERRA_NET is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SWITCH_FSA9480 is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UAS is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USS720 is not set
-# CONFIG_USB_VIDEO_CLASS is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VL600 is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_XHCI_DBGCAP is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USELIB is not set
-# CONFIG_USERFAULTFD is not set
-# CONFIG_USE_OF is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_U_SERIAL_CONSOLE is not set
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VBOXGUEST is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VDSO is not set
-# CONFIG_VEML6070 is not set
-# CONFIG_VETH is not set
-# CONFIG_VEXPRESS_CONFIG is not set
-# CONFIG_VF610_ADC is not set
-# CONFIG_VF610_DAC is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGA_SWITCHEROO is not set
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-# CONFIG_VHOST_NET is not set
-# CONFIG_VHOST_VSOCK is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CADENCE is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CS3308 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DM6446_CCDC is not set
-# CONFIG_VIDEO_DT3155 is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_IR_I2C is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_OMAP2_VOUT is not set
-# CONFIG_VIDEO_OV2640 is not set
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA6752HS is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_SONY_BTF_MPX is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_THS8200 is not set
-# CONFIG_VIDEO_TIMBERDALE is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TM6000 is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_TW2804 is not set
-# CONFIG_VIDEO_TW9903 is not set
-# CONFIG_VIDEO_TW9906 is not set
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_UDA1342 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBTV is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRTIO_BALLOON is not set
-# CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_VIRTIO_INPUT is not set
-CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_VIRT_DRIVERS is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VL6180 is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMWARE_PVSCSI is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VOP_BUS is not set
-# CONFIG_VORTEX is not set
-# CONFIG_VSOCKETS is not set
-# CONFIG_VSOCKETS_DIAG is not set
-# CONFIG_VT is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_VXGE is not set
-# CONFIG_VXLAN is not set
-# CONFIG_VZ89X is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2405 is not set
-# CONFIG_W1_SLAVE_DS2406 is not set
-# CONFIG_W1_SLAVE_DS2408 is not set
-# CONFIG_W1_SLAVE_DS2413 is not set
-# CONFIG_W1_SLAVE_DS2423 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2438 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_DS2780 is not set
-# CONFIG_W1_SLAVE_DS2781 is not set
-# CONFIG_W1_SLAVE_DS2805 is not set
-# CONFIG_W1_SLAVE_DS28E04 is not set
-# CONFIG_W1_SLAVE_DS28E17 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WANXL is not set
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_CORE is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-# CONFIG_WATCHDOG_SYSFS is not set
-# CONFIG_WD80x3 is not set
-# CONFIG_WDAT_WDT is not set
-# CONFIG_WDTPCI is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WILINK_PLATFORM_DATA=y
-# CONFIG_WIMAX is not set
-# CONFIG_WIMAX_GDM72XX is not set
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_WDS is not set
-# CONFIG_WIZNET_W5100 is not set
-# CONFIG_WIZNET_W5300 is not set
-# CONFIG_WL1251 is not set
-# CONFIG_WL12XX is not set
-# CONFIG_WL18XX is not set
-CONFIG_WLAN=y
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-# CONFIG_WLAN_VENDOR_ATH is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-# CONFIG_WLAN_VENDOR_BROADCOM is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-# CONFIG_WLAN_VENDOR_INTEL is not set
-# CONFIG_WLAN_VENDOR_INTERSIL is not set
-# CONFIG_WLAN_VENDOR_MARVELL is not set
-# CONFIG_WLAN_VENDOR_MEDIATEK is not set
-# CONFIG_WLAN_VENDOR_QUANTENNA is not set
-# CONFIG_WLAN_VENDOR_RALINK is not set
-# CONFIG_WLAN_VENDOR_REALTEK is not set
-# CONFIG_WLAN_VENDOR_RSI is not set
-# CONFIG_WLAN_VENDOR_ST is not set
-# CONFIG_WLAN_VENDOR_TI is not set
-# CONFIG_WLAN_VENDOR_ZYDAS is not set
-# CONFIG_WLCORE is not set
-# CONFIG_WL_MEDIATEK is not set
-CONFIG_WL_TI=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-# CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# CONFIG_X25 is not set
-# CONFIG_X509_CERTIFICATE_PARSER is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-# CONFIG_X86_PKG_TEMP_THERMAL is not set
-CONFIG_X86_SYSFB=y
-# CONFIG_XDP_SOCKETS is not set
-# CONFIG_XEN is not set
-# CONFIG_XEN_GRANT_DMA_ALLOC is not set
-# CONFIG_XEN_PVCALLS_FRONTEND is not set
-CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_INTERFACE is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XILINX_AXI_EMAC is not set
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XILINX_VCU is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-# CONFIG_XILLYBUS is not set
-# CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_XMON is not set
-CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_BCJ is not set
-# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_SPARC is not set
-# CONFIG_XZ_DEC_TEST is not set
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZBUD is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_ZLIB_DEFLATE is not set
-# CONFIG_ZLIB_INFLATE is not set
-CONFIG_ZONE_DMA=y
-# CONFIG_ZOPT2201 is not set
-# CONFIG_ZPA2326 is not set
-# CONFIG_ZPOOL is not set
-# CONFIG_ZRAM is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_ZSMALLOC is not set
-# CONFIG_ZX_TDM is not set
diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9
deleted file mode 100644 (file)
index 1194f5a..0000000
+++ /dev/null
@@ -1,5344 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_6LOWPAN is not set
-# CONFIG_6LOWPAN_DEBUGFS is not set
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_AB8500_CORE is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACERHDF is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ACPI_ALS is not set
-# CONFIG_ACPI_APEI is not set
-# CONFIG_ACPI_BUTTON is not set
-# CONFIG_ACPI_CONFIGFS is not set
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_EXTLOG is not set
-# CONFIG_ACPI_HED is not set
-# CONFIG_ACPI_NFIT is not set
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-# CONFIG_ACPI_TABLE_UPGRADE is not set
-# CONFIG_ACPI_VIDEO is not set
-# CONFIG_AD2S1200 is not set
-# CONFIG_AD2S1210 is not set
-# CONFIG_AD2S90 is not set
-# CONFIG_AD5064 is not set
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5449 is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5624R_SPI is not set
-# CONFIG_AD5686 is not set
-# CONFIG_AD5755 is not set
-# CONFIG_AD5761 is not set
-# CONFIG_AD5764 is not set
-# CONFIG_AD5791 is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7192 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7280 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7298 is not set
-# CONFIG_AD7303 is not set
-# CONFIG_AD7476 is not set
-# CONFIG_AD7606 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7816 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-# CONFIG_AD799X is not set
-# CONFIG_AD8366 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_AD9523 is not set
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADE7753 is not set
-# CONFIG_ADE7754 is not set
-# CONFIG_ADE7758 is not set
-# CONFIG_ADE7759 is not set
-# CONFIG_ADE7854 is not set
-# CONFIG_ADF4350 is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADIS16060 is not set
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16204 is not set
-# CONFIG_ADIS16209 is not set
-# CONFIG_ADIS16220 is not set
-# CONFIG_ADIS16240 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADIS16400 is not set
-# CONFIG_ADIS16480 is not set
-# CONFIG_ADJD_S311 is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_ADT7316 is not set
-CONFIG_ADVISE_SYSCALLS=y
-# CONFIG_ADXRS450 is not set
-CONFIG_AEABI=y
-# CONFIG_AFE4403 is not set
-# CONFIG_AFE4404 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AF_KCM is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_IPV6 is not set
-# CONFIG_AGP is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_IMX is not set
-# CONFIG_AHCI_MVEBU is not set
-# CONFIG_AHCI_QORIQ is not set
-CONFIG_AIO=y
-# CONFIG_AIRO is not set
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_AK09911 is not set
-# CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
-# CONFIG_AL3320A is not set
-# CONFIG_ALIM7101_WDT is not set
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_ALTERA_MBOX is not set
-# CONFIG_ALTERA_STAPL is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_ALX is not set
-# CONFIG_AM2315 is not set
-# CONFIG_AM335X_PHY_USB is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AMD_XGBE is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_AMILO_RFKILL is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_APDS9960 is not set
-# CONFIG_APM8018X is not set
-# CONFIG_APM_EMULATION is not set
-# CONFIG_APPLE_GMUX is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AR5523 is not set
-# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR8216_PHY_LEDS is not set
-# CONFIG_ARCH_ALPINE is not set
-# CONFIG_ARCH_ARTPEC is not set
-# CONFIG_ARCH_ASPEED is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_BCM_21664 is not set
-# CONFIG_ARCH_BCM_23550 is not set
-# CONFIG_ARCH_BCM_281XX is not set
-# CONFIG_ARCH_BCM_5301X is not set
-# CONFIG_ARCH_BCM_53573 is not set
-# CONFIG_ARCH_BCM_63XX is not set
-# CONFIG_ARCH_BCM_CYGNUS is not set
-# CONFIG_ARCH_BCM_IPROC is not set
-# CONFIG_ARCH_BCM_NSP is not set
-# CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CNS3XXX is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGICOLOR is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_EXYNOS is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_ARCH_HI3xxx is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_HISI is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KEYSTONE is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
-# CONFIG_ARCH_LG1K is not set
-# CONFIG_ARCH_LPC32XX is not set
-# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
-CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MULTIPLATFORM is not set
-# CONFIG_ARCH_MULTI_V6 is not set
-# CONFIG_ARCH_MULTI_V7 is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NSPIRE is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_OMAP1 is not set
-# CONFIG_ARCH_OMAP2 is not set
-# CONFIG_ARCH_OMAP2PLUS is not set
-# CONFIG_ARCH_OMAP3 is not set
-# CONFIG_ARCH_OMAP4 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_OXNAS is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_PICOXCELL is not set
-# CONFIG_ARCH_PRIMA2 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_QCOM is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SEATTLE is not set
-# CONFIG_ARCH_SHMOBILE is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
-# CONFIG_ARCH_SIRF is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_SPRD is not set
-# CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_STRATIX10 is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_TANGO is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_THUNDER is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_UNIPHIER is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_VIRT is not set
-# CONFIG_ARCH_VT8500 is not set
-# CONFIG_ARCH_VULCAN is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
-# CONFIG_ARCH_WM8505 is not set
-# CONFIG_ARCH_WM8750 is not set
-# CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_XGENE is not set
-# CONFIG_ARCH_ZX is not set
-# CONFIG_ARCH_ZYNQ is not set
-# CONFIG_ARCH_ZYNQMP is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARC_EMAC is not set
-# CONFIG_ARM64_ERRATUM_1024718 is not set
-# CONFIG_ARM64_ERRATUM_819472 is not set
-# CONFIG_ARM64_ERRATUM_824069 is not set
-# CONFIG_ARM64_ERRATUM_826319 is not set
-# CONFIG_ARM64_ERRATUM_827319 is not set
-# CONFIG_ARM64_ERRATUM_832075 is not set
-# CONFIG_ARM64_ERRATUM_834220 is not set
-# CONFIG_ARM64_ERRATUM_843419 is not set
-# CONFIG_ARM64_ERRATUM_845719 is not set
-# CONFIG_ARM_APPENDED_DTB is not set
-# CONFIG_ARM_ARCH_TIMER is not set
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
-# CONFIG_ARM_CCI is not set
-# CONFIG_ARM_CCI400_PMU is not set
-# CONFIG_ARM_CCI5xx_PMU is not set
-# CONFIG_ARM_CCN is not set
-# CONFIG_ARM_CPUIDLE is not set
-CONFIG_ARM_CPU_TOPOLOGY=y
-# CONFIG_ARM_CRYPTO is not set
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-# CONFIG_ARM_ERRATA_326103 is not set
-# CONFIG_ARM_ERRATA_364296 is not set
-# CONFIG_ARM_ERRATA_411920 is not set
-# CONFIG_ARM_ERRATA_430973 is not set
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_ARM_ERRATA_643719 is not set
-# CONFIG_ARM_ERRATA_720789 is not set
-# CONFIG_ARM_ERRATA_742230 is not set
-# CONFIG_ARM_ERRATA_742231 is not set
-# CONFIG_ARM_ERRATA_743622 is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_ARM_ERRATA_754322 is not set
-# CONFIG_ARM_ERRATA_754327 is not set
-# CONFIG_ARM_ERRATA_764369 is not set
-# CONFIG_ARM_ERRATA_773022 is not set
-# CONFIG_ARM_ERRATA_775420 is not set
-# CONFIG_ARM_ERRATA_798181 is not set
-# CONFIG_ARM_ERRATA_818325_852422 is not set
-# CONFIG_ARM_ERRATA_821420 is not set
-# CONFIG_ARM_ERRATA_825619 is not set
-# CONFIG_ARM_ERRATA_852421 is not set
-# CONFIG_ARM_ERRATA_852423 is not set
-CONFIG_ARM_GIC_MAX_NR=1
-# CONFIG_ARM_KERNMEM_PERMS is not set
-# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
-# CONFIG_ARM_KPROBES_TEST is not set
-# CONFIG_ARM_MHU is not set
-# CONFIG_ARM_MODULE_PLTS is not set
-# CONFIG_ARM_PATCH_PHYS_VIRT is not set
-# CONFIG_ARM_PSCI is not set
-# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_SBSA_WATCHDOG is not set
-# CONFIG_ARM_SCPI_PROTOCOL is not set
-# CONFIG_ARM_TIMER_SP804 is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_ARM_VIRT_EXT is not set
-# CONFIG_AS3935 is not set
-# CONFIG_ASM9260_TIMER is not set
-# CONFIG_ASUS_LAPTOP is not set
-# CONFIG_ASUS_WIRELESS is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
-# CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set
-# CONFIG_ASYNC_RAID6_TEST is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_AT91_SAMA5D2_ADC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATAGS is not set
-CONFIG_ATAGS_PROC=y
-# CONFIG_ATALK is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_ATA_ACPI is not set
-CONFIG_ATA_BMDMA=y
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K is not set
-# CONFIG_ATH25 is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH6KL is not set
-# CONFIG_ATH79 is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATH9K_HTC is not set
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATLAS_PH_SENSOR is not set
-# CONFIG_ATM is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_ATMEL_SSC is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_BR2684 is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_ATP is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_AURORA_NB8800 is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTO_ZRELADDR is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX88796 is not set
-# CONFIG_AXP288_ADC is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_APPLE is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_GENERIC is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_PANDORA is not set
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_RPI is not set
-# CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-# CONFIG_BCACHE is not set
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-# CONFIG_BCM63XX_PHY is not set
-# CONFIG_BCM7038_WDT is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BCMA is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMGENET is not set
-# CONFIG_BCM_IPROC_ADC is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_BDI_SWITCH is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BE2NET is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BGMAC is not set
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_BIG_KEYS is not set
-# CONFIG_BIG_LITTLE is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DRBD is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDE_AU1XXX is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_NULL_BLK is not set
-# CONFIG_BLK_DEV_NVME is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_PMEM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLOCK=y
-# CONFIG_BMA180 is not set
-# CONFIG_BMA220 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMC150_MAGN is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
-# CONFIG_BMIPS_GENERIC is not set
-# CONFIG_BMP085 is not set
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
-# CONFIG_BMP280 is not set
-# CONFIG_BNA is not set
-# CONFIG_BNX2 is not set
-# CONFIG_BNX2X is not set
-# CONFIG_BNXT is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOKE_WDT is not set
-CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_BOOT_RAW=y
-CONFIG_BPF=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_SYSCALL=y
-# CONFIG_BPQETHER is not set
-CONFIG_BQL=y
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_BRCMSTB_GISB_ARB is not set
-CONFIG_BRIDGE=y
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE_VLAN_FILTERING=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-# CONFIG_BT is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BTRFS_FS_POSIX_ACL is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_BREDR is not set
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIBTUSB_RTL is not set
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_3WIRE is not set
-# CONFIG_BT_HCIUART_AG6XX is not set
-# CONFIG_BT_HCIUART_ATH3K is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUART_MRVL is not set
-# CONFIG_BT_HCIUART_QCA is not set
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT_HS is not set
-# CONFIG_BT_LE is not set
-# CONFIG_BT_LEDS is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_SELFTEST is not set
-CONFIG_BUG=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-# CONFIG_BUILD_BIN2C is not set
-# CONFIG_C2PORT is not set
-CONFIG_CACHE_L2X0_PMU=y
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
-# CONFIG_CAN is not set
-# CONFIG_CAN_BCM is not set
-# CONFIG_CAN_DEBUG_DEVICES is not set
-# CONFIG_CAN_DEV is not set
-# CONFIG_CAN_GS_USB is not set
-# CONFIG_CAN_GW is not set
-# CONFIG_CAN_IFI_CANFD is not set
-# CONFIG_CAN_M_CAN is not set
-# CONFIG_CAN_RAW is not set
-# CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_RCAR_CANFD is not set
-# CONFIG_CAN_SLCAN is not set
-# CONFIG_CAN_SUN4I is not set
-# CONFIG_CAN_VCAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CARL9170 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CAVIUM_ERRATUM_22375 is not set
-# CONFIG_CAVIUM_ERRATUM_23144 is not set
-# CONFIG_CAVIUM_ERRATUM_23154 is not set
-# CONFIG_CAVIUM_ERRATUM_27456 is not set
-# CONFIG_CAVIUM_OCTEON_SOC is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC10001_ADC is not set
-# CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_CC_STACKPROTECTOR_NONE=y
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CEPH_FS is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_NET_CLASSID is not set
-# CONFIG_CGROUP_NET_PRIO is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_RT9455 is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_CHARGER_TWL4030 is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHELSIO_T4 is not set
-# CONFIG_CHELSIO_T4VF is not set
-# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS is not set
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_FSCACHE is not set
-# CONFIG_CIFS_NFSD_EXPORT is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIO_DAC is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_CLKSRC_VERSATILE is not set
-# CONFIG_CLK_QORIQ is not set
-# CONFIG_CLOCK_THERMAL is not set
-CONFIG_CLS_U32_MARK=y
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-# CONFIG_CMA is not set
-CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_BOOL is not set
-# CONFIG_CMDLINE_EXTEND is not set
-# CONFIG_CMDLINE_FORCE is not set
-# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_IPROC is not set
-# CONFIG_COMMON_CLK_NXP is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_QCOM is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-CONFIG_COMPACTION=y
-# CONFIG_COMPAL_LAPTOP is not set
-# CONFIG_COMPAT is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_COPS is not set
-# CONFIG_CORDIC is not set
-# CONFIG_COREDUMP is not set
-# CONFIG_CORESIGHT is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CPU_IDLE_GOV_MENU is not set
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-# CONFIG_CPU_NO_EFFICIENT_FFS is not set
-CONFIG_CPU_SW_DOMAIN_PAN=y
-# CONFIG_CRAMFS is not set
-CONFIG_CRASHLOG=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC32_SARWATE=y
-# CONFIG_CRC32_SELFTEST is not set
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SLICEBY8 is not set
-# CONFIG_CRC7 is not set
-# CONFIG_CRC8 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSS_COMPILE=""
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_CRYPTO=y
-# CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_AEAD is not set
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES_ARM is not set
-# CONFIG_CRYPTO_AES_ARM_BS is not set
-# CONFIG_CRYPTO_AES_NI_INTEL is not set
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=y
-# CONFIG_CRYPTO_AUTHENC is not set
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_CMAC is not set
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
-# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
-# CONFIG_CRYPTO_DEV_CCP is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set
-# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
-# CONFIG_CRYPTO_DEV_MV_CESA is not set
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C62X is not set
-# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
-# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
-# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
-# CONFIG_CRYPTO_DEV_QCE is not set
-# CONFIG_CRYPTO_DEV_SAHARA is not set
-# CONFIG_CRYPTO_DEV_TALITOS is not set
-# CONFIG_CRYPTO_DH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_MENU is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_ECDH is not set
-# CONFIG_CRYPTO_ECHAINIV is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_JITTERENTROPY is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-# CONFIG_CRYPTO_MCRYPTD is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_PCOMP is not set
-# CONFIG_CRYPTO_PCOMP2 is not set
-CONFIG_CRYPTO_PCRYPT=y
-# CONFIG_CRYPTO_POLY1305 is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_RSA is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA1_ARM is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA3 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_USER is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CS5535_MFGPT is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_CUSE is not set
-# CONFIG_CW1200 is not set
-# CONFIG_CXL_AFU_DRIVER_OPS is not set
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_EEH is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CYPRESS_FIRMWARE is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DDR is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_DEBUG_ICEDCC is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-CONFIG_DEBUG_INFO_REDUCED=y
-# CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_KOBJECT_RELEASE is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LL_UART_8250 is not set
-# CONFIG_DEBUG_LL_UART_PL01X is not set
-# CONFIG_DEBUG_LOCKDEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_PINCTRL is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RODATA is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_DEBUG_SEMIHOSTING is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_DEBUG_UART_8250_PALMCHIP is not set
-# CONFIG_DEBUG_UART_BCM63XX is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_ZBOOT is not set
-# CONFIG_DECNET is not set
-CONFIG_DEFAULT_CUBIC=y
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DELL_RBTN is not set
-# CONFIG_DELL_SMO8800 is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVMEM is not set
-CONFIG_DEVPORT=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DGAP is not set
-# CONFIG_DGNC is not set
-# CONFIG_DHT11 is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
-# CONFIG_DISPLAY_CONNECTOR_DVI is not set
-# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
-# CONFIG_DISPLAY_ENCODER_TFP410 is not set
-# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
-# CONFIG_DISPLAY_PANEL_DPI is not set
-# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set
-# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMADEVICES_DEBUG is not set
-# CONFIG_DMARD06 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_DM_CACHE is not set
-# CONFIG_DM_DEBUG is not set
-# CONFIG_DM_DELAY is not set
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_FLAKEY is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DM_LOG_WRITES is not set
-# CONFIG_DM_MQ_DEFAULT is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_RAID is not set
-# CONFIG_DM_SWITCH is not set
-# CONFIG_DM_THIN_PROVISIONING is not set
-# CONFIG_DM_UEVENT is not set
-# CONFIG_DM_VERITY is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DNS_RESOLVER is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-CONFIG_DQL=y
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DRM_AMDGPU is not set
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_ARMADA is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_BOCHS is not set
-# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_DRM_FBDEV_EMULATION is not set
-# CONFIG_DRM_FSL_DCU is not set
-# CONFIG_DRM_HDLCD is not set
-# CONFIG_DRM_HISI_KIRIN is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_LEGACY is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_MALI_DISPLAY is not set
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_OMAP is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
-# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_QXL is not set
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_STI is not set
-# CONFIG_DRM_SUN4I is not set
-# CONFIG_DRM_TILCDC is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VIRTIO_GPU is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DS1803 is not set
-# CONFIG_DST_CACHE is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-# CONFIG_DWMAC_IPQ806X is not set
-# CONFIG_DWMAC_LPC18XX is not set
-# CONFIG_DWMAC_MESON is not set
-# CONFIG_DWMAC_ROCKCHIP is not set
-# CONFIG_DWMAC_SOCFPGA is not set
-# CONFIG_DWMAC_STI is not set
-# CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_E100 is not set
-# CONFIG_E1000 is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000E_HWTS is not set
-# CONFIG_EARLY_PRINTK_8250 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEEPC_LAPTOP is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_EFS_FS is not set
-CONFIG_ELFCORE=y
-# CONFIG_ELF_CORE is not set
-# CONFIG_EMAC_ROCKCHIP is not set
-CONFIG_EMBEDDED=y
-# CONFIG_EM_TIMER_STI is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENA_ETHERNET is not set
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_ENCX24J600 is not set
-# CONFIG_ENIC is not set
-# CONFIG_EPAPR_PARAVIRT is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-CONFIG_ETHERNET=y
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-CONFIG_EXPERT=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXPORTFS_BLOCK_OPS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4_ENCRYPTION is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-CONFIG_EXT4_USE_FOR_EXT2=y
-# CONFIG_EXTCON is not set
-# CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_AXP288 is not set
-# CONFIG_EXTCON_GPIO is not set
-# CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-# CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USB_GPIO is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EXYNOS_ADC is not set
-# CONFIG_EXYNOS_VIDEO is not set
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
-# CONFIG_F2FS_FS_POSIX_ACL is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FANOTIFY is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_FAT_FS is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FB is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ARMCLCD is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_AUO_K190X is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BIG_ENDIAN is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BOTH_ENDIAN is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_IMX is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LITTLE_ENDIAN is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_MXS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-CONFIG_FB_NOTIFY=y
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_OMAP2 is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SM712 is not set
-# CONFIG_FB_SM750 is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TFT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
-# CONFIG_FCOE is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_FENCE_TRACE is not set
-# CONFIG_FHANDLE is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# CONFIG_FIREWIRE_SERIAL is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FM10K is not set
-# CONFIG_FMC is not set
-# CONFIG_FORCEDETH is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_FPGA is not set
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FREEZER is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_FSCACHE is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_MC_BUS is not set
-# CONFIG_FSL_PQ_MDIO is not set
-# CONFIG_FSL_XGMAC_MDIO is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_DAX is not set
-# CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTGMAC100 is not set
-# CONFIG_FTL is not set
-# CONFIG_FTMAC100 is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTR_FIXUP_SELFTEST is not set
-# CONFIG_FUJITSU_ES is not set
-# CONFIG_FUJITSU_LAPTOP is not set
-# CONFIG_FUJITSU_TABLET is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-# CONFIG_FW_CFG_SYSFS is not set
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_GACT_PROB=y
-# CONFIG_GADGET_UAC1 is not set
-# CONFIG_GAMEPORT is not set
-# CONFIG_GATEWORKS_GW16083 is not set
-# CONFIG_GCC_PLUGINS is not set
-# CONFIG_GCOV is not set
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_GDB_SCRIPTS is not set
-# CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_GENERIC_ADC_THERMAL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_NET_UTILS=y
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_GENEVE is not set
-# CONFIG_GENWQE is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GIGASET_CAPI is not set
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-# CONFIG_GLOB_SELFTEST is not set
-# CONFIG_GOLDFISH is not set
-# CONFIG_GP2AP020A00F is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_AMD8111 is not set
-# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_BCM_KONA is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EM is not set
-# CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_GPIO_MM is not set
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_ICH is not set
-# CONFIG_GPIO_IT87 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_RCAR is not set
-# CONFIG_GPIO_RDC321X is not set
-# CONFIG_GPIO_SCH is not set
-# CONFIG_GPIO_SCH311X is not set
-# CONFIG_GPIO_SX150X is not set
-# CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TS4900 is not set
-# CONFIG_GPIO_TS5500 is not set
-# CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_GPIO_WS16C48 is not set
-# CONFIG_GPIO_XGENE is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GREYBUS is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_GTP is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_HAPPYMEAL is not set
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
-# CONFIG_HAVE_ARCH_HASH is not set
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-# CONFIG_HAVE_ARCH_VMAP_STACK is not set
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-# CONFIG_HAVE_ARM_ARCH_TIMER is not set
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_CAT=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_NMI=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDC100X is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDQ_MASTER_OMAP is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFS_FS_POSIX_ACL is not set
-# CONFIG_HI8435 is not set
-# CONFIG_HIBERNATION is not set
-# CONFIG_HID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_ACRUX_FF is not set
-# CONFIG_HID_ALPS is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BATTERY_STRENGTH is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GENERIC is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_LOGITECH_DJ is not set
-# CONFIG_HID_LOGITECH_HIDPP is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIP04_ETH is not set
-# CONFIG_HIPPI is not set
-# CONFIG_HISI_FEMAC is not set
-# CONFIG_HIX5HD2_GMAC is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_HNS is not set
-# CONFIG_HNS_DSAF is not set
-# CONFIG_HNS_ENET is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-# CONFIG_HP03 is not set
-# CONFIG_HP100 is not set
-# CONFIG_HP206C is not set
-CONFIG_HPET_MMAP_DEFAULT=y
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HP_WIRELESS is not set
-# CONFIG_HSI is not set
-# CONFIG_HSR is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_DCC is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HWSPINLOCK_OMAP is not set
-CONFIG_HW_PERF_EVENTS=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_ATMEL is not set
-# CONFIG_HW_RANDOM_EXYNOS is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
-# CONFIG_HW_RANDOM_OMAP3_ROM is not set
-# CONFIG_HW_RANDOM_PPC4XX is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_TPM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_200 is not set
-# CONFIG_HZ_24 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_500 is not set
-# CONFIG_HZ_PERIODIC is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_AU1550 is not set
-# CONFIG_I2C_BCM2835 is not set
-# CONFIG_I2C_BCM_IPROC is not set
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_EG20T is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_HID is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_IMG is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_ISMT is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_MUX is not set
-# CONFIG_I2C_MUX_GPIO is not set
-# CONFIG_I2C_MUX_PCA9541 is not set
-# CONFIG_I2C_MUX_PCA954x is not set
-# CONFIG_I2C_MUX_PINCTRL is not set
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_MV64XXX is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NOMADIK is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_OCTEON is not set
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PXA_PCI is not set
-# CONFIG_I2C_RCAR is not set
-# CONFIG_I2C_RK3X is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_SCMI is not set
-# CONFIG_I2C_SH_MOBILE is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_SMBUS is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_THUNDERX is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VERSATILE is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I40E is not set
-# CONFIG_I40EVF is not set
-# CONFIG_I6300ESB_WDT is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IAQCORE is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_EMAC_DEBUG is not set
-# CONFIG_IBM_EMAC_EMAC4 is not set
-# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_EMAC_RGMII is not set
-# CONFIG_IBM_EMAC_TAH is not set
-# CONFIG_IBM_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDE is not set
-# CONFIG_IDEAPAD_LAPTOP is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE_PROC_FS is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IEEE802154_ADF7242 is not set
-# CONFIG_IEEE802154_ATUSB is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_IIO_BUFFER_CB is not set
-# CONFIG_IIO_CONFIGFS is not set
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_SSP_SENSORHUB is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_IIO_SW_DEVICE is not set
-# CONFIG_IIO_SW_TRIGGER is not set
-# CONFIG_IIO_SYSFS_TRIGGER is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMGPDC_WDT is not set
-# CONFIG_IMG_MDC_DMA is not set
-# CONFIG_IMX7D_ADC is not set
-# CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_IMX_THERMAL is not set
-# CONFIG_INA2XX_ADC is not set
-CONFIG_INET=y
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_AXP20X_PEK is not set
-# CONFIG_INPUT_BMA150 is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_CMA3000 is not set
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-# CONFIG_INPUT_DRV2665_HAPTICS is not set
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-# CONFIG_INPUT_E3X0_BUTTON is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
-# CONFIG_INPUT_IMS_PCU is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_KXTJ9 is not set
-# CONFIG_INPUT_LEDS is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-# CONFIG_INPUT_MAX8997_HAPTIC is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MMA8450 is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MPU3050 is not set
-# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
-# CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_PWM_BEEPER is not set
-# CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
-# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
-# CONFIG_INPUT_TWL4030_VIBRA is not set
-# CONFIG_INPUT_TWL6040_VIBRA is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INT340X_THERMAL is not set
-# CONFIG_INTEL_HID_EVENT is not set
-# CONFIG_INTEL_IDLE is not set
-# CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_IOATDMA is not set
-# CONFIG_INTEL_ISH_HID is not set
-# CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MEI_ME is not set
-# CONFIG_INTEL_MEI_TXE is not set
-# CONFIG_INTEL_MIC_CARD is not set
-# CONFIG_INTEL_MIC_HOST is not set
-# CONFIG_INTEL_MID_PTI is not set
-# CONFIG_INTEL_OAKTRAIL is not set
-# CONFIG_INTEL_PMC_CORE is not set
-# CONFIG_INTEL_PUNIT_IPC is not set
-# CONFIG_INTEL_RST is not set
-# CONFIG_INTEL_SMARTCONNECT is not set
-# CONFIG_INTEL_SOC_PMIC is not set
-# CONFIG_INTEL_TH is not set
-# CONFIG_INTEL_VBTN is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_INV_MPU6050_IIO is not set
-# CONFIG_INV_MPU6050_SPI is not set
-# CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_SECURITY is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-# CONFIG_IPACK_BUS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_FOU is not set
-# CONFIG_IPV6_FOU_TUNNEL is not set
-# CONFIG_IPV6_ILA is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_VTI is not set
-# CONFIG_IPVLAN is not set
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200 is not set
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_FIB_TRIE_STATS is not set
-# CONFIG_IP_MROUTE is not set
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_SYNPROXY is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-# CONFIG_IP_SET is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_IRQ_ALL_CPUS is not set
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-# CONFIG_IRQ_POLL is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_IR_GPIO_CIR is not set
-# CONFIG_IR_HIX5HD2 is not set
-# CONFIG_IR_IGORPLUGUSB is not set
-# CONFIG_IR_IGUANA is not set
-# CONFIG_IR_IMG is not set
-# CONFIG_IR_IMON is not set
-# CONFIG_IR_JVC_DECODER is not set
-# CONFIG_IR_LIRC_CODEC is not set
-# CONFIG_IR_MCEUSB is not set
-# CONFIG_IR_NEC_DECODER is not set
-# CONFIG_IR_RC5_DECODER is not set
-# CONFIG_IR_RC6_DECODER is not set
-# CONFIG_IR_REDRAT3 is not set
-# CONFIG_IR_SONY_DECODER is not set
-# CONFIG_IR_STREAMZAP is not set
-# CONFIG_IR_TTUSBIR is not set
-# CONFIG_ISA_BUS is not set
-# CONFIG_ISA_BUS_API is not set
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_I4L is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_ISL29125 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_ISS4xx is not set
-# CONFIG_ITG3200 is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
-# CONFIG_IXGBEVF is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_POSIX_ACL is not set
-# CONFIG_JFFS2_FS_SECURITY is not set
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_LZMA=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_ZLIB is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-# CONFIG_KALLSYMS_UNCOMPRESSED is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KASAN is not set
-# CONFIG_KCOV is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_CAT is not set
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_LZO is not set
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_KERNEL_XZ=y
-CONFIG_KERNFS=y
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ADC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_BCM is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PXA27x is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_SH_KEYSC is not set
-# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
-# CONFIG_KEYBOARD_STMPE is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_TWL4030 is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYS is not set
-# CONFIG_KEY_DH_OPERATIONS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMCHECK is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_KS7010 is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_KSZ884X_PCI is not set
-CONFIG_KUSER_HELPERS=y
-# CONFIG_KVM_AMD is not set
-# CONFIG_KVM_GUEST is not set
-# CONFIG_KVM_INTEL is not set
-# CONFIG_KXCJK1013 is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_L2TP is not set
-# CONFIG_L2TP_ETH is not set
-# CONFIG_L2TP_IP is not set
-# CONFIG_L2TP_V3 is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LANTIQ is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-CONFIG_LBDAF=y
-# CONFIG_LCD_AMS369FG06 is not set
-# CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LMS501KF03 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_S6E63M0 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-CONFIG_LDISC_AUTOLOAD=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_BLINKM is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS_INTEL_SS4200 is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_MLXCPLD is not set
-# CONFIG_LEDS_NS2 is not set
-# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PWM is not set
-# CONFIG_LEDS_REGULATOR is not set
-# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-CONFIG_LEDS_TRIGGERS=y
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_DISK is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MTD is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-# CONFIG_LEDS_TRIGGER_ONESHOT is not set
-# CONFIG_LEDS_TRIGGER_PANIC is not set
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LGUEST is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LIBNVDIMM is not set
-# CONFIG_LIDAR_LITE_V2 is not set
-# CONFIG_LIQUIDIO is not set
-# CONFIG_LIRC_STAGING is not set
-# CONFIG_LIS3L02DQ is not set
-# CONFIG_LKDTM is not set
-CONFIG_LLC=y
-# CONFIG_LLC2 is not set
-# CONFIG_LNET is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_LOCKD is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_LOGFS is not set
-# CONFIG_LOGIG940_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIWHEELS_FF is not set
-# CONFIG_LOGO is not set
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-# CONFIG_LOONGSON_MC146818 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTC2485 is not set
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_LTPC is not set
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_LWTUNNEL is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_LZ4HC_COMPRESS is not set
-# CONFIG_LZ4_COMPRESS is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-CONFIG_LZMA_COMPRESS=y
-CONFIG_LZMA_DECOMPRESS=y
-# CONFIG_LZO_COMPRESS is not set
-# CONFIG_LZO_DECOMPRESS is not set
-# CONFIG_M62332 is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_MACB is not set
-# CONFIG_MACH_ASM9260 is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_INGENIC is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_JZ4740 is not set
-# CONFIG_MACH_LOONGSON32 is not set
-# CONFIG_MACH_LOONGSON64 is not set
-# CONFIG_MACH_PIC32 is not set
-# CONFIG_MACH_PISTACHIO is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MACH_XILFPGA is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MACSEC is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MACVTAP is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MAG3110 is not set
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-# CONFIG_MAGIC_SYSRQ_SERIAL is not set
-# CONFIG_MAILBOX is not set
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-# CONFIG_MANGLE_BOOTARGS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MAX1027 is not set
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MAX5487 is not set
-# CONFIG_MAX5821 is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_MAY_USE_DEVLINK=y
-# CONFIG_MC3230 is not set
-# CONFIG_MCB is not set
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4131 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-# CONFIG_MCPM is not set
-# CONFIG_MD is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_THUNDER is not set
-# CONFIG_MD_FAULTY is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_CONTROLLER is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_PCI_SUPPORT is not set
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_USB_SUPPORT is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-CONFIG_MEMBARRIER=y
-# CONFIG_MEMORY is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_SM is not set
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_CS5535 is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_EXYNOS_LPASS is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MC13XXX is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_OMAP_USB_HOST is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8921_CORE is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RTSX_PCI is not set
-# CONFIG_MFD_RTSX_USB is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MICREL_KS8995MA is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-# CONFIG_MIKROTIK_RB532 is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_MIPS_CDMM is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_FPU_EMULATOR is not set
-# CONFIG_MIPS_GENERIC is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_O32_FP64_SUPPORT is not set
-# CONFIG_MIPS_PARAVIRT is not set
-# CONFIG_MIPS_PLATFORM_DEVICES is not set
-# CONFIG_MIPS_SEAD3 is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MLX4_CORE is not set
-# CONFIG_MLX4_EN is not set
-# CONFIG_MLX5_CORE is not set
-# CONFIG_MLX90614 is not set
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MMA7455_I2C is not set
-# CONFIG_MMA7455_SPI is not set
-# CONFIG_MMA7660 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC35240 is not set
-# CONFIG_MMC_ARMMMCI is not set
-# CONFIG_MMC_AU1X is not set
-# CONFIG_MMC_BLOCK is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK_MINORS=8
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_DW is not set
-# CONFIG_MMC_MTK is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDHCI_ACPI is not set
-# CONFIG_MMC_SDHCI_BCM_KONA is not set
-# CONFIG_MMC_SDHCI_F_SDH30 is not set
-# CONFIG_MMC_SDHCI_IPROC is not set
-# CONFIG_MMC_SDHCI_MSM is not set
-# CONFIG_MMC_SDHCI_OF_ARASAN is not set
-# CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF_HLWD is not set
-# CONFIG_MMC_SDHCI_PXAV2 is not set
-# CONFIG_MMC_SDHCI_PXAV3 is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_TOSHIBA_PCI is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-# CONFIG_MMC_VUB300 is not set
-# CONFIG_MMIOTRACE is not set
-CONFIG_MMU=y
-CONFIG_MODULES=y
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_STRIPPED=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOST is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_FOCALTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_MPL115 is not set
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL115_SPI is not set
-# CONFIG_MPL3115 is not set
-# CONFIG_MPLS is not set
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MSI_BITMAP_SELFTEST is not set
-# CONFIG_MSI_LAPTOP is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LATCH_ADDR is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_LPDDR2_NVM is not set
-# CONFIG_MTD_M25P80 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MT81xx_NOR is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_AMS_DELTA is not set
-# CONFIG_MTD_NAND_AR934X is not set
-# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
-# CONFIG_MTD_NAND_ATMEL is not set
-# CONFIG_MTD_NAND_AU1550 is not set
-# CONFIG_MTD_NAND_BCH is not set
-# CONFIG_MTD_NAND_BF5XX is not set
-# CONFIG_MTD_NAND_BRCMNAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_CM_X270 is not set
-# CONFIG_MTD_NAND_CS553X is not set
-# CONFIG_MTD_NAND_DAVINCI is not set
-# CONFIG_MTD_NAND_DENALI is not set
-# CONFIG_MTD_NAND_DENALI_DT is not set
-# CONFIG_MTD_NAND_DENALI_PCI is not set
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_DOCG4 is not set
-# CONFIG_MTD_NAND_ECC is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_FSL_ELBC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
-# CONFIG_MTD_NAND_FSL_UPM is not set
-# CONFIG_MTD_NAND_FSMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-# CONFIG_MTD_NAND_GPMI_NAND is not set
-# CONFIG_MTD_NAND_HISI504 is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_JZ4740 is not set
-# CONFIG_MTD_NAND_MPC5121_NFC is not set
-# CONFIG_MTD_NAND_MTK is not set
-# CONFIG_MTD_NAND_MXC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_NDFC is not set
-# CONFIG_MTD_NAND_NUC900 is not set
-# CONFIG_MTD_NAND_OMAP2 is not set
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-# CONFIG_MTD_NAND_ORION is not set
-# CONFIG_MTD_NAND_PASEMI is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_PXA3xx is not set
-# CONFIG_MTD_NAND_RB4XX is not set
-# CONFIG_MTD_NAND_RB750 is not set
-# CONFIG_MTD_NAND_RICOH is not set
-# CONFIG_MTD_NAND_S3C2410 is not set
-# CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_SH_FLCTL is not set
-# CONFIG_MTD_NAND_SOCRATES is not set
-# CONFIG_MTD_NAND_TMIO is not set
-# CONFIG_MTD_NAND_TXX9NDFMC is not set
-CONFIG_MTD_OF_PARTS=y
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_SPINAND_MT29F is not set
-# CONFIG_MTD_SPI_NOR is not set
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096
-CONFIG_MTD_SPLIT=y
-# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
-# CONFIG_MTD_SPLIT_EVA_FW is not set
-# CONFIG_MTD_SPLIT_FIRMWARE is not set
-CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
-# CONFIG_MTD_SPLIT_FIT_FW is not set
-# CONFIG_MTD_SPLIT_JIMAGE_FW is not set
-# CONFIG_MTD_SPLIT_LZMA_FW is not set
-# CONFIG_MTD_SPLIT_MINOR_FW is not set
-# CONFIG_MTD_SPLIT_SEAMA_FW is not set
-CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
-CONFIG_MTD_SPLIT_SUPPORT=y
-# CONFIG_MTD_SPLIT_TPLINK_FW is not set
-# CONFIG_MTD_SPLIT_TRX_FW is not set
-# CONFIG_MTD_SPLIT_UIMAGE_FW is not set
-# CONFIG_MTD_SPLIT_WRGG_FW is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-# CONFIG_MTD_UIMAGE_SPLIT is not set
-CONFIG_MULTIUSER=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVMDIO is not set
-# CONFIG_MVNETA_BM is not set
-# CONFIG_MVSW61XX_PHY is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MV_XOR_V2 is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NAU7802 is not set
-# CONFIG_NBPFAXI_DMA is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2000 is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-CONFIG_NET=y
-# CONFIG_NETCONSOLE is not set
-CONFIG_NETDEVICES=y
-# CONFIG_NETFILTER is not set
-# CONFIG_NETFILTER_ADVANCED is not set
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_INGRESS is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_BPF is not set
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ECN is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_LOG is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-# CONFIG_NETLINK_DIAG is not set
-# CONFIG_NETLINK_MMAP is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NETROM is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_BPF is not set
-# CONFIG_NET_ACT_CSUM is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IFE is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_SKBMOD is not set
-# CONFIG_NET_ACT_TUNNEL_KEY is not set
-# CONFIG_NET_ACT_VLAN is not set
-CONFIG_NET_CADENCE=y
-# CONFIG_NET_CALXEDA_XGMAC is not set
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_BASIC is not set
-# CONFIG_NET_CLS_BPF is not set
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FLOWER is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_MATCHALL is not set
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CORE=y
-# CONFIG_NET_DEVLINK is not set
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_DSA_BCM_SF2 is not set
-# CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6171 is not set
-# CONFIG_NET_DSA_MV88E6352 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-# CONFIG_NET_DSA_QCA8K is not set
-# CONFIG_NET_DSA_TAG_DSA is not set
-# CONFIG_NET_DSA_TAG_EDSA is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_CANID is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-# CONFIG_NET_FC is not set
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_IPGRE is not set
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPVTI is not set
-# CONFIG_NET_IP_TUNNEL is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-# CONFIG_NET_L3_MASTER_DEV is not set
-# CONFIG_NET_MPLS_GSO is not set
-# CONFIG_NET_NCSI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NET_PTP_CLASSIFY is not set
-CONFIG_NET_RX_BUSY_POLL=y
-# CONFIG_NET_SB1000 is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CHOKE is not set
-# CONFIG_NET_SCH_CODEL is not set
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_FQ is not set
-CONFIG_NET_SCH_FQ_CODEL=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HHF is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MQPRIO is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PIE is not set
-# CONFIG_NET_SCH_PLUG is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_QFQ is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_SFB is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_SCTPPROBE is not set
-# CONFIG_NET_SWITCHDEV is not set
-# CONFIG_NET_TCPPROBE is not set
-# CONFIG_NET_TEAM is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_UDP_TUNNEL is not set
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_NET_VENDOR_8390=y
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_NET_VENDOR_AGERE=y
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_FARADAY=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_NET_VENDOR_HISILICON=y
-CONFIG_NET_VENDOR_HP=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_IBM=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_NET_VENDOR_TI=y
-CONFIG_NET_VENDOR_TOSHIBA=y
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_NET_VENDOR_XILINX=y
-CONFIG_NET_VENDOR_XIRCOM=y
-# CONFIG_NET_VRF is not set
-# CONFIG_NET_XGENE is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NFC is not set
-# CONFIG_NFP_NETVF is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFSD_V2_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_FSCACHE is not set
-# CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V2 is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NFT_BRIDGE_META is not set
-# CONFIG_NFT_BRIDGE_REJECT is not set
-# CONFIG_NFT_DUP_IPV4 is not set
-# CONFIG_NFT_DUP_IPV6 is not set
-# CONFIG_NF_CONNTRACK is not set
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK_MARK is not set
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROCFS=y
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_NF_CONNTRACK_SNMP is not set
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-# CONFIG_NF_CONNTRACK_ZONES is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_DUP_IPV4 is not set
-# CONFIG_NF_DUP_IPV6 is not set
-# CONFIG_NF_LOG_ARP is not set
-# CONFIG_NF_LOG_IPV4 is not set
-# CONFIG_NF_NAT is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IPV6 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT_MASQUERADE_IPV4 is not set
-# CONFIG_NF_NAT_MASQUERADE_IPV6 is not set
-# CONFIG_NF_NAT_NEEDED is not set
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NF_REJECT_IPV4 is not set
-# CONFIG_NF_REJECT_IPV6 is not set
-# CONFIG_NF_TABLES is not set
-# CONFIG_NF_TABLES_NETDEV is not set
-# CONFIG_NI65 is not set
-# CONFIG_NI903X_WDT is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_NIU is not set
-CONFIG_NLATTR=y
-# CONFIG_NLMON is not set
-# CONFIG_NLM_XLP_BOARD is not set
-# CONFIG_NLM_XLR_BOARD is not set
-# CONFIG_NLS is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_MAC_CELTIC is not set
-# CONFIG_NLS_MAC_CENTEURO is not set
-# CONFIG_NLS_MAC_CROATIAN is not set
-# CONFIG_NLS_MAC_CYRILLIC is not set
-# CONFIG_NLS_MAC_GAELIC is not set
-# CONFIG_NLS_MAC_GREEK is not set
-# CONFIG_NLS_MAC_ICELAND is not set
-# CONFIG_NLS_MAC_INUIT is not set
-# CONFIG_NLS_MAC_ROMAN is not set
-# CONFIG_NLS_MAC_ROMANIAN is not set
-# CONFIG_NLS_MAC_TURKISH is not set
-# CONFIG_NLS_UTF8 is not set
-CONFIG_NMI_LOG_BUF_SHIFT=13
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NO_BOOTMEM is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NO_HZ_FULL is not set
-# CONFIG_NO_HZ_IDLE is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTB is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NTP_PPS is not set
-# CONFIG_NVM is not set
-# CONFIG_NVMEM is not set
-# CONFIG_NVMEM_IMX_OCOTP is not set
-# CONFIG_NVME_TARGET is not set
-# CONFIG_NVRAM is not set
-# CONFIG_NV_TCO is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-# CONFIG_N_GSM is not set
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_OBS600 is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OF_OVERLAY is not set
-# CONFIG_OF_UNITTEST is not set
-# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_OMAP2_DSS_DEBUGFS is not set
-# CONFIG_OMAP2_DSS_SDI is not set
-# CONFIG_OMAP_OCP2SCP is not set
-# CONFIG_OMAP_USB2 is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_OPROFILE is not set
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-# CONFIG_OPT3001 is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=y
-# CONFIG_OWL_LOADER is not set
-# CONFIG_P54_COMMON is not set
-# CONFIG_PA12203001 is not set
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PALMAS_GPADC is not set
-# CONFIG_PANASONIC_LAPTOP is not set
-# CONFIG_PANEL is not set
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_ON_OOPS_VALUE=1
-CONFIG_PANIC_TIMEOUT=1
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARAVIRT is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_1284 is not set
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARASAN_CF is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IMX is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OCTEON_CF is not set
-# CONFIG_PATA_OF_PLATFORM is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCH_DMA is not set
-# CONFIG_PCH_GBE is not set
-# CONFIG_PCH_PHUB is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_PCIE_ALTERA is not set
-# CONFIG_PCIE_ARMADA_8K is not set
-# CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_DW_PLAT is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIE_IPROC is not set
-# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LAYERSCAPE is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCI_PASID is not set
-# CONFIG_PCI_PRI is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_AXNET is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_PCNET is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PERF_EVENTS_AMD_POWER is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
-# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_DWC3 is not set
-# CONFIG_PHY_SAMSUNG_USB2 is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_PID_NS is not set
-CONFIG_PINCONF=y
-# CONFIG_PINCTRL is not set
-# CONFIG_PINCTRL_AMD is not set
-# CONFIG_PINCTRL_EXYNOS is not set
-# CONFIG_PINCTRL_EXYNOS5440 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINMUX=y
-# CONFIG_PKCS7_MESSAGE_PARSER is not set
-# CONFIG_PL320_MBOX is not set
-# CONFIG_PL330_DMA is not set
-# CONFIG_PLATFORM_MHU is not set
-# CONFIG_PLAT_SPEAR is not set
-# CONFIG_PLIP is not set
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PM is not set
-# CONFIG_PMBUS is not set
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_PM_WAKELOCKS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWERCAP is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-# CONFIG_POWER_RESET_BRCMKONA is not set
-# CONFIG_POWER_RESET_BRCMSTB is not set
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_RESTART is not set
-# CONFIG_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_POWER_RESET_VERSATILE is not set
-# CONFIG_POWER_RESET_XGENE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PPC4xx_GPIO is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
-CONFIG_PPC_BARRIER_NOSPEC=y
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
-# CONFIG_PPP is not set
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_PARPORT is not set
-# CONFIG_PPS_DEBUG is not set
-# CONFIG_PPTP is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_STRIPPED=y
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_PROVE_RCU is not set
-# CONFIG_PROVE_RCU_REPEATEDLY is not set
-# CONFIG_PSB6970_PHY is not set
-# CONFIG_PSTORE is not set
-# CONFIG_PTP_1588_CLOCK is not set
-# CONFIG_PTP_1588_CLOCK_IXP46X is not set
-# CONFIG_PTP_1588_CLOCK_PCH is not set
-# CONFIG_PUBLIC_KEY_ALGO_RSA is not set
-# CONFIG_PWM is not set
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_PCA9685 is not set
-CONFIG_PWRSEQ_EMMC=y
-CONFIG_PWRSEQ_SIMPLE=y
-# CONFIG_QCA7000 is not set
-# CONFIG_QCOM_EMAC is not set
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-# CONFIG_QED is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QLCNIC is not set
-# CONFIG_QLGE is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_QORIQ_CPUFREQ is not set
-# CONFIG_QORIQ_THERMAL is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUEUED_LOCK_STAT is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-# CONFIG_QUOTA_DEBUG is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_R8188EU is not set
-# CONFIG_R8712U is not set
-# CONFIG_R8723AU is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_RALINK is not set
-# CONFIG_RANDOM32_SELFTEST is not set
-# CONFIG_RAPIDIO is not set
-# CONFIG_RAS is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RBTREE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_RCU_EXPEDITE_BOOT is not set
-CONFIG_RCU_EXPERT=y
-CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FAST_NO_HZ is not set
-CONFIG_RCU_KTHREAD_PRIO=0
-# CONFIG_RCU_NOCB_CPU is not set
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RC_ATI_REMOTE is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_RC_DECODERS is not set
-# CONFIG_RC_LOOPBACK is not set
-# CONFIG_RC_MAP is not set
-# CONFIG_RDS is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_GZIP is not set
-# CONFIG_RD_LZ4 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_READABLE_ASM is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGMAP is not set
-# CONFIG_REGMAP_I2C is not set
-# CONFIG_REGMAP_MMIO is not set
-# CONFIG_REGMAP_SPI is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_ANATOP is not set
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_GPIO is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_ISL9305 is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-# CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_PFUZE100 is not set
-# CONFIG_REGULATOR_PV88060 is not set
-# CONFIG_REGULATOR_PV88080 is not set
-# CONFIG_REGULATOR_PV88090 is not set
-# CONFIG_REGULATOR_PWM is not set
-# CONFIG_REGULATOR_TI_ABB is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS6524X is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_POSIX_ACL is not set
-# CONFIG_REISERFS_FS_SECURITY is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RELOCATABLE is not set
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
-# CONFIG_RESET_ZYNQ is not set
-# CONFIG_RFD_FTL is not set
-CONFIG_RFKILL=y
-# CONFIG_RFKILL_FULL is not set
-# CONFIG_RFKILL_GPIO is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL_LEDS is not set
-# CONFIG_RFKILL_REGULATOR is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RMI4_CORE is not set
-# CONFIG_ROCKER is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_ARMADA38X is not set
-# CONFIG_RTC_DRV_AU1XXX is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1302 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-# CONFIG_RTC_DRV_DS1307_HWMON is not set
-# CONFIG_RTC_DRV_DS1343 is not set
-# CONFIG_RTC_DRV_DS1347 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_GENERIC is not set
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12057 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_MAX6916 is not set
-# CONFIG_RTC_DRV_MCP795 is not set
-# CONFIG_RTC_DRV_MOXART is not set
-# CONFIG_RTC_DRV_MPC5121 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_OMAP is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
-# CONFIG_RTC_DRV_PS3 is not set
-# CONFIG_RTC_DRV_PT7C4338 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_RX4581 is not set
-# CONFIG_RTC_DRV_RX6110 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_SUN6I is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_XGENE is not set
-# CONFIG_RTC_DRV_ZYNQMP is not set
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366_SMI_DEBUG_FS is not set
-# CONFIG_RTL8367B_PHY is not set
-# CONFIG_RTL8367_PHY is not set
-# CONFIG_RTLLIB is not set
-# CONFIG_RTL_CARDS is not set
-# CONFIG_RTS5208 is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_RXKAD=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SAMSUNG_LAPTOP is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_SATA_DWC is not set
-# CONFIG_SATA_FSL is not set
-# CONFIG_SATA_HIGHBANK is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_RCAR is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-CONFIG_SBITMAP=y
-# CONFIG_SC92031 is not set
-# CONFIG_SCA3000 is not set
-# CONFIG_SCACHE_DEBUGFS is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_SCHED_HRTICK=y
-# CONFIG_SCHED_MC is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCHED_SMT is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2X_FCOE is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HISI_SAS is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCI is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-# CONFIG_SCSI_LPFC is not set
-CONFIG_SCSI_MOD=y
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MQ_DEFAULT is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SMARTPQI is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_VIRTIO is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCx200_ACB is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SECCOMP is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ACPI_POWER is not set
-# CONFIG_SENSORS_AD7314 is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM1275 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS1015 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADS7871 is not set
-# CONFIG_SENSORS_ADT7310 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_BH1780 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DELL_SMM is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FAM15H_POWER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FTSTEUTATES is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_GSC is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_HMC5843 is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-# CONFIG_SENSORS_HTU21 is not set
-# CONFIG_SENSORS_I5500 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM25066 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2978 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC3815 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX16064 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX20751 is not set
-# CONFIG_SENSORS_MAX31722 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MAX34440 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX8688 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NSA320 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_PMBUS is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_PWM_FAN is not set
-# CONFIG_SENSORS_SCH5627 is not set
-# CONFIG_SENSORS_SCH5636 is not set
-# CONFIG_SENSORS_SCH56XX_COMMON is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TPS40422 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_SENSORS_UCD9000 is not set
-# CONFIG_SENSORS_UCD9200 is not set
-# CONFIG_SENSORS_VEXPRESS is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VIA_CPUTEMP is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_XGENE is not set
-# CONFIG_SENSORS_ZL6100 is not set
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_ACCENT is not set
-# CONFIG_SERIAL_8250_BOCA is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_DMA=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_EM is not set
-# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_FINTEK is not set
-# CONFIG_SERIAL_8250_FOURPORT is not set
-# CONFIG_SERIAL_8250_HUB6 is not set
-# CONFIG_SERIAL_8250_INGENIC is not set
-# CONFIG_SERIAL_8250_LPSS is not set
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_MID is not set
-# CONFIG_SERIAL_8250_MOXA is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-# CONFIG_SERIAL_8250_RSA is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_AMBA_PL010 is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_EARLYCON=y
-# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_PCH_UART is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SH_SCI is not set
-# CONFIG_SERIAL_STM32 is not set
-# CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIO is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_AMBAKMI is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_SUN4I_PS2 is not set
-# CONFIG_SFC is not set
-# CONFIG_SFI is not set
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SG_POOL is not set
-# CONFIG_SG_SPLIT is not set
-CONFIG_SHMEM=y
-# CONFIG_SH_ETH is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_SI1145 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SIGNALFD=y
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SLAB is not set
-CONFIG_SLABINFO=y
-# CONFIG_SLAB_FREELIST_RANDOM is not set
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC9194 is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_SND is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALOOP is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ASIHPI is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_ATMEL_AC97C is not set
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BCD2000 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_DESIGNWARE_I2S is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EDMA_SOC is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_FIREWIRE is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDA_PREALLOC_SIZE=64
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND_KIRKWOOD_SOC is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LOLA is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_MTS64 is not set
-# CONFIG_SND_MXS_SOC is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCM_TIMER is not set
-# CONFIG_SND_PCM_XRUN_DEBUG is not set
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_PORTMAN2X4 is not set
-# CONFIG_SND_POWERPC_SOC is not set
-# CONFIG_SND_PPC is not set
-CONFIG_SND_PROC_FS=y
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_SE6X is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIMPLE_CARD is not set
-# CONFIG_SND_SIMPLE_SCU_CARD is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU7002 is not set
-# CONFIG_SND_SOC_AK4104 is not set
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-# CONFIG_SND_SOC_ALC5623 is not set
-# CONFIG_SND_SOC_AMD_ACP is not set
-# CONFIG_SND_SOC_AU1XAUDIO is not set
-# CONFIG_SND_SOC_AU1XPSC is not set
-# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_ES8328 is not set
-# CONFIG_SND_SOC_EUKREA_TLV320 is not set
-# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
-# CONFIG_SND_SOC_FSL_ASRC is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
-# CONFIG_SND_SOC_FSL_SAI is not set
-# CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
-# CONFIG_SND_SOC_GTM601 is not set
-# CONFIG_SND_SOC_ICS43432 is not set
-# CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
-# CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_SPDIF is not set
-# CONFIG_SND_SOC_IMX_WM8962 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH is not set
-# CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH is not set
-# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH is not set
-# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
-# CONFIG_SND_SOC_INTEL_SST is not set
-# CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MEDIATEK is not set
-# CONFIG_SND_SOC_MPC5200_AC97 is not set
-# CONFIG_SND_SOC_MPC5200_I2S is not set
-# CONFIG_SND_SOC_MT2701 is not set
-# CONFIG_SND_SOC_MT8173 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1792A is not set
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_QCOM is not set
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
-# CONFIG_SND_SOC_RT5677_SPI is not set
-# CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-# CONFIG_SND_SOC_SPDIF is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-# CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TPA6130A2 is not set
-# CONFIG_SND_SOC_TS3A227E is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_USB_6FIRE is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_HIFACE is not set
-# CONFIG_SND_USB_POD is not set
-# CONFIG_SND_USB_PODHD is not set
-# CONFIG_SND_USB_TONEPORT is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-# CONFIG_SND_USB_VARIAX is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOCK_CGROUP_DATA is not set
-# CONFIG_SOC_AM33XX is not set
-# CONFIG_SOC_AM43XX is not set
-# CONFIG_SOC_BRCMSTB is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOC_DRA7XX is not set
-# CONFIG_SOC_HAS_OMAP2_SDRC is not set
-# CONFIG_SOC_OMAP5 is not set
-# CONFIG_SOC_TI is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_OSS_CORE is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SP5100_TCO is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPARSE_IRQ is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_SPEAKUP is not set
-# CONFIG_SPI is not set
-# CONFIG_SPINLOCK_TEST is not set
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AU1550 is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-# CONFIG_SPI_BCM2835 is not set
-# CONFIG_SPI_BCM_QSPI is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_FSL_DSPI is not set
-# CONFIG_SPI_FSL_ESPI is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI_IMG_SPFI is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_LOOPBACK_TEST is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_MPC52xx is not set
-# CONFIG_SPI_MPC52xx_PSC is not set
-# CONFIG_SPI_OCTEON is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_PPC4xx is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_PXA2XX_PCI is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_THUNDERX is not set
-# CONFIG_SPI_TI_QSPI is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_XWAY is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SPMI is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_EMBEDDED=y
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_LZ4 is not set
-# CONFIG_SQUASHFS_LZO is not set
-# CONFIG_SQUASHFS_XATTR is not set
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZLIB is not set
-# CONFIG_SRAM is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB_DRIVER_GPIO is not set
-# CONFIG_SSB_HOST_SOC is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACKTRACE is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STACK_TRACER is not set
-# CONFIG_STACK_VALIDATION is not set
-CONFIG_STAGING=y
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STANDALONE=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-# CONFIG_STE_MODEM_RPROC is not set
-# CONFIG_STK3310 is not set
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-# CONFIG_STM is not set
-# CONFIG_STMMAC_ETH is not set
-# CONFIG_STMMAC_PCI is not set
-# CONFIG_STMMAC_PLATFORM is not set
-# CONFIG_STM_DUMMY is not set
-# CONFIG_STM_SOURCE_CONSOLE is not set
-CONFIG_STP=y
-# CONFIG_STREAM_PARSER is not set
-# CONFIG_STRICT_DEVMEM is not set
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STX104 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_DEBUG is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNXI_SRAM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUSPEND is not set
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SWCONFIG_B53 is not set
-# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
-# CONFIG_SWCONFIG_LEDS is not set
-# CONFIG_SX9500 is not set
-# CONFIG_SXGBE_ETH is not set
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_SYNC_FILE is not set
-# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_SYSCTL=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYSFS=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSTEMPORT is not set
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_T5403 is not set
-# CONFIG_TARGET_CORE is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_TASKS_RCU is not set
-# CONFIG_TASK_XACCT is not set
-# CONFIG_TC35815 is not set
-# CONFIG_TCG_ATMEL is not set
-# CONFIG_TCG_CRB is not set
-# CONFIG_TCG_INFINEON is not set
-# CONFIG_TCG_NSC is not set
-# CONFIG_TCG_ST33_I2C is not set
-# CONFIG_TCG_TIS is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_XEN is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BBR is not set
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CDG is not set
-CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TCP_CONG_DCTCP is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_NV is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_WESTWOOD is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_TEGRA_AHB is not set
-# CONFIG_TEGRA_HOST1X is not set
-# CONFIG_TEHUTI is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_UDELAY is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_UUID is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-# CONFIG_THINKPAD_ACPI is not set
-# CONFIG_THRUSTMASTER_FF is not set
-# CONFIG_THUNDERBOLT is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_TICK_CPU_ACCOUNTING is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_TIMB_DMA is not set
-CONFIG_TIMERFD=y
-# CONFIG_TIMER_STATS is not set
-CONFIG_TINY_RCU=y
-# CONFIG_TIPC is not set
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS8688 is not set
-# CONFIG_TI_AM335X_ADC is not set
-# CONFIG_TI_CPSW is not set
-# CONFIG_TI_CPSW_ALE is not set
-# CONFIG_TI_CPTS is not set
-# CONFIG_TI_DAC7512 is not set
-# CONFIG_TI_DAVINCI_CPDMA is not set
-# CONFIG_TI_DAVINCI_MDIO is not set
-# CONFIG_TI_ST is not set
-# CONFIG_TI_SYSCON_RESET is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMP006 is not set
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS_XATTR=y
-# CONFIG_TOPSTAR_LAPTOP is not set
-# CONFIG_TORTURE_TEST is not set
-# CONFIG_TOSHIBA_HAPS is not set
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
-# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-# CONFIG_TOUCHSCREEN_BU21013 is not set
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_DYNAPRO is not set
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_EGALAX is not set
-# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
-# CONFIG_TOUCHSCREEN_ELAN is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FT6236 is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GOODIX is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
-# CONFIG_TOUCHSCREEN_ILI210X is not set
-# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_PIXCIR is not set
-# CONFIG_TOUCHSCREEN_RM_TS is not set
-# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_SILEAD is not set
-# CONFIG_TOUCHSCREEN_SIS_I2C is not set
-# CONFIG_TOUCHSCREEN_ST1232 is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
-# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TPS6507X is not set
-# CONFIG_TOUCHSCREEN_TSC2004 is not set
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-# CONFIG_TOUCHSCREEN_WM97XX is not set
-# CONFIG_TOUCHSCREEN_ZFORCE is not set
-# CONFIG_TPL0102 is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
-CONFIG_TRACING_SUPPORT=y
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-# CONFIG_TRUSTED_KEYS is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_TTPCI_EEPROM is not set
-CONFIG_TTY=y
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_TUN is not set
-# CONFIG_TUN_VNET_CROSS_LE is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL4030_MADC is not set
-# CONFIG_TWL6030_GPADC is not set
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_TYPHOON is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-# CONFIG_UBSAN is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UCSI is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UHID is not set
-CONFIG_UID16=y
-# CONFIG_UIO is not set
-# CONFIG_ULTRA is not set
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_UNIX=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_UPROBES is not set
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_US5182D is not set
-# CONFIG_USB is not set
-# CONFIG_USBIP_CORE is not set
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-# CONFIG_USBIP_VUDC is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-CONFIG_USB_ALI_M5632=y
-# CONFIG_USB_AMD5536UDC is not set
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_BDC_UDC is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_CHAOSKEY is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CONFIGFS is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DUMMY_HCD is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_DWC2_DEBUG is not set
-# CONFIG_USB_DWC2_DUAL_ROLE is not set
-# CONFIG_USB_DWC2_HOST is not set
-# CONFIG_USB_DWC2_PERIPHERAL is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC3_EXYNOS is not set
-# CONFIG_USB_DWC3_KEYSTONE is not set
-# CONFIG_USB_DWC3_OF_SIMPLE is not set
-# CONFIG_USB_DWC3_PCI is not set
-# CONFIG_USB_DWC3_QCOM is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EG20T is not set
-# CONFIG_USB_EHCI_ATH79 is not set
-# CONFIG_USB_EHCI_HCD_AT91 is not set
-# CONFIG_USB_EHCI_HCD_OMAP is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-# CONFIG_USB_EHCI_MSM is not set
-# CONFIG_USB_EHCI_MV is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_FOTG210_UDC is not set
-# CONFIG_USB_FSL_USB2 is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FUSB300 is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_GADGET_XILINX is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GOKU is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GR_UDC is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_BENQ is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_CPIA1 is not set
-# CONFIG_USB_GSPCA_DTCS033 is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_JL2005BCD is not set
-# CONFIG_USB_GSPCA_KINECT is not set
-# CONFIG_USB_GSPCA_KONICA is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_NW80X is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_OV534_9 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-# CONFIG_USB_GSPCA_SE401 is not set
-# CONFIG_USB_GSPCA_SN9C2028 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ930X is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STK1135 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TOPRO is not set
-# CONFIG_USB_GSPCA_TOUPTEK is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_VICAM is not set
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_NCM is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_G_WEBCAM is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760 is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_LAN78XX is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
-# CONFIG_USB_LED_TRIG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_M66592 is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MAX3421_HCD is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MSM_OTG is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_USB_MXS_PHY is not set
-# CONFIG_USB_NET2272 is not set
-# CONFIG_USB_NET2280 is not set
-# CONFIG_USB_NET_AX88179_178A is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
-# CONFIG_USB_NET_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_CH9200 is not set
-# CONFIG_USB_NET_CX82310_ETH is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_DRIVERS is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_KALMIA is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_QMI_WWAN is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC75XX is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_SR9700 is not set
-# CONFIG_USB_NET_SR9800 is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHY is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_PXA27X is not set
-# CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RCAR_PHY is not set
-# CONFIG_USB_RENESAS_USBHS is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_RTL8152 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_METRO is not set
-# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MXUPORT is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QCAUX is not set
-# CONFIG_USB_SERIAL_QT2 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SIMPLE is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_XSENS_MT is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SIERRA_NET is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SWITCH_FSA9480 is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UAS is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USS720 is not set
-# CONFIG_USB_VIDEO_CLASS is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VL600 is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USELIB is not set
-# CONFIG_USERFAULTFD is not set
-# CONFIG_USE_OF is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_U_SERIAL_CONSOLE is not set
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VDSO is not set
-# CONFIG_VEML6070 is not set
-# CONFIG_VETH is not set
-# CONFIG_VEXPRESS_CONFIG is not set
-# CONFIG_VF610_ADC is not set
-# CONFIG_VF610_DAC is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGA_SWITCHEROO is not set
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-# CONFIG_VHOST_NET is not set
-# CONFIG_VHOST_VSOCK is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CS3308 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DM6446_CCDC is not set
-# CONFIG_VIDEO_DT3155 is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IR_I2C is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_OMAP2_VOUT is not set
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA6752HS is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_SONY_BTF_MPX is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_THS8200 is not set
-# CONFIG_VIDEO_TIMBERDALE is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TM6000 is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_TW2804 is not set
-# CONFIG_VIDEO_TW9903 is not set
-# CONFIG_VIDEO_TW9906 is not set
-# CONFIG_VIDEO_UDA1342 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBTV is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRTIO_BALLOON is not set
-# CONFIG_VIRTIO_INPUT is not set
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_VIRT_DRIVERS is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VITESSE_PHY is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMWARE_PVSCSI is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VOP_BUS is not set
-# CONFIG_VORTEX is not set
-# CONFIG_VSOCKETS is not set
-# CONFIG_VT is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_VXGE is not set
-# CONFIG_VXLAN is not set
-# CONFIG_VZ89X is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2406 is not set
-# CONFIG_W1_SLAVE_DS2408 is not set
-# CONFIG_W1_SLAVE_DS2413 is not set
-# CONFIG_W1_SLAVE_DS2423 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_DS2780 is not set
-# CONFIG_W1_SLAVE_DS2781 is not set
-# CONFIG_W1_SLAVE_DS28E04 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WANXL is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_CORE is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-# CONFIG_WATCHDOG_SYSFS is not set
-# CONFIG_WD80x3 is not set
-# CONFIG_WDAT_WDT is not set
-# CONFIG_WDTPCI is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WILINK_PLATFORM_DATA=y
-# CONFIG_WIMAX is not set
-# CONFIG_WIMAX_GDM72XX is not set
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-# CONFIG_WIZNET_W5100 is not set
-# CONFIG_WIZNET_W5300 is not set
-# CONFIG_WL1251 is not set
-# CONFIG_WL12XX is not set
-# CONFIG_WL18XX is not set
-CONFIG_WLAN=y
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-# CONFIG_WLAN_VENDOR_ATH is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-# CONFIG_WLAN_VENDOR_BROADCOM is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-# CONFIG_WLAN_VENDOR_INTEL is not set
-# CONFIG_WLAN_VENDOR_INTERSIL is not set
-# CONFIG_WLAN_VENDOR_MARVELL is not set
-# CONFIG_WLAN_VENDOR_MEDIATEK is not set
-# CONFIG_WLAN_VENDOR_RALINK is not set
-# CONFIG_WLAN_VENDOR_REALTEK is not set
-# CONFIG_WLAN_VENDOR_RSI is not set
-# CONFIG_WLAN_VENDOR_ST is not set
-# CONFIG_WLAN_VENDOR_TI is not set
-# CONFIG_WLAN_VENDOR_ZYDAS is not set
-# CONFIG_WLCORE is not set
-# CONFIG_WL_MEDIATEK is not set
-CONFIG_WL_TI=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-# CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
-# CONFIG_X509_CERTIFICATE_PARSER is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-# CONFIG_X86_PKG_TEMP_THERMAL is not set
-CONFIG_X86_SYSFB=y
-# CONFIG_XEN is not set
-CONFIG_XFRM=y
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XILINX_AXI_EMAC is not set
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-# CONFIG_XILLYBUS is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_XMON is not set
-CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_BCJ is not set
-# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_SPARC is not set
-# CONFIG_XZ_DEC_TEST is not set
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZBUD is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_ZLIB_DEFLATE is not set
-# CONFIG_ZLIB_INFLATE is not set
-CONFIG_ZONE_DMA=y
-# CONFIG_ZPA2326 is not set
-# CONFIG_ZPOOL is not set
-# CONFIG_ZRAM is not set
-# CONFIG_ZSMALLOC is not set
diff --git a/target/linux/generic/hack-4.19/204-module_strip.patch b/target/linux/generic/hack-4.19/204-module_strip.patch
deleted file mode 100644 (file)
index c0650b3..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-From a779a482fb9b9f8fcdf8b2519c789b4b9bb5dd05 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 16:56:48 +0200
-Subject: build: add a hack for removing non-essential module info
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/module.h      | 13 ++++++++-----
- include/linux/moduleparam.h | 15 ++++++++++++---
- init/Kconfig                |  7 +++++++
- kernel/module.c             |  5 ++++-
- scripts/mod/modpost.c       | 12 ++++++++++++
- 5 files changed, 43 insertions(+), 9 deletions(-)
-
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -160,6 +160,7 @@ extern void cleanup_module(void);
- /* Generic info of form tag = "info" */
- #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
-+#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
- /* For userspace: you can also call me... */
- #define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
-@@ -203,12 +204,12 @@ extern void cleanup_module(void);
-  * Author(s), use "Name <email>" or just "Name", for multiple
-  * authors use multiple MODULE_AUTHOR() statements/lines.
-  */
--#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
-+#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
- /* What your module does. */
--#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
-+#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
--#ifdef MODULE
-+#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
- /* Creates an alias so file2alias.c can find device table. */
- #define MODULE_DEVICE_TABLE(type, name)                                       \
- extern typeof(name) __mod_##type##__##name##_device_table             \
-@@ -235,7 +236,9 @@ extern typeof(name) __mod_##type##__##na
-  */
- #if defined(MODULE) || !defined(CONFIG_SYSFS)
--#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
-+#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
-+#elif defined(CONFIG_MODULE_STRIPPED)
-+#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
- #else
- #define MODULE_VERSION(_version)                                      \
-       static struct module_version_attribute ___modver_attr = {       \
-@@ -257,7 +260,7 @@ extern typeof(name) __mod_##type##__##na
- /* Optional firmware file (or files) needed by the module
-  * format is simply firmware file name.  Multiple firmware
-  * files require multiple MODULE_FIRMWARE() specifiers */
--#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
-+#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
- struct notifier_block;
---- a/include/linux/moduleparam.h
-+++ b/include/linux/moduleparam.h
-@@ -17,6 +17,16 @@
- /* Chosen so that structs with an unsigned long line up. */
- #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
-+/* This struct is here for syntactic coherency, it is not used */
-+#define __MODULE_INFO_DISABLED(name)                                    \
-+  struct __UNIQUE_ID(name) {}
-+
-+#ifdef CONFIG_MODULE_STRIPPED
-+#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
-+#else
-+#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
-+#endif
-+
- #ifdef MODULE
- #define __MODULE_INFO(tag, name, info)                                          \
- static const char __UNIQUE_ID(name)[]                                   \
-@@ -24,8 +34,7 @@ static const char __UNIQUE_ID(name)[]
-   = __stringify(tag) "=" info
- #else  /* !MODULE */
- /* This struct is here for syntactic coherency, it is not used */
--#define __MODULE_INFO(tag, name, info)                                          \
--  struct __UNIQUE_ID(name) {}
-+#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name)
- #endif
- #define __MODULE_PARM_TYPE(name, _type)                                         \
-   __MODULE_INFO(parmtype, name##type, #name ":" _type)
-@@ -33,7 +42,7 @@ static const char __UNIQUE_ID(name)[]
- /* One for each parameter, describing how to use it.  Some files do
-    multiple of these per line, so can't just use MODULE_INFO. */
- #define MODULE_PARM_DESC(_parm, desc) \
--      __MODULE_INFO(parm, _parm, #_parm ":" desc)
-+      __MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
- struct kernel_param;
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1997,6 +1997,13 @@ config TRIM_UNUSED_KSYMS
-         If unsure, or if you need to build out-of-tree modules, say N.
-+config MODULE_STRIPPED
-+      bool "Reduce module size"
-+      depends on MODULES
-+      help
-+        Remove module parameter descriptions, author info, version, aliases,
-+        device tables, etc.
-+
- endif # MODULES
- config MODULES_TREE_LOOKUP
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -3009,9 +3009,11 @@ static int setup_load_info(struct load_i
- static int check_modinfo(struct module *mod, struct load_info *info, int flags)
- {
--      const char *modmagic = get_modinfo(info, "vermagic");
-       int err;
-+#ifndef CONFIG_MODULE_STRIPPED
-+      const char *modmagic = get_modinfo(info, "vermagic");
-+
-       if (flags & MODULE_INIT_IGNORE_VERMAGIC)
-               modmagic = NULL;
-@@ -3032,6 +3034,7 @@ static int check_modinfo(struct module *
-                               mod->name);
-               add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
-       }
-+#endif
-       check_modinfo_retpoline(mod, info);
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -1971,7 +1971,9 @@ static void read_symbols(const char *mod
-               symname = remove_dot(info.strtab + sym->st_name);
-               handle_modversions(mod, &info, sym, symname);
-+#ifndef CONFIG_MODULE_STRIPPED
-               handle_moddevtable(mod, &info, sym, symname);
-+#endif
-       }
-       if (!is_vmlinux(modname) || vmlinux_section_warnings)
-               check_sec_ref(mod, modname, &info);
-@@ -2134,8 +2136,10 @@ static void add_header(struct buffer *b,
-       buf_printf(b, "\n");
-       buf_printf(b, "BUILD_SALT;\n");
-       buf_printf(b, "\n");
-+#ifndef CONFIG_MODULE_STRIPPED
-       buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
-       buf_printf(b, "MODULE_INFO(name, KBUILD_MODNAME);\n");
-+#endif
-       buf_printf(b, "\n");
-       buf_printf(b, "__visible struct module __this_module\n");
-       buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-@@ -2152,8 +2156,10 @@ static void add_header(struct buffer *b,
- static void add_intree_flag(struct buffer *b, int is_intree)
- {
-+#ifndef CONFIG_MODULE_STRIPPED
-       if (is_intree)
-               buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
-+#endif
- }
- /* Cannot check for assembler */
-@@ -2166,8 +2172,10 @@ static void add_retpoline(struct buffer
- static void add_staging_flag(struct buffer *b, const char *name)
- {
-+#ifndef CONFIG_MODULE_STRIPPED
-       if (strstarts(name, "drivers/staging"))
-               buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
-+#endif
- }
- /**
-@@ -2266,11 +2274,13 @@ static void add_depends(struct buffer *b
- static void add_srcversion(struct buffer *b, struct module *mod)
- {
-+#ifndef CONFIG_MODULE_STRIPPED
-       if (mod->srcversion[0]) {
-               buf_printf(b, "\n");
-               buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
-                          mod->srcversion);
-       }
-+#endif
- }
- static void write_if_changed(struct buffer *b, const char *fname)
-@@ -2507,7 +2517,9 @@ int main(int argc, char **argv)
-               add_staging_flag(&buf, mod->name);
-               err |= add_versions(&buf, mod);
-               add_depends(&buf, mod, modules);
-+#ifndef CONFIG_MODULE_STRIPPED
-               add_moddevtable(&buf, mod);
-+#endif
-               add_srcversion(&buf, mod);
-               sprintf(fname, "%s.mod.c", mod->name);
diff --git a/target/linux/generic/hack-4.19/207-disable-modorder.patch b/target/linux/generic/hack-4.19/207-disable-modorder.patch
deleted file mode 100644 (file)
index 7d7b6a8..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From c9ef4ab0f54356ee9f91d9676ea0ec123840ddc7 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 16:57:33 +0200
-Subject: kernel: do not build modules.order
-
-It is not needed for anything on the system and skipping this saves some
-build time, especially in cases where there is nothing to do.
-
-lede-commit: afc1675833a7bf5df094f59f7250369520646d04
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile               | 2 --
- scripts/Makefile.build | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -1224,7 +1224,6 @@ all: modules
- PHONY += modules
- modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
--      $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
-       @$(kecho) '  Building modules, stage 2.';
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1253,7 +1252,6 @@ _modinst_:
-               rm -f $(MODLIB)/build ; \
-               ln -s $(CURDIR) $(MODLIB)/build ; \
-       fi
--      @cp -f $(objtree)/modules.order $(MODLIB)/
-       @cp -f $(objtree)/modules.builtin $(MODLIB)/
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
---- a/scripts/Makefile.build
-+++ b/scripts/Makefile.build
-@@ -78,7 +78,7 @@ modorder-target := $(obj)/modules.order
- # We keep a list of all modules in $(MODVERDIR)
- __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
--       $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \
-+       $(if $(KBUILD_MODULES),$(obj-m)) \
-        $(subdir-ym) $(always)
-       @:
diff --git a/target/linux/generic/hack-4.19/210-darwin_scripts_include.patch b/target/linux/generic/hack-4.19/210-darwin_scripts_include.patch
deleted file mode 100644 (file)
index be6adc0..0000000
+++ /dev/null
@@ -1,3053 +0,0 @@
-From db7c30dcd9a0391bf13b62c9f91e144d762ef43a Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Fri, 7 Jul 2017 17:00:49 +0200
-Subject: Add an OSX specific patch to make the kernel be compiled
-
-lede-commit: 3fc2a24f0422b2f55f9ed43f116db3111f700526
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- scripts/kconfig/Makefile   |    3 +
- scripts/mod/elf.h          | 3007 ++++++++++++++++++++++++++++++++++++++++++++
- scripts/mod/mk_elfconfig.c |    4 +
- scripts/mod/modpost.h      |    4 +
- 4 files changed, 3018 insertions(+)
- create mode 100644 scripts/mod/elf.h
-
---- /dev/null
-+++ b/scripts/mod/elf.h
-@@ -0,0 +1,3007 @@
-+/* This file defines standard ELF types, structures, and macros.
-+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef _ELF_H
-+#define       _ELF_H 1
-+
-+/* Standard ELF types.  */
-+
-+#include <stdint.h>
-+
-+/* Type for a 16-bit quantity.  */
-+typedef uint16_t Elf32_Half;
-+typedef uint16_t Elf64_Half;
-+
-+/* Types for signed and unsigned 32-bit quantities.  */
-+typedef uint32_t Elf32_Word;
-+typedef       int32_t  Elf32_Sword;
-+typedef uint32_t Elf64_Word;
-+typedef       int32_t  Elf64_Sword;
-+
-+/* Types for signed and unsigned 64-bit quantities.  */
-+typedef uint64_t Elf32_Xword;
-+typedef       int64_t  Elf32_Sxword;
-+typedef uint64_t Elf64_Xword;
-+typedef       int64_t  Elf64_Sxword;
-+
-+/* Type of addresses.  */
-+typedef uint32_t Elf32_Addr;
-+typedef uint64_t Elf64_Addr;
-+
-+/* Type of file offsets.  */
-+typedef uint32_t Elf32_Off;
-+typedef uint64_t Elf64_Off;
-+
-+/* Type for section indices, which are 16-bit quantities.  */
-+typedef uint16_t Elf32_Section;
-+typedef uint16_t Elf64_Section;
-+
-+/* Type for version symbol information.  */
-+typedef Elf32_Half Elf32_Versym;
-+typedef Elf64_Half Elf64_Versym;
-+
-+
-+/* The ELF file header.  This appears at the start of every ELF file.  */
-+
-+#define EI_NIDENT (16)
-+
-+typedef struct
-+{
-+  unsigned char       e_ident[EI_NIDENT];     /* Magic number and other info */
-+  Elf32_Half  e_type;                 /* Object file type */
-+  Elf32_Half  e_machine;              /* Architecture */
-+  Elf32_Word  e_version;              /* Object file version */
-+  Elf32_Addr  e_entry;                /* Entry point virtual address */
-+  Elf32_Off   e_phoff;                /* Program header table file offset */
-+  Elf32_Off   e_shoff;                /* Section header table file offset */
-+  Elf32_Word  e_flags;                /* Processor-specific flags */
-+  Elf32_Half  e_ehsize;               /* ELF header size in bytes */
-+  Elf32_Half  e_phentsize;            /* Program header table entry size */
-+  Elf32_Half  e_phnum;                /* Program header table entry count */
-+  Elf32_Half  e_shentsize;            /* Section header table entry size */
-+  Elf32_Half  e_shnum;                /* Section header table entry count */
-+  Elf32_Half  e_shstrndx;             /* Section header string table index */
-+} Elf32_Ehdr;
-+
-+typedef struct
-+{
-+  unsigned char       e_ident[EI_NIDENT];     /* Magic number and other info */
-+  Elf64_Half  e_type;                 /* Object file type */
-+  Elf64_Half  e_machine;              /* Architecture */
-+  Elf64_Word  e_version;              /* Object file version */
-+  Elf64_Addr  e_entry;                /* Entry point virtual address */
-+  Elf64_Off   e_phoff;                /* Program header table file offset */
-+  Elf64_Off   e_shoff;                /* Section header table file offset */
-+  Elf64_Word  e_flags;                /* Processor-specific flags */
-+  Elf64_Half  e_ehsize;               /* ELF header size in bytes */
-+  Elf64_Half  e_phentsize;            /* Program header table entry size */
-+  Elf64_Half  e_phnum;                /* Program header table entry count */
-+  Elf64_Half  e_shentsize;            /* Section header table entry size */
-+  Elf64_Half  e_shnum;                /* Section header table entry count */
-+  Elf64_Half  e_shstrndx;             /* Section header string table index */
-+} Elf64_Ehdr;
-+
-+/* Fields in the e_ident array.  The EI_* macros are indices into the
-+   array.  The macros under each EI_* macro are the values the byte
-+   may have.  */
-+
-+#define EI_MAG0               0               /* File identification byte 0 index */
-+#define ELFMAG0               0x7f            /* Magic number byte 0 */
-+
-+#define EI_MAG1               1               /* File identification byte 1 index */
-+#define ELFMAG1               'E'             /* Magic number byte 1 */
-+
-+#define EI_MAG2               2               /* File identification byte 2 index */
-+#define ELFMAG2               'L'             /* Magic number byte 2 */
-+
-+#define EI_MAG3               3               /* File identification byte 3 index */
-+#define ELFMAG3               'F'             /* Magic number byte 3 */
-+
-+/* Conglomeration of the identification bytes, for easy testing as a word.  */
-+#define       ELFMAG          "\177ELF"
-+#define       SELFMAG         4
-+
-+#define EI_CLASS      4               /* File class byte index */
-+#define ELFCLASSNONE  0               /* Invalid class */
-+#define ELFCLASS32    1               /* 32-bit objects */
-+#define ELFCLASS64    2               /* 64-bit objects */
-+#define ELFCLASSNUM   3
-+
-+#define EI_DATA               5               /* Data encoding byte index */
-+#define ELFDATANONE   0               /* Invalid data encoding */
-+#define ELFDATA2LSB   1               /* 2's complement, little endian */
-+#define ELFDATA2MSB   2               /* 2's complement, big endian */
-+#define ELFDATANUM    3
-+
-+#define EI_VERSION    6               /* File version byte index */
-+                                      /* Value must be EV_CURRENT */
-+
-+#define EI_OSABI      7               /* OS ABI identification */
-+#define ELFOSABI_NONE         0       /* UNIX System V ABI */
-+#define ELFOSABI_SYSV         0       /* Alias.  */
-+#define ELFOSABI_HPUX         1       /* HP-UX */
-+#define ELFOSABI_NETBSD               2       /* NetBSD.  */
-+#define ELFOSABI_GNU          3       /* Object uses GNU ELF extensions.  */
-+#define ELFOSABI_LINUX                ELFOSABI_GNU /* Compatibility alias.  */
-+#define ELFOSABI_SOLARIS      6       /* Sun Solaris.  */
-+#define ELFOSABI_AIX          7       /* IBM AIX.  */
-+#define ELFOSABI_IRIX         8       /* SGI Irix.  */
-+#define ELFOSABI_FREEBSD      9       /* FreeBSD.  */
-+#define ELFOSABI_TRU64                10      /* Compaq TRU64 UNIX.  */
-+#define ELFOSABI_MODESTO      11      /* Novell Modesto.  */
-+#define ELFOSABI_OPENBSD      12      /* OpenBSD.  */
-+#define ELFOSABI_ARM_AEABI    64      /* ARM EABI */
-+#define ELFOSABI_ARM          97      /* ARM */
-+#define ELFOSABI_STANDALONE   255     /* Standalone (embedded) application */
-+
-+#define EI_ABIVERSION 8               /* ABI version */
-+
-+#define EI_PAD                9               /* Byte index of padding bytes */
-+
-+/* Legal values for e_type (object file type).  */
-+
-+#define ET_NONE               0               /* No file type */
-+#define ET_REL                1               /* Relocatable file */
-+#define ET_EXEC               2               /* Executable file */
-+#define ET_DYN                3               /* Shared object file */
-+#define ET_CORE               4               /* Core file */
-+#define       ET_NUM          5               /* Number of defined types */
-+#define ET_LOOS               0xfe00          /* OS-specific range start */
-+#define ET_HIOS               0xfeff          /* OS-specific range end */
-+#define ET_LOPROC     0xff00          /* Processor-specific range start */
-+#define ET_HIPROC     0xffff          /* Processor-specific range end */
-+
-+/* Legal values for e_machine (architecture).  */
-+
-+#define EM_NONE                0              /* No machine */
-+#define EM_M32                 1              /* AT&T WE 32100 */
-+#define EM_SPARC       2              /* SUN SPARC */
-+#define EM_386                 3              /* Intel 80386 */
-+#define EM_68K                 4              /* Motorola m68k family */
-+#define EM_88K                 5              /* Motorola m88k family */
-+#define EM_860                 7              /* Intel 80860 */
-+#define EM_MIPS                8              /* MIPS R3000 big-endian */
-+#define EM_S370                9              /* IBM System/370 */
-+#define EM_MIPS_RS3_LE        10              /* MIPS R3000 little-endian */
-+
-+#define EM_PARISC     15              /* HPPA */
-+#define EM_VPP500     17              /* Fujitsu VPP500 */
-+#define EM_SPARC32PLUS        18              /* Sun's "v8plus" */
-+#define EM_960                19              /* Intel 80960 */
-+#define EM_PPC                20              /* PowerPC */
-+#define EM_PPC64      21              /* PowerPC 64-bit */
-+#define EM_S390               22              /* IBM S390 */
-+
-+#define EM_V800               36              /* NEC V800 series */
-+#define EM_FR20               37              /* Fujitsu FR20 */
-+#define EM_RH32               38              /* TRW RH-32 */
-+#define EM_RCE                39              /* Motorola RCE */
-+#define EM_ARM                40              /* ARM */
-+#define EM_FAKE_ALPHA 41              /* Digital Alpha */
-+#define EM_SH         42              /* Hitachi SH */
-+#define EM_SPARCV9    43              /* SPARC v9 64-bit */
-+#define EM_TRICORE    44              /* Siemens Tricore */
-+#define EM_ARC                45              /* Argonaut RISC Core */
-+#define EM_H8_300     46              /* Hitachi H8/300 */
-+#define EM_H8_300H    47              /* Hitachi H8/300H */
-+#define EM_H8S                48              /* Hitachi H8S */
-+#define EM_H8_500     49              /* Hitachi H8/500 */
-+#define EM_IA_64      50              /* Intel Merced */
-+#define EM_MIPS_X     51              /* Stanford MIPS-X */
-+#define EM_COLDFIRE   52              /* Motorola Coldfire */
-+#define EM_68HC12     53              /* Motorola M68HC12 */
-+#define EM_MMA                54              /* Fujitsu MMA Multimedia Accelerator*/
-+#define EM_PCP                55              /* Siemens PCP */
-+#define EM_NCPU               56              /* Sony nCPU embeeded RISC */
-+#define EM_NDR1               57              /* Denso NDR1 microprocessor */
-+#define EM_STARCORE   58              /* Motorola Start*Core processor */
-+#define EM_ME16               59              /* Toyota ME16 processor */
-+#define EM_ST100      60              /* STMicroelectronic ST100 processor */
-+#define EM_TINYJ      61              /* Advanced Logic Corp. Tinyj emb.fam*/
-+#define EM_X86_64     62              /* AMD x86-64 architecture */
-+#define EM_PDSP               63              /* Sony DSP Processor */
-+
-+#define EM_FX66               66              /* Siemens FX66 microcontroller */
-+#define EM_ST9PLUS    67              /* STMicroelectronics ST9+ 8/16 mc */
-+#define EM_ST7                68              /* STmicroelectronics ST7 8 bit mc */
-+#define EM_68HC16     69              /* Motorola MC68HC16 microcontroller */
-+#define EM_68HC11     70              /* Motorola MC68HC11 microcontroller */
-+#define EM_68HC08     71              /* Motorola MC68HC08 microcontroller */
-+#define EM_68HC05     72              /* Motorola MC68HC05 microcontroller */
-+#define EM_SVX                73              /* Silicon Graphics SVx */
-+#define EM_ST19               74              /* STMicroelectronics ST19 8 bit mc */
-+#define EM_VAX                75              /* Digital VAX */
-+#define EM_CRIS               76              /* Axis Communications 32-bit embedded processor */
-+#define EM_JAVELIN    77              /* Infineon Technologies 32-bit embedded processor */
-+#define EM_FIREPATH   78              /* Element 14 64-bit DSP Processor */
-+#define EM_ZSP                79              /* LSI Logic 16-bit DSP Processor */
-+#define EM_MMIX               80              /* Donald Knuth's educational 64-bit processor */
-+#define EM_HUANY      81              /* Harvard University machine-independent object files */
-+#define EM_PRISM      82              /* SiTera Prism */
-+#define EM_AVR                83              /* Atmel AVR 8-bit microcontroller */
-+#define EM_FR30               84              /* Fujitsu FR30 */
-+#define EM_D10V               85              /* Mitsubishi D10V */
-+#define EM_D30V               86              /* Mitsubishi D30V */
-+#define EM_V850               87              /* NEC v850 */
-+#define EM_M32R               88              /* Mitsubishi M32R */
-+#define EM_MN10300    89              /* Matsushita MN10300 */
-+#define EM_MN10200    90              /* Matsushita MN10200 */
-+#define EM_PJ         91              /* picoJava */
-+#define EM_OPENRISC   92              /* OpenRISC 32-bit embedded processor */
-+#define EM_ARC_A5     93              /* ARC Cores Tangent-A5 */
-+#define EM_XTENSA     94              /* Tensilica Xtensa Architecture */
-+#define EM_TILEPRO    188             /* Tilera TILEPro */
-+#define EM_TILEGX     191             /* Tilera TILE-Gx */
-+#define EM_NUM                192
-+
-+/* If it is necessary to assign new unofficial EM_* values, please
-+   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
-+   chances of collision with official or non-GNU unofficial values.  */
-+
-+#define EM_ALPHA      0x9026
-+
-+/* Legal values for e_version (version).  */
-+
-+#define EV_NONE               0               /* Invalid ELF version */
-+#define EV_CURRENT    1               /* Current version */
-+#define EV_NUM                2
-+
-+/* Section header.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  sh_name;                /* Section name (string tbl index) */
-+  Elf32_Word  sh_type;                /* Section type */
-+  Elf32_Word  sh_flags;               /* Section flags */
-+  Elf32_Addr  sh_addr;                /* Section virtual addr at execution */
-+  Elf32_Off   sh_offset;              /* Section file offset */
-+  Elf32_Word  sh_size;                /* Section size in bytes */
-+  Elf32_Word  sh_link;                /* Link to another section */
-+  Elf32_Word  sh_info;                /* Additional section information */
-+  Elf32_Word  sh_addralign;           /* Section alignment */
-+  Elf32_Word  sh_entsize;             /* Entry size if section holds table */
-+} Elf32_Shdr;
-+
-+typedef struct
-+{
-+  Elf64_Word  sh_name;                /* Section name (string tbl index) */
-+  Elf64_Word  sh_type;                /* Section type */
-+  Elf64_Xword sh_flags;               /* Section flags */
-+  Elf64_Addr  sh_addr;                /* Section virtual addr at execution */
-+  Elf64_Off   sh_offset;              /* Section file offset */
-+  Elf64_Xword sh_size;                /* Section size in bytes */
-+  Elf64_Word  sh_link;                /* Link to another section */
-+  Elf64_Word  sh_info;                /* Additional section information */
-+  Elf64_Xword sh_addralign;           /* Section alignment */
-+  Elf64_Xword sh_entsize;             /* Entry size if section holds table */
-+} Elf64_Shdr;
-+
-+/* Special section indices.  */
-+
-+#define SHN_UNDEF     0               /* Undefined section */
-+#define SHN_LORESERVE 0xff00          /* Start of reserved indices */
-+#define SHN_LOPROC    0xff00          /* Start of processor-specific */
-+#define SHN_BEFORE    0xff00          /* Order section before all others
-+                                         (Solaris).  */
-+#define SHN_AFTER     0xff01          /* Order section after all others
-+                                         (Solaris).  */
-+#define SHN_HIPROC    0xff1f          /* End of processor-specific */
-+#define SHN_LOOS      0xff20          /* Start of OS-specific */
-+#define SHN_HIOS      0xff3f          /* End of OS-specific */
-+#define SHN_ABS               0xfff1          /* Associated symbol is absolute */
-+#define SHN_COMMON    0xfff2          /* Associated symbol is common */
-+#define SHN_XINDEX    0xffff          /* Index is in extra table.  */
-+#define SHN_HIRESERVE 0xffff          /* End of reserved indices */
-+
-+/* Legal values for sh_type (section type).  */
-+
-+#define SHT_NULL        0             /* Section header table entry unused */
-+#define SHT_PROGBITS    1             /* Program data */
-+#define SHT_SYMTAB      2             /* Symbol table */
-+#define SHT_STRTAB      3             /* String table */
-+#define SHT_RELA        4             /* Relocation entries with addends */
-+#define SHT_HASH        5             /* Symbol hash table */
-+#define SHT_DYNAMIC     6             /* Dynamic linking information */
-+#define SHT_NOTE        7             /* Notes */
-+#define SHT_NOBITS      8             /* Program space with no data (bss) */
-+#define SHT_REL                 9             /* Relocation entries, no addends */
-+#define SHT_SHLIB       10            /* Reserved */
-+#define SHT_DYNSYM      11            /* Dynamic linker symbol table */
-+#define SHT_INIT_ARRAY          14            /* Array of constructors */
-+#define SHT_FINI_ARRAY          15            /* Array of destructors */
-+#define SHT_PREINIT_ARRAY 16          /* Array of pre-constructors */
-+#define SHT_GROUP       17            /* Section group */
-+#define SHT_SYMTAB_SHNDX  18          /* Extended section indeces */
-+#define       SHT_NUM           19            /* Number of defined types.  */
-+#define SHT_LOOS        0x60000000    /* Start OS-specific.  */
-+#define SHT_GNU_ATTRIBUTES 0x6ffffff5 /* Object attributes.  */
-+#define SHT_GNU_HASH    0x6ffffff6    /* GNU-style hash table.  */
-+#define SHT_GNU_LIBLIST         0x6ffffff7    /* Prelink library list */
-+#define SHT_CHECKSUM    0x6ffffff8    /* Checksum for DSO content.  */
-+#define SHT_LOSUNW      0x6ffffffa    /* Sun-specific low bound.  */
-+#define SHT_SUNW_move   0x6ffffffa
-+#define SHT_SUNW_COMDAT   0x6ffffffb
-+#define SHT_SUNW_syminfo  0x6ffffffc
-+#define SHT_GNU_verdef          0x6ffffffd    /* Version definition section.  */
-+#define SHT_GNU_verneed         0x6ffffffe    /* Version needs section.  */
-+#define SHT_GNU_versym          0x6fffffff    /* Version symbol table.  */
-+#define SHT_HISUNW      0x6fffffff    /* Sun-specific high bound.  */
-+#define SHT_HIOS        0x6fffffff    /* End OS-specific type */
-+#define SHT_LOPROC      0x70000000    /* Start of processor-specific */
-+#define SHT_HIPROC      0x7fffffff    /* End of processor-specific */
-+#define SHT_LOUSER      0x80000000    /* Start of application-specific */
-+#define SHT_HIUSER      0x8fffffff    /* End of application-specific */
-+
-+/* Legal values for sh_flags (section flags).  */
-+
-+#define SHF_WRITE          (1 << 0)   /* Writable */
-+#define SHF_ALLOC          (1 << 1)   /* Occupies memory during execution */
-+#define SHF_EXECINSTR      (1 << 2)   /* Executable */
-+#define SHF_MERGE          (1 << 4)   /* Might be merged */
-+#define SHF_STRINGS        (1 << 5)   /* Contains nul-terminated strings */
-+#define SHF_INFO_LINK      (1 << 6)   /* `sh_info' contains SHT index */
-+#define SHF_LINK_ORDER             (1 << 7)   /* Preserve order after combining */
-+#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling
-+                                         required */
-+#define SHF_GROUP          (1 << 9)   /* Section is member of a group.  */
-+#define SHF_TLS                    (1 << 10)  /* Section hold thread-local data.  */
-+#define SHF_MASKOS         0x0ff00000 /* OS-specific.  */
-+#define SHF_MASKPROC       0xf0000000 /* Processor-specific */
-+#define SHF_ORDERED        (1 << 30)  /* Special ordering requirement
-+                                         (Solaris).  */
-+#define SHF_EXCLUDE        (1 << 31)  /* Section is excluded unless
-+                                         referenced or allocated (Solaris).*/
-+
-+/* Section group handling.  */
-+#define GRP_COMDAT    0x1             /* Mark group as COMDAT.  */
-+
-+/* Symbol table entry.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  st_name;                /* Symbol name (string tbl index) */
-+  Elf32_Addr  st_value;               /* Symbol value */
-+  Elf32_Word  st_size;                /* Symbol size */
-+  unsigned char       st_info;                /* Symbol type and binding */
-+  unsigned char       st_other;               /* Symbol visibility */
-+  Elf32_Section       st_shndx;               /* Section index */
-+} Elf32_Sym;
-+
-+typedef struct
-+{
-+  Elf64_Word  st_name;                /* Symbol name (string tbl index) */
-+  unsigned char       st_info;                /* Symbol type and binding */
-+  unsigned char st_other;             /* Symbol visibility */
-+  Elf64_Section       st_shndx;               /* Section index */
-+  Elf64_Addr  st_value;               /* Symbol value */
-+  Elf64_Xword st_size;                /* Symbol size */
-+} Elf64_Sym;
-+
-+/* The syminfo section if available contains additional information about
-+   every dynamic symbol.  */
-+
-+typedef struct
-+{
-+  Elf32_Half si_boundto;              /* Direct bindings, symbol bound to */
-+  Elf32_Half si_flags;                        /* Per symbol flags */
-+} Elf32_Syminfo;
-+
-+typedef struct
-+{
-+  Elf64_Half si_boundto;              /* Direct bindings, symbol bound to */
-+  Elf64_Half si_flags;                        /* Per symbol flags */
-+} Elf64_Syminfo;
-+
-+/* Possible values for si_boundto.  */
-+#define SYMINFO_BT_SELF               0xffff  /* Symbol bound to self */
-+#define SYMINFO_BT_PARENT     0xfffe  /* Symbol bound to parent */
-+#define SYMINFO_BT_LOWRESERVE 0xff00  /* Beginning of reserved entries */
-+
-+/* Possible bitmasks for si_flags.  */
-+#define SYMINFO_FLG_DIRECT    0x0001  /* Direct bound symbol */
-+#define SYMINFO_FLG_PASSTHRU  0x0002  /* Pass-thru symbol for translator */
-+#define SYMINFO_FLG_COPY      0x0004  /* Symbol is a copy-reloc */
-+#define SYMINFO_FLG_LAZYLOAD  0x0008  /* Symbol bound to object to be lazy
-+                                         loaded */
-+/* Syminfo version values.  */
-+#define SYMINFO_NONE          0
-+#define SYMINFO_CURRENT               1
-+#define SYMINFO_NUM           2
-+
-+
-+/* How to extract and insert information held in the st_info field.  */
-+
-+#define ELF32_ST_BIND(val)            (((unsigned char) (val)) >> 4)
-+#define ELF32_ST_TYPE(val)            ((val) & 0xf)
-+#define ELF32_ST_INFO(bind, type)     (((bind) << 4) + ((type) & 0xf))
-+
-+/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
-+#define ELF64_ST_BIND(val)            ELF32_ST_BIND (val)
-+#define ELF64_ST_TYPE(val)            ELF32_ST_TYPE (val)
-+#define ELF64_ST_INFO(bind, type)     ELF32_ST_INFO ((bind), (type))
-+
-+/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
-+
-+#define STB_LOCAL     0               /* Local symbol */
-+#define STB_GLOBAL    1               /* Global symbol */
-+#define STB_WEAK      2               /* Weak symbol */
-+#define       STB_NUM         3               /* Number of defined types.  */
-+#define STB_LOOS      10              /* Start of OS-specific */
-+#define STB_GNU_UNIQUE        10              /* Unique symbol.  */
-+#define STB_HIOS      12              /* End of OS-specific */
-+#define STB_LOPROC    13              /* Start of processor-specific */
-+#define STB_HIPROC    15              /* End of processor-specific */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-+
-+#define STT_NOTYPE    0               /* Symbol type is unspecified */
-+#define STT_OBJECT    1               /* Symbol is a data object */
-+#define STT_FUNC      2               /* Symbol is a code object */
-+#define STT_SECTION   3               /* Symbol associated with a section */
-+#define STT_FILE      4               /* Symbol's name is file name */
-+#define STT_COMMON    5               /* Symbol is a common data object */
-+#define STT_TLS               6               /* Symbol is thread-local data object*/
-+#define       STT_NUM         7               /* Number of defined types.  */
-+#define STT_LOOS      10              /* Start of OS-specific */
-+#define STT_GNU_IFUNC 10              /* Symbol is indirect code object */
-+#define STT_HIOS      12              /* End of OS-specific */
-+#define STT_LOPROC    13              /* Start of processor-specific */
-+#define STT_HIPROC    15              /* End of processor-specific */
-+
-+
-+/* Symbol table indices are found in the hash buckets and chain table
-+   of a symbol hash table section.  This special index value indicates
-+   the end of a chain, meaning no further symbols are found in that bucket.  */
-+
-+#define STN_UNDEF     0               /* End of a chain.  */
-+
-+
-+/* How to extract and insert information held in the st_other field.  */
-+
-+#define ELF32_ST_VISIBILITY(o)        ((o) & 0x03)
-+
-+/* For ELF64 the definitions are the same.  */
-+#define ELF64_ST_VISIBILITY(o)        ELF32_ST_VISIBILITY (o)
-+
-+/* Symbol visibility specification encoded in the st_other field.  */
-+#define STV_DEFAULT   0               /* Default symbol visibility rules */
-+#define STV_INTERNAL  1               /* Processor specific hidden class */
-+#define STV_HIDDEN    2               /* Sym unavailable in other modules */
-+#define STV_PROTECTED 3               /* Not preemptible, not exported */
-+
-+
-+/* Relocation table entry without addend (in section of type SHT_REL).  */
-+
-+typedef struct
-+{
-+  Elf32_Addr  r_offset;               /* Address */
-+  Elf32_Word  r_info;                 /* Relocation type and symbol index */
-+} Elf32_Rel;
-+
-+/* I have seen two different definitions of the Elf64_Rel and
-+   Elf64_Rela structures, so we'll leave them out until Novell (or
-+   whoever) gets their act together.  */
-+/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
-+
-+typedef struct
-+{
-+  Elf64_Addr  r_offset;               /* Address */
-+  Elf64_Xword r_info;                 /* Relocation type and symbol index */
-+} Elf64_Rel;
-+
-+/* Relocation table entry with addend (in section of type SHT_RELA).  */
-+
-+typedef struct
-+{
-+  Elf32_Addr  r_offset;               /* Address */
-+  Elf32_Word  r_info;                 /* Relocation type and symbol index */
-+  Elf32_Sword r_addend;               /* Addend */
-+} Elf32_Rela;
-+
-+typedef struct
-+{
-+  Elf64_Addr  r_offset;               /* Address */
-+  Elf64_Xword r_info;                 /* Relocation type and symbol index */
-+  Elf64_Sxword        r_addend;               /* Addend */
-+} Elf64_Rela;
-+
-+/* How to extract and insert information held in the r_info field.  */
-+
-+#define ELF32_R_SYM(val)              ((val) >> 8)
-+#define ELF32_R_TYPE(val)             ((val) & 0xff)
-+#define ELF32_R_INFO(sym, type)               (((sym) << 8) + ((type) & 0xff))
-+
-+#define ELF64_R_SYM(i)                        ((i) >> 32)
-+#define ELF64_R_TYPE(i)                       ((i) & 0xffffffff)
-+#define ELF64_R_INFO(sym,type)                ((((Elf64_Xword) (sym)) << 32) + (type))
-+
-+/* Program segment header.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  p_type;                 /* Segment type */
-+  Elf32_Off   p_offset;               /* Segment file offset */
-+  Elf32_Addr  p_vaddr;                /* Segment virtual address */
-+  Elf32_Addr  p_paddr;                /* Segment physical address */
-+  Elf32_Word  p_filesz;               /* Segment size in file */
-+  Elf32_Word  p_memsz;                /* Segment size in memory */
-+  Elf32_Word  p_flags;                /* Segment flags */
-+  Elf32_Word  p_align;                /* Segment alignment */
-+} Elf32_Phdr;
-+
-+typedef struct
-+{
-+  Elf64_Word  p_type;                 /* Segment type */
-+  Elf64_Word  p_flags;                /* Segment flags */
-+  Elf64_Off   p_offset;               /* Segment file offset */
-+  Elf64_Addr  p_vaddr;                /* Segment virtual address */
-+  Elf64_Addr  p_paddr;                /* Segment physical address */
-+  Elf64_Xword p_filesz;               /* Segment size in file */
-+  Elf64_Xword p_memsz;                /* Segment size in memory */
-+  Elf64_Xword p_align;                /* Segment alignment */
-+} Elf64_Phdr;
-+
-+/* Special value for e_phnum.  This indicates that the real number of
-+   program headers is too large to fit into e_phnum.  Instead the real
-+   value is in the field sh_info of section 0.  */
-+
-+#define PN_XNUM               0xffff
-+
-+/* Legal values for p_type (segment type).  */
-+
-+#define       PT_NULL         0               /* Program header table entry unused */
-+#define PT_LOAD               1               /* Loadable program segment */
-+#define PT_DYNAMIC    2               /* Dynamic linking information */
-+#define PT_INTERP     3               /* Program interpreter */
-+#define PT_NOTE               4               /* Auxiliary information */
-+#define PT_SHLIB      5               /* Reserved */
-+#define PT_PHDR               6               /* Entry for header table itself */
-+#define PT_TLS                7               /* Thread-local storage segment */
-+#define       PT_NUM          8               /* Number of defined types */
-+#define PT_LOOS               0x60000000      /* Start of OS-specific */
-+#define PT_GNU_EH_FRAME       0x6474e550      /* GCC .eh_frame_hdr segment */
-+#define PT_GNU_STACK  0x6474e551      /* Indicates stack executability */
-+#define PT_GNU_RELRO  0x6474e552      /* Read-only after relocation */
-+#define PT_LOSUNW     0x6ffffffa
-+#define PT_SUNWBSS    0x6ffffffa      /* Sun Specific segment */
-+#define PT_SUNWSTACK  0x6ffffffb      /* Stack segment */
-+#define PT_HISUNW     0x6fffffff
-+#define PT_HIOS               0x6fffffff      /* End of OS-specific */
-+#define PT_LOPROC     0x70000000      /* Start of processor-specific */
-+#define PT_HIPROC     0x7fffffff      /* End of processor-specific */
-+
-+/* Legal values for p_flags (segment flags).  */
-+
-+#define PF_X          (1 << 0)        /* Segment is executable */
-+#define PF_W          (1 << 1)        /* Segment is writable */
-+#define PF_R          (1 << 2)        /* Segment is readable */
-+#define PF_MASKOS     0x0ff00000      /* OS-specific */
-+#define PF_MASKPROC   0xf0000000      /* Processor-specific */
-+
-+/* Legal values for note segment descriptor types for core files. */
-+
-+#define NT_PRSTATUS   1               /* Contains copy of prstatus struct */
-+#define NT_FPREGSET   2               /* Contains copy of fpregset struct */
-+#define NT_PRPSINFO   3               /* Contains copy of prpsinfo struct */
-+#define NT_PRXREG     4               /* Contains copy of prxregset struct */
-+#define NT_TASKSTRUCT 4               /* Contains copy of task structure */
-+#define NT_PLATFORM   5               /* String from sysinfo(SI_PLATFORM) */
-+#define NT_AUXV               6               /* Contains copy of auxv array */
-+#define NT_GWINDOWS   7               /* Contains copy of gwindows struct */
-+#define NT_ASRS               8               /* Contains copy of asrset struct */
-+#define NT_PSTATUS    10              /* Contains copy of pstatus struct */
-+#define NT_PSINFO     13              /* Contains copy of psinfo struct */
-+#define NT_PRCRED     14              /* Contains copy of prcred struct */
-+#define NT_UTSNAME    15              /* Contains copy of utsname struct */
-+#define NT_LWPSTATUS  16              /* Contains copy of lwpstatus struct */
-+#define NT_LWPSINFO   17              /* Contains copy of lwpinfo struct */
-+#define NT_PRFPXREG   20              /* Contains copy of fprxregset struct */
-+#define NT_PRXFPREG   0x46e62b7f      /* Contains copy of user_fxsr_struct */
-+#define NT_PPC_VMX    0x100           /* PowerPC Altivec/VMX registers */
-+#define NT_PPC_SPE    0x101           /* PowerPC SPE/EVR registers */
-+#define NT_PPC_VSX    0x102           /* PowerPC VSX registers */
-+#define NT_386_TLS    0x200           /* i386 TLS slots (struct user_desc) */
-+#define NT_386_IOPERM 0x201           /* x86 io permission bitmap (1=deny) */
-+#define NT_X86_XSTATE 0x202           /* x86 extended state using xsave */
-+
-+/* Legal values for the note segment descriptor types for object files.  */
-+
-+#define NT_VERSION    1               /* Contains a version string.  */
-+
-+
-+/* Dynamic section entry.  */
-+
-+typedef struct
-+{
-+  Elf32_Sword d_tag;                  /* Dynamic entry type */
-+  union
-+    {
-+      Elf32_Word d_val;                       /* Integer value */
-+      Elf32_Addr d_ptr;                       /* Address value */
-+    } d_un;
-+} Elf32_Dyn;
-+
-+typedef struct
-+{
-+  Elf64_Sxword        d_tag;                  /* Dynamic entry type */
-+  union
-+    {
-+      Elf64_Xword d_val;              /* Integer value */
-+      Elf64_Addr d_ptr;                       /* Address value */
-+    } d_un;
-+} Elf64_Dyn;
-+
-+/* Legal values for d_tag (dynamic entry type).  */
-+
-+#define DT_NULL               0               /* Marks end of dynamic section */
-+#define DT_NEEDED     1               /* Name of needed library */
-+#define DT_PLTRELSZ   2               /* Size in bytes of PLT relocs */
-+#define DT_PLTGOT     3               /* Processor defined value */
-+#define DT_HASH               4               /* Address of symbol hash table */
-+#define DT_STRTAB     5               /* Address of string table */
-+#define DT_SYMTAB     6               /* Address of symbol table */
-+#define DT_RELA               7               /* Address of Rela relocs */
-+#define DT_RELASZ     8               /* Total size of Rela relocs */
-+#define DT_RELAENT    9               /* Size of one Rela reloc */
-+#define DT_STRSZ      10              /* Size of string table */
-+#define DT_SYMENT     11              /* Size of one symbol table entry */
-+#define DT_INIT               12              /* Address of init function */
-+#define DT_FINI               13              /* Address of termination function */
-+#define DT_SONAME     14              /* Name of shared object */
-+#define DT_RPATH      15              /* Library search path (deprecated) */
-+#define DT_SYMBOLIC   16              /* Start symbol search here */
-+#define DT_REL                17              /* Address of Rel relocs */
-+#define DT_RELSZ      18              /* Total size of Rel relocs */
-+#define DT_RELENT     19              /* Size of one Rel reloc */
-+#define DT_PLTREL     20              /* Type of reloc in PLT */
-+#define DT_DEBUG      21              /* For debugging; unspecified */
-+#define DT_TEXTREL    22              /* Reloc might modify .text */
-+#define DT_JMPREL     23              /* Address of PLT relocs */
-+#define       DT_BIND_NOW     24              /* Process relocations of object */
-+#define       DT_INIT_ARRAY   25              /* Array with addresses of init fct */
-+#define       DT_FINI_ARRAY   26              /* Array with addresses of fini fct */
-+#define       DT_INIT_ARRAYSZ 27              /* Size in bytes of DT_INIT_ARRAY */
-+#define       DT_FINI_ARRAYSZ 28              /* Size in bytes of DT_FINI_ARRAY */
-+#define DT_RUNPATH    29              /* Library search path */
-+#define DT_FLAGS      30              /* Flags for the object being loaded */
-+#define DT_ENCODING   32              /* Start of encoded range */
-+#define DT_PREINIT_ARRAY 32           /* Array with addresses of preinit fct*/
-+#define DT_PREINIT_ARRAYSZ 33         /* size in bytes of DT_PREINIT_ARRAY */
-+#define       DT_NUM          34              /* Number used */
-+#define DT_LOOS               0x6000000d      /* Start of OS-specific */
-+#define DT_HIOS               0x6ffff000      /* End of OS-specific */
-+#define DT_LOPROC     0x70000000      /* Start of processor-specific */
-+#define DT_HIPROC     0x7fffffff      /* End of processor-specific */
-+#define       DT_PROCNUM      DT_MIPS_NUM     /* Most used by any processor */
-+
-+/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
-+   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
-+   approach.  */
-+#define DT_VALRNGLO   0x6ffffd00
-+#define DT_GNU_PRELINKED 0x6ffffdf5   /* Prelinking timestamp */
-+#define DT_GNU_CONFLICTSZ 0x6ffffdf6  /* Size of conflict section */
-+#define DT_GNU_LIBLISTSZ 0x6ffffdf7   /* Size of library list */
-+#define DT_CHECKSUM   0x6ffffdf8
-+#define DT_PLTPADSZ   0x6ffffdf9
-+#define DT_MOVEENT    0x6ffffdfa
-+#define DT_MOVESZ     0x6ffffdfb
-+#define DT_FEATURE_1  0x6ffffdfc      /* Feature selection (DTF_*).  */
-+#define DT_POSFLAG_1  0x6ffffdfd      /* Flags for DT_* entries, effecting
-+                                         the following DT_* entry.  */
-+#define DT_SYMINSZ    0x6ffffdfe      /* Size of syminfo table (in bytes) */
-+#define DT_SYMINENT   0x6ffffdff      /* Entry size of syminfo */
-+#define DT_VALRNGHI   0x6ffffdff
-+#define DT_VALTAGIDX(tag)     (DT_VALRNGHI - (tag))   /* Reverse order! */
-+#define DT_VALNUM 12
-+
-+/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
-+   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
-+
-+   If any adjustment is made to the ELF object after it has been
-+   built these entries will need to be adjusted.  */
-+#define DT_ADDRRNGLO  0x6ffffe00
-+#define DT_GNU_HASH   0x6ffffef5      /* GNU-style hash table.  */
-+#define DT_TLSDESC_PLT        0x6ffffef6
-+#define DT_TLSDESC_GOT        0x6ffffef7
-+#define DT_GNU_CONFLICT       0x6ffffef8      /* Start of conflict section */
-+#define DT_GNU_LIBLIST        0x6ffffef9      /* Library list */
-+#define DT_CONFIG     0x6ffffefa      /* Configuration information.  */
-+#define DT_DEPAUDIT   0x6ffffefb      /* Dependency auditing.  */
-+#define DT_AUDIT      0x6ffffefc      /* Object auditing.  */
-+#define       DT_PLTPAD       0x6ffffefd      /* PLT padding.  */
-+#define       DT_MOVETAB      0x6ffffefe      /* Move table.  */
-+#define DT_SYMINFO    0x6ffffeff      /* Syminfo table.  */
-+#define DT_ADDRRNGHI  0x6ffffeff
-+#define DT_ADDRTAGIDX(tag)    (DT_ADDRRNGHI - (tag))  /* Reverse order! */
-+#define DT_ADDRNUM 11
-+
-+/* The versioning entry types.  The next are defined as part of the
-+   GNU extension.  */
-+#define DT_VERSYM     0x6ffffff0
-+
-+#define DT_RELACOUNT  0x6ffffff9
-+#define DT_RELCOUNT   0x6ffffffa
-+
-+/* These were chosen by Sun.  */
-+#define DT_FLAGS_1    0x6ffffffb      /* State flags, see DF_1_* below.  */
-+#define       DT_VERDEF       0x6ffffffc      /* Address of version definition
-+                                         table */
-+#define       DT_VERDEFNUM    0x6ffffffd      /* Number of version definitions */
-+#define       DT_VERNEED      0x6ffffffe      /* Address of table with needed
-+                                         versions */
-+#define       DT_VERNEEDNUM   0x6fffffff      /* Number of needed versions */
-+#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */
-+#define DT_VERSIONTAGNUM 16
-+
-+/* Sun added these machine-independent extensions in the "processor-specific"
-+   range.  Be compatible.  */
-+#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
-+#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
-+#define DT_EXTRATAGIDX(tag)   ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-+#define DT_EXTRANUM   3
-+
-+/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
-+#define DF_ORIGIN     0x00000001      /* Object may use DF_ORIGIN */
-+#define DF_SYMBOLIC   0x00000002      /* Symbol resolutions starts here */
-+#define DF_TEXTREL    0x00000004      /* Object contains text relocations */
-+#define DF_BIND_NOW   0x00000008      /* No lazy binding for this object */
-+#define DF_STATIC_TLS 0x00000010      /* Module uses the static TLS model */
-+
-+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
-+   entry in the dynamic section.  */
-+#define DF_1_NOW      0x00000001      /* Set RTLD_NOW for this object.  */
-+#define DF_1_GLOBAL   0x00000002      /* Set RTLD_GLOBAL for this object.  */
-+#define DF_1_GROUP    0x00000004      /* Set RTLD_GROUP for this object.  */
-+#define DF_1_NODELETE 0x00000008      /* Set RTLD_NODELETE for this object.*/
-+#define DF_1_LOADFLTR 0x00000010      /* Trigger filtee loading at runtime.*/
-+#define DF_1_INITFIRST        0x00000020      /* Set RTLD_INITFIRST for this object*/
-+#define DF_1_NOOPEN   0x00000040      /* Set RTLD_NOOPEN for this object.  */
-+#define DF_1_ORIGIN   0x00000080      /* $ORIGIN must be handled.  */
-+#define DF_1_DIRECT   0x00000100      /* Direct binding enabled.  */
-+#define DF_1_TRANS    0x00000200
-+#define DF_1_INTERPOSE        0x00000400      /* Object is used to interpose.  */
-+#define DF_1_NODEFLIB 0x00000800      /* Ignore default lib search path.  */
-+#define DF_1_NODUMP   0x00001000      /* Object can't be dldump'ed.  */
-+#define DF_1_CONFALT  0x00002000      /* Configuration alternative created.*/
-+#define DF_1_ENDFILTEE        0x00004000      /* Filtee terminates filters search. */
-+#define       DF_1_DISPRELDNE 0x00008000      /* Disp reloc applied at build time. */
-+#define       DF_1_DISPRELPND 0x00010000      /* Disp reloc applied at run-time.  */
-+
-+/* Flags for the feature selection in DT_FEATURE_1.  */
-+#define DTF_1_PARINIT 0x00000001
-+#define DTF_1_CONFEXP 0x00000002
-+
-+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
-+#define DF_P1_LAZYLOAD        0x00000001      /* Lazyload following object.  */
-+#define DF_P1_GROUPPERM       0x00000002      /* Symbols from next object are not
-+                                         generally available.  */
-+
-+/* Version definition sections.  */
-+
-+typedef struct
-+{
-+  Elf32_Half  vd_version;             /* Version revision */
-+  Elf32_Half  vd_flags;               /* Version information */
-+  Elf32_Half  vd_ndx;                 /* Version Index */
-+  Elf32_Half  vd_cnt;                 /* Number of associated aux entries */
-+  Elf32_Word  vd_hash;                /* Version name hash value */
-+  Elf32_Word  vd_aux;                 /* Offset in bytes to verdaux array */
-+  Elf32_Word  vd_next;                /* Offset in bytes to next verdef
-+                                         entry */
-+} Elf32_Verdef;
-+
-+typedef struct
-+{
-+  Elf64_Half  vd_version;             /* Version revision */
-+  Elf64_Half  vd_flags;               /* Version information */
-+  Elf64_Half  vd_ndx;                 /* Version Index */
-+  Elf64_Half  vd_cnt;                 /* Number of associated aux entries */
-+  Elf64_Word  vd_hash;                /* Version name hash value */
-+  Elf64_Word  vd_aux;                 /* Offset in bytes to verdaux array */
-+  Elf64_Word  vd_next;                /* Offset in bytes to next verdef
-+                                         entry */
-+} Elf64_Verdef;
-+
-+
-+/* Legal values for vd_version (version revision).  */
-+#define VER_DEF_NONE  0               /* No version */
-+#define VER_DEF_CURRENT       1               /* Current version */
-+#define VER_DEF_NUM   2               /* Given version number */
-+
-+/* Legal values for vd_flags (version information flags).  */
-+#define VER_FLG_BASE  0x1             /* Version definition of file itself */
-+#define VER_FLG_WEAK  0x2             /* Weak version identifier */
-+
-+/* Versym symbol index values.  */
-+#define       VER_NDX_LOCAL           0       /* Symbol is local.  */
-+#define       VER_NDX_GLOBAL          1       /* Symbol is global.  */
-+#define       VER_NDX_LORESERVE       0xff00  /* Beginning of reserved entries.  */
-+#define       VER_NDX_ELIMINATE       0xff01  /* Symbol is to be eliminated.  */
-+
-+/* Auxialiary version information.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  vda_name;               /* Version or dependency names */
-+  Elf32_Word  vda_next;               /* Offset in bytes to next verdaux
-+                                         entry */
-+} Elf32_Verdaux;
-+
-+typedef struct
-+{
-+  Elf64_Word  vda_name;               /* Version or dependency names */
-+  Elf64_Word  vda_next;               /* Offset in bytes to next verdaux
-+                                         entry */
-+} Elf64_Verdaux;
-+
-+
-+/* Version dependency section.  */
-+
-+typedef struct
-+{
-+  Elf32_Half  vn_version;             /* Version of structure */
-+  Elf32_Half  vn_cnt;                 /* Number of associated aux entries */
-+  Elf32_Word  vn_file;                /* Offset of filename for this
-+                                         dependency */
-+  Elf32_Word  vn_aux;                 /* Offset in bytes to vernaux array */
-+  Elf32_Word  vn_next;                /* Offset in bytes to next verneed
-+                                         entry */
-+} Elf32_Verneed;
-+
-+typedef struct
-+{
-+  Elf64_Half  vn_version;             /* Version of structure */
-+  Elf64_Half  vn_cnt;                 /* Number of associated aux entries */
-+  Elf64_Word  vn_file;                /* Offset of filename for this
-+                                         dependency */
-+  Elf64_Word  vn_aux;                 /* Offset in bytes to vernaux array */
-+  Elf64_Word  vn_next;                /* Offset in bytes to next verneed
-+                                         entry */
-+} Elf64_Verneed;
-+
-+
-+/* Legal values for vn_version (version revision).  */
-+#define VER_NEED_NONE  0              /* No version */
-+#define VER_NEED_CURRENT 1            /* Current version */
-+#define VER_NEED_NUM   2              /* Given version number */
-+
-+/* Auxiliary needed version information.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  vna_hash;               /* Hash value of dependency name */
-+  Elf32_Half  vna_flags;              /* Dependency specific information */
-+  Elf32_Half  vna_other;              /* Unused */
-+  Elf32_Word  vna_name;               /* Dependency name string offset */
-+  Elf32_Word  vna_next;               /* Offset in bytes to next vernaux
-+                                         entry */
-+} Elf32_Vernaux;
-+
-+typedef struct
-+{
-+  Elf64_Word  vna_hash;               /* Hash value of dependency name */
-+  Elf64_Half  vna_flags;              /* Dependency specific information */
-+  Elf64_Half  vna_other;              /* Unused */
-+  Elf64_Word  vna_name;               /* Dependency name string offset */
-+  Elf64_Word  vna_next;               /* Offset in bytes to next vernaux
-+                                         entry */
-+} Elf64_Vernaux;
-+
-+
-+/* Legal values for vna_flags.  */
-+#define VER_FLG_WEAK  0x2             /* Weak version identifier */
-+
-+
-+/* Auxiliary vector.  */
-+
-+/* This vector is normally only used by the program interpreter.  The
-+   usual definition in an ABI supplement uses the name auxv_t.  The
-+   vector is not usually defined in a standard <elf.h> file, but it
-+   can't hurt.  We rename it to avoid conflicts.  The sizes of these
-+   types are an arrangement between the exec server and the program
-+   interpreter, so we don't fully specify them here.  */
-+
-+typedef struct
-+{
-+  uint32_t a_type;            /* Entry type */
-+  union
-+    {
-+      uint32_t a_val;         /* Integer value */
-+      /* We use to have pointer elements added here.  We cannot do that,
-+       though, since it does not work when using 32-bit definitions
-+       on 64-bit platforms and vice versa.  */
-+    } a_un;
-+} Elf32_auxv_t;
-+
-+typedef struct
-+{
-+  uint64_t a_type;            /* Entry type */
-+  union
-+    {
-+      uint64_t a_val;         /* Integer value */
-+      /* We use to have pointer elements added here.  We cannot do that,
-+       though, since it does not work when using 32-bit definitions
-+       on 64-bit platforms and vice versa.  */
-+    } a_un;
-+} Elf64_auxv_t;
-+
-+/* Legal values for a_type (entry type).  */
-+
-+#define AT_NULL               0               /* End of vector */
-+#define AT_IGNORE     1               /* Entry should be ignored */
-+#define AT_EXECFD     2               /* File descriptor of program */
-+#define AT_PHDR               3               /* Program headers for program */
-+#define AT_PHENT      4               /* Size of program header entry */
-+#define AT_PHNUM      5               /* Number of program headers */
-+#define AT_PAGESZ     6               /* System page size */
-+#define AT_BASE               7               /* Base address of interpreter */
-+#define AT_FLAGS      8               /* Flags */
-+#define AT_ENTRY      9               /* Entry point of program */
-+#define AT_NOTELF     10              /* Program is not ELF */
-+#define AT_UID                11              /* Real uid */
-+#define AT_EUID               12              /* Effective uid */
-+#define AT_GID                13              /* Real gid */
-+#define AT_EGID               14              /* Effective gid */
-+#define AT_CLKTCK     17              /* Frequency of times() */
-+
-+/* Some more special a_type values describing the hardware.  */
-+#define AT_PLATFORM   15              /* String identifying platform.  */
-+#define AT_HWCAP      16              /* Machine dependent hints about
-+                                         processor capabilities.  */
-+
-+/* This entry gives some information about the FPU initialization
-+   performed by the kernel.  */
-+#define AT_FPUCW      18              /* Used FPU control word.  */
-+
-+/* Cache block sizes.  */
-+#define AT_DCACHEBSIZE        19              /* Data cache block size.  */
-+#define AT_ICACHEBSIZE        20              /* Instruction cache block size.  */
-+#define AT_UCACHEBSIZE        21              /* Unified cache block size.  */
-+
-+/* A special ignored value for PPC, used by the kernel to control the
-+   interpretation of the AUXV. Must be > 16.  */
-+#define AT_IGNOREPPC  22              /* Entry should be ignored.  */
-+
-+#define       AT_SECURE       23              /* Boolean, was exec setuid-like?  */
-+
-+#define AT_BASE_PLATFORM 24           /* String identifying real platforms.*/
-+
-+#define AT_RANDOM     25              /* Address of 16 random bytes.  */
-+
-+#define AT_EXECFN     31              /* Filename of executable.  */
-+
-+/* Pointer to the global system page used for system calls and other
-+   nice things.  */
-+#define AT_SYSINFO    32
-+#define AT_SYSINFO_EHDR       33
-+
-+/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
-+   log2 of line size; mask those to get cache size.  */
-+#define AT_L1I_CACHESHAPE     34
-+#define AT_L1D_CACHESHAPE     35
-+#define AT_L2_CACHESHAPE      36
-+#define AT_L3_CACHESHAPE      37
-+
-+/* Note section contents.  Each entry in the note section begins with
-+   a header of a fixed form.  */
-+
-+typedef struct
-+{
-+  Elf32_Word n_namesz;                        /* Length of the note's name.  */
-+  Elf32_Word n_descsz;                        /* Length of the note's descriptor.  */
-+  Elf32_Word n_type;                  /* Type of the note.  */
-+} Elf32_Nhdr;
-+
-+typedef struct
-+{
-+  Elf64_Word n_namesz;                        /* Length of the note's name.  */
-+  Elf64_Word n_descsz;                        /* Length of the note's descriptor.  */
-+  Elf64_Word n_type;                  /* Type of the note.  */
-+} Elf64_Nhdr;
-+
-+/* Known names of notes.  */
-+
-+/* Solaris entries in the note section have this name.  */
-+#define ELF_NOTE_SOLARIS      "SUNW Solaris"
-+
-+/* Note entries for GNU systems have this name.  */
-+#define ELF_NOTE_GNU          "GNU"
-+
-+
-+/* Defined types of notes for Solaris.  */
-+
-+/* Value of descriptor (one word) is desired pagesize for the binary.  */
-+#define ELF_NOTE_PAGESIZE_HINT        1
-+
-+
-+/* Defined note types for GNU systems.  */
-+
-+/* ABI information.  The descriptor consists of words:
-+   word 0: OS descriptor
-+   word 1: major version of the ABI
-+   word 2: minor version of the ABI
-+   word 3: subminor version of the ABI
-+*/
-+#define NT_GNU_ABI_TAG        1
-+#define ELF_NOTE_ABI  NT_GNU_ABI_TAG /* Old name.  */
-+
-+/* Known OSes.  These values can appear in word 0 of an
-+   NT_GNU_ABI_TAG note section entry.  */
-+#define ELF_NOTE_OS_LINUX     0
-+#define ELF_NOTE_OS_GNU               1
-+#define ELF_NOTE_OS_SOLARIS2  2
-+#define ELF_NOTE_OS_FREEBSD   3
-+
-+/* Synthetic hwcap information.  The descriptor begins with two words:
-+   word 0: number of entries
-+   word 1: bitmask of enabled entries
-+   Then follow variable-length entries, one byte followed by a
-+   '\0'-terminated hwcap name string.  The byte gives the bit
-+   number to test if enabled, (1U << bit) & bitmask.  */
-+#define NT_GNU_HWCAP  2
-+
-+/* Build ID bits as generated by ld --build-id.
-+   The descriptor consists of any nonzero number of bytes.  */
-+#define NT_GNU_BUILD_ID       3
-+
-+/* Version note generated by GNU gold containing a version string.  */
-+#define NT_GNU_GOLD_VERSION   4
-+
-+
-+/* Move records.  */
-+typedef struct
-+{
-+  Elf32_Xword m_value;                /* Symbol value.  */
-+  Elf32_Word m_info;          /* Size and index.  */
-+  Elf32_Word m_poffset;               /* Symbol offset.  */
-+  Elf32_Half m_repeat;                /* Repeat count.  */
-+  Elf32_Half m_stride;                /* Stride info.  */
-+} Elf32_Move;
-+
-+typedef struct
-+{
-+  Elf64_Xword m_value;                /* Symbol value.  */
-+  Elf64_Xword m_info;         /* Size and index.  */
-+  Elf64_Xword m_poffset;      /* Symbol offset.  */
-+  Elf64_Half m_repeat;                /* Repeat count.  */
-+  Elf64_Half m_stride;                /* Stride info.  */
-+} Elf64_Move;
-+
-+/* Macro to construct move records.  */
-+#define ELF32_M_SYM(info)     ((info) >> 8)
-+#define ELF32_M_SIZE(info)    ((unsigned char) (info))
-+#define ELF32_M_INFO(sym, size)       (((sym) << 8) + (unsigned char) (size))
-+
-+#define ELF64_M_SYM(info)     ELF32_M_SYM (info)
-+#define ELF64_M_SIZE(info)    ELF32_M_SIZE (info)
-+#define ELF64_M_INFO(sym, size)       ELF32_M_INFO (sym, size)
-+
-+
-+/* Motorola 68k specific definitions.  */
-+
-+/* Values for Elf32_Ehdr.e_flags.  */
-+#define EF_CPU32      0x00810000
-+
-+/* m68k relocs.  */
-+
-+#define R_68K_NONE    0               /* No reloc */
-+#define R_68K_32      1               /* Direct 32 bit  */
-+#define R_68K_16      2               /* Direct 16 bit  */
-+#define R_68K_8               3               /* Direct 8 bit  */
-+#define R_68K_PC32    4               /* PC relative 32 bit */
-+#define R_68K_PC16    5               /* PC relative 16 bit */
-+#define R_68K_PC8     6               /* PC relative 8 bit */
-+#define R_68K_GOT32   7               /* 32 bit PC relative GOT entry */
-+#define R_68K_GOT16   8               /* 16 bit PC relative GOT entry */
-+#define R_68K_GOT8    9               /* 8 bit PC relative GOT entry */
-+#define R_68K_GOT32O  10              /* 32 bit GOT offset */
-+#define R_68K_GOT16O  11              /* 16 bit GOT offset */
-+#define R_68K_GOT8O   12              /* 8 bit GOT offset */
-+#define R_68K_PLT32   13              /* 32 bit PC relative PLT address */
-+#define R_68K_PLT16   14              /* 16 bit PC relative PLT address */
-+#define R_68K_PLT8    15              /* 8 bit PC relative PLT address */
-+#define R_68K_PLT32O  16              /* 32 bit PLT offset */
-+#define R_68K_PLT16O  17              /* 16 bit PLT offset */
-+#define R_68K_PLT8O   18              /* 8 bit PLT offset */
-+#define R_68K_COPY    19              /* Copy symbol at runtime */
-+#define R_68K_GLOB_DAT        20              /* Create GOT entry */
-+#define R_68K_JMP_SLOT        21              /* Create PLT entry */
-+#define R_68K_RELATIVE        22              /* Adjust by program base */
-+#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
-+#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
-+#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
-+#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
-+#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
-+#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
-+#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
-+#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
-+#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
-+#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
-+#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
-+#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
-+#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
-+                                         static TLS block */
-+#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
-+                                         static TLS block */
-+#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
-+                                         static TLS block */
-+#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
-+#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
-+#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
-+/* Keep this the last entry.  */
-+#define R_68K_NUM     43
-+
-+/* Intel 80386 specific definitions.  */
-+
-+/* i386 relocs.  */
-+
-+#define R_386_NONE       0            /* No reloc */
-+#define R_386_32         1            /* Direct 32 bit  */
-+#define R_386_PC32       2            /* PC relative 32 bit */
-+#define R_386_GOT32      3            /* 32 bit GOT entry */
-+#define R_386_PLT32      4            /* 32 bit PLT address */
-+#define R_386_COPY       5            /* Copy symbol at runtime */
-+#define R_386_GLOB_DAT           6            /* Create GOT entry */
-+#define R_386_JMP_SLOT           7            /* Create PLT entry */
-+#define R_386_RELATIVE           8            /* Adjust by program base */
-+#define R_386_GOTOFF     9            /* 32 bit offset to GOT */
-+#define R_386_GOTPC      10           /* 32 bit PC relative offset to GOT */
-+#define R_386_32PLT      11
-+#define R_386_TLS_TPOFF          14           /* Offset in static TLS block */
-+#define R_386_TLS_IE     15           /* Address of GOT entry for static TLS
-+                                         block offset */
-+#define R_386_TLS_GOTIE          16           /* GOT entry for static TLS block
-+                                         offset */
-+#define R_386_TLS_LE     17           /* Offset relative to static TLS
-+                                         block */
-+#define R_386_TLS_GD     18           /* Direct 32 bit for GNU version of
-+                                         general dynamic thread local data */
-+#define R_386_TLS_LDM    19           /* Direct 32 bit for GNU version of
-+                                         local dynamic thread local data
-+                                         in LE code */
-+#define R_386_16         20
-+#define R_386_PC16       21
-+#define R_386_8                  22
-+#define R_386_PC8        23
-+#define R_386_TLS_GD_32          24           /* Direct 32 bit for general dynamic
-+                                         thread local data */
-+#define R_386_TLS_GD_PUSH  25         /* Tag for pushl in GD TLS code */
-+#define R_386_TLS_GD_CALL  26         /* Relocation for call to
-+                                         __tls_get_addr() */
-+#define R_386_TLS_GD_POP   27         /* Tag for popl in GD TLS code */
-+#define R_386_TLS_LDM_32   28         /* Direct 32 bit for local dynamic
-+                                         thread local data in LE code */
-+#define R_386_TLS_LDM_PUSH 29         /* Tag for pushl in LDM TLS code */
-+#define R_386_TLS_LDM_CALL 30         /* Relocation for call to
-+                                         __tls_get_addr() in LDM code */
-+#define R_386_TLS_LDM_POP  31         /* Tag for popl in LDM TLS code */
-+#define R_386_TLS_LDO_32   32         /* Offset relative to TLS block */
-+#define R_386_TLS_IE_32          33           /* GOT entry for negated static TLS
-+                                         block offset */
-+#define R_386_TLS_LE_32          34           /* Negated offset relative to static
-+                                         TLS block */
-+#define R_386_TLS_DTPMOD32 35         /* ID of module containing symbol */
-+#define R_386_TLS_DTPOFF32 36         /* Offset in TLS block */
-+#define R_386_TLS_TPOFF32  37         /* Negated offset in static TLS block */
-+/* 38? */
-+#define R_386_TLS_GOTDESC  39         /* GOT offset for TLS descriptor.  */
-+#define R_386_TLS_DESC_CALL 40                /* Marker of call through TLS
-+                                         descriptor for
-+                                         relaxation.  */
-+#define R_386_TLS_DESC     41         /* TLS descriptor containing
-+                                         pointer to code and to
-+                                         argument, returning the TLS
-+                                         offset for the symbol.  */
-+#define R_386_IRELATIVE          42           /* Adjust indirectly by program base */
-+/* Keep this the last entry.  */
-+#define R_386_NUM        43
-+
-+/* SUN SPARC specific definitions.  */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-+
-+#define STT_SPARC_REGISTER    13      /* Global register reserved to app. */
-+
-+/* Values for Elf64_Ehdr.e_flags.  */
-+
-+#define EF_SPARCV9_MM         3
-+#define EF_SPARCV9_TSO                0
-+#define EF_SPARCV9_PSO                1
-+#define EF_SPARCV9_RMO                2
-+#define EF_SPARC_LEDATA               0x800000 /* little endian data */
-+#define EF_SPARC_EXT_MASK     0xFFFF00
-+#define EF_SPARC_32PLUS               0x000100 /* generic V8+ features */
-+#define EF_SPARC_SUN_US1      0x000200 /* Sun UltraSPARC1 extensions */
-+#define EF_SPARC_HAL_R1               0x000400 /* HAL R1 extensions */
-+#define EF_SPARC_SUN_US3      0x000800 /* Sun UltraSPARCIII extensions */
-+
-+/* SPARC relocs.  */
-+
-+#define R_SPARC_NONE          0       /* No reloc */
-+#define R_SPARC_8             1       /* Direct 8 bit */
-+#define R_SPARC_16            2       /* Direct 16 bit */
-+#define R_SPARC_32            3       /* Direct 32 bit */
-+#define R_SPARC_DISP8         4       /* PC relative 8 bit */
-+#define R_SPARC_DISP16                5       /* PC relative 16 bit */
-+#define R_SPARC_DISP32                6       /* PC relative 32 bit */
-+#define R_SPARC_WDISP30               7       /* PC relative 30 bit shifted */
-+#define R_SPARC_WDISP22               8       /* PC relative 22 bit shifted */
-+#define R_SPARC_HI22          9       /* High 22 bit */
-+#define R_SPARC_22            10      /* Direct 22 bit */
-+#define R_SPARC_13            11      /* Direct 13 bit */
-+#define R_SPARC_LO10          12      /* Truncated 10 bit */
-+#define R_SPARC_GOT10         13      /* Truncated 10 bit GOT entry */
-+#define R_SPARC_GOT13         14      /* 13 bit GOT entry */
-+#define R_SPARC_GOT22         15      /* 22 bit GOT entry shifted */
-+#define R_SPARC_PC10          16      /* PC relative 10 bit truncated */
-+#define R_SPARC_PC22          17      /* PC relative 22 bit shifted */
-+#define R_SPARC_WPLT30                18      /* 30 bit PC relative PLT address */
-+#define R_SPARC_COPY          19      /* Copy symbol at runtime */
-+#define R_SPARC_GLOB_DAT      20      /* Create GOT entry */
-+#define R_SPARC_JMP_SLOT      21      /* Create PLT entry */
-+#define R_SPARC_RELATIVE      22      /* Adjust by program base */
-+#define R_SPARC_UA32          23      /* Direct 32 bit unaligned */
-+
-+/* Additional Sparc64 relocs.  */
-+
-+#define R_SPARC_PLT32         24      /* Direct 32 bit ref to PLT entry */
-+#define R_SPARC_HIPLT22               25      /* High 22 bit PLT entry */
-+#define R_SPARC_LOPLT10               26      /* Truncated 10 bit PLT entry */
-+#define R_SPARC_PCPLT32               27      /* PC rel 32 bit ref to PLT entry */
-+#define R_SPARC_PCPLT22               28      /* PC rel high 22 bit PLT entry */
-+#define R_SPARC_PCPLT10               29      /* PC rel trunc 10 bit PLT entry */
-+#define R_SPARC_10            30      /* Direct 10 bit */
-+#define R_SPARC_11            31      /* Direct 11 bit */
-+#define R_SPARC_64            32      /* Direct 64 bit */
-+#define R_SPARC_OLO10         33      /* 10bit with secondary 13bit addend */
-+#define R_SPARC_HH22          34      /* Top 22 bits of direct 64 bit */
-+#define R_SPARC_HM10          35      /* High middle 10 bits of ... */
-+#define R_SPARC_LM22          36      /* Low middle 22 bits of ... */
-+#define R_SPARC_PC_HH22               37      /* Top 22 bits of pc rel 64 bit */
-+#define R_SPARC_PC_HM10               38      /* High middle 10 bit of ... */
-+#define R_SPARC_PC_LM22               39      /* Low miggle 22 bits of ... */
-+#define R_SPARC_WDISP16               40      /* PC relative 16 bit shifted */
-+#define R_SPARC_WDISP19               41      /* PC relative 19 bit shifted */
-+#define R_SPARC_GLOB_JMP      42      /* was part of v9 ABI but was removed */
-+#define R_SPARC_7             43      /* Direct 7 bit */
-+#define R_SPARC_5             44      /* Direct 5 bit */
-+#define R_SPARC_6             45      /* Direct 6 bit */
-+#define R_SPARC_DISP64                46      /* PC relative 64 bit */
-+#define R_SPARC_PLT64         47      /* Direct 64 bit ref to PLT entry */
-+#define R_SPARC_HIX22         48      /* High 22 bit complemented */
-+#define R_SPARC_LOX10         49      /* Truncated 11 bit complemented */
-+#define R_SPARC_H44           50      /* Direct high 12 of 44 bit */
-+#define R_SPARC_M44           51      /* Direct mid 22 of 44 bit */
-+#define R_SPARC_L44           52      /* Direct low 10 of 44 bit */
-+#define R_SPARC_REGISTER      53      /* Global register usage */
-+#define R_SPARC_UA64          54      /* Direct 64 bit unaligned */
-+#define R_SPARC_UA16          55      /* Direct 16 bit unaligned */
-+#define R_SPARC_TLS_GD_HI22   56
-+#define R_SPARC_TLS_GD_LO10   57
-+#define R_SPARC_TLS_GD_ADD    58
-+#define R_SPARC_TLS_GD_CALL   59
-+#define R_SPARC_TLS_LDM_HI22  60
-+#define R_SPARC_TLS_LDM_LO10  61
-+#define R_SPARC_TLS_LDM_ADD   62
-+#define R_SPARC_TLS_LDM_CALL  63
-+#define R_SPARC_TLS_LDO_HIX22 64
-+#define R_SPARC_TLS_LDO_LOX10 65
-+#define R_SPARC_TLS_LDO_ADD   66
-+#define R_SPARC_TLS_IE_HI22   67
-+#define R_SPARC_TLS_IE_LO10   68
-+#define R_SPARC_TLS_IE_LD     69
-+#define R_SPARC_TLS_IE_LDX    70
-+#define R_SPARC_TLS_IE_ADD    71
-+#define R_SPARC_TLS_LE_HIX22  72
-+#define R_SPARC_TLS_LE_LOX10  73
-+#define R_SPARC_TLS_DTPMOD32  74
-+#define R_SPARC_TLS_DTPMOD64  75
-+#define R_SPARC_TLS_DTPOFF32  76
-+#define R_SPARC_TLS_DTPOFF64  77
-+#define R_SPARC_TLS_TPOFF32   78
-+#define R_SPARC_TLS_TPOFF64   79
-+#define R_SPARC_GOTDATA_HIX22 80
-+#define R_SPARC_GOTDATA_LOX10 81
-+#define R_SPARC_GOTDATA_OP_HIX22      82
-+#define R_SPARC_GOTDATA_OP_LOX10      83
-+#define R_SPARC_GOTDATA_OP    84
-+#define R_SPARC_H34           85
-+#define R_SPARC_SIZE32                86
-+#define R_SPARC_SIZE64                87
-+#define R_SPARC_WDISP10               88
-+#define R_SPARC_JMP_IREL      248
-+#define R_SPARC_IRELATIVE     249
-+#define R_SPARC_GNU_VTINHERIT 250
-+#define R_SPARC_GNU_VTENTRY   251
-+#define R_SPARC_REV32         252
-+/* Keep this the last entry.  */
-+#define R_SPARC_NUM           253
-+
-+/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
-+
-+#define DT_SPARC_REGISTER 0x70000001
-+#define DT_SPARC_NUM  2
-+
-+/* MIPS R3000 specific definitions.  */
-+
-+/* Legal values for e_flags field of Elf32_Ehdr.  */
-+
-+#define EF_MIPS_NOREORDER   1         /* A .noreorder directive was used */
-+#define EF_MIPS_PIC       2           /* Contains PIC code */
-+#define EF_MIPS_CPIC      4           /* Uses PIC calling sequence */
-+#define EF_MIPS_XGOT      8
-+#define EF_MIPS_64BIT_WHIRL 16
-+#define EF_MIPS_ABI2      32
-+#define EF_MIPS_ABI_ON32    64
-+#define EF_MIPS_ARCH      0xf0000000  /* MIPS architecture level */
-+
-+/* Legal values for MIPS architecture level.  */
-+
-+#define EF_MIPS_ARCH_1            0x00000000  /* -mips1 code.  */
-+#define EF_MIPS_ARCH_2            0x10000000  /* -mips2 code.  */
-+#define EF_MIPS_ARCH_3            0x20000000  /* -mips3 code.  */
-+#define EF_MIPS_ARCH_4            0x30000000  /* -mips4 code.  */
-+#define EF_MIPS_ARCH_5            0x40000000  /* -mips5 code.  */
-+#define EF_MIPS_ARCH_32           0x60000000  /* MIPS32 code.  */
-+#define EF_MIPS_ARCH_64           0x70000000  /* MIPS64 code.  */
-+
-+/* The following are non-official names and should not be used.  */
-+
-+#define E_MIPS_ARCH_1   0x00000000    /* -mips1 code.  */
-+#define E_MIPS_ARCH_2   0x10000000    /* -mips2 code.  */
-+#define E_MIPS_ARCH_3   0x20000000    /* -mips3 code.  */
-+#define E_MIPS_ARCH_4   0x30000000    /* -mips4 code.  */
-+#define E_MIPS_ARCH_5   0x40000000    /* -mips5 code.  */
-+#define E_MIPS_ARCH_32          0x60000000    /* MIPS32 code.  */
-+#define E_MIPS_ARCH_64          0x70000000    /* MIPS64 code.  */
-+
-+/* Special section indices.  */
-+
-+#define SHN_MIPS_ACOMMON    0xff00    /* Allocated common symbols */
-+#define SHN_MIPS_TEXT     0xff01      /* Allocated test symbols.  */
-+#define SHN_MIPS_DATA     0xff02      /* Allocated data symbols.  */
-+#define SHN_MIPS_SCOMMON    0xff03    /* Small common symbols */
-+#define SHN_MIPS_SUNDEFINED 0xff04    /* Small undefined symbols */
-+
-+/* Legal values for sh_type field of Elf32_Shdr.  */
-+
-+#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
-+#define SHT_MIPS_MSYM        0x70000001
-+#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
-+#define SHT_MIPS_GPTAB               0x70000003 /* Global data area sizes */
-+#define SHT_MIPS_UCODE               0x70000004 /* Reserved for SGI/MIPS compilers */
-+#define SHT_MIPS_DEBUG               0x70000005 /* MIPS ECOFF debugging information*/
-+#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
-+#define SHT_MIPS_PACKAGE       0x70000007
-+#define SHT_MIPS_PACKSYM       0x70000008
-+#define SHT_MIPS_RELD        0x70000009
-+#define SHT_MIPS_IFACE         0x7000000b
-+#define SHT_MIPS_CONTENT       0x7000000c
-+#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
-+#define SHT_MIPS_SHDR        0x70000010
-+#define SHT_MIPS_FDESC               0x70000011
-+#define SHT_MIPS_EXTSYM              0x70000012
-+#define SHT_MIPS_DENSE               0x70000013
-+#define SHT_MIPS_PDESC               0x70000014
-+#define SHT_MIPS_LOCSYM              0x70000015
-+#define SHT_MIPS_AUXSYM              0x70000016
-+#define SHT_MIPS_OPTSYM              0x70000017
-+#define SHT_MIPS_LOCSTR              0x70000018
-+#define SHT_MIPS_LINE        0x70000019
-+#define SHT_MIPS_RFDESC              0x7000001a
-+#define SHT_MIPS_DELTASYM      0x7000001b
-+#define SHT_MIPS_DELTAINST     0x7000001c
-+#define SHT_MIPS_DELTACLASS    0x7000001d
-+#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
-+#define SHT_MIPS_DELTADECL     0x7000001f
-+#define SHT_MIPS_SYMBOL_LIB    0x70000020
-+#define SHT_MIPS_EVENTS              0x70000021 /* Event section.  */
-+#define SHT_MIPS_TRANSLATE     0x70000022
-+#define SHT_MIPS_PIXIE               0x70000023
-+#define SHT_MIPS_XLATE               0x70000024
-+#define SHT_MIPS_XLATE_DEBUG   0x70000025
-+#define SHT_MIPS_WHIRL               0x70000026
-+#define SHT_MIPS_EH_REGION     0x70000027
-+#define SHT_MIPS_XLATE_OLD     0x70000028
-+#define SHT_MIPS_PDR_EXCEPTION 0x70000029
-+
-+/* Legal values for sh_flags field of Elf32_Shdr.  */
-+
-+#define SHF_MIPS_GPREL         0x10000000     /* Must be part of global data area */
-+#define SHF_MIPS_MERGE         0x20000000
-+#define SHF_MIPS_ADDR  0x40000000
-+#define SHF_MIPS_STRINGS 0x80000000
-+#define SHF_MIPS_NOSTRIP 0x08000000
-+#define SHF_MIPS_LOCAL         0x04000000
-+#define SHF_MIPS_NAMES         0x02000000
-+#define SHF_MIPS_NODUPE        0x01000000
-+
-+
-+/* Symbol tables.  */
-+
-+/* MIPS specific values for `st_other'.  */
-+#define STO_MIPS_DEFAULT              0x0
-+#define STO_MIPS_INTERNAL             0x1
-+#define STO_MIPS_HIDDEN                       0x2
-+#define STO_MIPS_PROTECTED            0x3
-+#define STO_MIPS_PLT                  0x8
-+#define STO_MIPS_SC_ALIGN_UNUSED      0xff
-+
-+/* MIPS specific values for `st_info'.  */
-+#define STB_MIPS_SPLIT_COMMON         13
-+
-+/* Entries found in sections of type SHT_MIPS_GPTAB.  */
-+
-+typedef union
-+{
-+  struct
-+    {
-+      Elf32_Word gt_current_g_value;  /* -G value used for compilation */
-+      Elf32_Word gt_unused;           /* Not used */
-+    } gt_header;                      /* First entry in section */
-+  struct
-+    {
-+      Elf32_Word gt_g_value;          /* If this value were used for -G */
-+      Elf32_Word gt_bytes;            /* This many bytes would be used */
-+    } gt_entry;                               /* Subsequent entries in section */
-+} Elf32_gptab;
-+
-+/* Entry found in sections of type SHT_MIPS_REGINFO.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  ri_gprmask;             /* General registers used */
-+  Elf32_Word  ri_cprmask[4];          /* Coprocessor registers used */
-+  Elf32_Sword ri_gp_value;            /* $gp register value */
-+} Elf32_RegInfo;
-+
-+/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
-+
-+typedef struct
-+{
-+  unsigned char kind;         /* Determines interpretation of the
-+                                 variable part of descriptor.  */
-+  unsigned char size;         /* Size of descriptor, including header.  */
-+  Elf32_Section section;      /* Section header index of section affected,
-+                                 0 for global options.  */
-+  Elf32_Word info;            /* Kind-specific information.  */
-+} Elf_Options;
-+
-+/* Values for `kind' field in Elf_Options.  */
-+
-+#define ODK_NULL      0       /* Undefined.  */
-+#define ODK_REGINFO   1       /* Register usage information.  */
-+#define ODK_EXCEPTIONS        2       /* Exception processing options.  */
-+#define ODK_PAD               3       /* Section padding options.  */
-+#define ODK_HWPATCH   4       /* Hardware workarounds performed */
-+#define ODK_FILL      5       /* record the fill value used by the linker. */
-+#define ODK_TAGS      6       /* reserve space for desktop tools to write. */
-+#define ODK_HWAND     7       /* HW workarounds.  'AND' bits when merging. */
-+#define ODK_HWOR      8       /* HW workarounds.  'OR' bits when merging.  */
-+
-+/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
-+
-+#define OEX_FPU_MIN   0x1f    /* FPE's which MUST be enabled.  */
-+#define OEX_FPU_MAX   0x1f00  /* FPE's which MAY be enabled.  */
-+#define OEX_PAGE0     0x10000 /* page zero must be mapped.  */
-+#define OEX_SMM               0x20000 /* Force sequential memory mode?  */
-+#define OEX_FPDBUG    0x40000 /* Force floating point debug mode?  */
-+#define OEX_PRECISEFP OEX_FPDBUG
-+#define OEX_DISMISS   0x80000 /* Dismiss invalid address faults?  */
-+
-+#define OEX_FPU_INVAL 0x10
-+#define OEX_FPU_DIV0  0x08
-+#define OEX_FPU_OFLO  0x04
-+#define OEX_FPU_UFLO  0x02
-+#define OEX_FPU_INEX  0x01
-+
-+/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
-+
-+#define OHW_R4KEOP    0x1     /* R4000 end-of-page patch.  */
-+#define OHW_R8KPFETCH 0x2     /* may need R8000 prefetch patch.  */
-+#define OHW_R5KEOP    0x4     /* R5000 end-of-page patch.  */
-+#define OHW_R5KCVTL   0x8     /* R5000 cvt.[ds].l bug.  clean=1.  */
-+
-+#define OPAD_PREFIX   0x1
-+#define OPAD_POSTFIX  0x2
-+#define OPAD_SYMBOL   0x4
-+
-+/* Entry found in `.options' section.  */
-+
-+typedef struct
-+{
-+  Elf32_Word hwp_flags1;      /* Extra flags.  */
-+  Elf32_Word hwp_flags2;      /* Extra flags.  */
-+} Elf_Options_Hw;
-+
-+/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
-+
-+#define OHWA0_R4KEOP_CHECKED  0x00000001
-+#define OHWA1_R4KEOP_CLEAN    0x00000002
-+
-+/* MIPS relocs.  */
-+
-+#define R_MIPS_NONE           0       /* No reloc */
-+#define R_MIPS_16             1       /* Direct 16 bit */
-+#define R_MIPS_32             2       /* Direct 32 bit */
-+#define R_MIPS_REL32          3       /* PC relative 32 bit */
-+#define R_MIPS_26             4       /* Direct 26 bit shifted */
-+#define R_MIPS_HI16           5       /* High 16 bit */
-+#define R_MIPS_LO16           6       /* Low 16 bit */
-+#define R_MIPS_GPREL16                7       /* GP relative 16 bit */
-+#define R_MIPS_LITERAL                8       /* 16 bit literal entry */
-+#define R_MIPS_GOT16          9       /* 16 bit GOT entry */
-+#define R_MIPS_PC16           10      /* PC relative 16 bit */
-+#define R_MIPS_CALL16         11      /* 16 bit GOT entry for function */
-+#define R_MIPS_GPREL32                12      /* GP relative 32 bit */
-+
-+#define R_MIPS_SHIFT5         16
-+#define R_MIPS_SHIFT6         17
-+#define R_MIPS_64             18
-+#define R_MIPS_GOT_DISP               19
-+#define R_MIPS_GOT_PAGE               20
-+#define R_MIPS_GOT_OFST               21
-+#define R_MIPS_GOT_HI16               22
-+#define R_MIPS_GOT_LO16               23
-+#define R_MIPS_SUB            24
-+#define R_MIPS_INSERT_A               25
-+#define R_MIPS_INSERT_B               26
-+#define R_MIPS_DELETE         27
-+#define R_MIPS_HIGHER         28
-+#define R_MIPS_HIGHEST                29
-+#define R_MIPS_CALL_HI16      30
-+#define R_MIPS_CALL_LO16      31
-+#define R_MIPS_SCN_DISP               32
-+#define R_MIPS_REL16          33
-+#define R_MIPS_ADD_IMMEDIATE  34
-+#define R_MIPS_PJUMP          35
-+#define R_MIPS_RELGOT         36
-+#define R_MIPS_JALR           37
-+#define R_MIPS_TLS_DTPMOD32   38      /* Module number 32 bit */
-+#define R_MIPS_TLS_DTPREL32   39      /* Module-relative offset 32 bit */
-+#define R_MIPS_TLS_DTPMOD64   40      /* Module number 64 bit */
-+#define R_MIPS_TLS_DTPREL64   41      /* Module-relative offset 64 bit */
-+#define R_MIPS_TLS_GD         42      /* 16 bit GOT offset for GD */
-+#define R_MIPS_TLS_LDM                43      /* 16 bit GOT offset for LDM */
-+#define R_MIPS_TLS_DTPREL_HI16        44      /* Module-relative offset, high 16 bits */
-+#define R_MIPS_TLS_DTPREL_LO16        45      /* Module-relative offset, low 16 bits */
-+#define R_MIPS_TLS_GOTTPREL   46      /* 16 bit GOT offset for IE */
-+#define R_MIPS_TLS_TPREL32    47      /* TP-relative offset, 32 bit */
-+#define R_MIPS_TLS_TPREL64    48      /* TP-relative offset, 64 bit */
-+#define R_MIPS_TLS_TPREL_HI16 49      /* TP-relative offset, high 16 bits */
-+#define R_MIPS_TLS_TPREL_LO16 50      /* TP-relative offset, low 16 bits */
-+#define R_MIPS_GLOB_DAT               51
-+#define R_MIPS_COPY           126
-+#define R_MIPS_JUMP_SLOT        127
-+/* Keep this the last entry.  */
-+#define R_MIPS_NUM            128
-+
-+/* Legal values for p_type field of Elf32_Phdr.  */
-+
-+#define PT_MIPS_REGINFO       0x70000000      /* Register usage information */
-+#define PT_MIPS_RTPROC  0x70000001    /* Runtime procedure table. */
-+#define PT_MIPS_OPTIONS 0x70000002
-+
-+/* Special program header types.  */
-+
-+#define PF_MIPS_LOCAL 0x10000000
-+
-+/* Legal values for d_tag field of Elf32_Dyn.  */
-+
-+#define DT_MIPS_RLD_VERSION  0x70000001       /* Runtime linker interface version */
-+#define DT_MIPS_TIME_STAMP   0x70000002       /* Timestamp */
-+#define DT_MIPS_ICHECKSUM    0x70000003       /* Checksum */
-+#define DT_MIPS_IVERSION     0x70000004       /* Version string (string tbl index) */
-+#define DT_MIPS_FLAGS      0x70000005 /* Flags */
-+#define DT_MIPS_BASE_ADDRESS 0x70000006       /* Base address */
-+#define DT_MIPS_MSYM       0x70000007
-+#define DT_MIPS_CONFLICT     0x70000008       /* Address of CONFLICT section */
-+#define DT_MIPS_LIBLIST            0x70000009 /* Address of LIBLIST section */
-+#define DT_MIPS_LOCAL_GOTNO  0x7000000a       /* Number of local GOT entries */
-+#define DT_MIPS_CONFLICTNO   0x7000000b       /* Number of CONFLICT entries */
-+#define DT_MIPS_LIBLISTNO    0x70000010       /* Number of LIBLIST entries */
-+#define DT_MIPS_SYMTABNO     0x70000011       /* Number of DYNSYM entries */
-+#define DT_MIPS_UNREFEXTNO   0x70000012       /* First external DYNSYM */
-+#define DT_MIPS_GOTSYM             0x70000013 /* First GOT entry in DYNSYM */
-+#define DT_MIPS_HIPAGENO     0x70000014       /* Number of GOT page table entries */
-+#define DT_MIPS_RLD_MAP            0x70000016 /* Address of run time loader map.  */
-+#define DT_MIPS_DELTA_CLASS  0x70000017       /* Delta C++ class definition.  */
-+#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
-+                                              DT_MIPS_DELTA_CLASS.  */
-+#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
-+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
-+                                              DT_MIPS_DELTA_INSTANCE.  */
-+#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
-+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
-+                                           DT_MIPS_DELTA_RELOC.  */
-+#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
-+                                         relocations refer to.  */
-+#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
-+                                         DT_MIPS_DELTA_SYM.  */
-+#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
-+                                           class declaration.  */
-+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
-+                                              DT_MIPS_DELTA_CLASSSYM.  */
-+#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
-+#define DT_MIPS_PIXIE_INIT   0x70000023
-+#define DT_MIPS_SYMBOL_LIB   0x70000024
-+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-+#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-+#define DT_MIPS_OPTIONS            0x70000029 /* Address of .options.  */
-+#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
-+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-+#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
-+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
-+                                                  function stored in GOT.  */
-+#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
-+                                         by rld on dlopen() calls.  */
-+#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
-+#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
-+#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
-+/* The address of .got.plt in an executable using the new non-PIC ABI.  */
-+#define DT_MIPS_PLTGOT             0x70000032
-+/* The base of the PLT in an executable using the new non-PIC ABI if that
-+   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
-+   value.  */
-+#define DT_MIPS_RWPLT        0x70000034
-+#define DT_MIPS_NUM        0x35
-+
-+/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
-+
-+#define RHF_NONE                 0            /* No flags */
-+#define RHF_QUICKSTART                   (1 << 0)     /* Use quickstart */
-+#define RHF_NOTPOT               (1 << 1)     /* Hash size not power of 2 */
-+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)   /* Ignore LD_LIBRARY_PATH */
-+#define RHF_NO_MOVE              (1 << 3)
-+#define RHF_SGI_ONLY             (1 << 4)
-+#define RHF_GUARANTEE_INIT       (1 << 5)
-+#define RHF_DELTA_C_PLUS_PLUS    (1 << 6)
-+#define RHF_GUARANTEE_START_INIT   (1 << 7)
-+#define RHF_PIXIE                (1 << 8)
-+#define RHF_DEFAULT_DELAY_LOAD           (1 << 9)
-+#define RHF_REQUICKSTART         (1 << 10)
-+#define RHF_REQUICKSTARTED       (1 << 11)
-+#define RHF_CORD                 (1 << 12)
-+#define RHF_NO_UNRES_UNDEF       (1 << 13)
-+#define RHF_RLD_ORDER_SAFE       (1 << 14)
-+
-+/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
-+
-+typedef struct
-+{
-+  Elf32_Word l_name;          /* Name (string table index) */
-+  Elf32_Word l_time_stamp;    /* Timestamp */
-+  Elf32_Word l_checksum;      /* Checksum */
-+  Elf32_Word l_version;               /* Interface version */
-+  Elf32_Word l_flags;         /* Flags */
-+} Elf32_Lib;
-+
-+typedef struct
-+{
-+  Elf64_Word l_name;          /* Name (string table index) */
-+  Elf64_Word l_time_stamp;    /* Timestamp */
-+  Elf64_Word l_checksum;      /* Checksum */
-+  Elf64_Word l_version;               /* Interface version */
-+  Elf64_Word l_flags;         /* Flags */
-+} Elf64_Lib;
-+
-+
-+/* Legal values for l_flags.  */
-+
-+#define LL_NONE                 0
-+#define LL_EXACT_MATCH          (1 << 0)      /* Require exact match */
-+#define LL_IGNORE_INT_VER (1 << 1)    /* Ignore interface version */
-+#define LL_REQUIRE_MINOR  (1 << 2)
-+#define LL_EXPORTS      (1 << 3)
-+#define LL_DELAY_LOAD   (1 << 4)
-+#define LL_DELTA        (1 << 5)
-+
-+/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
-+
-+typedef Elf32_Addr Elf32_Conflict;
-+
-+
-+/* HPPA specific definitions.  */
-+
-+/* Legal values for e_flags field of Elf32_Ehdr.  */
-+
-+#define EF_PARISC_TRAPNIL     0x00010000 /* Trap nil pointer dereference.  */
-+#define EF_PARISC_EXT         0x00020000 /* Program uses arch. extensions. */
-+#define EF_PARISC_LSB         0x00040000 /* Program expects little endian. */
-+#define EF_PARISC_WIDE                0x00080000 /* Program expects wide mode.  */
-+#define EF_PARISC_NO_KABP     0x00100000 /* No kernel assisted branch
-+                                            prediction.  */
-+#define EF_PARISC_LAZYSWAP    0x00400000 /* Allow lazy swapping.  */
-+#define EF_PARISC_ARCH                0x0000ffff /* Architecture version.  */
-+
-+/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
-+
-+#define EFA_PARISC_1_0                    0x020b /* PA-RISC 1.0 big-endian.  */
-+#define EFA_PARISC_1_1                    0x0210 /* PA-RISC 1.1 big-endian.  */
-+#define EFA_PARISC_2_0                    0x0214 /* PA-RISC 2.0 big-endian.  */
-+
-+/* Additional section indeces.  */
-+
-+#define SHN_PARISC_ANSI_COMMON        0xff00     /* Section for tenatively declared
-+                                            symbols in ANSI C.  */
-+#define SHN_PARISC_HUGE_COMMON        0xff01     /* Common blocks in huge model.  */
-+
-+/* Legal values for sh_type field of Elf32_Shdr.  */
-+
-+#define SHT_PARISC_EXT                0x70000000 /* Contains product specific ext. */
-+#define SHT_PARISC_UNWIND     0x70000001 /* Unwind information.  */
-+#define SHT_PARISC_DOC                0x70000002 /* Debug info for optimized code. */
-+
-+/* Legal values for sh_flags field of Elf32_Shdr.  */
-+
-+#define SHF_PARISC_SHORT      0x20000000 /* Section with short addressing. */
-+#define SHF_PARISC_HUGE               0x40000000 /* Section far from gp.  */
-+#define SHF_PARISC_SBP                0x80000000 /* Static branch prediction code. */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-+
-+#define STT_PARISC_MILLICODE  13      /* Millicode function entry point.  */
-+
-+#define STT_HP_OPAQUE         (STT_LOOS + 0x1)
-+#define STT_HP_STUB           (STT_LOOS + 0x2)
-+
-+/* HPPA relocs.  */
-+
-+#define R_PARISC_NONE         0       /* No reloc.  */
-+#define R_PARISC_DIR32                1       /* Direct 32-bit reference.  */
-+#define R_PARISC_DIR21L               2       /* Left 21 bits of eff. address.  */
-+#define R_PARISC_DIR17R               3       /* Right 17 bits of eff. address.  */
-+#define R_PARISC_DIR17F               4       /* 17 bits of eff. address.  */
-+#define R_PARISC_DIR14R               6       /* Right 14 bits of eff. address.  */
-+#define R_PARISC_PCREL32      9       /* 32-bit rel. address.  */
-+#define R_PARISC_PCREL21L     10      /* Left 21 bits of rel. address.  */
-+#define R_PARISC_PCREL17R     11      /* Right 17 bits of rel. address.  */
-+#define R_PARISC_PCREL17F     12      /* 17 bits of rel. address.  */
-+#define R_PARISC_PCREL14R     14      /* Right 14 bits of rel. address.  */
-+#define R_PARISC_DPREL21L     18      /* Left 21 bits of rel. address.  */
-+#define R_PARISC_DPREL14R     22      /* Right 14 bits of rel. address.  */
-+#define R_PARISC_GPREL21L     26      /* GP-relative, left 21 bits.  */
-+#define R_PARISC_GPREL14R     30      /* GP-relative, right 14 bits.  */
-+#define R_PARISC_LTOFF21L     34      /* LT-relative, left 21 bits.  */
-+#define R_PARISC_LTOFF14R     38      /* LT-relative, right 14 bits.  */
-+#define R_PARISC_SECREL32     41      /* 32 bits section rel. address.  */
-+#define R_PARISC_SEGBASE      48      /* No relocation, set segment base.  */
-+#define R_PARISC_SEGREL32     49      /* 32 bits segment rel. address.  */
-+#define R_PARISC_PLTOFF21L    50      /* PLT rel. address, left 21 bits.  */
-+#define R_PARISC_PLTOFF14R    54      /* PLT rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF_FPTR32 57      /* 32 bits LT-rel. function pointer. */
-+#define R_PARISC_LTOFF_FPTR21L        58      /* LT-rel. fct ptr, left 21 bits. */
-+#define R_PARISC_LTOFF_FPTR14R        62      /* LT-rel. fct ptr, right 14 bits. */
-+#define R_PARISC_FPTR64               64      /* 64 bits function address.  */
-+#define R_PARISC_PLABEL32     65      /* 32 bits function address.  */
-+#define R_PARISC_PLABEL21L    66      /* Left 21 bits of fdesc address.  */
-+#define R_PARISC_PLABEL14R    70      /* Right 14 bits of fdesc address.  */
-+#define R_PARISC_PCREL64      72      /* 64 bits PC-rel. address.  */
-+#define R_PARISC_PCREL22F     74      /* 22 bits PC-rel. address.  */
-+#define R_PARISC_PCREL14WR    75      /* PC-rel. address, right 14 bits.  */
-+#define R_PARISC_PCREL14DR    76      /* PC rel. address, right 14 bits.  */
-+#define R_PARISC_PCREL16F     77      /* 16 bits PC-rel. address.  */
-+#define R_PARISC_PCREL16WF    78      /* 16 bits PC-rel. address.  */
-+#define R_PARISC_PCREL16DF    79      /* 16 bits PC-rel. address.  */
-+#define R_PARISC_DIR64                80      /* 64 bits of eff. address.  */
-+#define R_PARISC_DIR14WR      83      /* 14 bits of eff. address.  */
-+#define R_PARISC_DIR14DR      84      /* 14 bits of eff. address.  */
-+#define R_PARISC_DIR16F               85      /* 16 bits of eff. address.  */
-+#define R_PARISC_DIR16WF      86      /* 16 bits of eff. address.  */
-+#define R_PARISC_DIR16DF      87      /* 16 bits of eff. address.  */
-+#define R_PARISC_GPREL64      88      /* 64 bits of GP-rel. address.  */
-+#define R_PARISC_GPREL14WR    91      /* GP-rel. address, right 14 bits.  */
-+#define R_PARISC_GPREL14DR    92      /* GP-rel. address, right 14 bits.  */
-+#define R_PARISC_GPREL16F     93      /* 16 bits GP-rel. address.  */
-+#define R_PARISC_GPREL16WF    94      /* 16 bits GP-rel. address.  */
-+#define R_PARISC_GPREL16DF    95      /* 16 bits GP-rel. address.  */
-+#define R_PARISC_LTOFF64      96      /* 64 bits LT-rel. address.  */
-+#define R_PARISC_LTOFF14WR    99      /* LT-rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF14DR    100     /* LT-rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF16F     101     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_LTOFF16WF    102     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_LTOFF16DF    103     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_SECREL64     104     /* 64 bits section rel. address.  */
-+#define R_PARISC_SEGREL64     112     /* 64 bits segment rel. address.  */
-+#define R_PARISC_PLTOFF14WR   115     /* PLT-rel. address, right 14 bits.  */
-+#define R_PARISC_PLTOFF14DR   116     /* PLT-rel. address, right 14 bits.  */
-+#define R_PARISC_PLTOFF16F    117     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_PLTOFF16WF   118     /* 16 bits PLT-rel. address.  */
-+#define R_PARISC_PLTOFF16DF   119     /* 16 bits PLT-rel. address.  */
-+#define R_PARISC_LTOFF_FPTR64 120     /* 64 bits LT-rel. function ptr.  */
-+#define R_PARISC_LTOFF_FPTR14WR       123     /* LT-rel. fct. ptr., right 14 bits. */
-+#define R_PARISC_LTOFF_FPTR14DR       124     /* LT-rel. fct. ptr., right 14 bits. */
-+#define R_PARISC_LTOFF_FPTR16F        125     /* 16 bits LT-rel. function ptr.  */
-+#define R_PARISC_LTOFF_FPTR16WF       126     /* 16 bits LT-rel. function ptr.  */
-+#define R_PARISC_LTOFF_FPTR16DF       127     /* 16 bits LT-rel. function ptr.  */
-+#define R_PARISC_LORESERVE    128
-+#define R_PARISC_COPY         128     /* Copy relocation.  */
-+#define R_PARISC_IPLT         129     /* Dynamic reloc, imported PLT */
-+#define R_PARISC_EPLT         130     /* Dynamic reloc, exported PLT */
-+#define R_PARISC_TPREL32      153     /* 32 bits TP-rel. address.  */
-+#define R_PARISC_TPREL21L     154     /* TP-rel. address, left 21 bits.  */
-+#define R_PARISC_TPREL14R     158     /* TP-rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF_TP21L  162     /* LT-TP-rel. address, left 21 bits. */
-+#define R_PARISC_LTOFF_TP14R  166     /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP14F  167     /* 14 bits LT-TP-rel. address.  */
-+#define R_PARISC_TPREL64      216     /* 64 bits TP-rel. address.  */
-+#define R_PARISC_TPREL14WR    219     /* TP-rel. address, right 14 bits.  */
-+#define R_PARISC_TPREL14DR    220     /* TP-rel. address, right 14 bits.  */
-+#define R_PARISC_TPREL16F     221     /* 16 bits TP-rel. address.  */
-+#define R_PARISC_TPREL16WF    222     /* 16 bits TP-rel. address.  */
-+#define R_PARISC_TPREL16DF    223     /* 16 bits TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP64   224     /* 64 bits LT-TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP14WR 227     /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP14DR 228     /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP16F  229     /* 16 bits LT-TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP16WF 230     /* 16 bits LT-TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP16DF 231     /* 16 bits LT-TP-rel. address.  */
-+#define R_PARISC_GNU_VTENTRY  232
-+#define R_PARISC_GNU_VTINHERIT        233
-+#define R_PARISC_TLS_GD21L    234     /* GD 21-bit left.  */
-+#define R_PARISC_TLS_GD14R    235     /* GD 14-bit right.  */
-+#define R_PARISC_TLS_GDCALL   236     /* GD call to __t_g_a.  */
-+#define R_PARISC_TLS_LDM21L   237     /* LD module 21-bit left.  */
-+#define R_PARISC_TLS_LDM14R   238     /* LD module 14-bit right.  */
-+#define R_PARISC_TLS_LDMCALL  239     /* LD module call to __t_g_a.  */
-+#define R_PARISC_TLS_LDO21L   240     /* LD offset 21-bit left.  */
-+#define R_PARISC_TLS_LDO14R   241     /* LD offset 14-bit right.  */
-+#define R_PARISC_TLS_DTPMOD32 242     /* DTP module 32-bit.  */
-+#define R_PARISC_TLS_DTPMOD64 243     /* DTP module 64-bit.  */
-+#define R_PARISC_TLS_DTPOFF32 244     /* DTP offset 32-bit.  */
-+#define R_PARISC_TLS_DTPOFF64 245     /* DTP offset 32-bit.  */
-+#define R_PARISC_TLS_LE21L    R_PARISC_TPREL21L
-+#define R_PARISC_TLS_LE14R    R_PARISC_TPREL14R
-+#define R_PARISC_TLS_IE21L    R_PARISC_LTOFF_TP21L
-+#define R_PARISC_TLS_IE14R    R_PARISC_LTOFF_TP14R
-+#define R_PARISC_TLS_TPREL32  R_PARISC_TPREL32
-+#define R_PARISC_TLS_TPREL64  R_PARISC_TPREL64
-+#define R_PARISC_HIRESERVE    255
-+
-+/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
-+
-+#define PT_HP_TLS             (PT_LOOS + 0x0)
-+#define PT_HP_CORE_NONE               (PT_LOOS + 0x1)
-+#define PT_HP_CORE_VERSION    (PT_LOOS + 0x2)
-+#define PT_HP_CORE_KERNEL     (PT_LOOS + 0x3)
-+#define PT_HP_CORE_COMM               (PT_LOOS + 0x4)
-+#define PT_HP_CORE_PROC               (PT_LOOS + 0x5)
-+#define PT_HP_CORE_LOADABLE   (PT_LOOS + 0x6)
-+#define PT_HP_CORE_STACK      (PT_LOOS + 0x7)
-+#define PT_HP_CORE_SHM                (PT_LOOS + 0x8)
-+#define PT_HP_CORE_MMF                (PT_LOOS + 0x9)
-+#define PT_HP_PARALLEL                (PT_LOOS + 0x10)
-+#define PT_HP_FASTBIND                (PT_LOOS + 0x11)
-+#define PT_HP_OPT_ANNOT               (PT_LOOS + 0x12)
-+#define PT_HP_HSL_ANNOT               (PT_LOOS + 0x13)
-+#define PT_HP_STACK           (PT_LOOS + 0x14)
-+
-+#define PT_PARISC_ARCHEXT     0x70000000
-+#define PT_PARISC_UNWIND      0x70000001
-+
-+/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
-+
-+#define PF_PARISC_SBP         0x08000000
-+
-+#define PF_HP_PAGE_SIZE               0x00100000
-+#define PF_HP_FAR_SHARED      0x00200000
-+#define PF_HP_NEAR_SHARED     0x00400000
-+#define PF_HP_CODE            0x01000000
-+#define PF_HP_MODIFY          0x02000000
-+#define PF_HP_LAZYSWAP                0x04000000
-+#define PF_HP_SBP             0x08000000
-+
-+
-+/* Alpha specific definitions.  */
-+
-+/* Legal values for e_flags field of Elf64_Ehdr.  */
-+
-+#define EF_ALPHA_32BIT                1       /* All addresses must be < 2GB.  */
-+#define EF_ALPHA_CANRELAX     2       /* Relocations for relaxing exist.  */
-+
-+/* Legal values for sh_type field of Elf64_Shdr.  */
-+
-+/* These two are primerily concerned with ECOFF debugging info.  */
-+#define SHT_ALPHA_DEBUG               0x70000001
-+#define SHT_ALPHA_REGINFO     0x70000002
-+
-+/* Legal values for sh_flags field of Elf64_Shdr.  */
-+
-+#define SHF_ALPHA_GPREL               0x10000000
-+
-+/* Legal values for st_other field of Elf64_Sym.  */
-+#define STO_ALPHA_NOPV                0x80    /* No PV required.  */
-+#define STO_ALPHA_STD_GPLOAD  0x88    /* PV only used for initial ldgp.  */
-+
-+/* Alpha relocs.  */
-+
-+#define R_ALPHA_NONE          0       /* No reloc */
-+#define R_ALPHA_REFLONG               1       /* Direct 32 bit */
-+#define R_ALPHA_REFQUAD               2       /* Direct 64 bit */
-+#define R_ALPHA_GPREL32               3       /* GP relative 32 bit */
-+#define R_ALPHA_LITERAL               4       /* GP relative 16 bit w/optimization */
-+#define R_ALPHA_LITUSE                5       /* Optimization hint for LITERAL */
-+#define R_ALPHA_GPDISP                6       /* Add displacement to GP */
-+#define R_ALPHA_BRADDR                7       /* PC+4 relative 23 bit shifted */
-+#define R_ALPHA_HINT          8       /* PC+4 relative 16 bit shifted */
-+#define R_ALPHA_SREL16                9       /* PC relative 16 bit */
-+#define R_ALPHA_SREL32                10      /* PC relative 32 bit */
-+#define R_ALPHA_SREL64                11      /* PC relative 64 bit */
-+#define R_ALPHA_GPRELHIGH     17      /* GP relative 32 bit, high 16 bits */
-+#define R_ALPHA_GPRELLOW      18      /* GP relative 32 bit, low 16 bits */
-+#define R_ALPHA_GPREL16               19      /* GP relative 16 bit */
-+#define R_ALPHA_COPY          24      /* Copy symbol at runtime */
-+#define R_ALPHA_GLOB_DAT      25      /* Create GOT entry */
-+#define R_ALPHA_JMP_SLOT      26      /* Create PLT entry */
-+#define R_ALPHA_RELATIVE      27      /* Adjust by program base */
-+#define R_ALPHA_TLS_GD_HI     28
-+#define R_ALPHA_TLSGD         29
-+#define R_ALPHA_TLS_LDM               30
-+#define R_ALPHA_DTPMOD64      31
-+#define R_ALPHA_GOTDTPREL     32
-+#define R_ALPHA_DTPREL64      33
-+#define R_ALPHA_DTPRELHI      34
-+#define R_ALPHA_DTPRELLO      35
-+#define R_ALPHA_DTPREL16      36
-+#define R_ALPHA_GOTTPREL      37
-+#define R_ALPHA_TPREL64               38
-+#define R_ALPHA_TPRELHI               39
-+#define R_ALPHA_TPRELLO               40
-+#define R_ALPHA_TPREL16               41
-+/* Keep this the last entry.  */
-+#define R_ALPHA_NUM           46
-+
-+/* Magic values of the LITUSE relocation addend.  */
-+#define LITUSE_ALPHA_ADDR     0
-+#define LITUSE_ALPHA_BASE     1
-+#define LITUSE_ALPHA_BYTOFF   2
-+#define LITUSE_ALPHA_JSR      3
-+#define LITUSE_ALPHA_TLS_GD   4
-+#define LITUSE_ALPHA_TLS_LDM  5
-+
-+/* Legal values for d_tag of Elf64_Dyn.  */
-+#define DT_ALPHA_PLTRO                (DT_LOPROC + 0)
-+#define DT_ALPHA_NUM          1
-+
-+/* PowerPC specific declarations */
-+
-+/* Values for Elf32/64_Ehdr.e_flags.  */
-+#define EF_PPC_EMB            0x80000000      /* PowerPC embedded flag */
-+
-+/* Cygnus local bits below */
-+#define EF_PPC_RELOCATABLE    0x00010000      /* PowerPC -mrelocatable flag*/
-+#define EF_PPC_RELOCATABLE_LIB        0x00008000      /* PowerPC -mrelocatable-lib
-+                                                 flag */
-+
-+/* PowerPC relocations defined by the ABIs */
-+#define R_PPC_NONE            0
-+#define R_PPC_ADDR32          1       /* 32bit absolute address */
-+#define R_PPC_ADDR24          2       /* 26bit address, 2 bits ignored.  */
-+#define R_PPC_ADDR16          3       /* 16bit absolute address */
-+#define R_PPC_ADDR16_LO               4       /* lower 16bit of absolute address */
-+#define R_PPC_ADDR16_HI               5       /* high 16bit of absolute address */
-+#define R_PPC_ADDR16_HA               6       /* adjusted high 16bit */
-+#define R_PPC_ADDR14          7       /* 16bit address, 2 bits ignored */
-+#define R_PPC_ADDR14_BRTAKEN  8
-+#define R_PPC_ADDR14_BRNTAKEN 9
-+#define R_PPC_REL24           10      /* PC relative 26 bit */
-+#define R_PPC_REL14           11      /* PC relative 16 bit */
-+#define R_PPC_REL14_BRTAKEN   12
-+#define R_PPC_REL14_BRNTAKEN  13
-+#define R_PPC_GOT16           14
-+#define R_PPC_GOT16_LO                15
-+#define R_PPC_GOT16_HI                16
-+#define R_PPC_GOT16_HA                17
-+#define R_PPC_PLTREL24                18
-+#define R_PPC_COPY            19
-+#define R_PPC_GLOB_DAT                20
-+#define R_PPC_JMP_SLOT                21
-+#define R_PPC_RELATIVE                22
-+#define R_PPC_LOCAL24PC               23
-+#define R_PPC_UADDR32         24
-+#define R_PPC_UADDR16         25
-+#define R_PPC_REL32           26
-+#define R_PPC_PLT32           27
-+#define R_PPC_PLTREL32                28
-+#define R_PPC_PLT16_LO                29
-+#define R_PPC_PLT16_HI                30
-+#define R_PPC_PLT16_HA                31
-+#define R_PPC_SDAREL16                32
-+#define R_PPC_SECTOFF         33
-+#define R_PPC_SECTOFF_LO      34
-+#define R_PPC_SECTOFF_HI      35
-+#define R_PPC_SECTOFF_HA      36
-+
-+/* PowerPC relocations defined for the TLS access ABI.  */
-+#define R_PPC_TLS             67 /* none      (sym+add)@tls */
-+#define R_PPC_DTPMOD32                68 /* word32    (sym+add)@dtpmod */
-+#define R_PPC_TPREL16         69 /* half16*   (sym+add)@tprel */
-+#define R_PPC_TPREL16_LO      70 /* half16    (sym+add)@tprel@l */
-+#define R_PPC_TPREL16_HI      71 /* half16    (sym+add)@tprel@h */
-+#define R_PPC_TPREL16_HA      72 /* half16    (sym+add)@tprel@ha */
-+#define R_PPC_TPREL32         73 /* word32    (sym+add)@tprel */
-+#define R_PPC_DTPREL16                74 /* half16*   (sym+add)@dtprel */
-+#define R_PPC_DTPREL16_LO     75 /* half16    (sym+add)@dtprel@l */
-+#define R_PPC_DTPREL16_HI     76 /* half16    (sym+add)@dtprel@h */
-+#define R_PPC_DTPREL16_HA     77 /* half16    (sym+add)@dtprel@ha */
-+#define R_PPC_DTPREL32                78 /* word32    (sym+add)@dtprel */
-+#define R_PPC_GOT_TLSGD16     79 /* half16*   (sym+add)@got@tlsgd */
-+#define R_PPC_GOT_TLSGD16_LO  80 /* half16    (sym+add)@got@tlsgd@l */
-+#define R_PPC_GOT_TLSGD16_HI  81 /* half16    (sym+add)@got@tlsgd@h */
-+#define R_PPC_GOT_TLSGD16_HA  82 /* half16    (sym+add)@got@tlsgd@ha */
-+#define R_PPC_GOT_TLSLD16     83 /* half16*   (sym+add)@got@tlsld */
-+#define R_PPC_GOT_TLSLD16_LO  84 /* half16    (sym+add)@got@tlsld@l */
-+#define R_PPC_GOT_TLSLD16_HI  85 /* half16    (sym+add)@got@tlsld@h */
-+#define R_PPC_GOT_TLSLD16_HA  86 /* half16    (sym+add)@got@tlsld@ha */
-+#define R_PPC_GOT_TPREL16     87 /* half16*   (sym+add)@got@tprel */
-+#define R_PPC_GOT_TPREL16_LO  88 /* half16    (sym+add)@got@tprel@l */
-+#define R_PPC_GOT_TPREL16_HI  89 /* half16    (sym+add)@got@tprel@h */
-+#define R_PPC_GOT_TPREL16_HA  90 /* half16    (sym+add)@got@tprel@ha */
-+#define R_PPC_GOT_DTPREL16    91 /* half16*   (sym+add)@got@dtprel */
-+#define R_PPC_GOT_DTPREL16_LO 92 /* half16*   (sym+add)@got@dtprel@l */
-+#define R_PPC_GOT_DTPREL16_HI 93 /* half16*   (sym+add)@got@dtprel@h */
-+#define R_PPC_GOT_DTPREL16_HA 94 /* half16*   (sym+add)@got@dtprel@ha */
-+
-+/* The remaining relocs are from the Embedded ELF ABI, and are not
-+   in the SVR4 ELF ABI.  */
-+#define R_PPC_EMB_NADDR32     101
-+#define R_PPC_EMB_NADDR16     102
-+#define R_PPC_EMB_NADDR16_LO  103
-+#define R_PPC_EMB_NADDR16_HI  104
-+#define R_PPC_EMB_NADDR16_HA  105
-+#define R_PPC_EMB_SDAI16      106
-+#define R_PPC_EMB_SDA2I16     107
-+#define R_PPC_EMB_SDA2REL     108
-+#define R_PPC_EMB_SDA21               109     /* 16 bit offset in SDA */
-+#define R_PPC_EMB_MRKREF      110
-+#define R_PPC_EMB_RELSEC16    111
-+#define R_PPC_EMB_RELST_LO    112
-+#define R_PPC_EMB_RELST_HI    113
-+#define R_PPC_EMB_RELST_HA    114
-+#define R_PPC_EMB_BIT_FLD     115
-+#define R_PPC_EMB_RELSDA      116     /* 16 bit relative offset in SDA */
-+
-+/* Diab tool relocations.  */
-+#define R_PPC_DIAB_SDA21_LO   180     /* like EMB_SDA21, but lower 16 bit */
-+#define R_PPC_DIAB_SDA21_HI   181     /* like EMB_SDA21, but high 16 bit */
-+#define R_PPC_DIAB_SDA21_HA   182     /* like EMB_SDA21, adjusted high 16 */
-+#define R_PPC_DIAB_RELSDA_LO  183     /* like EMB_RELSDA, but lower 16 bit */
-+#define R_PPC_DIAB_RELSDA_HI  184     /* like EMB_RELSDA, but high 16 bit */
-+#define R_PPC_DIAB_RELSDA_HA  185     /* like EMB_RELSDA, adjusted high 16 */
-+
-+/* GNU extension to support local ifunc.  */
-+#define R_PPC_IRELATIVE               248
-+
-+/* GNU relocs used in PIC code sequences.  */
-+#define R_PPC_REL16           249     /* half16   (sym+add-.) */
-+#define R_PPC_REL16_LO                250     /* half16   (sym+add-.)@l */
-+#define R_PPC_REL16_HI                251     /* half16   (sym+add-.)@h */
-+#define R_PPC_REL16_HA                252     /* half16   (sym+add-.)@ha */
-+
-+/* This is a phony reloc to handle any old fashioned TOC16 references
-+   that may still be in object files.  */
-+#define R_PPC_TOC16           255
-+
-+/* PowerPC specific values for the Dyn d_tag field.  */
-+#define DT_PPC_GOT            (DT_LOPROC + 0)
-+#define DT_PPC_NUM            1
-+
-+/* PowerPC64 relocations defined by the ABIs */
-+#define R_PPC64_NONE          R_PPC_NONE
-+#define R_PPC64_ADDR32                R_PPC_ADDR32 /* 32bit absolute address */
-+#define R_PPC64_ADDR24                R_PPC_ADDR24 /* 26bit address, word aligned */
-+#define R_PPC64_ADDR16                R_PPC_ADDR16 /* 16bit absolute address */
-+#define R_PPC64_ADDR16_LO     R_PPC_ADDR16_LO /* lower 16bits of address */
-+#define R_PPC64_ADDR16_HI     R_PPC_ADDR16_HI /* high 16bits of address. */
-+#define R_PPC64_ADDR16_HA     R_PPC_ADDR16_HA /* adjusted high 16bits.  */
-+#define R_PPC64_ADDR14                R_PPC_ADDR14 /* 16bit address, word aligned */
-+#define R_PPC64_ADDR14_BRTAKEN        R_PPC_ADDR14_BRTAKEN
-+#define R_PPC64_ADDR14_BRNTAKEN       R_PPC_ADDR14_BRNTAKEN
-+#define R_PPC64_REL24         R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
-+#define R_PPC64_REL14         R_PPC_REL14 /* PC relative 16 bit */
-+#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
-+#define R_PPC64_REL14_BRNTAKEN        R_PPC_REL14_BRNTAKEN
-+#define R_PPC64_GOT16         R_PPC_GOT16
-+#define R_PPC64_GOT16_LO      R_PPC_GOT16_LO
-+#define R_PPC64_GOT16_HI      R_PPC_GOT16_HI
-+#define R_PPC64_GOT16_HA      R_PPC_GOT16_HA
-+
-+#define R_PPC64_COPY          R_PPC_COPY
-+#define R_PPC64_GLOB_DAT      R_PPC_GLOB_DAT
-+#define R_PPC64_JMP_SLOT      R_PPC_JMP_SLOT
-+#define R_PPC64_RELATIVE      R_PPC_RELATIVE
-+
-+#define R_PPC64_UADDR32               R_PPC_UADDR32
-+#define R_PPC64_UADDR16               R_PPC_UADDR16
-+#define R_PPC64_REL32         R_PPC_REL32
-+#define R_PPC64_PLT32         R_PPC_PLT32
-+#define R_PPC64_PLTREL32      R_PPC_PLTREL32
-+#define R_PPC64_PLT16_LO      R_PPC_PLT16_LO
-+#define R_PPC64_PLT16_HI      R_PPC_PLT16_HI
-+#define R_PPC64_PLT16_HA      R_PPC_PLT16_HA
-+
-+#define R_PPC64_SECTOFF               R_PPC_SECTOFF
-+#define R_PPC64_SECTOFF_LO    R_PPC_SECTOFF_LO
-+#define R_PPC64_SECTOFF_HI    R_PPC_SECTOFF_HI
-+#define R_PPC64_SECTOFF_HA    R_PPC_SECTOFF_HA
-+#define R_PPC64_ADDR30                37 /* word30 (S + A - P) >> 2 */
-+#define R_PPC64_ADDR64                38 /* doubleword64 S + A */
-+#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A) */
-+#define R_PPC64_ADDR16_HIGHERA        40 /* half16 #highera(S + A) */
-+#define R_PPC64_ADDR16_HIGHEST        41 /* half16 #highest(S + A) */
-+#define R_PPC64_ADDR16_HIGHESTA       42 /* half16 #highesta(S + A) */
-+#define R_PPC64_UADDR64               43 /* doubleword64 S + A */
-+#define R_PPC64_REL64         44 /* doubleword64 S + A - P */
-+#define R_PPC64_PLT64         45 /* doubleword64 L + A */
-+#define R_PPC64_PLTREL64      46 /* doubleword64 L + A - P */
-+#define R_PPC64_TOC16         47 /* half16* S + A - .TOC */
-+#define R_PPC64_TOC16_LO      48 /* half16 #lo(S + A - .TOC.) */
-+#define R_PPC64_TOC16_HI      49 /* half16 #hi(S + A - .TOC.) */
-+#define R_PPC64_TOC16_HA      50 /* half16 #ha(S + A - .TOC.) */
-+#define R_PPC64_TOC           51 /* doubleword64 .TOC */
-+#define R_PPC64_PLTGOT16      52 /* half16* M + A */
-+#define R_PPC64_PLTGOT16_LO   53 /* half16 #lo(M + A) */
-+#define R_PPC64_PLTGOT16_HI   54 /* half16 #hi(M + A) */
-+#define R_PPC64_PLTGOT16_HA   55 /* half16 #ha(M + A) */
-+
-+#define R_PPC64_ADDR16_DS     56 /* half16ds* (S + A) >> 2 */
-+#define R_PPC64_ADDR16_LO_DS  57 /* half16ds  #lo(S + A) >> 2 */
-+#define R_PPC64_GOT16_DS      58 /* half16ds* (G + A) >> 2 */
-+#define R_PPC64_GOT16_LO_DS   59 /* half16ds  #lo(G + A) >> 2 */
-+#define R_PPC64_PLT16_LO_DS   60 /* half16ds  #lo(L + A) >> 2 */
-+#define R_PPC64_SECTOFF_DS    61 /* half16ds* (R + A) >> 2 */
-+#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds  #lo(R + A) >> 2 */
-+#define R_PPC64_TOC16_DS      63 /* half16ds* (S + A - .TOC.) >> 2 */
-+#define R_PPC64_TOC16_LO_DS   64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
-+#define R_PPC64_PLTGOT16_DS   65 /* half16ds* (M + A) >> 2 */
-+#define R_PPC64_PLTGOT16_LO_DS        66 /* half16ds  #lo(M + A) >> 2 */
-+
-+/* PowerPC64 relocations defined for the TLS access ABI.  */
-+#define R_PPC64_TLS           67 /* none      (sym+add)@tls */
-+#define R_PPC64_DTPMOD64      68 /* doubleword64 (sym+add)@dtpmod */
-+#define R_PPC64_TPREL16               69 /* half16*   (sym+add)@tprel */
-+#define R_PPC64_TPREL16_LO    70 /* half16    (sym+add)@tprel@l */
-+#define R_PPC64_TPREL16_HI    71 /* half16    (sym+add)@tprel@h */
-+#define R_PPC64_TPREL16_HA    72 /* half16    (sym+add)@tprel@ha */
-+#define R_PPC64_TPREL64               73 /* doubleword64 (sym+add)@tprel */
-+#define R_PPC64_DTPREL16      74 /* half16*   (sym+add)@dtprel */
-+#define R_PPC64_DTPREL16_LO   75 /* half16    (sym+add)@dtprel@l */
-+#define R_PPC64_DTPREL16_HI   76 /* half16    (sym+add)@dtprel@h */
-+#define R_PPC64_DTPREL16_HA   77 /* half16    (sym+add)@dtprel@ha */
-+#define R_PPC64_DTPREL64      78 /* doubleword64 (sym+add)@dtprel */
-+#define R_PPC64_GOT_TLSGD16   79 /* half16*   (sym+add)@got@tlsgd */
-+#define R_PPC64_GOT_TLSGD16_LO        80 /* half16    (sym+add)@got@tlsgd@l */
-+#define R_PPC64_GOT_TLSGD16_HI        81 /* half16    (sym+add)@got@tlsgd@h */
-+#define R_PPC64_GOT_TLSGD16_HA        82 /* half16    (sym+add)@got@tlsgd@ha */
-+#define R_PPC64_GOT_TLSLD16   83 /* half16*   (sym+add)@got@tlsld */
-+#define R_PPC64_GOT_TLSLD16_LO        84 /* half16    (sym+add)@got@tlsld@l */
-+#define R_PPC64_GOT_TLSLD16_HI        85 /* half16    (sym+add)@got@tlsld@h */
-+#define R_PPC64_GOT_TLSLD16_HA        86 /* half16    (sym+add)@got@tlsld@ha */
-+#define R_PPC64_GOT_TPREL16_DS        87 /* half16ds* (sym+add)@got@tprel */
-+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
-+#define R_PPC64_GOT_TPREL16_HI        89 /* half16    (sym+add)@got@tprel@h */
-+#define R_PPC64_GOT_TPREL16_HA        90 /* half16    (sym+add)@got@tprel@ha */
-+#define R_PPC64_GOT_DTPREL16_DS       91 /* half16ds* (sym+add)@got@dtprel */
-+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
-+#define R_PPC64_GOT_DTPREL16_HI       93 /* half16    (sym+add)@got@dtprel@h */
-+#define R_PPC64_GOT_DTPREL16_HA       94 /* half16    (sym+add)@got@dtprel@ha */
-+#define R_PPC64_TPREL16_DS    95 /* half16ds* (sym+add)@tprel */
-+#define R_PPC64_TPREL16_LO_DS 96 /* half16ds  (sym+add)@tprel@l */
-+#define R_PPC64_TPREL16_HIGHER        97 /* half16    (sym+add)@tprel@higher */
-+#define R_PPC64_TPREL16_HIGHERA       98 /* half16    (sym+add)@tprel@highera */
-+#define R_PPC64_TPREL16_HIGHEST       99 /* half16    (sym+add)@tprel@highest */
-+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16        (sym+add)@tprel@highesta */
-+#define R_PPC64_DTPREL16_DS   101 /* half16ds* (sym+add)@dtprel */
-+#define R_PPC64_DTPREL16_LO_DS        102 /* half16ds (sym+add)@dtprel@l */
-+#define R_PPC64_DTPREL16_HIGHER       103 /* half16   (sym+add)@dtprel@higher */
-+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16        (sym+add)@dtprel@highera */
-+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16        (sym+add)@dtprel@highest */
-+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16       (sym+add)@dtprel@highesta */
-+
-+/* GNU extension to support local ifunc.  */
-+#define R_PPC64_JMP_IREL      247
-+#define R_PPC64_IRELATIVE     248
-+#define R_PPC64_REL16         249     /* half16   (sym+add-.) */
-+#define R_PPC64_REL16_LO      250     /* half16   (sym+add-.)@l */
-+#define R_PPC64_REL16_HI      251     /* half16   (sym+add-.)@h */
-+#define R_PPC64_REL16_HA      252     /* half16   (sym+add-.)@ha */
-+
-+/* PowerPC64 specific values for the Dyn d_tag field.  */
-+#define DT_PPC64_GLINK  (DT_LOPROC + 0)
-+#define DT_PPC64_OPD  (DT_LOPROC + 1)
-+#define DT_PPC64_OPDSZ        (DT_LOPROC + 2)
-+#define DT_PPC64_NUM    3
-+
-+
-+/* ARM specific declarations */
-+
-+/* Processor specific flags for the ELF header e_flags field.  */
-+#define EF_ARM_RELEXEC                0x01
-+#define EF_ARM_HASENTRY               0x02
-+#define EF_ARM_INTERWORK      0x04
-+#define EF_ARM_APCS_26                0x08
-+#define EF_ARM_APCS_FLOAT     0x10
-+#define EF_ARM_PIC            0x20
-+#define EF_ARM_ALIGN8         0x40 /* 8-bit structure alignment is in use */
-+#define EF_ARM_NEW_ABI                0x80
-+#define EF_ARM_OLD_ABI                0x100
-+#define EF_ARM_SOFT_FLOAT     0x200
-+#define EF_ARM_VFP_FLOAT      0x400
-+#define EF_ARM_MAVERICK_FLOAT 0x800
-+
-+
-+/* Other constants defined in the ARM ELF spec. version B-01.  */
-+/* NB. These conflict with values defined above.  */
-+#define EF_ARM_SYMSARESORTED  0x04
-+#define EF_ARM_DYNSYMSUSESEGIDX       0x08
-+#define EF_ARM_MAPSYMSFIRST   0x10
-+#define EF_ARM_EABIMASK               0XFF000000
-+
-+/* Constants defined in AAELF.  */
-+#define EF_ARM_BE8        0x00800000
-+#define EF_ARM_LE8        0x00400000
-+
-+#define EF_ARM_EABI_VERSION(flags)    ((flags) & EF_ARM_EABIMASK)
-+#define EF_ARM_EABI_UNKNOWN   0x00000000
-+#define EF_ARM_EABI_VER1      0x01000000
-+#define EF_ARM_EABI_VER2      0x02000000
-+#define EF_ARM_EABI_VER3      0x03000000
-+#define EF_ARM_EABI_VER4      0x04000000
-+#define EF_ARM_EABI_VER5      0x05000000
-+
-+/* Additional symbol types for Thumb.  */
-+#define STT_ARM_TFUNC         STT_LOPROC /* A Thumb function.  */
-+#define STT_ARM_16BIT         STT_HIPROC /* A Thumb label.  */
-+
-+/* ARM-specific values for sh_flags */
-+#define SHF_ARM_ENTRYSECT     0x10000000 /* Section contains an entry point */
-+#define SHF_ARM_COMDEF                0x80000000 /* Section may be multiply defined
-+                                            in the input to a link step.  */
-+
-+/* ARM-specific program header flags */
-+#define PF_ARM_SB             0x10000000 /* Segment contains the location
-+                                            addressed by the static base. */
-+#define PF_ARM_PI             0x20000000 /* Position-independent segment.  */
-+#define PF_ARM_ABS            0x40000000 /* Absolute segment.  */
-+
-+/* Processor specific values for the Phdr p_type field.  */
-+#define PT_ARM_EXIDX          (PT_LOPROC + 1) /* ARM unwind segment.  */
-+
-+/* Processor specific values for the Shdr sh_type field.  */
-+#define SHT_ARM_EXIDX         (SHT_LOPROC + 1) /* ARM unwind section.  */
-+#define SHT_ARM_PREEMPTMAP    (SHT_LOPROC + 2) /* Preemption details.  */
-+#define SHT_ARM_ATTRIBUTES    (SHT_LOPROC + 3) /* ARM attributes section.  */
-+
-+
-+/* ARM relocs.  */
-+
-+#define R_ARM_NONE            0       /* No reloc */
-+#define R_ARM_PC24            1       /* PC relative 26 bit branch */
-+#define R_ARM_ABS32           2       /* Direct 32 bit  */
-+#define R_ARM_REL32           3       /* PC relative 32 bit */
-+#define R_ARM_PC13            4
-+#define R_ARM_ABS16           5       /* Direct 16 bit */
-+#define R_ARM_ABS12           6       /* Direct 12 bit */
-+#define R_ARM_THM_ABS5                7
-+#define R_ARM_ABS8            8       /* Direct 8 bit */
-+#define R_ARM_SBREL32         9
-+#define R_ARM_THM_PC22                10
-+#define R_ARM_THM_PC8         11
-+#define R_ARM_AMP_VCALL9      12
-+#define R_ARM_SWI24           13      /* Obsolete static relocation.  */
-+#define R_ARM_TLS_DESC                13      /* Dynamic relocation.  */
-+#define R_ARM_THM_SWI8                14
-+#define R_ARM_XPC25           15
-+#define R_ARM_THM_XPC22               16
-+#define R_ARM_TLS_DTPMOD32    17      /* ID of module containing symbol */
-+#define R_ARM_TLS_DTPOFF32    18      /* Offset in TLS block */
-+#define R_ARM_TLS_TPOFF32     19      /* Offset in static TLS block */
-+#define R_ARM_COPY            20      /* Copy symbol at runtime */
-+#define R_ARM_GLOB_DAT                21      /* Create GOT entry */
-+#define R_ARM_JUMP_SLOT               22      /* Create PLT entry */
-+#define R_ARM_RELATIVE                23      /* Adjust by program base */
-+#define R_ARM_GOTOFF          24      /* 32 bit offset to GOT */
-+#define R_ARM_GOTPC           25      /* 32 bit PC relative offset to GOT */
-+#define R_ARM_GOT32           26      /* 32 bit GOT entry */
-+#define R_ARM_PLT32           27      /* 32 bit PLT address */
-+#define R_ARM_ALU_PCREL_7_0   32
-+#define R_ARM_ALU_PCREL_15_8  33
-+#define R_ARM_ALU_PCREL_23_15 34
-+#define R_ARM_LDR_SBREL_11_0  35
-+#define R_ARM_ALU_SBREL_19_12 36
-+#define R_ARM_ALU_SBREL_27_20 37
-+#define R_ARM_TLS_GOTDESC     90
-+#define R_ARM_TLS_CALL                91
-+#define R_ARM_TLS_DESCSEQ     92
-+#define R_ARM_THM_TLS_CALL    93
-+#define R_ARM_GNU_VTENTRY     100
-+#define R_ARM_GNU_VTINHERIT   101
-+#define R_ARM_THM_PC11                102     /* thumb unconditional branch */
-+#define R_ARM_THM_PC9         103     /* thumb conditional branch */
-+#define R_ARM_TLS_GD32                104     /* PC-rel 32 bit for global dynamic
-+                                         thread local data */
-+#define R_ARM_TLS_LDM32               105     /* PC-rel 32 bit for local dynamic
-+                                         thread local data */
-+#define R_ARM_TLS_LDO32               106     /* 32 bit offset relative to TLS
-+                                         block */
-+#define R_ARM_TLS_IE32                107     /* PC-rel 32 bit for GOT entry of
-+                                         static TLS block offset */
-+#define R_ARM_TLS_LE32                108     /* 32 bit offset relative to static
-+                                         TLS block */
-+#define       R_ARM_THM_TLS_DESCSEQ   129
-+#define R_ARM_IRELATIVE               160
-+#define R_ARM_RXPC25          249
-+#define R_ARM_RSBREL32                250
-+#define R_ARM_THM_RPC22               251
-+#define R_ARM_RREL32          252
-+#define R_ARM_RABS22          253
-+#define R_ARM_RPC24           254
-+#define R_ARM_RBASE           255
-+/* Keep this the last entry.  */
-+#define R_ARM_NUM             256
-+
-+/* IA-64 specific declarations.  */
-+
-+/* Processor specific flags for the Ehdr e_flags field.  */
-+#define EF_IA_64_MASKOS               0x0000000f      /* os-specific flags */
-+#define EF_IA_64_ABI64                0x00000010      /* 64-bit ABI */
-+#define EF_IA_64_ARCH         0xff000000      /* arch. version mask */
-+
-+/* Processor specific values for the Phdr p_type field.  */
-+#define PT_IA_64_ARCHEXT      (PT_LOPROC + 0) /* arch extension bits */
-+#define PT_IA_64_UNWIND               (PT_LOPROC + 1) /* ia64 unwind bits */
-+#define PT_IA_64_HP_OPT_ANOT  (PT_LOOS + 0x12)
-+#define PT_IA_64_HP_HSL_ANOT  (PT_LOOS + 0x13)
-+#define PT_IA_64_HP_STACK     (PT_LOOS + 0x14)
-+
-+/* Processor specific flags for the Phdr p_flags field.  */
-+#define PF_IA_64_NORECOV      0x80000000      /* spec insns w/o recovery */
-+
-+/* Processor specific values for the Shdr sh_type field.  */
-+#define SHT_IA_64_EXT         (SHT_LOPROC + 0) /* extension bits */
-+#define SHT_IA_64_UNWIND      (SHT_LOPROC + 1) /* unwind bits */
-+
-+/* Processor specific flags for the Shdr sh_flags field.  */
-+#define SHF_IA_64_SHORT               0x10000000      /* section near gp */
-+#define SHF_IA_64_NORECOV     0x20000000      /* spec insns w/o recovery */
-+
-+/* Processor specific values for the Dyn d_tag field.  */
-+#define DT_IA_64_PLT_RESERVE  (DT_LOPROC + 0)
-+#define DT_IA_64_NUM          1
-+
-+/* IA-64 relocations.  */
-+#define R_IA64_NONE           0x00    /* none */
-+#define R_IA64_IMM14          0x21    /* symbol + addend, add imm14 */
-+#define R_IA64_IMM22          0x22    /* symbol + addend, add imm22 */
-+#define R_IA64_IMM64          0x23    /* symbol + addend, mov imm64 */
-+#define R_IA64_DIR32MSB               0x24    /* symbol + addend, data4 MSB */
-+#define R_IA64_DIR32LSB               0x25    /* symbol + addend, data4 LSB */
-+#define R_IA64_DIR64MSB               0x26    /* symbol + addend, data8 MSB */
-+#define R_IA64_DIR64LSB               0x27    /* symbol + addend, data8 LSB */
-+#define R_IA64_GPREL22                0x2a    /* @gprel(sym + add), add imm22 */
-+#define R_IA64_GPREL64I               0x2b    /* @gprel(sym + add), mov imm64 */
-+#define R_IA64_GPREL32MSB     0x2c    /* @gprel(sym + add), data4 MSB */
-+#define R_IA64_GPREL32LSB     0x2d    /* @gprel(sym + add), data4 LSB */
-+#define R_IA64_GPREL64MSB     0x2e    /* @gprel(sym + add), data8 MSB */
-+#define R_IA64_GPREL64LSB     0x2f    /* @gprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF22                0x32    /* @ltoff(sym + add), add imm22 */
-+#define R_IA64_LTOFF64I               0x33    /* @ltoff(sym + add), mov imm64 */
-+#define R_IA64_PLTOFF22               0x3a    /* @pltoff(sym + add), add imm22 */
-+#define R_IA64_PLTOFF64I      0x3b    /* @pltoff(sym + add), mov imm64 */
-+#define R_IA64_PLTOFF64MSB    0x3e    /* @pltoff(sym + add), data8 MSB */
-+#define R_IA64_PLTOFF64LSB    0x3f    /* @pltoff(sym + add), data8 LSB */
-+#define R_IA64_FPTR64I                0x43    /* @fptr(sym + add), mov imm64 */
-+#define R_IA64_FPTR32MSB      0x44    /* @fptr(sym + add), data4 MSB */
-+#define R_IA64_FPTR32LSB      0x45    /* @fptr(sym + add), data4 LSB */
-+#define R_IA64_FPTR64MSB      0x46    /* @fptr(sym + add), data8 MSB */
-+#define R_IA64_FPTR64LSB      0x47    /* @fptr(sym + add), data8 LSB */
-+#define R_IA64_PCREL60B               0x48    /* @pcrel(sym + add), brl */
-+#define R_IA64_PCREL21B               0x49    /* @pcrel(sym + add), ptb, call */
-+#define R_IA64_PCREL21M               0x4a    /* @pcrel(sym + add), chk.s */
-+#define R_IA64_PCREL21F               0x4b    /* @pcrel(sym + add), fchkf */
-+#define R_IA64_PCREL32MSB     0x4c    /* @pcrel(sym + add), data4 MSB */
-+#define R_IA64_PCREL32LSB     0x4d    /* @pcrel(sym + add), data4 LSB */
-+#define R_IA64_PCREL64MSB     0x4e    /* @pcrel(sym + add), data8 MSB */
-+#define R_IA64_PCREL64LSB     0x4f    /* @pcrel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_FPTR22   0x52    /* @ltoff(@fptr(s+a)), imm22 */
-+#define R_IA64_LTOFF_FPTR64I  0x53    /* @ltoff(@fptr(s+a)), imm64 */
-+#define R_IA64_LTOFF_FPTR32MSB        0x54    /* @ltoff(@fptr(s+a)), data4 MSB */
-+#define R_IA64_LTOFF_FPTR32LSB        0x55    /* @ltoff(@fptr(s+a)), data4 LSB */
-+#define R_IA64_LTOFF_FPTR64MSB        0x56    /* @ltoff(@fptr(s+a)), data8 MSB */
-+#define R_IA64_LTOFF_FPTR64LSB        0x57    /* @ltoff(@fptr(s+a)), data8 LSB */
-+#define R_IA64_SEGREL32MSB    0x5c    /* @segrel(sym + add), data4 MSB */
-+#define R_IA64_SEGREL32LSB    0x5d    /* @segrel(sym + add), data4 LSB */
-+#define R_IA64_SEGREL64MSB    0x5e    /* @segrel(sym + add), data8 MSB */
-+#define R_IA64_SEGREL64LSB    0x5f    /* @segrel(sym + add), data8 LSB */
-+#define R_IA64_SECREL32MSB    0x64    /* @secrel(sym + add), data4 MSB */
-+#define R_IA64_SECREL32LSB    0x65    /* @secrel(sym + add), data4 LSB */
-+#define R_IA64_SECREL64MSB    0x66    /* @secrel(sym + add), data8 MSB */
-+#define R_IA64_SECREL64LSB    0x67    /* @secrel(sym + add), data8 LSB */
-+#define R_IA64_REL32MSB               0x6c    /* data 4 + REL */
-+#define R_IA64_REL32LSB               0x6d    /* data 4 + REL */
-+#define R_IA64_REL64MSB               0x6e    /* data 8 + REL */
-+#define R_IA64_REL64LSB               0x6f    /* data 8 + REL */
-+#define R_IA64_LTV32MSB               0x74    /* symbol + addend, data4 MSB */
-+#define R_IA64_LTV32LSB               0x75    /* symbol + addend, data4 LSB */
-+#define R_IA64_LTV64MSB               0x76    /* symbol + addend, data8 MSB */
-+#define R_IA64_LTV64LSB               0x77    /* symbol + addend, data8 LSB */
-+#define R_IA64_PCREL21BI      0x79    /* @pcrel(sym + add), 21bit inst */
-+#define R_IA64_PCREL22                0x7a    /* @pcrel(sym + add), 22bit inst */
-+#define R_IA64_PCREL64I               0x7b    /* @pcrel(sym + add), 64bit inst */
-+#define R_IA64_IPLTMSB                0x80    /* dynamic reloc, imported PLT, MSB */
-+#define R_IA64_IPLTLSB                0x81    /* dynamic reloc, imported PLT, LSB */
-+#define R_IA64_COPY           0x84    /* copy relocation */
-+#define R_IA64_SUB            0x85    /* Addend and symbol difference */
-+#define R_IA64_LTOFF22X               0x86    /* LTOFF22, relaxable.  */
-+#define R_IA64_LDXMOV         0x87    /* Use of LTOFF22X.  */
-+#define R_IA64_TPREL14                0x91    /* @tprel(sym + add), imm14 */
-+#define R_IA64_TPREL22                0x92    /* @tprel(sym + add), imm22 */
-+#define R_IA64_TPREL64I               0x93    /* @tprel(sym + add), imm64 */
-+#define R_IA64_TPREL64MSB     0x96    /* @tprel(sym + add), data8 MSB */
-+#define R_IA64_TPREL64LSB     0x97    /* @tprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_TPREL22  0x9a    /* @ltoff(@tprel(s+a)), imm2 */
-+#define R_IA64_DTPMOD64MSB    0xa6    /* @dtpmod(sym + add), data8 MSB */
-+#define R_IA64_DTPMOD64LSB    0xa7    /* @dtpmod(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_DTPMOD22 0xaa    /* @ltoff(@dtpmod(sym + add)), imm22 */
-+#define R_IA64_DTPREL14               0xb1    /* @dtprel(sym + add), imm14 */
-+#define R_IA64_DTPREL22               0xb2    /* @dtprel(sym + add), imm22 */
-+#define R_IA64_DTPREL64I      0xb3    /* @dtprel(sym + add), imm64 */
-+#define R_IA64_DTPREL32MSB    0xb4    /* @dtprel(sym + add), data4 MSB */
-+#define R_IA64_DTPREL32LSB    0xb5    /* @dtprel(sym + add), data4 LSB */
-+#define R_IA64_DTPREL64MSB    0xb6    /* @dtprel(sym + add), data8 MSB */
-+#define R_IA64_DTPREL64LSB    0xb7    /* @dtprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_DTPREL22 0xba    /* @ltoff(@dtprel(s+a)), imm22 */
-+
-+/* SH specific declarations */
-+
-+/* Processor specific flags for the ELF header e_flags field.  */
-+#define EF_SH_MACH_MASK               0x1f
-+#define EF_SH_UNKNOWN         0x0
-+#define EF_SH1                        0x1
-+#define EF_SH2                        0x2
-+#define EF_SH3                        0x3
-+#define EF_SH_DSP             0x4
-+#define EF_SH3_DSP            0x5
-+#define EF_SH4AL_DSP          0x6
-+#define EF_SH3E                       0x8
-+#define EF_SH4                        0x9
-+#define EF_SH2E                       0xb
-+#define EF_SH4A                       0xc
-+#define EF_SH2A                       0xd
-+#define EF_SH4_NOFPU          0x10
-+#define EF_SH4A_NOFPU         0x11
-+#define EF_SH4_NOMMU_NOFPU    0x12
-+#define EF_SH2A_NOFPU         0x13
-+#define EF_SH3_NOMMU          0x14
-+#define EF_SH2A_SH4_NOFPU     0x15
-+#define EF_SH2A_SH3_NOFPU     0x16
-+#define EF_SH2A_SH4           0x17
-+#define EF_SH2A_SH3E          0x18
-+
-+/* SH relocs.  */
-+#define       R_SH_NONE               0
-+#define       R_SH_DIR32              1
-+#define       R_SH_REL32              2
-+#define       R_SH_DIR8WPN            3
-+#define       R_SH_IND12W             4
-+#define       R_SH_DIR8WPL            5
-+#define       R_SH_DIR8WPZ            6
-+#define       R_SH_DIR8BP             7
-+#define       R_SH_DIR8W              8
-+#define       R_SH_DIR8L              9
-+#define       R_SH_SWITCH16           25
-+#define       R_SH_SWITCH32           26
-+#define       R_SH_USES               27
-+#define       R_SH_COUNT              28
-+#define       R_SH_ALIGN              29
-+#define       R_SH_CODE               30
-+#define       R_SH_DATA               31
-+#define       R_SH_LABEL              32
-+#define       R_SH_SWITCH8            33
-+#define       R_SH_GNU_VTINHERIT      34
-+#define       R_SH_GNU_VTENTRY        35
-+#define       R_SH_TLS_GD_32          144
-+#define       R_SH_TLS_LD_32          145
-+#define       R_SH_TLS_LDO_32         146
-+#define       R_SH_TLS_IE_32          147
-+#define       R_SH_TLS_LE_32          148
-+#define       R_SH_TLS_DTPMOD32       149
-+#define       R_SH_TLS_DTPOFF32       150
-+#define       R_SH_TLS_TPOFF32        151
-+#define       R_SH_GOT32              160
-+#define       R_SH_PLT32              161
-+#define       R_SH_COPY               162
-+#define       R_SH_GLOB_DAT           163
-+#define       R_SH_JMP_SLOT           164
-+#define       R_SH_RELATIVE           165
-+#define       R_SH_GOTOFF             166
-+#define       R_SH_GOTPC              167
-+/* Keep this the last entry.  */
-+#define       R_SH_NUM                256
-+
-+/* S/390 specific definitions.  */
-+
-+/* Valid values for the e_flags field.  */
-+
-+#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
-+
-+/* Additional s390 relocs */
-+
-+#define R_390_NONE            0       /* No reloc.  */
-+#define R_390_8                       1       /* Direct 8 bit.  */
-+#define R_390_12              2       /* Direct 12 bit.  */
-+#define R_390_16              3       /* Direct 16 bit.  */
-+#define R_390_32              4       /* Direct 32 bit.  */
-+#define R_390_PC32            5       /* PC relative 32 bit.  */
-+#define R_390_GOT12           6       /* 12 bit GOT offset.  */
-+#define R_390_GOT32           7       /* 32 bit GOT offset.  */
-+#define R_390_PLT32           8       /* 32 bit PC relative PLT address.  */
-+#define R_390_COPY            9       /* Copy symbol at runtime.  */
-+#define R_390_GLOB_DAT                10      /* Create GOT entry.  */
-+#define R_390_JMP_SLOT                11      /* Create PLT entry.  */
-+#define R_390_RELATIVE                12      /* Adjust by program base.  */
-+#define R_390_GOTOFF32                13      /* 32 bit offset to GOT.         */
-+#define R_390_GOTPC           14      /* 32 bit PC relative offset to GOT.  */
-+#define R_390_GOT16           15      /* 16 bit GOT offset.  */
-+#define R_390_PC16            16      /* PC relative 16 bit.  */
-+#define R_390_PC16DBL         17      /* PC relative 16 bit shifted by 1.  */
-+#define R_390_PLT16DBL                18      /* 16 bit PC rel. PLT shifted by 1.  */
-+#define R_390_PC32DBL         19      /* PC relative 32 bit shifted by 1.  */
-+#define R_390_PLT32DBL                20      /* 32 bit PC rel. PLT shifted by 1.  */
-+#define R_390_GOTPCDBL                21      /* 32 bit PC rel. GOT shifted by 1.  */
-+#define R_390_64              22      /* Direct 64 bit.  */
-+#define R_390_PC64            23      /* PC relative 64 bit.  */
-+#define R_390_GOT64           24      /* 64 bit GOT offset.  */
-+#define R_390_PLT64           25      /* 64 bit PC relative PLT address.  */
-+#define R_390_GOTENT          26      /* 32 bit PC rel. to GOT entry >> 1. */
-+#define R_390_GOTOFF16                27      /* 16 bit offset to GOT. */
-+#define R_390_GOTOFF64                28      /* 64 bit offset to GOT. */
-+#define R_390_GOTPLT12                29      /* 12 bit offset to jump slot.  */
-+#define R_390_GOTPLT16                30      /* 16 bit offset to jump slot.  */
-+#define R_390_GOTPLT32                31      /* 32 bit offset to jump slot.  */
-+#define R_390_GOTPLT64                32      /* 64 bit offset to jump slot.  */
-+#define R_390_GOTPLTENT               33      /* 32 bit rel. offset to jump slot.  */
-+#define R_390_PLTOFF16                34      /* 16 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF32                35      /* 32 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF64                36      /* 16 bit offset from GOT to PLT. */
-+#define R_390_TLS_LOAD                37      /* Tag for load insn in TLS code.  */
-+#define R_390_TLS_GDCALL      38      /* Tag for function call in general
-+                                         dynamic TLS code. */
-+#define R_390_TLS_LDCALL      39      /* Tag for function call in local
-+                                         dynamic TLS code. */
-+#define R_390_TLS_GD32                40      /* Direct 32 bit for general dynamic
-+                                         thread local data.  */
-+#define R_390_TLS_GD64                41      /* Direct 64 bit for general dynamic
-+                                        thread local data.  */
-+#define R_390_TLS_GOTIE12     42      /* 12 bit GOT offset for static TLS
-+                                         block offset.  */
-+#define R_390_TLS_GOTIE32     43      /* 32 bit GOT offset for static TLS
-+                                         block offset.  */
-+#define R_390_TLS_GOTIE64     44      /* 64 bit GOT offset for static TLS
-+                                         block offset. */
-+#define R_390_TLS_LDM32               45      /* Direct 32 bit for local dynamic
-+                                         thread local data in LE code.  */
-+#define R_390_TLS_LDM64               46      /* Direct 64 bit for local dynamic
-+                                         thread local data in LE code.  */
-+#define R_390_TLS_IE32                47      /* 32 bit address of GOT entry for
-+                                         negated static TLS block offset.  */
-+#define R_390_TLS_IE64                48      /* 64 bit address of GOT entry for
-+                                         negated static TLS block offset.  */
-+#define R_390_TLS_IEENT               49      /* 32 bit rel. offset to GOT entry for
-+                                         negated static TLS block offset.  */
-+#define R_390_TLS_LE32                50      /* 32 bit negated offset relative to
-+                                         static TLS block.  */
-+#define R_390_TLS_LE64                51      /* 64 bit negated offset relative to
-+                                         static TLS block.  */
-+#define R_390_TLS_LDO32               52      /* 32 bit offset relative to TLS
-+                                         block.  */
-+#define R_390_TLS_LDO64               53      /* 64 bit offset relative to TLS
-+                                         block.  */
-+#define R_390_TLS_DTPMOD      54      /* ID of module containing symbol.  */
-+#define R_390_TLS_DTPOFF      55      /* Offset in TLS block.  */
-+#define R_390_TLS_TPOFF               56      /* Negated offset in static TLS
-+                                         block.  */
-+#define R_390_20              57      /* Direct 20 bit.  */
-+#define R_390_GOT20           58      /* 20 bit GOT offset.  */
-+#define R_390_GOTPLT20                59      /* 20 bit offset to jump slot.  */
-+#define R_390_TLS_GOTIE20     60      /* 20 bit GOT offset for static TLS
-+                                         block offset.  */
-+#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
-+/* Keep this the last entry.  */
-+#define R_390_NUM             62
-+
-+
-+/* CRIS relocations.  */
-+#define R_CRIS_NONE           0
-+#define R_CRIS_8              1
-+#define R_CRIS_16             2
-+#define R_CRIS_32             3
-+#define R_CRIS_8_PCREL                4
-+#define R_CRIS_16_PCREL               5
-+#define R_CRIS_32_PCREL               6
-+#define R_CRIS_GNU_VTINHERIT  7
-+#define R_CRIS_GNU_VTENTRY    8
-+#define R_CRIS_COPY           9
-+#define R_CRIS_GLOB_DAT               10
-+#define R_CRIS_JUMP_SLOT      11
-+#define R_CRIS_RELATIVE               12
-+#define R_CRIS_16_GOT         13
-+#define R_CRIS_32_GOT         14
-+#define R_CRIS_16_GOTPLT      15
-+#define R_CRIS_32_GOTPLT      16
-+#define R_CRIS_32_GOTREL      17
-+#define R_CRIS_32_PLT_GOTREL  18
-+#define R_CRIS_32_PLT_PCREL   19
-+
-+#define R_CRIS_NUM            20
-+
-+
-+/* AMD x86-64 relocations.  */
-+#define R_X86_64_NONE         0       /* No reloc */
-+#define R_X86_64_64           1       /* Direct 64 bit  */
-+#define R_X86_64_PC32         2       /* PC relative 32 bit signed */
-+#define R_X86_64_GOT32                3       /* 32 bit GOT entry */
-+#define R_X86_64_PLT32                4       /* 32 bit PLT address */
-+#define R_X86_64_COPY         5       /* Copy symbol at runtime */
-+#define R_X86_64_GLOB_DAT     6       /* Create GOT entry */
-+#define R_X86_64_JUMP_SLOT    7       /* Create PLT entry */
-+#define R_X86_64_RELATIVE     8       /* Adjust by program base */
-+#define R_X86_64_GOTPCREL     9       /* 32 bit signed PC relative
-+                                         offset to GOT */
-+#define R_X86_64_32           10      /* Direct 32 bit zero extended */
-+#define R_X86_64_32S          11      /* Direct 32 bit sign extended */
-+#define R_X86_64_16           12      /* Direct 16 bit zero extended */
-+#define R_X86_64_PC16         13      /* 16 bit sign extended pc relative */
-+#define R_X86_64_8            14      /* Direct 8 bit sign extended  */
-+#define R_X86_64_PC8          15      /* 8 bit sign extended pc relative */
-+#define R_X86_64_DTPMOD64     16      /* ID of module containing symbol */
-+#define R_X86_64_DTPOFF64     17      /* Offset in module's TLS block */
-+#define R_X86_64_TPOFF64      18      /* Offset in initial TLS block */
-+#define R_X86_64_TLSGD                19      /* 32 bit signed PC relative offset
-+                                         to two GOT entries for GD symbol */
-+#define R_X86_64_TLSLD                20      /* 32 bit signed PC relative offset
-+                                         to two GOT entries for LD symbol */
-+#define R_X86_64_DTPOFF32     21      /* Offset in TLS block */
-+#define R_X86_64_GOTTPOFF     22      /* 32 bit signed PC relative offset
-+                                         to GOT entry for IE symbol */
-+#define R_X86_64_TPOFF32      23      /* Offset in initial TLS block */
-+#define R_X86_64_PC64         24      /* PC relative 64 bit */
-+#define R_X86_64_GOTOFF64     25      /* 64 bit offset to GOT */
-+#define R_X86_64_GOTPC32      26      /* 32 bit signed pc relative
-+                                         offset to GOT */
-+#define R_X86_64_GOT64                27      /* 64-bit GOT entry offset */
-+#define R_X86_64_GOTPCREL64   28      /* 64-bit PC relative offset
-+                                         to GOT entry */
-+#define R_X86_64_GOTPC64      29      /* 64-bit PC relative offset to GOT */
-+#define R_X86_64_GOTPLT64     30      /* like GOT64, says PLT entry needed */
-+#define R_X86_64_PLTOFF64     31      /* 64-bit GOT relative offset
-+                                         to PLT entry */
-+#define R_X86_64_SIZE32               32      /* Size of symbol plus 32-bit addend */
-+#define R_X86_64_SIZE64               33      /* Size of symbol plus 64-bit addend */
-+#define R_X86_64_GOTPC32_TLSDESC 34   /* GOT offset for TLS descriptor.  */
-+#define R_X86_64_TLSDESC_CALL   35    /* Marker for call through TLS
-+                                         descriptor.  */
-+#define R_X86_64_TLSDESC        36    /* TLS descriptor.  */
-+#define R_X86_64_IRELATIVE    37      /* Adjust indirectly by program base */
-+#define R_X86_64_RELATIVE64   38      /* 64-bit adjust by program base */
-+
-+#define R_X86_64_NUM          39
-+
-+
-+/* AM33 relocations.  */
-+#define R_MN10300_NONE                0       /* No reloc.  */
-+#define R_MN10300_32          1       /* Direct 32 bit.  */
-+#define R_MN10300_16          2       /* Direct 16 bit.  */
-+#define R_MN10300_8           3       /* Direct 8 bit.  */
-+#define R_MN10300_PCREL32     4       /* PC-relative 32-bit.  */
-+#define R_MN10300_PCREL16     5       /* PC-relative 16-bit signed.  */
-+#define R_MN10300_PCREL8      6       /* PC-relative 8-bit signed.  */
-+#define R_MN10300_GNU_VTINHERIT       7       /* Ancient C++ vtable garbage... */
-+#define R_MN10300_GNU_VTENTRY 8       /* ... collection annotation.  */
-+#define R_MN10300_24          9       /* Direct 24 bit.  */
-+#define R_MN10300_GOTPC32     10      /* 32-bit PCrel offset to GOT.  */
-+#define R_MN10300_GOTPC16     11      /* 16-bit PCrel offset to GOT.  */
-+#define R_MN10300_GOTOFF32    12      /* 32-bit offset from GOT.  */
-+#define R_MN10300_GOTOFF24    13      /* 24-bit offset from GOT.  */
-+#define R_MN10300_GOTOFF16    14      /* 16-bit offset from GOT.  */
-+#define R_MN10300_PLT32               15      /* 32-bit PCrel to PLT entry.  */
-+#define R_MN10300_PLT16               16      /* 16-bit PCrel to PLT entry.  */
-+#define R_MN10300_GOT32               17      /* 32-bit offset to GOT entry.  */
-+#define R_MN10300_GOT24               18      /* 24-bit offset to GOT entry.  */
-+#define R_MN10300_GOT16               19      /* 16-bit offset to GOT entry.  */
-+#define R_MN10300_COPY                20      /* Copy symbol at runtime.  */
-+#define R_MN10300_GLOB_DAT    21      /* Create GOT entry.  */
-+#define R_MN10300_JMP_SLOT    22      /* Create PLT entry.  */
-+#define R_MN10300_RELATIVE    23      /* Adjust by program base.  */
-+
-+#define R_MN10300_NUM         24
-+
-+
-+/* M32R relocs.  */
-+#define R_M32R_NONE           0       /* No reloc. */
-+#define R_M32R_16             1       /* Direct 16 bit. */
-+#define R_M32R_32             2       /* Direct 32 bit. */
-+#define R_M32R_24             3       /* Direct 24 bit. */
-+#define R_M32R_10_PCREL               4       /* PC relative 10 bit shifted. */
-+#define R_M32R_18_PCREL               5       /* PC relative 18 bit shifted. */
-+#define R_M32R_26_PCREL               6       /* PC relative 26 bit shifted. */
-+#define R_M32R_HI16_ULO               7       /* High 16 bit with unsigned low. */
-+#define R_M32R_HI16_SLO               8       /* High 16 bit with signed low. */
-+#define R_M32R_LO16           9       /* Low 16 bit. */
-+#define R_M32R_SDA16          10      /* 16 bit offset in SDA. */
-+#define R_M32R_GNU_VTINHERIT  11
-+#define R_M32R_GNU_VTENTRY    12
-+/* M32R relocs use SHT_RELA.  */
-+#define R_M32R_16_RELA                33      /* Direct 16 bit. */
-+#define R_M32R_32_RELA                34      /* Direct 32 bit. */
-+#define R_M32R_24_RELA                35      /* Direct 24 bit. */
-+#define R_M32R_10_PCREL_RELA  36      /* PC relative 10 bit shifted. */
-+#define R_M32R_18_PCREL_RELA  37      /* PC relative 18 bit shifted. */
-+#define R_M32R_26_PCREL_RELA  38      /* PC relative 26 bit shifted. */
-+#define R_M32R_HI16_ULO_RELA  39      /* High 16 bit with unsigned low */
-+#define R_M32R_HI16_SLO_RELA  40      /* High 16 bit with signed low */
-+#define R_M32R_LO16_RELA      41      /* Low 16 bit */
-+#define R_M32R_SDA16_RELA     42      /* 16 bit offset in SDA */
-+#define R_M32R_RELA_GNU_VTINHERIT     43
-+#define R_M32R_RELA_GNU_VTENTRY       44
-+#define R_M32R_REL32          45      /* PC relative 32 bit.  */
-+
-+#define R_M32R_GOT24          48      /* 24 bit GOT entry */
-+#define R_M32R_26_PLTREL      49      /* 26 bit PC relative to PLT shifted */
-+#define R_M32R_COPY           50      /* Copy symbol at runtime */
-+#define R_M32R_GLOB_DAT               51      /* Create GOT entry */
-+#define R_M32R_JMP_SLOT               52      /* Create PLT entry */
-+#define R_M32R_RELATIVE               53      /* Adjust by program base */
-+#define R_M32R_GOTOFF         54      /* 24 bit offset to GOT */
-+#define R_M32R_GOTPC24                55      /* 24 bit PC relative offset to GOT */
-+#define R_M32R_GOT16_HI_ULO   56      /* High 16 bit GOT entry with unsigned
-+                                         low */
-+#define R_M32R_GOT16_HI_SLO   57      /* High 16 bit GOT entry with signed
-+                                         low */
-+#define R_M32R_GOT16_LO               58      /* Low 16 bit GOT entry */
-+#define R_M32R_GOTPC_HI_ULO   59      /* High 16 bit PC relative offset to
-+                                         GOT with unsigned low */
-+#define R_M32R_GOTPC_HI_SLO   60      /* High 16 bit PC relative offset to
-+                                         GOT with signed low */
-+#define R_M32R_GOTPC_LO               61      /* Low 16 bit PC relative offset to
-+                                         GOT */
-+#define R_M32R_GOTOFF_HI_ULO  62      /* High 16 bit offset to GOT
-+                                         with unsigned low */
-+#define R_M32R_GOTOFF_HI_SLO  63      /* High 16 bit offset to GOT
-+                                         with signed low */
-+#define R_M32R_GOTOFF_LO      64      /* Low 16 bit offset to GOT */
-+#define R_M32R_NUM            256     /* Keep this the last entry. */
-+
-+
-+/* TILEPro relocations.  */
-+#define R_TILEPRO_NONE                0       /* No reloc */
-+#define R_TILEPRO_32          1       /* Direct 32 bit */
-+#define R_TILEPRO_16          2       /* Direct 16 bit */
-+#define R_TILEPRO_8           3       /* Direct 8 bit */
-+#define R_TILEPRO_32_PCREL    4       /* PC relative 32 bit */
-+#define R_TILEPRO_16_PCREL    5       /* PC relative 16 bit */
-+#define R_TILEPRO_8_PCREL     6       /* PC relative 8 bit */
-+#define R_TILEPRO_LO16                7       /* Low 16 bit */
-+#define R_TILEPRO_HI16                8       /* High 16 bit */
-+#define R_TILEPRO_HA16                9       /* High 16 bit, adjusted */
-+#define R_TILEPRO_COPY                10      /* Copy relocation */
-+#define R_TILEPRO_GLOB_DAT    11      /* Create GOT entry */
-+#define R_TILEPRO_JMP_SLOT    12      /* Create PLT entry */
-+#define R_TILEPRO_RELATIVE    13      /* Adjust by program base */
-+#define R_TILEPRO_BROFF_X1    14      /* X1 pipe branch offset */
-+#define R_TILEPRO_JOFFLONG_X1 15      /* X1 pipe jump offset */
-+#define R_TILEPRO_JOFFLONG_X1_PLT 16  /* X1 pipe jump offset to PLT */
-+#define R_TILEPRO_IMM8_X0     17      /* X0 pipe 8-bit */
-+#define R_TILEPRO_IMM8_Y0     18      /* Y0 pipe 8-bit */
-+#define R_TILEPRO_IMM8_X1     19      /* X1 pipe 8-bit */
-+#define R_TILEPRO_IMM8_Y1     20      /* Y1 pipe 8-bit */
-+#define R_TILEPRO_MT_IMM15_X1 21      /* X1 pipe mtspr */
-+#define R_TILEPRO_MF_IMM15_X1 22      /* X1 pipe mfspr */
-+#define R_TILEPRO_IMM16_X0    23      /* X0 pipe 16-bit */
-+#define R_TILEPRO_IMM16_X1    24      /* X1 pipe 16-bit */
-+#define R_TILEPRO_IMM16_X0_LO 25      /* X0 pipe low 16-bit */
-+#define R_TILEPRO_IMM16_X1_LO 26      /* X1 pipe low 16-bit */
-+#define R_TILEPRO_IMM16_X0_HI 27      /* X0 pipe high 16-bit */
-+#define R_TILEPRO_IMM16_X1_HI 28      /* X1 pipe high 16-bit */
-+#define R_TILEPRO_IMM16_X0_HA 29      /* X0 pipe high 16-bit, adjusted */
-+#define R_TILEPRO_IMM16_X1_HA 30      /* X1 pipe high 16-bit, adjusted */
-+#define R_TILEPRO_IMM16_X0_PCREL 31   /* X0 pipe PC relative 16 bit */
-+#define R_TILEPRO_IMM16_X1_PCREL 32   /* X1 pipe PC relative 16 bit */
-+#define R_TILEPRO_IMM16_X0_LO_PCREL 33        /* X0 pipe PC relative low 16 bit */
-+#define R_TILEPRO_IMM16_X1_LO_PCREL 34        /* X1 pipe PC relative low 16 bit */
-+#define R_TILEPRO_IMM16_X0_HI_PCREL 35        /* X0 pipe PC relative high 16 bit */
-+#define R_TILEPRO_IMM16_X1_HI_PCREL 36        /* X1 pipe PC relative high 16 bit */
-+#define R_TILEPRO_IMM16_X0_HA_PCREL 37        /* X0 pipe PC relative ha() 16 bit */
-+#define R_TILEPRO_IMM16_X1_HA_PCREL 38        /* X1 pipe PC relative ha() 16 bit */
-+#define R_TILEPRO_IMM16_X0_GOT        39      /* X0 pipe 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT        40      /* X1 pipe 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X0_GOT_LO 41  /* X0 pipe low 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT_LO 42  /* X1 pipe low 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X0_GOT_HI 43  /* X0 pipe high 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT_HI 44  /* X1 pipe high 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X0_GOT_HA 45  /* X0 pipe ha() 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT_HA 46  /* X1 pipe ha() 16-bit GOT offset */
-+#define R_TILEPRO_MMSTART_X0  47      /* X0 pipe mm "start" */
-+#define R_TILEPRO_MMEND_X0    48      /* X0 pipe mm "end" */
-+#define R_TILEPRO_MMSTART_X1  49      /* X1 pipe mm "start" */
-+#define R_TILEPRO_MMEND_X1    50      /* X1 pipe mm "end" */
-+#define R_TILEPRO_SHAMT_X0    51      /* X0 pipe shift amount */
-+#define R_TILEPRO_SHAMT_X1    52      /* X1 pipe shift amount */
-+#define R_TILEPRO_SHAMT_Y0    53      /* Y0 pipe shift amount */
-+#define R_TILEPRO_SHAMT_Y1    54      /* Y1 pipe shift amount */
-+#define R_TILEPRO_DEST_IMM8_X1        55      /* X1 pipe destination 8-bit */
-+/* Relocs 56-59 are currently not defined.  */
-+#define R_TILEPRO_TLS_GD_CALL 60      /* "jal" for TLS GD */
-+#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61       /* X0 pipe "addi" for TLS GD */
-+#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62       /* X1 pipe "addi" for TLS GD */
-+#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63       /* Y0 pipe "addi" for TLS GD */
-+#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64       /* Y1 pipe "addi" for TLS GD */
-+#define R_TILEPRO_TLS_IE_LOAD 65      /* "lw_tls" for TLS IE */
-+#define R_TILEPRO_IMM16_X0_TLS_GD 66  /* X0 pipe 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD 67  /* X1 pipe 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68       /* X0 pipe low 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69       /* X1 pipe low 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70       /* X0 pipe high 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71       /* X1 pipe high 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72       /* X0 pipe ha() 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73       /* X1 pipe ha() 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE 74  /* X0 pipe 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE 75  /* X1 pipe 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76       /* X0 pipe low 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77       /* X1 pipe low 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78       /* X0 pipe high 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79       /* X1 pipe high 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80       /* X0 pipe ha() 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81       /* X1 pipe ha() 16-bit TLS IE offset */
-+#define R_TILEPRO_TLS_DTPMOD32        82      /* ID of module containing symbol */
-+#define R_TILEPRO_TLS_DTPOFF32        83      /* Offset in TLS block */
-+#define R_TILEPRO_TLS_TPOFF32 84      /* Offset in static TLS block */
-+#define R_TILEPRO_IMM16_X0_TLS_LE 85  /* X0 pipe 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE 86  /* X1 pipe 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87       /* X0 pipe low 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88       /* X1 pipe low 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89       /* X0 pipe high 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90       /* X1 pipe high 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91       /* X0 pipe ha() 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92       /* X1 pipe ha() 16-bit TLS LE offset */
-+
-+#define R_TILEPRO_GNU_VTINHERIT       128     /* GNU C++ vtable hierarchy */
-+#define R_TILEPRO_GNU_VTENTRY 129     /* GNU C++ vtable member usage */
-+
-+#define R_TILEPRO_NUM         130
-+
-+
-+/* TILE-Gx relocations.  */
-+#define R_TILEGX_NONE         0       /* No reloc */
-+#define R_TILEGX_64           1       /* Direct 64 bit */
-+#define R_TILEGX_32           2       /* Direct 32 bit */
-+#define R_TILEGX_16           3       /* Direct 16 bit */
-+#define R_TILEGX_8            4       /* Direct 8 bit */
-+#define R_TILEGX_64_PCREL     5       /* PC relative 64 bit */
-+#define R_TILEGX_32_PCREL     6       /* PC relative 32 bit */
-+#define R_TILEGX_16_PCREL     7       /* PC relative 16 bit */
-+#define R_TILEGX_8_PCREL      8       /* PC relative 8 bit */
-+#define R_TILEGX_HW0          9       /* hword 0 16-bit */
-+#define R_TILEGX_HW1          10      /* hword 1 16-bit */
-+#define R_TILEGX_HW2          11      /* hword 2 16-bit */
-+#define R_TILEGX_HW3          12      /* hword 3 16-bit */
-+#define R_TILEGX_HW0_LAST     13      /* last hword 0 16-bit */
-+#define R_TILEGX_HW1_LAST     14      /* last hword 1 16-bit */
-+#define R_TILEGX_HW2_LAST     15      /* last hword 2 16-bit */
-+#define R_TILEGX_COPY         16      /* Copy relocation */
-+#define R_TILEGX_GLOB_DAT     17      /* Create GOT entry */
-+#define R_TILEGX_JMP_SLOT     18      /* Create PLT entry */
-+#define R_TILEGX_RELATIVE     19      /* Adjust by program base */
-+#define R_TILEGX_BROFF_X1     20      /* X1 pipe branch offset */
-+#define R_TILEGX_JUMPOFF_X1   21      /* X1 pipe jump offset */
-+#define R_TILEGX_JUMPOFF_X1_PLT       22      /* X1 pipe jump offset to PLT */
-+#define R_TILEGX_IMM8_X0      23      /* X0 pipe 8-bit */
-+#define R_TILEGX_IMM8_Y0      24      /* Y0 pipe 8-bit */
-+#define R_TILEGX_IMM8_X1      25      /* X1 pipe 8-bit */
-+#define R_TILEGX_IMM8_Y1      26      /* Y1 pipe 8-bit */
-+#define R_TILEGX_DEST_IMM8_X1 27      /* X1 pipe destination 8-bit */
-+#define R_TILEGX_MT_IMM14_X1  28      /* X1 pipe mtspr */
-+#define R_TILEGX_MF_IMM14_X1  29      /* X1 pipe mfspr */
-+#define R_TILEGX_MMSTART_X0   30      /* X0 pipe mm "start" */
-+#define R_TILEGX_MMEND_X0     31      /* X0 pipe mm "end" */
-+#define R_TILEGX_SHAMT_X0     32      /* X0 pipe shift amount */
-+#define R_TILEGX_SHAMT_X1     33      /* X1 pipe shift amount */
-+#define R_TILEGX_SHAMT_Y0     34      /* Y0 pipe shift amount */
-+#define R_TILEGX_SHAMT_Y1     35      /* Y1 pipe shift amount */
-+#define R_TILEGX_IMM16_X0_HW0 36      /* X0 pipe hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0 37      /* X1 pipe hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1 38      /* X0 pipe hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1 39      /* X1 pipe hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2 40      /* X0 pipe hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2 41      /* X1 pipe hword 2 */
-+#define R_TILEGX_IMM16_X0_HW3 42      /* X0 pipe hword 3 */
-+#define R_TILEGX_IMM16_X1_HW3 43      /* X1 pipe hword 3 */
-+#define R_TILEGX_IMM16_X0_HW0_LAST 44 /* X0 pipe last hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0_LAST 45 /* X1 pipe last hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1_LAST 46 /* X0 pipe last hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1_LAST 47 /* X1 pipe last hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2_LAST 48 /* X0 pipe last hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2_LAST 49 /* X1 pipe last hword 2 */
-+#define R_TILEGX_IMM16_X0_HW0_PCREL 50        /* X0 pipe PC relative hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0_PCREL 51        /* X1 pipe PC relative hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1_PCREL 52        /* X0 pipe PC relative hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1_PCREL 53        /* X1 pipe PC relative hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2_PCREL 54        /* X0 pipe PC relative hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2_PCREL 55        /* X1 pipe PC relative hword 2 */
-+#define R_TILEGX_IMM16_X0_HW3_PCREL 56        /* X0 pipe PC relative hword 3 */
-+#define R_TILEGX_IMM16_X1_HW3_PCREL 57        /* X1 pipe PC relative hword 3 */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
-+#define R_TILEGX_IMM16_X0_HW0_GOT 64  /* X0 pipe hword 0 GOT offset */
-+#define R_TILEGX_IMM16_X1_HW0_GOT 65  /* X1 pipe hword 0 GOT offset */
-+/* Relocs 66-71 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
-+/* Relocs 76-77 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78       /* X0 pipe hword 0 TLS GD offset */
-+#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79       /* X1 pipe hword 0 TLS GD offset */
-+#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80       /* X0 pipe hword 0 TLS LE offset */
-+#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81       /* X1 pipe hword 0 TLS LE offset */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
-+/* Relocs 90-91 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92       /* X0 pipe hword 0 TLS IE offset */
-+#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93       /* X1 pipe hword 0 TLS IE offset */
-+/* Relocs 94-99 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
-+/* Relocs 104-105 are currently not defined.  */
-+#define R_TILEGX_TLS_DTPMOD64 106     /* 64-bit ID of symbol's module */
-+#define R_TILEGX_TLS_DTPOFF64 107     /* 64-bit offset in TLS block */
-+#define R_TILEGX_TLS_TPOFF64  108     /* 64-bit offset in static TLS block */
-+#define R_TILEGX_TLS_DTPMOD32 109     /* 32-bit ID of symbol's module */
-+#define R_TILEGX_TLS_DTPOFF32 110     /* 32-bit offset in TLS block */
-+#define R_TILEGX_TLS_TPOFF32  111     /* 32-bit offset in static TLS block */
-+#define R_TILEGX_TLS_GD_CALL  112     /* "jal" for TLS GD */
-+#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113       /* X0 pipe "addi" for TLS GD */
-+#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114       /* X1 pipe "addi" for TLS GD */
-+#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115       /* Y0 pipe "addi" for TLS GD */
-+#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116       /* Y1 pipe "addi" for TLS GD */
-+#define R_TILEGX_TLS_IE_LOAD  117     /* "ld_tls" for TLS IE */
-+#define R_TILEGX_IMM8_X0_TLS_ADD 118  /* X0 pipe "addi" for TLS GD/IE */
-+#define R_TILEGX_IMM8_X1_TLS_ADD 119  /* X1 pipe "addi" for TLS GD/IE */
-+#define R_TILEGX_IMM8_Y0_TLS_ADD 120  /* Y0 pipe "addi" for TLS GD/IE */
-+#define R_TILEGX_IMM8_Y1_TLS_ADD 121  /* Y1 pipe "addi" for TLS GD/IE */
-+
-+#define R_TILEGX_GNU_VTINHERIT        128     /* GNU C++ vtable hierarchy */
-+#define R_TILEGX_GNU_VTENTRY  129     /* GNU C++ vtable member usage */
-+
-+#define R_TILEGX_NUM          130
-+
-+#endif        /* elf.h */
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -2,7 +2,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "elf.h"
-+#endif
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -8,7 +8,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "elf.h"
-+#endif
- #include "elfconfig.h"
diff --git a/target/linux/generic/hack-4.19/211-host_tools_portability.patch b/target/linux/generic/hack-4.19/211-host_tools_portability.patch
deleted file mode 100644 (file)
index f3c2858..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7f698012384ccb1ed10cc758acfd085096fdb307 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:02:03 +0200
-Subject: kernel: fix linux 4.9 host tools portability issues
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- tools/build/Build.include       | 2 +-
- tools/perf/pmu-events/jevents.c | 1 +
- tools/perf/pmu-events/json.c    | 1 -
- 3 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/tools/build/Build.include
-+++ b/tools/build/Build.include
-@@ -98,4 +98,4 @@ cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$
- ###
- ## HOSTCC C flags
--host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(KBUILD_HOSTCFLAGS) -D"BUILD_STR(s)=\#s" $(HOSTCFLAGS_$(basetarget).o) $(HOSTCFLAGS_$(obj))
-+host_c_flags = -MD -MF $(depfile) -MT $@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
---- a/tools/perf/pmu-events/jevents.c
-+++ b/tools/perf/pmu-events/jevents.c
-@@ -35,6 +35,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- #include <unistd.h>
- #include <stdarg.h>
---- a/tools/perf/pmu-events/json.c
-+++ b/tools/perf/pmu-events/json.c
-@@ -38,7 +38,6 @@
- #include <unistd.h>
- #include "jsmn.h"
- #include "json.h"
--#include <linux/kernel.h>
- static char *mapfile(const char *fn, size_t *size)
diff --git a/target/linux/generic/hack-4.19/212-byteshift_portability.patch b/target/linux/generic/hack-4.19/212-byteshift_portability.patch
deleted file mode 100644 (file)
index 1a5ac87..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 48232d3d931c95953ce2ddfe7da7bb164aef6a73 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:03:16 +0200
-Subject: linux-3.6: fix portability of some includes files in tools/ used on the host
-
-lede-commit: 6040b1d29ab1f047c5e49b748abcb6a3196add28
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- tools/include/tools/be_byteshift.h |  4 ++++
- tools/include/tools/le_byteshift.h |  4 ++++
- tools/include/tools/linux_types.h  | 22 ++++++++++++++++++++++
- 3 files changed, 30 insertions(+)
- create mode 100644 tools/include/tools/linux_types.h
-
---- a/tools/include/tools/be_byteshift.h
-+++ b/tools/include/tools/be_byteshift.h
-@@ -2,6 +2,10 @@
- #ifndef _TOOLS_BE_BYTESHIFT_H
- #define _TOOLS_BE_BYTESHIFT_H
-+#ifndef __linux__
-+#include "linux_types.h"
-+#endif
-+
- #include <stdint.h>
- static inline uint16_t __get_unaligned_be16(const uint8_t *p)
---- a/tools/include/tools/le_byteshift.h
-+++ b/tools/include/tools/le_byteshift.h
-@@ -2,6 +2,10 @@
- #ifndef _TOOLS_LE_BYTESHIFT_H
- #define _TOOLS_LE_BYTESHIFT_H
-+#ifndef __linux__
-+#include "linux_types.h"
-+#endif
-+
- #include <stdint.h>
- static inline uint16_t __get_unaligned_le16(const uint8_t *p)
---- /dev/null
-+++ b/tools/include/tools/linux_types.h
-@@ -0,0 +1,22 @@
-+#ifndef __LINUX_TYPES_H
-+#define __LINUX_TYPES_H
-+
-+#include <stdint.h>
-+
-+typedef uint8_t __u8;
-+typedef uint8_t __be8;
-+typedef uint8_t __le8;
-+
-+typedef uint16_t __u16;
-+typedef uint16_t __be16;
-+typedef uint16_t __le16;
-+
-+typedef uint32_t __u32;
-+typedef uint32_t __be32;
-+typedef uint32_t __le32;
-+
-+typedef uint64_t __u64;
-+typedef uint64_t __be64;
-+typedef uint64_t __le64;
-+
-+#endif
diff --git a/target/linux/generic/hack-4.19/214-spidev_h_portability.patch b/target/linux/generic/hack-4.19/214-spidev_h_portability.patch
deleted file mode 100644 (file)
index 093f600..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From be9be95ff10e16a5b4ad36f903978d0cc5747024 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:04:08 +0200
-Subject: kernel: fix linux/spi/spidev.h portability issues with musl
-
-Felix will try to get this define included into musl
-
-lede-commit: 795e7cf60de19e7a076a46874fab7bb88b43bbff
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/uapi/linux/spi/spidev.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/uapi/linux/spi/spidev.h
-+++ b/include/uapi/linux/spi/spidev.h
-@@ -113,7 +113,7 @@ struct spi_ioc_transfer {
- /* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
- #define SPI_MSGSIZE(N) \
--      ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
-+      ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << 13)) \
-               ? ((N)*(sizeof (struct spi_ioc_transfer))) : 0)
- #define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)])
diff --git a/target/linux/generic/hack-4.19/220-gc_sections.patch b/target/linux/generic/hack-4.19/220-gc_sections.patch
deleted file mode 100644 (file)
index d6fc946..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-From e3d8676f5722b7622685581e06e8f53e6138e3ab Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 15 Jul 2017 23:42:36 +0200
-Subject: use -ffunction-sections, -fdata-sections and --gc-sections
-
-In combination with kernel symbol export stripping this significantly reduces
-the kernel image size. Used on both ARM and MIPS architectures.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- Makefile                          | 10 +++----
- arch/arm/Kconfig                  |  1 +
- arch/arm/boot/compressed/Makefile |  1 +
- arch/arm/kernel/vmlinux.lds.S     | 26 ++++++++--------
- arch/mips/Kconfig                 |  1 +
- arch/mips/kernel/vmlinux.lds.S    |  4 +--
- include/asm-generic/vmlinux.lds.h | 63 ++++++++++++++++++++-------------------
- 7 files changed, 55 insertions(+), 51 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -294,6 +294,11 @@ else
- scripts/Kbuild.include: ;
- include scripts/Kbuild.include
-+ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
-+KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
-+LDFLAGS_vmlinux += --gc-sections
-+endif
-+
- # Read KERNELRELEASE from include/config/kernel.release (if it exists)
- KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
- KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
-@@ -780,11 +785,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH
- KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
- endif
--ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
--KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
--LDFLAGS_vmlinux += --gc-sections
--endif
--
- # arch Makefile may override CC so keep this after arch Makefile is included
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -98,6 +98,7 @@ config ARM
-       select HAVE_UID16
-       select HAVE_VIRT_CPU_ACCOUNTING_GEN
-       select IRQ_FORCED_THREADING
-+      select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
-       select MODULES_USE_ELF_REL
-       select NEED_DMA_MAP_STATE
-       select NO_BOOTMEM
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -106,6 +106,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
- KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
- endif
-+KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
- # -fstack-protector-strong triggers protection checks in this code,
- # but it is being used too early to link to meaningful stack_chk logic.
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -100,24 +100,24 @@ SECTIONS
-       }
-       .init.arch.info : {
-               __arch_info_begin = .;
--              *(.arch.info.init)
-+              KEEP(*(.arch.info.init))
-               __arch_info_end = .;
-       }
-       .init.tagtable : {
-               __tagtable_begin = .;
--              *(.taglist.init)
-+              KEEP(*(.taglist.init))
-               __tagtable_end = .;
-       }
- #ifdef CONFIG_SMP_ON_UP
-       .init.smpalt : {
-               __smpalt_begin = .;
--              *(.alt.smp.init)
-+              KEEP(*(.alt.smp.init))
-               __smpalt_end = .;
-       }
- #endif
-       .init.pv_table : {
-               __pv_table_begin = .;
--              *(.pv_table)
-+              KEEP(*(.pv_table))
-               __pv_table_end = .;
-       }
---- a/arch/arm/kernel/vmlinux.lds.h
-+++ b/arch/arm/kernel/vmlinux.lds.h
-@@ -22,13 +22,13 @@
- #define ARM_MMU_DISCARD(x)
- #else
- #define ARM_MMU_KEEP(x)
--#define ARM_MMU_DISCARD(x)    x
-+#define ARM_MMU_DISCARD(x)    KEEP(x)
- #endif
- #define PROC_INFO                                                     \
-               . = ALIGN(4);                                           \
-               __proc_info_begin = .;                                  \
--              *(.proc.info.init)                                      \
-+              KEEP(*(.proc.info.init))                                \
-               __proc_info_end = .;
- #define HYPERVISOR_TEXT                                                       \
-@@ -39,11 +39,11 @@
- #define IDMAP_TEXT                                                    \
-               ALIGN_FUNCTION();                                       \
-               __idmap_text_start = .;                                 \
--              *(.idmap.text)                                          \
-+              KEEP(*(.idmap.text))                                    \
-               __idmap_text_end = .;                                   \
-               . = ALIGN(PAGE_SIZE);                                   \
-               __hyp_idmap_text_start = .;                             \
--              *(.hyp.idmap.text)                                      \
-+              KEEP(*(.hyp.idmap.text))                                \
-               __hyp_idmap_text_end = .;
- #define ARM_DISCARD                                                   \
-@@ -86,12 +86,12 @@
-       . = ALIGN(8);                                                   \
-       .ARM.unwind_idx : {                                             \
-               __start_unwind_idx = .;                                 \
--              *(.ARM.exidx*)                                          \
-+              KEEP(*(.ARM.exidx*))                                    \
-               __stop_unwind_idx = .;                                  \
-       }                                                               \
-       .ARM.unwind_tab : {                                             \
-               __start_unwind_tab = .;                                 \
--              *(.ARM.extab*)                                          \
-+              KEEP(*(.ARM.extab*))                                    \
-               __stop_unwind_tab = .;                                  \
-       }
-@@ -102,14 +102,14 @@
- #define ARM_VECTORS                                                   \
-       __vectors_start = .;                                            \
-       .vectors 0xffff0000 : AT(__vectors_start) {                     \
--              *(.vectors)                                             \
-+              KEEP(*(.vectors))                                       \
-       }                                                               \
-       . = __vectors_start + SIZEOF(.vectors);                         \
-       __vectors_end = .;                                              \
-                                                                       \
-       __stubs_start = .;                                              \
-       .stubs ADDR(.vectors) + 0x1000 : AT(__stubs_start) {            \
--              *(.stubs)                                               \
-+              KEEP(*(.stubs))                                         \
-       }                                                               \
-       . = __stubs_start + SIZEOF(.stubs);                             \
-       __stubs_end = .;                                                \
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -43,6 +43,7 @@ config MIPS
-       select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
-       select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)
-       select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)
-+      select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
-       select HAVE_CONTEXT_TRACKING
-       select HAVE_COPY_THREAD_TLS
-       select HAVE_C_RECORDMCOUNT
---- a/arch/mips/kernel/vmlinux.lds.S
-+++ b/arch/mips/kernel/vmlinux.lds.S
-@@ -72,7 +72,7 @@ SECTIONS
-       /* Exception table for data bus errors */
-       __dbe_table : {
-               __start___dbe_table = .;
--              *(__dbe_table)
-+              KEEP(*(__dbe_table))
-               __stop___dbe_table = .;
-       }
-@@ -123,7 +123,7 @@ SECTIONS
-       . = ALIGN(4);
-       .mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
-               __mips_machines_start = .;
--              *(.mips.machines.init)
-+              KEEP(*(.mips.machines.init))
-               __mips_machines_end = .;
-       }
diff --git a/target/linux/generic/hack-4.19/221-module_exports.patch b/target/linux/generic/hack-4.19/221-module_exports.patch
deleted file mode 100644 (file)
index cd5ae58..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-From b14784e7883390c20ed3ff904892255404a5914b Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:05:53 +0200
-Subject: add an optional config option for stripping all unnecessary symbol exports from the kernel image
-
-lede-commit: bb5a40c64b7c4f4848509fa0a6625055fc9e66cc
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/asm-generic/vmlinux.lds.h | 18 +++++++++++++++---
- include/linux/export.h            |  9 ++++++++-
- scripts/Makefile.build            |  2 +-
- 3 files changed, 24 insertions(+), 5 deletions(-)
-
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -54,6 +54,16 @@
- #define LOAD_OFFSET 0
- #endif
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*)))
-+#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*)))
-+#endif
-+
-+#ifndef SYMTAB_DISCARD
-+#define SYMTAB_DISCARD
-+#define SYMTAB_DISCARD_GPL
-+#endif
-+
- /* Align . to a 8 byte boundary equals to maximum function alignment. */
- #define ALIGN_FUNCTION()  . = ALIGN(8)
-@@ -372,14 +382,14 @@
-       /* Kernel symbol table: Normal symbols */                       \
-       __ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {         \
-               __start___ksymtab = .;                                  \
--              KEEP(*(SORT(___ksymtab+*)))                             \
-+              SYMTAB_KEEP                                             \
-               __stop___ksymtab = .;                                   \
-       }                                                               \
-                                                                       \
-       /* Kernel symbol table: GPL-only symbols */                     \
-       __ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {     \
-               __start___ksymtab_gpl = .;                              \
--              KEEP(*(SORT(___ksymtab_gpl+*)))                         \
-+              SYMTAB_KEEP_GPL                                         \
-               __stop___ksymtab_gpl = .;                               \
-       }                                                               \
-                                                                       \
-@@ -441,7 +451,7 @@
-                                                                       \
-       /* Kernel symbol table: strings */                              \
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {       \
--              *(__ksymtab_strings)                                    \
-+              *(__ksymtab_strings+*)                                  \
-       }                                                               \
-                                                                       \
-       /* __*init sections */                                          \
-@@ -841,6 +851,8 @@
-       EXIT_TEXT                                                       \
-       EXIT_DATA                                                       \
-       EXIT_CALL                                                       \
-+      SYMTAB_DISCARD                                                  \
-+      SYMTAB_DISCARD_GPL                                              \
-       *(.discard)                                                     \
-       *(.discard.*)                                                   \
-       }
---- a/include/linux/export.h
-+++ b/include/linux/export.h
-@@ -74,12 +74,19 @@ struct kernel_symbol {
- };
- #endif
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "+" #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define ___EXPORT_SYMBOL(sym, sec)                                    \
-       extern typeof(sym) sym;                                         \
-       __CRC_SYMBOL(sym, sec)                                          \
-       static const char __kstrtab_##sym[]                             \
--      __attribute__((section("__ksymtab_strings"), used, aligned(1))) \
-+      __attribute__((section("__ksymtab_strings"                      \
-+        __EXPORT_SUFFIX(sym)), used, aligned(1)))                     \
-       = #sym;                                                         \
-       __KSYMTAB_ENTRY(sym, sec)
---- a/scripts/Makefile.build
-+++ b/scripts/Makefile.build
-@@ -408,7 +408,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
- # Linker scripts preprocessor (.lds.S -> .lds)
- # ---------------------------------------------------------------------------
- quiet_cmd_cpp_lds_S = LDS     $@
--      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -U$(ARCH) \
-+      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -U$(ARCH) \
-                            -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
- $(obj)/%.lds: $(src)/%.lds.S FORCE
diff --git a/target/linux/generic/hack-4.19/230-openwrt_lzma_options.patch b/target/linux/generic/hack-4.19/230-openwrt_lzma_options.patch
deleted file mode 100644 (file)
index b45ed11..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From b3d00b452467f621317953d9e4c6f9ae8dcfd271 Mon Sep 17 00:00:00 2001
-From: Imre Kaloz <kaloz@openwrt.org>
-Date: Fri, 7 Jul 2017 17:06:55 +0200
-Subject: use the openwrt lzma options for now
-
-lede-commit: 548de949f392049420a6a1feeef118b30ab8ea8c
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- lib/decompress.c              |  1 +
- scripts/Makefile.lib          |  2 +-
- usr/gen_initramfs_list.sh | 10 +++++-----
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -49,6 +49,7 @@ static const struct compress_format comp
-       { {0x1f, 0x9e}, "gzip", gunzip },
-       { {0x42, 0x5a}, "bzip2", bunzip2 },
-       { {0x5d, 0x00}, "lzma", unlzma },
-+      { {0x6d, 0x00}, "lzma-openwrt", unlzma },
-       { {0xfd, 0x37}, "xz", unxz },
-       { {0x89, 0x4c}, "lzo", unlzo },
-       { {0x02, 0x21}, "lz4", unlz4 },
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -324,7 +324,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--      lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+      lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-       (rm -f $@ ; false)
- quiet_cmd_lzo = LZO     $@
---- a/usr/gen_initramfs_list.sh
-+++ b/usr/gen_initramfs_list.sh
-@@ -229,7 +229,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -n -9 -f"
-+compr="gzip -n -9 -f -"
- arg="$1"
- case "$arg" in
-@@ -245,13 +245,13 @@ case "$arg" in
-               output=${cpio_list}
-               echo "$output_file" | grep -q "\.gz$" \
-                 && [ -x "`which gzip 2> /dev/null`" ] \
--                && compr="gzip -n -9 -f"
-+                && compr="gzip -n -9 -f -"
-               echo "$output_file" | grep -q "\.bz2$" \
-                 && [ -x "`which bzip2 2> /dev/null`" ] \
--                && compr="bzip2 -9 -f"
-+                && compr="bzip2 -9 -f -"
-               echo "$output_file" | grep -q "\.lzma$" \
-                 && [ -x "`which lzma 2> /dev/null`" ] \
--                && compr="lzma -9 -f"
-+                && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
-               echo "$output_file" | grep -q "\.xz$" \
-                 && [ -x "`which xz 2> /dev/null`" ] \
-                 && compr="xz --check=crc32 --lzma2=dict=1MiB"
-@@ -320,7 +320,7 @@ if [ ! -z ${output_file} ]; then
-       if [ "${is_cpio_compressed}" = "compressed" ]; then
-               cat ${cpio_tfile} > ${output_file}
-       else
--              (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+              (cat ${cpio_tfile} | ${compr} > ${output_file}) \
-               || (rm -f ${output_file} ; false)
-       fi
-       [ -z ${cpio_file} ] && rm ${cpio_tfile}
diff --git a/target/linux/generic/hack-4.19/250-netfilter_depends.patch b/target/linux/generic/hack-4.19/250-netfilter_depends.patch
deleted file mode 100644 (file)
index cb744bd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: hack: net: remove bogus netfilter dependencies
-
-lede-commit: 589d2a377dee27d206fc3725325309cf649e4df6
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/Kconfig | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -241,7 +241,6 @@ config NF_CONNTRACK_FTP
- config NF_CONNTRACK_H323
-       tristate "H.323 protocol support"
--      depends on IPV6 || IPV6=n
-       depends on NETFILTER_ADVANCED
-       help
-         H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -1077,7 +1076,6 @@ config NETFILTER_XT_TARGET_SECMARK
- config NETFILTER_XT_TARGET_TCPMSS
-       tristate '"TCPMSS" target support'
--      depends on IPV6 || IPV6=n
-       default m if NETFILTER_ADVANCED=n
-       ---help---
-         This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic/hack-4.19/251-sound_kconfig.patch b/target/linux/generic/hack-4.19/251-sound_kconfig.patch
deleted file mode 100644 (file)
index 2cfc2fa..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-From da3c50704f14132f4adf80d48e9a4cd5d46e54c9 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 7 Jul 2017 17:09:21 +0200
-Subject: kconfig: owrt specifc dependencies
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- crypto/Kconfig        | 10 +++++-----
- drivers/bcma/Kconfig  |  1 +
- drivers/ssb/Kconfig   |  3 ++-
- lib/Kconfig           |  8 ++++----
- net/netfilter/Kconfig |  2 +-
- net/wireless/Kconfig  | 17 ++++++++++-------
- sound/core/Kconfig    |  4 ++--
- 7 files changed, 25 insertions(+), 20 deletions(-)
-
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -33,7 +33,7 @@ config CRYPTO_FIPS
-         this is.
- config CRYPTO_ALGAPI
--      tristate
-+      tristate "ALGAPI"
-       select CRYPTO_ALGAPI2
-       help
-         This option provides the API for cryptographic algorithms.
-@@ -42,7 +42,7 @@ config CRYPTO_ALGAPI2
-       tristate
- config CRYPTO_AEAD
--      tristate
-+      tristate "AEAD"
-       select CRYPTO_AEAD2
-       select CRYPTO_ALGAPI
-@@ -53,7 +53,7 @@ config CRYPTO_AEAD2
-       select CRYPTO_RNG2
- config CRYPTO_BLKCIPHER
--      tristate
-+      tristate "BLKCIPHER"
-       select CRYPTO_BLKCIPHER2
-       select CRYPTO_ALGAPI
-@@ -64,7 +64,7 @@ config CRYPTO_BLKCIPHER2
-       select CRYPTO_WORKQUEUE
- config CRYPTO_HASH
--      tristate
-+      tristate "HASH"
-       select CRYPTO_HASH2
-       select CRYPTO_ALGAPI
-@@ -73,7 +73,7 @@ config CRYPTO_HASH2
-       select CRYPTO_ALGAPI2
- config CRYPTO_RNG
--      tristate
-+      tristate "RNG"
-       select CRYPTO_RNG2
-       select CRYPTO_ALGAPI
---- a/drivers/bcma/Kconfig
-+++ b/drivers/bcma/Kconfig
-@@ -16,6 +16,7 @@ if BCMA
- # Support for Block-I/O. SELECT this from the driver that needs it.
- config BCMA_BLOCKIO
-       bool
-+      default y
- config BCMA_HOST_PCI_POSSIBLE
-       bool
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -28,6 +28,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
-       bool
-       depends on SSB
-+      default y
- config SSB_PCIHOST_POSSIBLE
-       bool
-@@ -48,7 +49,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
-       bool
-       depends on SSB_PCIHOST
--      default n
-+      default y
- config SSB_PCMCIAHOST_POSSIBLE
-       bool
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -377,16 +377,16 @@ config BCH_CONST_T
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--      bool
-+      bool "Textsearch support"
- config TEXTSEARCH_KMP
--      tristate
-+      tristate "Textsearch KMP"
- config TEXTSEARCH_BM
--      tristate
-+      tristate "Textsearch BM"
- config TEXTSEARCH_FSM
--      tristate
-+      tristate "Textsearch FSM"
- config BTREE
-       bool
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -10,7 +10,7 @@ config NETFILTER_INGRESS
-         infrastructure.
- config NETFILTER_NETLINK
--      tristate
-+      tristate "Netfilter NFNETLINK interface"
- config NETFILTER_FAMILY_BRIDGE
-       bool
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,5 +1,5 @@
- config WIRELESS_EXT
--      bool
-+      bool "Wireless extensions"
- config WEXT_CORE
-       def_bool y
-@@ -11,10 +11,10 @@ config WEXT_PROC
-       depends on WEXT_CORE
- config WEXT_SPY
--      bool
-+      bool "WEXT_SPY"
- config WEXT_PRIV
--      bool
-+      bool "WEXT_PRIV"
- config CFG80211
-       tristate "cfg80211 - wireless configuration API"
-@@ -202,7 +202,7 @@ config CFG80211_WEXT_EXPORT
- endif # CFG80211
- config LIB80211
--      tristate
-+      tristate "LIB80211"
-       default n
-       help
-         This options enables a library of common routines used
-@@ -211,13 +211,16 @@ config LIB80211
-         Drivers should select this themselves if needed.
- config LIB80211_CRYPT_WEP
--      tristate
-+      tristate "LIB80211_CRYPT_WEP"
-+      select LIB80211
- config LIB80211_CRYPT_CCMP
--      tristate
-+      tristate "LIB80211_CRYPT_CCMP"
-+      select LIB80211
- config LIB80211_CRYPT_TKIP
--      tristate
-+      tristate "LIB80211_CRYPT_TKIP"
-+      select LIB80211
- config LIB80211_DEBUG
-       bool "lib80211 debugging messages"
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -16,7 +16,7 @@ config SND_DMAENGINE_PCM
-       tristate
- config SND_HWDEP
--      tristate
-+      tristate "Sound hardware support"
- config SND_SEQ_DEVICE
-       tristate
-@@ -26,7 +26,7 @@ config SND_RAWMIDI
-       select SND_SEQ_DEVICE if SND_SEQUENCER != n
- config SND_COMPRESS_OFFLOAD
--      tristate
-+      tristate "Compression offloading support"
- config SND_JACK
-       bool
diff --git a/target/linux/generic/hack-4.19/259-regmap_dynamic.patch b/target/linux/generic/hack-4.19/259-regmap_dynamic.patch
deleted file mode 100644 (file)
index 335ec4a..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From 811d9e2268a62b830cfe93cd8bc929afcb8b198b Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 15 Jul 2017 21:12:38 +0200
-Subject: kernel: move regmap bloat out of the kernel image if it is only being used in modules
-
-lede-commit: 96f39119815028073583e4fca3a9c5fe9141e998
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/base/regmap/Kconfig  | 15 ++++++++++-----
- drivers/base/regmap/Makefile | 12 ++++++++----
- drivers/base/regmap/regmap.c |  3 +++
- include/linux/regmap.h       |  2 +-
- 4 files changed, 22 insertions(+), 10 deletions(-)
-
---- a/drivers/base/regmap/Kconfig
-+++ b/drivers/base/regmap/Kconfig
-@@ -4,9 +4,8 @@
- # subsystems should select the appropriate symbols.
- config REGMAP
--      default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
-       select IRQ_DOMAIN if REGMAP_IRQ
--      bool
-+      tristate
- config REGCACHE_COMPRESSED
-       select LZO_COMPRESS
-@@ -18,6 +17,7 @@ config REGMAP_AC97
- config REGMAP_I2C
-       tristate
-+      select REGMAP
-       depends on I2C
- config REGMAP_SLIMBUS
-@@ -26,20 +26,26 @@ config REGMAP_SLIMBUS
- config REGMAP_SPI
-       tristate
-+      select REGMAP
-+      depends on SPI_MASTER
-       depends on SPI
- config REGMAP_SPMI
-+      select REGMAP
-       tristate
-       depends on SPMI
- config REGMAP_W1
-+      select REGMAP
-       tristate
-       depends on W1
- config REGMAP_MMIO
-       tristate
-+      select REGMAP
- config REGMAP_IRQ
-+      select REGMAP
-       bool
- config REGMAP_SOUNDWIRE
---- a/drivers/base/regmap/Makefile
-+++ b/drivers/base/regmap/Makefile
-@@ -2,10 +2,14 @@
- # For include/trace/define_trace.h to include trace.h
- CFLAGS_regmap.o := -I$(src)
--obj-$(CONFIG_REGMAP) += regmap.o regcache.o
--obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o
--obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o
--obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
-+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-flat.o
-+ifdef CONFIG_DEBUG_FS
-+regmap-core-objs += regmap-debugfs.o
-+endif
-+ifdef CONFIG_REGCACHE_COMPRESSED
-+regmap-core-objs += regcache-lzo.o
-+endif
-+obj-$(CONFIG_REGMAP) += regmap-core.o
- obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o
- obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
- obj-$(CONFIG_REGMAP_SLIMBUS) += regmap-slimbus.o
---- a/drivers/base/regmap/regmap.c
-+++ b/drivers/base/regmap/regmap.c
-@@ -13,6 +13,7 @@
- #include <linux/device.h>
- #include <linux/slab.h>
- #include <linux/export.h>
-+#include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/err.h>
- #include <linux/of.h>
-@@ -3037,3 +3038,5 @@ static int __init regmap_initcall(void)
-       return 0;
- }
- postcore_initcall(regmap_initcall);
-+
-+MODULE_LICENSE("GPL");
---- a/include/linux/regmap.h
-+++ b/include/linux/regmap.h
-@@ -187,7 +187,7 @@ struct reg_sequence {
-       pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
- })
--#ifdef CONFIG_REGMAP
-+#if IS_REACHABLE(CONFIG_REGMAP)
- enum regmap_endian {
-       /* Unspecified -> 0 -> Backwards compatible default */
diff --git a/target/linux/generic/hack-4.19/260-crypto_test_dependencies.patch b/target/linux/generic/hack-4.19/260-crypto_test_dependencies.patch
deleted file mode 100644 (file)
index f11f454..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From fd1799b0bf5efa46dd3e6dfbbf3955564807e508 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:12:51 +0200
-Subject: kernel: prevent cryptomgr from pulling in useless extra dependencies for tests that are not run
-
-Reduces kernel size after LZMA by about 5k on MIPS
-
-lede-commit: 044c316167e076479a344c59905e5b435b84a77f
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- crypto/Kconfig   | 13 ++++++-------
- crypto/algboss.c |  4 ++++
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -144,13 +144,13 @@ config CRYPTO_MANAGER
-         cbc(aes).
- config CRYPTO_MANAGER2
--      def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
--      select CRYPTO_AEAD2
--      select CRYPTO_HASH2
--      select CRYPTO_BLKCIPHER2
--      select CRYPTO_AKCIPHER2
--      select CRYPTO_KPP2
--      select CRYPTO_ACOMP2
-+      def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS)
-+      select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_ACOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
- config CRYPTO_USER
-       tristate "Userspace cryptographic algorithm configuration"
-@@ -163,7 +163,6 @@ config CRYPTO_USER
- config CRYPTO_MANAGER_DISABLE_TESTS
-       bool "Disable run-time self tests"
-       default y
--      depends on CRYPTO_MANAGER2
-       help
-         Disable run-time self tests that normally take place at
-         algorithm registration.
---- a/crypto/algboss.c
-+++ b/crypto/algboss.c
-@@ -247,8 +247,12 @@ static int cryptomgr_schedule_test(struc
-       type = alg->cra_flags;
-       /* Do not test internal algorithms. */
-+#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
-+      type |= CRYPTO_ALG_TESTED;
-+#else
-       if (type & CRYPTO_ALG_INTERNAL)
-               type |= CRYPTO_ALG_TESTED;
-+#endif
-       param->type = type;
diff --git a/target/linux/generic/hack-4.19/280-rfkill-stubs.patch b/target/linux/generic/hack-4.19/280-rfkill-stubs.patch
deleted file mode 100644 (file)
index 7bb7d26..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 236c1acdfef5958010ac9814a9872e0a46fd78ee Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 7 Jul 2017 17:13:44 +0200
-Subject: rfkill: add fake rfkill support
-
-allow building of modules depending on RFKILL even if RFKILL is not enabled.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- include/linux/rfkill.h |  2 +-
- net/Makefile           |  2 +-
- net/rfkill/Kconfig     | 14 +++++++++-----
- net/rfkill/Makefile    |  2 +-
- 4 files changed, 12 insertions(+), 8 deletions(-)
-
---- a/include/linux/rfkill.h
-+++ b/include/linux/rfkill.h
-@@ -64,7 +64,7 @@ struct rfkill_ops {
-       int     (*set_block)(void *data, bool blocked);
- };
--#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
-+#if defined(CONFIG_RFKILL_FULL) || defined(CONFIG_RFKILL_FULL_MODULE)
- /**
-  * rfkill_alloc - Allocate rfkill structure
-  * @name: name of the struct -- the string is not copied internally
---- a/net/Makefile
-+++ b/net/Makefile
-@@ -53,7 +53,7 @@ obj-$(CONFIG_TIPC)           += tipc/
- obj-$(CONFIG_NETLABEL)                += netlabel/
- obj-$(CONFIG_IUCV)            += iucv/
- obj-$(CONFIG_SMC)             += smc/
--obj-$(CONFIG_RFKILL)          += rfkill/
-+obj-$(CONFIG_RFKILL_FULL)     += rfkill/
- obj-$(CONFIG_NET_9P)          += 9p/
- obj-$(CONFIG_CAIF)            += caif/
- ifneq ($(CONFIG_DCB),)
---- a/net/rfkill/Kconfig
-+++ b/net/rfkill/Kconfig
-@@ -1,7 +1,11 @@
- #
- # RF switch subsystem configuration
- #
--menuconfig RFKILL
-+config RFKILL
-+      bool
-+      default y
-+
-+menuconfig RFKILL_FULL
-       tristate "RF switch subsystem support"
-       help
-         Say Y here if you want to have control over RF switches
-@@ -13,19 +17,19 @@ menuconfig RFKILL
- # LED trigger support
- config RFKILL_LEDS
-       bool
--      depends on RFKILL
-+      depends on RFKILL_FULL
-       depends on LEDS_TRIGGERS = y || RFKILL = LEDS_TRIGGERS
-       default y
- config RFKILL_INPUT
-       bool "RF switch input support" if EXPERT
--      depends on RFKILL
-+      depends on RFKILL_FULL
-       depends on INPUT = y || RFKILL = INPUT
-       default y if !EXPERT
- config RFKILL_GPIO
-       tristate "GPIO RFKILL driver"
--      depends on RFKILL
-+      depends on RFKILL_FULL
-       depends on GPIOLIB || COMPILE_TEST
-       default n
-       help
---- a/net/rfkill/Makefile
-+++ b/net/rfkill/Makefile
-@@ -4,5 +4,5 @@
- rfkill-y                      += core.o
- rfkill-$(CONFIG_RFKILL_INPUT) += input.o
--obj-$(CONFIG_RFKILL)          += rfkill.o
-+obj-$(CONFIG_RFKILL_FULL)     += rfkill.o
- obj-$(CONFIG_RFKILL_GPIO)     += rfkill-gpio.o
diff --git a/target/linux/generic/hack-4.19/290-nvmem-make-CONFIG_NVMEM-tristate-again.patch b/target/linux/generic/hack-4.19/290-nvmem-make-CONFIG_NVMEM-tristate-again.patch
deleted file mode 100644 (file)
index ad45dc9..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2579d9b982c7232f9354bcca5262e26a84c38799 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Fri, 2 Nov 2018 17:40:32 +0100
-Subject: [PATCH] nvmem: make CONFIG_NVMEM tristate again
-
-Only build it in when OF_NET is selected and make it possible to build
-it as module otherwise.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/nvmem/Kconfig | 2 +-
- drivers/of/Kconfig    | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/nvmem/Kconfig
-+++ b/drivers/nvmem/Kconfig
-@@ -1,5 +1,5 @@
- menuconfig NVMEM
--      bool "NVMEM Support"
-+      tristate "NVMEM Support"
-       help
-         Support for NVMEM(Non Volatile Memory) devices like EEPROM, EFUSES...
---- a/drivers/of/Kconfig
-+++ b/drivers/of/Kconfig
-@@ -71,6 +71,7 @@ config OF_IRQ
- config OF_NET
-       depends on NETDEVICES
-+      select NVMEM
-       def_bool y
- config OF_MDIO
diff --git a/target/linux/generic/hack-4.19/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch b/target/linux/generic/hack-4.19/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch
deleted file mode 100644 (file)
index c07ccf9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Ben Menchaca <ben.menchaca@qca.qualcomm.com>
-Date: Fri, 7 Jun 2013 18:35:22 -0500
-Subject: MIPS: r4k_cache: use more efficient cache blast
-
-Optimize the compiler output for larger cache blast cases that are
-common for DMA-based networking.
-
-Signed-off-by: Ben Menchaca <ben.menchaca@qca.qualcomm.com>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
---- a/arch/mips/include/asm/r4kcache.h
-+++ b/arch/mips/include/asm/r4kcache.h
-@@ -683,16 +683,48 @@ static inline void prot##extra##blast_##
-                                                   unsigned long end)  \
- {                                                                     \
-       unsigned long lsize = cpu_##desc##_line_size();                 \
-+      unsigned long lsize_2 = lsize * 2;                              \
-+      unsigned long lsize_3 = lsize * 3;                              \
-+      unsigned long lsize_4 = lsize * 4;                              \
-+      unsigned long lsize_5 = lsize * 5;                              \
-+      unsigned long lsize_6 = lsize * 6;                              \
-+      unsigned long lsize_7 = lsize * 7;                              \
-+      unsigned long lsize_8 = lsize * 8;                              \
-       unsigned long addr = start & ~(lsize - 1);                      \
--      unsigned long aend = (end - 1) & ~(lsize - 1);                  \
-+      unsigned long aend = (end + lsize - 1) & ~(lsize - 1);          \
-+      int lines = (aend - addr) / lsize;                              \
-                                                                       \
-       __##pfx##flush_prologue                                         \
-                                                                       \
--      while (1) {                                                     \
-+      while (lines >= 8) {                                            \
-+              prot##cache_op(hitop, addr);                            \
-+              prot##cache_op(hitop, addr + lsize);                    \
-+              prot##cache_op(hitop, addr + lsize_2);                  \
-+              prot##cache_op(hitop, addr + lsize_3);                  \
-+              prot##cache_op(hitop, addr + lsize_4);                  \
-+              prot##cache_op(hitop, addr + lsize_5);                  \
-+              prot##cache_op(hitop, addr + lsize_6);                  \
-+              prot##cache_op(hitop, addr + lsize_7);                  \
-+              addr += lsize_8;                                        \
-+              lines -= 8;                                             \
-+      }                                                               \
-+                                                                      \
-+      if (lines & 0x4) {                                              \
-+              prot##cache_op(hitop, addr);                            \
-+              prot##cache_op(hitop, addr + lsize);                    \
-+              prot##cache_op(hitop, addr + lsize_2);                  \
-+              prot##cache_op(hitop, addr + lsize_3);                  \
-+              addr += lsize_4;                                        \
-+      }                                                               \
-+                                                                      \
-+      if (lines & 0x2) {                                              \
-+              prot##cache_op(hitop, addr);                            \
-+              prot##cache_op(hitop, addr + lsize);                    \
-+              addr += lsize_2;                                        \
-+      }                                                               \
-+                                                                      \
-+      if (lines & 0x1) {                                              \
-               prot##cache_op(hitop, addr);                            \
--              if (addr == aend)                                       \
--                      break;                                          \
--              addr += lsize;                                          \
-       }                                                               \
-                                                                       \
-       __##pfx##flush_epilogue                                         \
diff --git a/target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch
deleted file mode 100644 (file)
index 7a6948d..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: John Crispin <john@phrozen.org>
-Subject: hack: kernel: add generic image_cmdline hack to MIPS targets
-
-lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- arch/mips/Kconfig       | 4 ++++
- arch/mips/kernel/head.S | 6 ++++++
- 2 files changed, 10 insertions(+)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1143,6 +1143,10 @@ config SYNC_R4K
- config MIPS_MACHINE
-       def_bool n
-+config IMAGE_CMDLINE_HACK
-+      bool "OpenWrt specific image command line hack"
-+      default n
-+
- config NO_IOPORT_MAP
-       def_bool n
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry)
-       j       kernel_entry
- #endif
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+      .ascii  "CMDLINE:"
-+EXPORT(__image_cmdline)
-+      .fill   0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
-       __REF
- NESTED(kernel_entry, 16, sp)                  # kernel entry point
diff --git a/target/linux/generic/hack-4.19/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/hack-4.19/321-powerpc_crtsavres_prereq.patch
deleted file mode 100644 (file)
index 26c385f..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 107c0964cb8db7ca28ac5199426414fdab3c274d Mon Sep 17 00:00:00 2001
-From: "Alexandros C. Couloumbis" <alex@ozo.com>
-Date: Fri, 7 Jul 2017 17:14:51 +0200
-Subject: hack: arch: powerpc: drop register save/restore library from modules
-
-Upstream GCC uses a libgcc function for saving/restoring registers. This
-makes the code bigger, and upstream kernels need to carry that function
-for every single kernel module. Our GCC is patched to avoid those
-references, so we can drop the extra bloat for modules.
-
-lede-commit: e8e1084654f50904e6bf77b70b2de3f137d7b3ec
-Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
----
- arch/powerpc/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -60,20 +60,6 @@ machine-$(CONFIG_PPC64) += 64
- machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
- UTS_MACHINE := $(subst $(space),,$(machine-y))
--# XXX This needs to be before we override LD below
--ifdef CONFIG_PPC32
--KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
--else
--KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/powerpc/kernel/module.lds
--ifeq ($(call ld-ifversion, -ge, 225000000, y),y)
--# Have the linker provide sfpr if possible.
--# There is a corresponding test in arch/powerpc/lib/Makefile
--KBUILD_LDFLAGS_MODULE += --save-restore-funcs
--else
--KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
--endif
--endif
--
- ifdef CONFIG_CPU_LITTLE_ENDIAN
- KBUILD_CFLAGS += -mlittle-endian
- KBUILD_LDFLAGS        += -EL
diff --git a/target/linux/generic/hack-4.19/531-debloat_lzma.patch b/target/linux/generic/hack-4.19/531-debloat_lzma.patch
deleted file mode 100644 (file)
index 2e453cc..0000000
+++ /dev/null
@@ -1,1040 +0,0 @@
-From 3fd297761ac246c54d7723c57fca95c112b99465 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 15 Jul 2017 21:15:44 +0200
-Subject: lzma: de-bloat the lzma library used by jffs2
-
-lede-commit: 3fd1dd08fbcbb78b34efefd32c3032e5c99108d6
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/lzma/LzFind.h  |  17 ---
- include/linux/lzma/LzmaDec.h | 101 ---------------
- include/linux/lzma/LzmaEnc.h |  20 ---
- lib/lzma/LzFind.c            | 287 ++++---------------------------------------
- lib/lzma/LzmaDec.c           |  86 +------------
- lib/lzma/LzmaEnc.c           | 172 ++------------------------
- 6 files changed, 42 insertions(+), 641 deletions(-)
-
---- a/include/linux/lzma/LzFind.h
-+++ b/include/linux/lzma/LzFind.h
-@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
- #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
--int MatchFinder_NeedMove(CMatchFinder *p);
--Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
--void MatchFinder_MoveBlock(CMatchFinder *p);
--void MatchFinder_ReadIfRequired(CMatchFinder *p);
--
- void MatchFinder_Construct(CMatchFinder *p);
- /* Conditions:
-@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
-     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-     ISzAlloc *alloc);
- void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
--void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
--void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
--
--UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
--    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
--    UInt32 *distances, UInt32 maxLen);
- /*
- Conditions:
-@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
- void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
--void MatchFinder_Init(CMatchFinder *p);
--UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
--UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
--void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
--void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
--
- #ifdef __cplusplus
- }
- #endif
---- a/include/linux/lzma/LzmaDec.h
-+++ b/include/linux/lzma/LzmaDec.h
-@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
-   UInt32 dicSize;
- } CLzmaProps;
--/* LzmaProps_Decode - decodes properties
--Returns:
--  SZ_OK
--  SZ_ERROR_UNSUPPORTED - Unsupported properties
--*/
--
--SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
--
- /* ---------- LZMA Decoder state ---------- */
-@@ -70,8 +62,6 @@ typedef struct
- #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
--void LzmaDec_Init(CLzmaDec *p);
--
- /* There are two types of LZMA streams:
-      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-@@ -108,97 +98,6 @@ typedef enum
- /* ELzmaStatus is used only as output value for function call */
--
--/* ---------- Interfaces ---------- */
--
--/* There are 3 levels of interfaces:
--     1) Dictionary Interface
--     2) Buffer Interface
--     3) One Call Interface
--   You can select any of these interfaces, but don't mix functions from different
--   groups for same object. */
--
--
--/* There are two variants to allocate state for Dictionary Interface:
--     1) LzmaDec_Allocate / LzmaDec_Free
--     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
--   You can use variant 2, if you set dictionary buffer manually.
--   For Buffer Interface you must always use variant 1.
--
--LzmaDec_Allocate* can return:
--  SZ_OK
--  SZ_ERROR_MEM         - Memory allocation error
--  SZ_ERROR_UNSUPPORTED - Unsupported properties
--*/
--   
--SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
--void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
--
--SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
--void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
--
--/* ---------- Dictionary Interface ---------- */
--
--/* You can use it, if you want to eliminate the overhead for data copying from
--   dictionary to some other external buffer.
--   You must work with CLzmaDec variables directly in this interface.
--
--   STEPS:
--     LzmaDec_Constr()
--     LzmaDec_Allocate()
--     for (each new stream)
--     {
--       LzmaDec_Init()
--       while (it needs more decompression)
--       {
--         LzmaDec_DecodeToDic()
--         use data from CLzmaDec::dic and update CLzmaDec::dicPos
--       }
--     }
--     LzmaDec_Free()
--*/
--
--/* LzmaDec_DecodeToDic
--   
--   The decoding to internal dictionary buffer (CLzmaDec::dic).
--   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
--
--finishMode:
--  It has meaning only if the decoding reaches output limit (dicLimit).
--  LZMA_FINISH_ANY - Decode just dicLimit bytes.
--  LZMA_FINISH_END - Stream must be finished after dicLimit.
--
--Returns:
--  SZ_OK
--    status:
--      LZMA_STATUS_FINISHED_WITH_MARK
--      LZMA_STATUS_NOT_FINISHED
--      LZMA_STATUS_NEEDS_MORE_INPUT
--      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
--  SZ_ERROR_DATA - Data error
--*/
--
--SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
--    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
--
--
--/* ---------- Buffer Interface ---------- */
--
--/* It's zlib-like interface.
--   See LzmaDec_DecodeToDic description for information about STEPS and return results,
--   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
--   to work with CLzmaDec variables manually.
--
--finishMode:
--  It has meaning only if the decoding reaches output limit (*destLen).
--  LZMA_FINISH_ANY - Decode just destLen bytes.
--  LZMA_FINISH_END - Stream must be finished after (*destLen).
--*/
--
--SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
--    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
--
--
- /* ---------- One Call Interface ---------- */
- /* LzmaDecode
---- a/include/linux/lzma/LzmaEnc.h
-+++ b/include/linux/lzma/LzmaEnc.h
-@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
- } CLzmaEncProps;
- void LzmaEncProps_Init(CLzmaEncProps *p);
--void LzmaEncProps_Normalize(CLzmaEncProps *p);
--UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
--
- /* ---------- CLzmaEncHandle Interface ---------- */
-@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
- void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
- SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
- SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
--SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
--    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
- SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
--/* ---------- One Call Interface ---------- */
--
--/* LzmaEncode
--Return code:
--  SZ_OK               - OK
--  SZ_ERROR_MEM        - Memory allocation error
--  SZ_ERROR_PARAM      - Incorrect paramater
--  SZ_ERROR_OUTPUT_EOF - output buffer overflow
--  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
--*/
--
--SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
--    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
--    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
--
- #ifdef __cplusplus
- }
- #endif
---- a/lib/lzma/LzFind.c
-+++ b/lib/lzma/LzFind.c
-@@ -14,9 +14,15 @@
- #define kStartMaxLen 3
-+#if 0
-+#define DIRECT_INPUT  p->directInput
-+#else
-+#define DIRECT_INPUT  1
-+#endif
-+
- static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
- {
--  if (!p->directInput)
-+  if (!DIRECT_INPUT)
-   {
-     alloc->Free(alloc, p->bufferBase);
-     p->bufferBase = 0;
-@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder
- static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
- {
-   UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
--  if (p->directInput)
-+  if (DIRECT_INPUT)
-   {
-     p->blockSize = blockSize;
-     return 1;
-@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde
-   return (p->bufferBase != 0);
- }
--Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
--Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-+static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-+static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
--UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-+static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
--void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-+static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
- {
-   p->posLimit -= subValue;
-   p->pos -= subValue;
-@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch
- {
-   if (p->streamEndWasReached || p->result != SZ_OK)
-     return;
--  if (p->directInput)
-+  if (DIRECT_INPUT)
-   {
-     UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-     if (curSize > p->directInputRem)
-@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch
-   }
- }
--void MatchFinder_MoveBlock(CMatchFinder *p)
-+static void MatchFinder_MoveBlock(CMatchFinder *p)
- {
-   memmove(p->bufferBase,
-     p->buffer - p->keepSizeBefore,
-@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder
-   p->buffer = p->bufferBase + p->keepSizeBefore;
- }
--int MatchFinder_NeedMove(CMatchFinder *p)
-+static int MatchFinder_NeedMove(CMatchFinder *p)
- {
--  if (p->directInput)
-+  if (DIRECT_INPUT)
-     return 0;
-   /* if (p->streamEndWasReached) return 0; */
-   return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
- }
--void MatchFinder_ReadIfRequired(CMatchFinder *p)
--{
--  if (p->streamEndWasReached)
--    return;
--  if (p->keepSizeAfter >= p->streamPos - p->pos)
--    MatchFinder_ReadBlock(p);
--}
--
- static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
- {
-   if (MatchFinder_NeedMove(p))
-@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch
-   p->posLimit = p->pos + limit;
- }
--void MatchFinder_Init(CMatchFinder *p)
-+static void MatchFinder_Init(CMatchFinder *p)
- {
-   UInt32 i;
-   for (i = 0; i < p->hashSizeSum; i++)
-@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM
-   return (p->pos - p->historySize - 1) & kNormalizeMask;
- }
--void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-+static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
- {
-   UInt32 i;
-   for (i = 0; i < numItems; i++)
-@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat
-   MatchFinder_SetLimits(p);
- }
--static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
--    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
--    UInt32 *distances, UInt32 maxLen)
--{
--  son[_cyclicBufferPos] = curMatch;
--  for (;;)
--  {
--    UInt32 delta = pos - curMatch;
--    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
--      return distances;
--    {
--      const Byte *pb = cur - delta;
--      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
--      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
--      {
--        UInt32 len = 0;
--        while (++len != lenLimit)
--          if (pb[len] != cur[len])
--            break;
--        if (maxLen < len)
--        {
--          *distances++ = maxLen = len;
--          *distances++ = delta - 1;
--          if (len == lenLimit)
--            return distances;
--        }
--      }
--    }
--  }
--}
--
--UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-     UInt32 *distances, UInt32 maxLen)
- {
-@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi
-   p->buffer++; \
-   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
--#define MOVE_POS_RET MOVE_POS return offset;
--
- static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-+#define MOVE_POS_RET MatchFinder_MovePos(p); return offset;
-+
- #define GET_MATCHES_HEADER2(minLen, ret_op) \
-   UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-   lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi
-   distances + offset, maxLen) - distances); MOVE_POS_RET;
- #define SKIP_FOOTER \
--  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
--
--static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 offset;
--  GET_MATCHES_HEADER(2)
--  HASH2_CALC;
--  curMatch = p->hash[hashValue];
--  p->hash[hashValue] = p->pos;
--  offset = 0;
--  GET_MATCHES_FOOTER(offset, 1)
--}
--
--UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 offset;
--  GET_MATCHES_HEADER(3)
--  HASH_ZIP_CALC;
--  curMatch = p->hash[hashValue];
--  p->hash[hashValue] = p->pos;
--  offset = 0;
--  GET_MATCHES_FOOTER(offset, 2)
--}
--
--static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 hash2Value, delta2, maxLen, offset;
--  GET_MATCHES_HEADER(3)
--
--  HASH3_CALC;
--
--  delta2 = p->pos - p->hash[hash2Value];
--  curMatch = p->hash[kFix3HashSize + hashValue];
--  
--  p->hash[hash2Value] =
--  p->hash[kFix3HashSize + hashValue] = p->pos;
--
--
--  maxLen = 2;
--  offset = 0;
--  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
--  {
--    for (; maxLen != lenLimit; maxLen++)
--      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
--        break;
--    distances[0] = maxLen;
--    distances[1] = delta2 - 1;
--    offset = 2;
--    if (maxLen == lenLimit)
--    {
--      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
--      MOVE_POS_RET;
--    }
--  }
--  GET_MATCHES_FOOTER(offset, maxLen)
--}
-+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p);
- static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
- {
-@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches
-   GET_MATCHES_FOOTER(offset, maxLen)
- }
--static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
--  GET_MATCHES_HEADER(4)
--
--  HASH4_CALC;
--
--  delta2 = p->pos - p->hash[                hash2Value];
--  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
--  curMatch = p->hash[kFix4HashSize + hashValue];
--
--  p->hash[                hash2Value] =
--  p->hash[kFix3HashSize + hash3Value] =
--  p->hash[kFix4HashSize + hashValue] = p->pos;
--
--  maxLen = 1;
--  offset = 0;
--  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
--  {
--    distances[0] = maxLen = 2;
--    distances[1] = delta2 - 1;
--    offset = 2;
--  }
--  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
--  {
--    maxLen = 3;
--    distances[offset + 1] = delta3 - 1;
--    offset += 2;
--    delta2 = delta3;
--  }
--  if (offset != 0)
--  {
--    for (; maxLen != lenLimit; maxLen++)
--      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
--        break;
--    distances[offset - 2] = maxLen;
--    if (maxLen == lenLimit)
--    {
--      p->son[p->cyclicBufferPos] = curMatch;
--      MOVE_POS_RET;
--    }
--  }
--  if (maxLen < 3)
--    maxLen = 3;
--  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
--    distances + offset, maxLen) - (distances));
--  MOVE_POS_RET
--}
--
--UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 offset;
--  GET_MATCHES_HEADER(3)
--  HASH_ZIP_CALC;
--  curMatch = p->hash[hashValue];
--  p->hash[hashValue] = p->pos;
--  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
--    distances, 2) - (distances));
--  MOVE_POS_RET
--}
--
--static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    SKIP_HEADER(2)
--    HASH2_CALC;
--    curMatch = p->hash[hashValue];
--    p->hash[hashValue] = p->pos;
--    SKIP_FOOTER
--  }
--  while (--num != 0);
--}
--
--void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    SKIP_HEADER(3)
--    HASH_ZIP_CALC;
--    curMatch = p->hash[hashValue];
--    p->hash[hashValue] = p->pos;
--    SKIP_FOOTER
--  }
--  while (--num != 0);
--}
--
--static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    UInt32 hash2Value;
--    SKIP_HEADER(3)
--    HASH3_CALC;
--    curMatch = p->hash[kFix3HashSize + hashValue];
--    p->hash[hash2Value] =
--    p->hash[kFix3HashSize + hashValue] = p->pos;
--    SKIP_FOOTER
--  }
--  while (--num != 0);
--}
--
- static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
- {
-   do
-@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF
-   while (--num != 0);
- }
--static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    UInt32 hash2Value, hash3Value;
--    SKIP_HEADER(4)
--    HASH4_CALC;
--    curMatch = p->hash[kFix4HashSize + hashValue];
--    p->hash[                hash2Value] =
--    p->hash[kFix3HashSize + hash3Value] =
--    p->hash[kFix4HashSize + hashValue] = p->pos;
--    p->son[p->cyclicBufferPos] = curMatch;
--    MOVE_POS
--  }
--  while (--num != 0);
--}
--
--void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    SKIP_HEADER(3)
--    HASH_ZIP_CALC;
--    curMatch = p->hash[hashValue];
--    p->hash[hashValue] = p->pos;
--    p->son[p->cyclicBufferPos] = curMatch;
--    MOVE_POS
--  }
--  while (--num != 0);
--}
--
- void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
- {
-   vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-   vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-   vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-   vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
--  if (!p->btMode)
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
--  }
--  else if (p->numHashBytes == 2)
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
--  }
--  else if (p->numHashBytes == 3)
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
--  }
--  else
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
--  }
-+  vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-+  vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
- }
---- a/lib/lzma/LzmaDec.c
-+++ b/lib/lzma/LzmaDec.c
-@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
-   p->needFlush = 0;
- }
--void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-+static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
- {
-   p->needFlush = 1;
-   p->remainLen = 0;
-@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
-     p->needInitState = 1;
- }
--void LzmaDec_Init(CLzmaDec *p)
-+static void LzmaDec_Init(CLzmaDec *p)
- {
-   p->dicPos = 0;
-   LzmaDec_InitDicAndState(p, True, True);
-@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
-   p->needInitState = 0;
- }
--SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-+static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-     ELzmaFinishMode finishMode, ELzmaStatus *status)
- {
-   SizeT inSize = *srcLen;
-@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
-   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
- }
--SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
--{
--  SizeT outSize = *destLen;
--  SizeT inSize = *srcLen;
--  *srcLen = *destLen = 0;
--  for (;;)
--  {
--    SizeT inSizeCur = inSize, outSizeCur, dicPos;
--    ELzmaFinishMode curFinishMode;
--    SRes res;
--    if (p->dicPos == p->dicBufSize)
--      p->dicPos = 0;
--    dicPos = p->dicPos;
--    if (outSize > p->dicBufSize - dicPos)
--    {
--      outSizeCur = p->dicBufSize;
--      curFinishMode = LZMA_FINISH_ANY;
--    }
--    else
--    {
--      outSizeCur = dicPos + outSize;
--      curFinishMode = finishMode;
--    }
--
--    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
--    src += inSizeCur;
--    inSize -= inSizeCur;
--    *srcLen += inSizeCur;
--    outSizeCur = p->dicPos - dicPos;
--    memcpy(dest, p->dic + dicPos, outSizeCur);
--    dest += outSizeCur;
--    outSize -= outSizeCur;
--    *destLen += outSizeCur;
--    if (res != 0)
--      return res;
--    if (outSizeCur == 0 || outSize == 0)
--      return SZ_OK;
--  }
--}
--
--void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-+static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
- {
-   alloc->Free(alloc, p->probs);
-   p->probs = 0;
- }
--static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
--{
--  alloc->Free(alloc, p->dic);
--  p->dic = 0;
--}
--
--void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
--{
--  LzmaDec_FreeProbs(p, alloc);
--  LzmaDec_FreeDict(p, alloc);
--}
--
--SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-+static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
- {
-   UInt32 dicSize;
-   Byte d;
-@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
-   return SZ_OK;
- }
--SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
- {
-   CLzmaProps propNew;
-   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
-   p->prop = propNew;
-   return SZ_OK;
- }
--
--SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
--{
--  CLzmaProps propNew;
--  SizeT dicBufSize;
--  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
--  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
--  dicBufSize = propNew.dicSize;
--  if (p->dic == 0 || dicBufSize != p->dicBufSize)
--  {
--    LzmaDec_FreeDict(p, alloc);
--    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
--    if (p->dic == 0)
--    {
--      LzmaDec_FreeProbs(p, alloc);
--      return SZ_ERROR_MEM;
--    }
--  }
--  p->dicBufSize = dicBufSize;
--  p->prop = propNew;
--  return SZ_OK;
--}
- SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-     const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
---- a/lib/lzma/LzmaEnc.c
-+++ b/lib/lzma/LzmaEnc.c
-@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
-   p->writeEndMark = 0;
- }
--void LzmaEncProps_Normalize(CLzmaEncProps *p)
-+static void LzmaEncProps_Normalize(CLzmaEncProps *p)
- {
-   int level = p->level;
-   if (level < 0) level = 5;
-@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
-       #endif
- }
--UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-+static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
- {
-   CLzmaEncProps props = *props2;
-   LzmaEncProps_Normalize(&props);
-@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
- #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
--UInt32 GetPosSlot1(UInt32 pos)
-+static UInt32 GetPosSlot1(UInt32 pos)
- {
-   UInt32 res;
-   BSR2_RET(pos, res);
-@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
- #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
- #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
--void LzmaEnc_FastPosInit(Byte *g_FastPos)
-+static void LzmaEnc_FastPosInit(Byte *g_FastPos)
- {
-   int c = 2, slotFast;
-   g_FastPos[0] = 0;
-@@ -339,58 +339,6 @@ typedef struct
-   CSaveState saveState;
- } CLzmaEnc;
--void LzmaEnc_SaveState(CLzmaEncHandle pp)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  CSaveState *dest = &p->saveState;
--  int i;
--  dest->lenEnc = p->lenEnc;
--  dest->repLenEnc = p->repLenEnc;
--  dest->state = p->state;
--
--  for (i = 0; i < kNumStates; i++)
--  {
--    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
--    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
--  }
--  for (i = 0; i < kNumLenToPosStates; i++)
--    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
--  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
--  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
--  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
--  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
--  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
--  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
--  memcpy(dest->reps, p->reps, sizeof(p->reps));
--  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
--}
--
--void LzmaEnc_RestoreState(CLzmaEncHandle pp)
--{
--  CLzmaEnc *dest = (CLzmaEnc *)pp;
--  const CSaveState *p = &dest->saveState;
--  int i;
--  dest->lenEnc = p->lenEnc;
--  dest->repLenEnc = p->repLenEnc;
--  dest->state = p->state;
--
--  for (i = 0; i < kNumStates; i++)
--  {
--    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
--    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
--  }
--  for (i = 0; i < kNumLenToPosStates; i++)
--    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
--  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
--  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
--  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
--  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
--  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
--  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
--  memcpy(dest->reps, p->reps, sizeof(p->reps));
--  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
--}
--
- SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
- {
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE
-   while (symbol < 0x10000);
- }
--void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-+static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
- {
-   UInt32 i;
-   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc
-   p->matchPriceCount = 0;
- }
--void LzmaEnc_Construct(CLzmaEnc *p)
-+static void LzmaEnc_Construct(CLzmaEnc *p)
- {
-   RangeEnc_Construct(&p->rc);
-   MatchFinder_Construct(&p->matchFinderBase);
-@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
-   return p;
- }
--void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-+static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
- {
-   alloc->Free(alloc, p->litProbs);
-   alloc->Free(alloc, p->saveState.litProbs);
-@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl
-   p->saveState.litProbs = 0;
- }
--void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
- {
-   #ifndef _7ZIP_ST
-   MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U
-   return SZ_OK;
- }
--void LzmaEnc_Init(CLzmaEnc *p)
-+static void LzmaEnc_Init(CLzmaEnc *p)
- {
-   UInt32 i;
-   p->state = 0;
-@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p)
-   p->lpMask = (1 << p->lp) - 1;
- }
--void LzmaEnc_InitPrices(CLzmaEnc *p)
-+static void LzmaEnc_InitPrices(CLzmaEnc *p)
- {
-   if (!p->fastMode)
-   {
-@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
-   return SZ_OK;
- }
--static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
--    ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  p->matchFinderBase.stream = inStream;
--  p->needInit = 1;
--  p->rc.outStream = outStream;
--  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
--}
--
--SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
--    ISeqInStream *inStream, UInt32 keepWindowSize,
--    ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  p->matchFinderBase.stream = inStream;
--  p->needInit = 1;
--  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
--}
--
- static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
- {
-   p->matchFinderBase.directInput = 1;
-@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc
-   p->matchFinderBase.directInputRem = srcLen;
- }
--SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-+static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-     UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
- {
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
-   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
- }
--void LzmaEnc_Finish(CLzmaEncHandle pp)
-+static void LzmaEnc_Finish(CLzmaEncHandle pp)
- {
-   #ifndef _7ZIP_ST
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo
-   return size;
- }
--
--UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
--{
--  const CLzmaEnc *p = (CLzmaEnc *)pp;
--  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
--}
--
--const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
--{
--  const CLzmaEnc *p = (CLzmaEnc *)pp;
--  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
--}
--
--SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
--    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  UInt64 nowPos64;
--  SRes res;
--  CSeqOutStreamBuf outStream;
--
--  outStream.funcTable.Write = MyWrite;
--  outStream.data = dest;
--  outStream.rem = *destLen;
--  outStream.overflow = False;
--
--  p->writeEndMark = False;
--  p->finished = False;
--  p->result = SZ_OK;
--
--  if (reInit)
--    LzmaEnc_Init(p);
--  LzmaEnc_InitPrices(p);
--  nowPos64 = p->nowPos64;
--  RangeEnc_Init(&p->rc);
--  p->rc.outStream = &outStream.funcTable;
--
--  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
--  
--  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
--  *destLen -= outStream.rem;
--  if (outStream.overflow)
--    return SZ_ERROR_OUTPUT_EOF;
--
--  return res;
--}
--
- static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
- {
-   SRes res = SZ_OK;
-@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p,
-   return res;
- }
--SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
--    ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
--  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
--}
--
- SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
- {
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
-     return SZ_ERROR_OUTPUT_EOF;
-   return res;
- }
--
--SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
--    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
--    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
--  SRes res;
--  if (p == 0)
--    return SZ_ERROR_MEM;
--
--  res = LzmaEnc_SetProps(p, props);
--  if (res == SZ_OK)
--  {
--    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
--    if (res == SZ_OK)
--      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
--          writeEndMark, progress, alloc, allocBig);
--  }
--
--  LzmaEnc_Destroy(p, alloc, allocBig);
--  return res;
--}
diff --git a/target/linux/generic/hack-4.19/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.19/640-bridge-only-accept-EAP-locally.patch
deleted file mode 100644 (file)
index 981d49b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:18:54 +0200
-Subject: bridge: only accept EAP locally
-
-When bridging, do not forward EAP frames to other ports, only deliver
-them locally, regardless of the state.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/bridge/br_input.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -110,10 +110,14 @@ int br_handle_frame_finish(struct net *n
-               }
-       }
-+      BR_INPUT_SKB_CB(skb)->brdev = br->dev;
-+
-+      if (skb->protocol == htons(ETH_P_PAE))
-+              return br_pass_frame_up(skb);
-+
-       if (p->state == BR_STATE_LEARNING)
-               goto drop;
--      BR_INPUT_SKB_CB(skb)->brdev = br->dev;
-       BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED);
-       if (IS_ENABLED(CONFIG_INET) &&
diff --git a/target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch b/target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch
deleted file mode 100644 (file)
index 2a9725f..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/include/net/netfilter/nf_flow_table.h
-+++ b/include/net/netfilter/nf_flow_table.h
-@@ -163,6 +163,8 @@ struct nf_flow_table_hw {
- int nf_flow_table_hw_register(const struct nf_flow_table_hw *offload);
- void nf_flow_table_hw_unregister(const struct nf_flow_table_hw *offload);
-+void nf_flow_table_acct(struct flow_offload *flow, struct sk_buff *skb, int dir);
-+
- extern struct work_struct nf_flow_offload_hw_work;
- #define MODULE_ALIAS_NF_FLOWTABLE(family)     \
---- a/net/netfilter/nf_flow_table_core.c
-+++ b/net/netfilter/nf_flow_table_core.c
-@@ -11,6 +11,7 @@
- #include <net/netfilter/nf_conntrack.h>
- #include <net/netfilter/nf_conntrack_core.h>
- #include <net/netfilter/nf_conntrack_tuple.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
- struct flow_offload_entry {
-       struct flow_offload     flow;
-@@ -149,6 +150,22 @@ void flow_offload_free(struct flow_offlo
- }
- EXPORT_SYMBOL_GPL(flow_offload_free);
-+void nf_flow_table_acct(struct flow_offload *flow, struct sk_buff *skb, int dir)
-+{
-+      struct flow_offload_entry *entry;
-+      struct nf_conn_acct *acct;
-+
-+      entry = container_of(flow, struct flow_offload_entry, flow);
-+      acct = nf_conn_acct_find(entry->ct);
-+      if (acct) {
-+              struct nf_conn_counter *counter = acct->counter;
-+
-+              atomic64_inc(&counter[dir].packets);
-+              atomic64_add(skb->len, &counter[dir].bytes);
-+      }
-+}
-+EXPORT_SYMBOL_GPL(nf_flow_table_acct);
-+
- static u32 flow_offload_hash(const void *data, u32 len, u32 seed)
- {
-       const struct flow_offload_tuple *tuple = data;
---- a/net/netfilter/nf_flow_table_ip.c
-+++ b/net/netfilter/nf_flow_table_ip.c
-@@ -11,6 +11,7 @@
- #include <net/ip6_route.h>
- #include <net/neighbour.h>
- #include <net/netfilter/nf_flow_table.h>
-+
- /* For layer 4 checksum field offset. */
- #include <linux/tcp.h>
- #include <linux/udp.h>
-@@ -265,6 +266,7 @@ nf_flow_offload_ip_hook(void *priv, stru
-       skb->dev = outdev;
-       nexthop = rt_nexthop(rt, flow->tuplehash[!dir].tuple.src_v4.s_addr);
-       skb_dst_set_noref(skb, &rt->dst);
-+      nf_flow_table_acct(flow, skb, dir);
-       neigh_xmit(NEIGH_ARP_TABLE, outdev, &nexthop, skb);
-       return NF_STOLEN;
-@@ -482,6 +484,7 @@ nf_flow_offload_ipv6_hook(void *priv, st
-       skb->dev = outdev;
-       nexthop = rt6_nexthop(rt, &flow->tuplehash[!dir].tuple.src_v6);
-       skb_dst_set_noref(skb, &rt->dst);
-+      nf_flow_table_acct(flow, skb, dir);
-       neigh_xmit(NEIGH_ND_TABLE, outdev, nexthop, skb);
-       return NF_STOLEN;
diff --git a/target/linux/generic/hack-4.19/650-netfilter-add-xt_OFFLOAD-target.patch b/target/linux/generic/hack-4.19/650-netfilter-add-xt_OFFLOAD-target.patch
deleted file mode 100644 (file)
index 8ebea32..0000000
+++ /dev/null
@@ -1,497 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 20 Feb 2018 15:56:02 +0100
-Subject: [PATCH] netfilter: add xt_OFFLOAD target
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- create mode 100644 net/netfilter/xt_OFFLOAD.c
-
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -63,8 +63,6 @@ config NF_TABLES_ARP
-       help
-         This option enables the ARP support for nf_tables.
--endif # NF_TABLES
--
- config NF_FLOW_TABLE_IPV4
-       tristate "Netfilter flow table IPv4 module"
-       depends on NF_FLOW_TABLE
-@@ -73,6 +71,8 @@ config NF_FLOW_TABLE_IPV4
-         To compile it as a module, choose M here.
-+endif # NF_TABLES
-+
- config NF_DUP_IPV4
-       tristate "Netfilter IPv4 packet duplication to alternate destination"
-       depends on !NF_CONNTRACK || NF_CONNTRACK
---- a/net/ipv6/netfilter/Kconfig
-+++ b/net/ipv6/netfilter/Kconfig
-@@ -80,7 +80,6 @@ config NFT_FIB_IPV6
-         multicast or blackhole.
- endif # NF_TABLES_IPV6
--endif # NF_TABLES
- config NF_FLOW_TABLE_IPV6
-       tristate "Netfilter flow table IPv6 module"
-@@ -90,6 +89,8 @@ config NF_FLOW_TABLE_IPV6
-         To compile it as a module, choose M here.
-+endif # NF_TABLES
-+
- config NF_DUP_IPV6
-       tristate "Netfilter IPv6 packet duplication to alternate destination"
-       depends on !NF_CONNTRACK || NF_CONNTRACK
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -693,8 +693,6 @@ config NFT_FIB_NETDEV
- endif # NF_TABLES_NETDEV
--endif # NF_TABLES
--
- config NF_FLOW_TABLE_INET
-       tristate "Netfilter flow table mixed IPv4/IPv6 module"
-       depends on NF_FLOW_TABLE
-@@ -703,11 +701,12 @@ config NF_FLOW_TABLE_INET
-         To compile it as a module, choose M here.
-+endif # NF_TABLES
-+
- config NF_FLOW_TABLE
-       tristate "Netfilter flow table module"
-       depends on NETFILTER_INGRESS
-       depends on NF_CONNTRACK
--      depends on NF_TABLES
-       help
-         This option adds the flow table core infrastructure.
-@@ -996,6 +995,15 @@ config NETFILTER_XT_TARGET_NOTRACK
-       depends on NETFILTER_ADVANCED
-       select NETFILTER_XT_TARGET_CT
-+config NETFILTER_XT_TARGET_FLOWOFFLOAD
-+      tristate '"FLOWOFFLOAD" target support'
-+      depends on NF_FLOW_TABLE
-+      depends on NETFILTER_INGRESS
-+      help
-+        This option adds a `FLOWOFFLOAD' target, which uses the nf_flow_offload
-+        module to speed up processing of packets by bypassing the usual
-+        netfilter chains
-+
- config NETFILTER_XT_TARGET_RATEEST
-       tristate '"RATEEST" target support'
-       depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -144,6 +144,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIF
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD) += xt_FLOWOFFLOAD.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
---- /dev/null
-+++ b/net/netfilter/xt_FLOWOFFLOAD.c
-@@ -0,0 +1,366 @@
-+/*
-+ * Copyright (C) 2018 Felix Fietkau <nbd@nbd.name>
-+ *
-+ * 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/module.h>
-+#include <linux/init.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter/xt_FLOWOFFLOAD.h>
-+#include <net/ip.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_flow_table.h>
-+
-+static struct nf_flowtable nf_flowtable;
-+static HLIST_HEAD(hooks);
-+static DEFINE_SPINLOCK(hooks_lock);
-+static struct delayed_work hook_work;
-+
-+struct xt_flowoffload_hook {
-+      struct hlist_node list;
-+      struct nf_hook_ops ops;
-+      struct net *net;
-+      bool registered;
-+      bool used;
-+};
-+
-+static unsigned int
-+xt_flowoffload_net_hook(void *priv, struct sk_buff *skb,
-+                        const struct nf_hook_state *state)
-+{
-+      switch (skb->protocol) {
-+      case htons(ETH_P_IP):
-+              return nf_flow_offload_ip_hook(priv, skb, state);
-+      case htons(ETH_P_IPV6):
-+              return nf_flow_offload_ipv6_hook(priv, skb, state);
-+      }
-+
-+      return NF_ACCEPT;
-+}
-+
-+static int
-+xt_flowoffload_create_hook(struct net_device *dev)
-+{
-+      struct xt_flowoffload_hook *hook;
-+      struct nf_hook_ops *ops;
-+
-+      hook = kzalloc(sizeof(*hook), GFP_ATOMIC);
-+      if (!hook)
-+              return -ENOMEM;
-+
-+      ops = &hook->ops;
-+      ops->pf = NFPROTO_NETDEV;
-+      ops->hooknum = NF_NETDEV_INGRESS;
-+      ops->priority = 10;
-+      ops->priv = &nf_flowtable;
-+      ops->hook = xt_flowoffload_net_hook;
-+      ops->dev = dev;
-+
-+      hlist_add_head(&hook->list, &hooks);
-+      mod_delayed_work(system_power_efficient_wq, &hook_work, 0);
-+
-+      return 0;
-+}
-+
-+static struct xt_flowoffload_hook *
-+flow_offload_lookup_hook(struct net_device *dev)
-+{
-+      struct xt_flowoffload_hook *hook;
-+
-+      hlist_for_each_entry(hook, &hooks, list) {
-+              if (hook->ops.dev == dev)
-+                      return hook;
-+      }
-+
-+      return NULL;
-+}
-+
-+static void
-+xt_flowoffload_check_device(struct net_device *dev)
-+{
-+      struct xt_flowoffload_hook *hook;
-+
-+      spin_lock_bh(&hooks_lock);
-+      hook = flow_offload_lookup_hook(dev);
-+      if (hook)
-+              hook->used = true;
-+      else
-+              xt_flowoffload_create_hook(dev);
-+      spin_unlock_bh(&hooks_lock);
-+}
-+
-+static void
-+xt_flowoffload_register_hooks(void)
-+{
-+      struct xt_flowoffload_hook *hook;
-+
-+restart:
-+      hlist_for_each_entry(hook, &hooks, list) {
-+              if (hook->registered)
-+                      continue;
-+
-+              hook->registered = true;
-+              hook->net = dev_net(hook->ops.dev);
-+              spin_unlock_bh(&hooks_lock);
-+              nf_register_net_hook(hook->net, &hook->ops);
-+              spin_lock_bh(&hooks_lock);
-+              goto restart;
-+      }
-+
-+}
-+
-+static void
-+xt_flowoffload_cleanup_hooks(void)
-+{
-+      struct xt_flowoffload_hook *hook;
-+
-+restart:
-+      hlist_for_each_entry(hook, &hooks, list) {
-+              if (hook->used || !hook->registered)
-+                      continue;
-+
-+              hlist_del(&hook->list);
-+              spin_unlock_bh(&hooks_lock);
-+              nf_unregister_net_hook(hook->net, &hook->ops);
-+              kfree(hook);
-+              spin_lock_bh(&hooks_lock);
-+              goto restart;
-+      }
-+
-+}
-+
-+static void
-+xt_flowoffload_check_hook(struct flow_offload *flow, void *data)
-+{
-+      struct flow_offload_tuple *tuple = &flow->tuplehash[0].tuple;
-+      struct xt_flowoffload_hook *hook;
-+      bool *found = data;
-+
-+      spin_lock_bh(&hooks_lock);
-+      hlist_for_each_entry(hook, &hooks, list) {
-+              if (hook->ops.dev->ifindex != tuple->iifidx &&
-+                  hook->ops.dev->ifindex != tuple->oifidx)
-+                      continue;
-+
-+              hook->used = true;
-+              *found = true;
-+      }
-+      spin_unlock_bh(&hooks_lock);
-+}
-+
-+static void
-+xt_flowoffload_hook_work(struct work_struct *work)
-+{
-+      struct xt_flowoffload_hook *hook;
-+      bool found = false;
-+      int err;
-+
-+      spin_lock_bh(&hooks_lock);
-+      xt_flowoffload_register_hooks();
-+      hlist_for_each_entry(hook, &hooks, list)
-+              hook->used = false;
-+      spin_unlock_bh(&hooks_lock);
-+
-+      err = nf_flow_table_iterate(&nf_flowtable, xt_flowoffload_check_hook,
-+                                  &found);
-+      if (err && err != -EAGAIN)
-+          goto out;
-+
-+      spin_lock_bh(&hooks_lock);
-+      xt_flowoffload_cleanup_hooks();
-+      spin_unlock_bh(&hooks_lock);
-+
-+out:
-+      if (found)
-+              queue_delayed_work(system_power_efficient_wq, &hook_work, HZ);
-+}
-+
-+static bool
-+xt_flowoffload_skip(struct sk_buff *skb)
-+{
-+      struct ip_options *opt = &(IPCB(skb)->opt);
-+
-+      if (unlikely(opt->optlen))
-+              return true;
-+      if (skb_sec_path(skb))
-+              return true;
-+
-+      return false;
-+}
-+
-+static struct dst_entry *
-+xt_flowoffload_dst(const struct nf_conn *ct, enum ip_conntrack_dir dir,
-+                 const struct xt_action_param *par)
-+{
-+      struct dst_entry *dst = NULL;
-+      struct flowi fl;
-+
-+      memset(&fl, 0, sizeof(fl));
-+      switch (xt_family(par)) {
-+      case NFPROTO_IPV4:
-+              fl.u.ip4.daddr = ct->tuplehash[dir].tuple.src.u3.ip;
-+              break;
-+      case NFPROTO_IPV6:
-+              fl.u.ip6.saddr = ct->tuplehash[dir].tuple.dst.u3.in6;
-+              fl.u.ip6.daddr = ct->tuplehash[dir].tuple.src.u3.in6;
-+              break;
-+      }
-+
-+      nf_route(xt_net(par), &dst, &fl, false, xt_family(par));
-+
-+      return dst;
-+}
-+
-+static int
-+xt_flowoffload_route(struct sk_buff *skb, const struct nf_conn *ct,
-+                 const struct xt_action_param *par,
-+                 struct nf_flow_route *route, enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *this_dst, *other_dst;
-+
-+      this_dst = xt_flowoffload_dst(ct, dir, par);
-+      other_dst = xt_flowoffload_dst(ct, !dir, par);
-+      if (!this_dst || !other_dst)
-+              return -ENOENT;
-+
-+      if (dst_xfrm(this_dst) || dst_xfrm(other_dst))
-+              return -EINVAL;
-+
-+      route->tuple[dir].dst           = this_dst;
-+      route->tuple[!dir].dst          = other_dst;
-+
-+      return 0;
-+}
-+
-+static unsigned int
-+flowoffload_tg(struct sk_buff *skb, const struct xt_action_param *par)
-+{
-+      const struct xt_flowoffload_target_info *info = par->targinfo;
-+      enum ip_conntrack_info ctinfo;
-+      enum ip_conntrack_dir dir;
-+      struct nf_flow_route route;
-+      struct flow_offload *flow;
-+      struct nf_conn *ct;
-+
-+      if (xt_flowoffload_skip(skb))
-+              return XT_CONTINUE;
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (ct == NULL)
-+              return XT_CONTINUE;
-+
-+      switch (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum) {
-+      case IPPROTO_TCP:
-+              if (ct->proto.tcp.state != TCP_CONNTRACK_ESTABLISHED)
-+                      return XT_CONTINUE;
-+              break;
-+      case IPPROTO_UDP:
-+              break;
-+      default:
-+              return XT_CONTINUE;
-+      }
-+
-+      if (test_bit(IPS_HELPER_BIT, &ct->status))
-+              return XT_CONTINUE;
-+
-+      if (ctinfo == IP_CT_NEW ||
-+          ctinfo == IP_CT_RELATED)
-+              return XT_CONTINUE;
-+
-+      if (!xt_in(par) || !xt_out(par))
-+              return XT_CONTINUE;
-+
-+      if (test_and_set_bit(IPS_OFFLOAD_BIT, &ct->status))
-+              return XT_CONTINUE;
-+
-+      dir = CTINFO2DIR(ctinfo);
-+
-+      if (xt_flowoffload_route(skb, ct, par, &route, dir) < 0)
-+              goto err_flow_route;
-+
-+      flow = flow_offload_alloc(ct, &route);
-+      if (!flow)
-+              goto err_flow_alloc;
-+
-+      if (flow_offload_add(&nf_flowtable, flow) < 0)
-+              goto err_flow_add;
-+
-+      xt_flowoffload_check_device(xt_in(par));
-+      xt_flowoffload_check_device(xt_out(par));
-+
-+      if (info->flags & XT_FLOWOFFLOAD_HW)
-+              nf_flow_offload_hw_add(xt_net(par), flow, ct);
-+
-+      return XT_CONTINUE;
-+
-+err_flow_add:
-+      flow_offload_free(flow);
-+err_flow_alloc:
-+      dst_release(route.tuple[!dir].dst);
-+err_flow_route:
-+      clear_bit(IPS_OFFLOAD_BIT, &ct->status);
-+      return XT_CONTINUE;
-+}
-+
-+
-+static int flowoffload_chk(const struct xt_tgchk_param *par)
-+{
-+      struct xt_flowoffload_target_info *info = par->targinfo;
-+
-+      if (info->flags & ~XT_FLOWOFFLOAD_MASK)
-+              return -EINVAL;
-+
-+      return 0;
-+}
-+
-+static struct xt_target offload_tg_reg __read_mostly = {
-+      .family         = NFPROTO_UNSPEC,
-+      .name           = "FLOWOFFLOAD",
-+      .revision       = 0,
-+      .targetsize     = sizeof(struct xt_flowoffload_target_info),
-+      .usersize       = sizeof(struct xt_flowoffload_target_info),
-+      .checkentry     = flowoffload_chk,
-+      .target         = flowoffload_tg,
-+      .me             = THIS_MODULE,
-+};
-+
-+static int xt_flowoffload_table_init(struct nf_flowtable *table)
-+{
-+      table->flags = NF_FLOWTABLE_F_HW;
-+      nf_flow_table_init(table);
-+      return 0;
-+}
-+
-+static void xt_flowoffload_table_cleanup(struct nf_flowtable *table)
-+{
-+      nf_flow_table_free(table);
-+}
-+
-+static int __init xt_flowoffload_tg_init(void)
-+{
-+      int ret;
-+
-+      INIT_DELAYED_WORK(&hook_work, xt_flowoffload_hook_work);
-+
-+      ret = xt_flowoffload_table_init(&nf_flowtable);
-+      if (ret)
-+              return ret;
-+
-+      ret = xt_register_target(&offload_tg_reg);
-+      if (ret)
-+              xt_flowoffload_table_cleanup(&nf_flowtable);
-+
-+      return ret;
-+}
-+
-+static void __exit xt_flowoffload_tg_exit(void)
-+{
-+      xt_unregister_target(&offload_tg_reg);
-+      xt_flowoffload_table_cleanup(&nf_flowtable);
-+}
-+
-+MODULE_LICENSE("GPL");
-+module_init(xt_flowoffload_tg_init);
-+module_exit(xt_flowoffload_tg_exit);
---- a/net/netfilter/nf_flow_table_core.c
-+++ b/net/netfilter/nf_flow_table_core.c
-@@ -6,7 +6,6 @@
- #include <linux/netdevice.h>
- #include <net/ip.h>
- #include <net/ip6_route.h>
--#include <net/netfilter/nf_tables.h>
- #include <net/netfilter/nf_flow_table.h>
- #include <net/netfilter/nf_conntrack.h>
- #include <net/netfilter/nf_conntrack_core.h>
---- /dev/null
-+++ b/include/uapi/linux/netfilter/xt_FLOWOFFLOAD.h
-@@ -0,0 +1,17 @@
-+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-+#ifndef _XT_FLOWOFFLOAD_H
-+#define _XT_FLOWOFFLOAD_H
-+
-+#include <linux/types.h>
-+
-+enum {
-+      XT_FLOWOFFLOAD_HW       = 1 << 0,
-+
-+      XT_FLOWOFFLOAD_MASK     = XT_FLOWOFFLOAD_HW
-+};
-+
-+struct xt_flowoffload_target_info {
-+      __u32 flags;
-+};
-+
-+#endif /* _XT_FLOWOFFLOAD_H */
diff --git a/target/linux/generic/hack-4.19/651-wireless_mesh_header.patch b/target/linux/generic/hack-4.19/651-wireless_mesh_header.patch
deleted file mode 100644 (file)
index 965b431..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6d3bc769657b0ee7c7506dad9911111c4226a7ea Mon Sep 17 00:00:00 2001
-From: Imre Kaloz <kaloz@openwrt.org>
-Date: Fri, 7 Jul 2017 17:21:05 +0200
-Subject: mac80211: increase wireless mesh header size
-
-lede-commit 3d4466cfd8f75f717efdb1f96fdde3c70d865fc1
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- include/linux/netdevice.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -140,8 +140,8 @@ static inline bool dev_xmit_complete(int
- #if defined(CONFIG_HYPERV_NET)
- # define LL_MAX_HEADER 128
--#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
--# if defined(CONFIG_MAC80211_MESH)
-+#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || 1
-+# if defined(CONFIG_MAC80211_MESH) || 1
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic/hack-4.19/660-fq_codel_defaults.patch b/target/linux/generic/hack-4.19/660-fq_codel_defaults.patch
deleted file mode 100644 (file)
index 42698c6..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From a6ccb238939b25851474a279b20367fd24a0e816 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:21:53 +0200
-Subject:  hack: net: fq_codel: tune defaults for small devices
-
-Assume that x86_64 devices always have a big memory and do not need this 
-optimization compared to devices with only 32 MB or 64 MB RAM.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/sched/sch_fq_codel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -474,7 +474,11 @@ static int fq_codel_init(struct Qdisc *s
-       sch->limit = 10*1024;
-       q->flows_cnt = 1024;
-+#ifdef CONFIG_X86_64
-       q->memory_limit = 32 << 20; /* 32 MBytes */
-+#else
-+      q->memory_limit = 4 << 20; /* 4 MBytes */
-+#endif
-       q->drop_batch_size = 64;
-       q->quantum = psched_mtu(qdisc_dev(sch));
-       INIT_LIST_HEAD(&q->new_flows);
diff --git a/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch
deleted file mode 100644 (file)
index 817c418..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-From 1d418f7e88035ed7a94073f6354246c66e9193e9 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:22:58 +0200
-Subject: fq_codel: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/net/sch_generic.h | 3 ++-
- net/sched/Kconfig         | 3 ++-
- net/sched/sch_api.c       | 2 +-
- net/sched/sch_fq_codel.c  | 3 ++-
- net/sched/sch_generic.c   | 4 ++--
- 5 files changed, 9 insertions(+), 6 deletions(-)
-
---- a/include/net/sch_generic.h
-+++ b/include/net/sch_generic.h
-@@ -481,12 +481,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
- extern struct Qdisc_ops pfifo_fast_ops;
- extern struct Qdisc_ops mq_qdisc_ops;
- extern struct Qdisc_ops noqueue_qdisc_ops;
-+extern struct Qdisc_ops fq_codel_qdisc_ops;
- extern const struct Qdisc_ops *default_qdisc_ops;
- static inline const struct Qdisc_ops *
- get_default_qdisc_ops(const struct net_device *dev, int ntx)
- {
-       return ntx < dev->real_num_tx_queues ?
--                      default_qdisc_ops : &pfifo_fast_ops;
-+                      default_qdisc_ops : &fq_codel_qdisc_ops;
- }
- struct Qdisc_class_common {
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -3,8 +3,9 @@
- #
- menuconfig NET_SCHED
--      bool "QoS and/or fair queueing"
-+      def_bool y
-       select NET_SCH_FIFO
-+      select NET_SCH_FQ_CODEL
-       ---help---
-         When the kernel has several packets to send out over a network
-         device, it has to decide which ones to send first, which ones to
---- a/net/sched/sch_api.c
-+++ b/net/sched/sch_api.c
-@@ -2157,7 +2157,7 @@ static int __init pktsched_init(void)
-               return err;
-       }
--      register_qdisc(&pfifo_fast_ops);
-+      register_qdisc(&fq_codel_qdisc_ops);
-       register_qdisc(&pfifo_qdisc_ops);
-       register_qdisc(&bfifo_qdisc_ops);
-       register_qdisc(&pfifo_head_drop_qdisc_ops);
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -716,7 +716,7 @@ static const struct Qdisc_class_ops fq_c
-       .walk           =       fq_codel_walk,
- };
--static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
-+struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
-       .cl_ops         =       &fq_codel_class_ops,
-       .id             =       "fq_codel",
-       .priv_size      =       sizeof(struct fq_codel_sched_data),
-@@ -731,6 +731,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
-       .dump_stats =   fq_codel_dump_stats,
-       .owner          =       THIS_MODULE,
- };
-+EXPORT_SYMBOL(fq_codel_qdisc_ops);
- static int __init fq_codel_module_init(void)
- {
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -35,7 +35,7 @@
- #include <net/xfrm.h>
- /* Qdisc to use by default */
--const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
-+const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops;
- EXPORT_SYMBOL(default_qdisc_ops);
- /* Main transmission queue. */
-@@ -1004,7 +1004,7 @@ static void attach_one_default_qdisc(str
-                                    void *_unused)
- {
-       struct Qdisc *qdisc;
--      const struct Qdisc_ops *ops = default_qdisc_ops;
-+      const struct Qdisc_ops *ops = &fq_codel_qdisc_ops;
-       if (dev->priv_flags & IFF_NO_QUEUE)
-               ops = &noqueue_qdisc_ops;
diff --git a/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch b/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch
deleted file mode 100644 (file)
index 0009940..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-From b531d492d5ef1cf9dba0f4888eb5fd8624a6d762 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:23:42 +0200
-Subject: net: sched: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/sched/sch_generic.c | 140 ------------------------------------------------
- 1 file changed, 140 deletions(-)
-
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -595,207 +595,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea
-       .owner          =       THIS_MODULE,
- };
--static const u8 prio2band[TC_PRIO_MAX + 1] = {
--      1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
--};
--
--/* 3-band FIFO queue: old style, but should be a bit faster than
--   generic prio+fifo combination.
-- */
--
--#define PFIFO_FAST_BANDS 3
--
--/*
-- * Private data for a pfifo_fast scheduler containing:
-- *    - rings for priority bands
-- */
--struct pfifo_fast_priv {
--      struct skb_array q[PFIFO_FAST_BANDS];
--};
--
--static inline struct skb_array *band2list(struct pfifo_fast_priv *priv,
--                                        int band)
--{
--      return &priv->q[band];
--}
--
--static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc,
--                            struct sk_buff **to_free)
--{
--      int band = prio2band[skb->priority & TC_PRIO_MAX];
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--      struct skb_array *q = band2list(priv, band);
--      unsigned int pkt_len = qdisc_pkt_len(skb);
--      int err;
--
--      err = skb_array_produce(q, skb);
--
--      if (unlikely(err))
--              return qdisc_drop_cpu(skb, qdisc, to_free);
--
--      qdisc_qstats_atomic_qlen_inc(qdisc);
--      /* Note: skb can not be used after skb_array_produce(),
--       * so we better not use qdisc_qstats_cpu_backlog_inc()
--       */
--      this_cpu_add(qdisc->cpu_qstats->backlog, pkt_len);
--      return NET_XMIT_SUCCESS;
--}
--
--static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
--{
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--      struct sk_buff *skb = NULL;
--      int band;
--
--      for (band = 0; band < PFIFO_FAST_BANDS && !skb; band++) {
--              struct skb_array *q = band2list(priv, band);
--
--              if (__skb_array_empty(q))
--                      continue;
--
--              skb = __skb_array_consume(q);
--      }
--      if (likely(skb)) {
--              qdisc_qstats_cpu_backlog_dec(qdisc, skb);
--              qdisc_bstats_cpu_update(qdisc, skb);
--              qdisc_qstats_atomic_qlen_dec(qdisc);
--      }
--
--      return skb;
--}
--
--static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
--{
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--      struct sk_buff *skb = NULL;
--      int band;
--
--      for (band = 0; band < PFIFO_FAST_BANDS && !skb; band++) {
--              struct skb_array *q = band2list(priv, band);
--
--              skb = __skb_array_peek(q);
--      }
--
--      return skb;
--}
--
--static void pfifo_fast_reset(struct Qdisc *qdisc)
--{
--      int i, band;
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--
--      for (band = 0; band < PFIFO_FAST_BANDS; band++) {
--              struct skb_array *q = band2list(priv, band);
--              struct sk_buff *skb;
--
--              /* NULL ring is possible if destroy path is due to a failed
--               * skb_array_init() in pfifo_fast_init() case.
--               */
--              if (!q->ring.queue)
--                      continue;
--
--              while ((skb = __skb_array_consume(q)) != NULL)
--                      kfree_skb(skb);
--      }
--
--      for_each_possible_cpu(i) {
--              struct gnet_stats_queue *q = per_cpu_ptr(qdisc->cpu_qstats, i);
--
--              q->backlog = 0;
--      }
--}
--
--static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
--{
--      struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
--
--      memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
--      if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
--              goto nla_put_failure;
--      return skb->len;
--
--nla_put_failure:
--      return -1;
--}
--
--static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt,
--                         struct netlink_ext_ack *extack)
--{
--      unsigned int qlen = qdisc_dev(qdisc)->tx_queue_len;
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--      int prio;
--
--      /* guard against zero length rings */
--      if (!qlen)
--              return -EINVAL;
--
--      for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
--              struct skb_array *q = band2list(priv, prio);
--              int err;
--
--              err = skb_array_init(q, qlen, GFP_KERNEL);
--              if (err)
--                      return -ENOMEM;
--      }
--
--      /* Can by-pass the queue discipline */
--      qdisc->flags |= TCQ_F_CAN_BYPASS;
--      return 0;
--}
--
--static void pfifo_fast_destroy(struct Qdisc *sch)
--{
--      struct pfifo_fast_priv *priv = qdisc_priv(sch);
--      int prio;
--
--      for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
--              struct skb_array *q = band2list(priv, prio);
--
--              /* NULL ring is possible if destroy path is due to a failed
--               * skb_array_init() in pfifo_fast_init() case.
--               */
--              if (!q->ring.queue)
--                      continue;
--              /* Destroy ring but no need to kfree_skb because a call to
--               * pfifo_fast_reset() has already done that work.
--               */
--              ptr_ring_cleanup(&q->ring, NULL);
--      }
--}
--
--static int pfifo_fast_change_tx_queue_len(struct Qdisc *sch,
--                                        unsigned int new_len)
--{
--      struct pfifo_fast_priv *priv = qdisc_priv(sch);
--      struct skb_array *bands[PFIFO_FAST_BANDS];
--      int prio;
--
--      for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
--              struct skb_array *q = band2list(priv, prio);
--
--              bands[prio] = q;
--      }
--
--      return skb_array_resize_multiple(bands, PFIFO_FAST_BANDS, new_len,
--                                       GFP_KERNEL);
--}
--
--struct Qdisc_ops pfifo_fast_ops __read_mostly = {
--      .id             =       "pfifo_fast",
--      .priv_size      =       sizeof(struct pfifo_fast_priv),
--      .enqueue        =       pfifo_fast_enqueue,
--      .dequeue        =       pfifo_fast_dequeue,
--      .peek           =       pfifo_fast_peek,
--      .init           =       pfifo_fast_init,
--      .destroy        =       pfifo_fast_destroy,
--      .reset          =       pfifo_fast_reset,
--      .dump           =       pfifo_fast_dump,
--      .change_tx_queue_len =  pfifo_fast_change_tx_queue_len,
--      .owner          =       THIS_MODULE,
--      .static_flags   =       TCQ_F_NOLOCK | TCQ_F_CPUSTATS,
--};
--EXPORT_SYMBOL(pfifo_fast_ops);
--
- static struct lock_class_key qdisc_tx_busylock;
- static struct lock_class_key qdisc_running_key;
diff --git a/target/linux/generic/hack-4.19/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-4.19/700-swconfig_switch_drivers.patch
deleted file mode 100644 (file)
index ebfcfe8..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-From 36e516290611e613aa92996cb4339561452695b4 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:24:23 +0200
-Subject: net: swconfig: adds openwrt switch layer
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/net/phy/Kconfig   | 83 +++++++++++++++++++++++++++++++++++++++++++++++
- drivers/net/phy/Makefile  | 15 +++++++++
- include/uapi/linux/Kbuild |  1 +
- 3 files changed, 99 insertions(+)
-
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -209,6 +209,89 @@ config LED_TRIGGER_PHY
-               for any speed known to the PHY.
-+comment "Switch configuration API + drivers"
-+
-+config SWCONFIG
-+      tristate "Switch configuration API"
-+      ---help---
-+        Switch configuration API using netlink. This allows
-+        you to configure the VLAN features of certain switches.
-+
-+config SWCONFIG_LEDS
-+      bool "Switch LED trigger support"
-+      depends on (SWCONFIG && LEDS_TRIGGERS)
-+
-+config ADM6996_PHY
-+      tristate "Driver for ADM6996 switches"
-+      select SWCONFIG
-+      ---help---
-+        Currently supports the ADM6996FC and ADM6996M switches.
-+        Support for FC is very limited.
-+
-+config AR8216_PHY
-+      tristate "Driver for Atheros AR8216 switches"
-+      select ETHERNET_PACKET_MANGLE
-+      select SWCONFIG
-+
-+config AR8216_PHY_LEDS
-+      bool "Atheros AR8216 switch LED support"
-+      depends on (AR8216_PHY && LEDS_CLASS)
-+
-+source "drivers/net/phy/b53/Kconfig"
-+
-+config IP17XX_PHY
-+      tristate "Driver for IC+ IP17xx switches"
-+      select SWCONFIG
-+
-+config MVSWITCH_PHY
-+      tristate "Driver for Marvell 88E6060 switches"
-+      select ETHERNET_PACKET_MANGLE
-+
-+config MVSW61XX_PHY
-+      tristate "Driver for Marvell 88E6171/6172 switches"
-+      select SWCONFIG
-+
-+config PSB6970_PHY
-+      tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
-+      select SWCONFIG
-+      select ETHERNET_PACKET_MANGLE
-+
-+config RTL8306_PHY
-+      tristate "Driver for Realtek RTL8306S switches"
-+      select SWCONFIG
-+
-+config RTL8366_SMI
-+      tristate "Driver for the RTL8366 SMI interface"
-+      depends on GPIOLIB
-+      ---help---
-+        This module implements the SMI interface protocol which is used
-+        by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366_SMI_DEBUG_FS
-+      bool "RTL8366 SMI interface debugfs support"
-+        depends on DEBUG_FS
-+        default n
-+
-+config RTL8366S_PHY
-+      tristate "Driver for the Realtek RTL8366S switch"
-+      select SWCONFIG
-+
-+config RTL8366RB_PHY
-+      tristate "Driver for the Realtek RTL8366RB switch"
-+      select SWCONFIG
-+
-+config RTL8367_PHY
-+      tristate "Driver for the Realtek RTL8367R/M switches"
-+      select SWCONFIG
-+
-+config RTL8367B_PHY
-+      tristate "Driver fot the Realtek RTL8367R-VB switch"
-+      select SWCONFIG
-+
-+endif # RTL8366_SMI
-+
- comment "MII PHY device drivers"
- config SFP
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -22,6 +22,21 @@ libphy-$(CONFIG_LED_TRIGGER_PHY)    += phy_
- obj-$(CONFIG_PHYLINK)         += phylink.o
- obj-$(CONFIG_PHYLIB)          += libphy.o
-+obj-$(CONFIG_SWCONFIG)                += swconfig.o
-+obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
-+obj-$(CONFIG_AR8216_PHY)      += ar8216.o ar8327.o
-+obj-$(CONFIG_SWCONFIG_B53)    += b53/
-+obj-$(CONFIG_IP17XX_PHY)      += ip17xx.o
-+obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
-+obj-$(CONFIG_MVSW61XX_PHY)    += mvsw61xx.o
-+obj-$(CONFIG_PSB6970_PHY)     += psb6970.o
-+obj-$(CONFIG_RTL8306_PHY)     += rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)     += rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)    += rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
-+obj-$(CONFIG_RTL8367_PHY)     += rtl8367.o
-+obj-$(CONFIG_RTL8367B_PHY)    += rtl8367b.o
-+
- obj-$(CONFIG_MDIO_BCM_IPROC)  += mdio-bcm-iproc.o
- obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o
- obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o
---- a/include/linux/platform_data/b53.h
-+++ b/include/linux/platform_data/b53.h
-@@ -29,6 +29,9 @@ struct b53_platform_data {
-       u32 chip_id;
-       u16 enabled_ports;
-+      /* allow to specify an ethX alias */
-+      const char *alias;
-+
-       /* only used by MMAP'd driver */
-       unsigned big_endian:1;
-       void __iomem *regs;
diff --git a/target/linux/generic/hack-4.19/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.19/702-phy_add_aneg_done_function.patch
deleted file mode 100644 (file)
index 6fbcd43..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -548,6 +548,12 @@ struct phy_driver {
-       /* Determines the negotiated speed and duplex */
-       int (*read_status)(struct phy_device *phydev);
-+      /* 
-+       * Update the value in phydev->link to reflect the 
-+       * current link value
-+       */
-+      int (*update_link)(struct phy_device *phydev);
-+
-       /* Clears any pending interrupts */
-       int (*ack_interrupt)(struct phy_device *phydev);
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -1506,6 +1506,9 @@ int genphy_update_link(struct phy_device
- {
-       int status;
-+      if (phydev->drv && phydev->drv->update_link)
-+              return phydev->drv->update_link(phydev);
-+
-       /* The link state is latched low so that momentary link
-        * drops can be detected. Do not double-read the status
-        * in polling mode to detect such short link drops.
diff --git a/target/linux/generic/hack-4.19/721-phy_packets.patch b/target/linux/generic/hack-4.19/721-phy_packets.patch
deleted file mode 100644 (file)
index 640ef37..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-From ffe387740bbe88dd88bbe04d6375902708003d6e Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:25:00 +0200
-Subject: net: add packet mangeling patch
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/netdevice.h | 11 +++++++++++
- include/linux/skbuff.h    | 14 ++++----------
- net/Kconfig               |  6 ++++++
- net/core/dev.c            | 18 ++++++++++++++----
- net/core/skbuff.c         | 17 +++++++++++++++++
- net/ethernet/eth.c        |  6 ++++++
- 6 files changed, 58 insertions(+), 14 deletions(-)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1514,6 +1514,7 @@ enum netdev_priv_flags {
-       IFF_FAILOVER_SLAVE              = 1<<28,
-       IFF_L3MDEV_RX_HANDLER           = 1<<29,
-       IFF_LIVE_RENAME_OK              = 1<<30,
-+      IFF_NO_IP_ALIGN                 = 1<<31,
- };
- #define IFF_802_1Q_VLAN                       IFF_802_1Q_VLAN
-@@ -1546,6 +1547,7 @@ enum netdev_priv_flags {
- #define IFF_FAILOVER_SLAVE            IFF_FAILOVER_SLAVE
- #define IFF_L3MDEV_RX_HANDLER         IFF_L3MDEV_RX_HANDLER
- #define IFF_LIVE_RENAME_OK            IFF_LIVE_RENAME_OK
-+#define IFF_NO_IP_ALIGN                       IFF_NO_IP_ALIGN
- /**
-  *    struct net_device - The DEVICE structure.
-@@ -1844,6 +1846,11 @@ struct net_device {
-       const struct tlsdev_ops *tlsdev_ops;
- #endif
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
-+      struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
-+#endif
-+
-       const struct header_ops *header_ops;
-       unsigned int            flags;
-@@ -1919,6 +1926,10 @@ struct net_device {
-       struct mpls_dev __rcu   *mpls_ptr;
- #endif
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      void                    *phy_ptr; /* PHY device specific data */
-+#endif
-+
- /*
-  * Cache lines mostly used on receive path (including eth_type_trans())
-  */
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -2529,6 +2529,10 @@ static inline int pskb_trim(struct sk_bu
-       return (len < skb->len) ? __pskb_trim(skb, len) : 0;
- }
-+extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
-+              unsigned int length, gfp_t gfp);
-+
-+
- /**
-  *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
-  *    @skb: buffer to alter
-@@ -2660,16 +2664,6 @@ static inline struct sk_buff *dev_alloc_
- }
--static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
--              unsigned int length, gfp_t gfp)
--{
--      struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
--
--      if (NET_IP_ALIGN && skb)
--              skb_reserve(skb, NET_IP_ALIGN);
--      return skb;
--}
--
- static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
-               unsigned int length)
- {
---- a/net/Kconfig
-+++ b/net/Kconfig
-@@ -25,6 +25,12 @@ menuconfig NET
- if NET
-+config ETHERNET_PACKET_MANGLE
-+      bool
-+      help
-+        This option can be selected by phy drivers that need to mangle
-+        packets going in or out of an ethernet device.
-+
- config WANT_COMPAT_NETLINK_MESSAGES
-       bool
-       help
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -3252,10 +3252,20 @@ static int xmit_one(struct sk_buff *skb,
-       if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
-               dev_queue_xmit_nit(skb, dev);
--      len = skb->len;
--      trace_net_dev_start_xmit(skb, dev);
--      rc = netdev_start_xmit(skb, dev, txq, more);
--      trace_net_dev_xmit(skb, rc, dev, len);
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      if (!dev->eth_mangle_tx ||
-+          (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
-+#else
-+      if (1)
-+#endif
-+      {
-+              len = skb->len;
-+              trace_net_dev_start_xmit(skb, dev);
-+              rc = netdev_start_xmit(skb, dev, txq, more);
-+              trace_net_dev_xmit(skb, rc, dev, len);
-+      } else {
-+              rc = NETDEV_TX_OK;
-+      }
-       return rc;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -63,6 +63,7 @@
- #include <linux/errqueue.h>
- #include <linux/prefetch.h>
- #include <linux/if_vlan.h>
-+#include <linux/if.h>
- #include <net/protocol.h>
- #include <net/dst.h>
-@@ -503,6 +504,22 @@ skb_fail:
- }
- EXPORT_SYMBOL(__napi_alloc_skb);
-+struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
-+              unsigned int length, gfp_t gfp)
-+{
-+      struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
-+
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
-+              return skb;
-+#endif
-+
-+      if (NET_IP_ALIGN && skb)
-+              skb_reserve(skb, NET_IP_ALIGN);
-+      return skb;
-+}
-+EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
-+
- void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
-                    int size, unsigned int truesize)
- {
---- a/net/ethernet/eth.c
-+++ b/net/ethernet/eth.c
-@@ -172,6 +172,12 @@ __be16 eth_type_trans(struct sk_buff *sk
-       const struct ethhdr *eth;
-       skb->dev = dev;
-+
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      if (dev->eth_mangle_rx)
-+              dev->eth_mangle_rx(dev, skb);
-+#endif
-+
-       skb_reset_mac_header(skb);
-       eth = (struct ethhdr *)skb->data;
diff --git a/target/linux/generic/hack-4.19/773-bgmac-add-srab-switch.patch b/target/linux/generic/hack-4.19/773-bgmac-add-srab-switch.patch
deleted file mode 100644 (file)
index 3b47816..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Fri, 7 Jul 2017 17:26:01 +0200
-Subject: bcm53xx: bgmac: use srab switch driver
-
-use the srab switch driver on these SoCs.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/net/ethernet/broadcom/bgmac-bcma.c |  1 +
- drivers/net/ethernet/broadcom/bgmac.c      | 24 ++++++++++++++++++++++++
- drivers/net/ethernet/broadcom/bgmac.h      |  4 ++++
- 3 files changed, 29 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
-@@ -268,6 +268,7 @@ static int bgmac_probe(struct bcma_devic
-               bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
-               bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
-               bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
-+              bgmac->feature_flags |= BGMAC_FEAT_SRAB;
-               break;
-       default:
-               bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -12,6 +12,7 @@
- #include <linux/bcma/bcma.h>
- #include <linux/etherdevice.h>
- #include <linux/interrupt.h>
-+#include <linux/platform_data/b53.h>
- #include <linux/bcm47xx_nvram.h>
- #include <linux/phy.h>
- #include <linux/phy_fixed.h>
-@@ -1409,6 +1410,17 @@ static const struct ethtool_ops bgmac_et
-       .set_link_ksettings     = phy_ethtool_set_link_ksettings,
- };
-+static struct b53_platform_data bgmac_b53_pdata = {
-+};
-+
-+static struct platform_device bgmac_b53_dev = {
-+      .name           = "b53-srab-switch",
-+      .id             = -1,
-+      .dev            = {
-+              .platform_data = &bgmac_b53_pdata,
-+      },
-+};
-+
- /**************************************************
-  * MII
-  **************************************************/
-@@ -1540,6 +1552,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
-       net_dev->hw_features = net_dev->features;
-       net_dev->vlan_features = net_dev->features;
-+      if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
-+              bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
-+
-+              err = platform_device_register(&bgmac_b53_dev);
-+              if (!err)
-+                      bgmac->b53_device = &bgmac_b53_dev;
-+      }
-+
-       err = register_netdev(bgmac->net_dev);
-       if (err) {
-               dev_err(bgmac->dev, "Cannot register net device\n");
-@@ -1562,6 +1582,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
- void bgmac_enet_remove(struct bgmac *bgmac)
- {
-+      if (bgmac->b53_device)
-+              platform_device_unregister(&bgmac_b53_dev);
-+      bgmac->b53_device = NULL;
-+
-       unregister_netdev(bgmac->net_dev);
-       phy_disconnect(bgmac->net_dev->phydev);
-       netif_napi_del(&bgmac->napi);
---- a/drivers/net/ethernet/broadcom/bgmac.h
-+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -427,6 +427,7 @@
- #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII       BIT(18)
- #define BGMAC_FEAT_CC7_IF_TYPE_RGMII  BIT(19)
- #define BGMAC_FEAT_IDM_MASK           BIT(20)
-+#define BGMAC_FEAT_SRAB                       BIT(21)
- struct bgmac_slot_info {
-       union {
-@@ -532,6 +533,9 @@ struct bgmac {
-       void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
-                             u32 set);
-       int (*phy_connect)(struct bgmac *bgmac);
-+
-+      /* platform device for associated switch */
-+      struct platform_device *b53_device;
- };
- struct bgmac *bgmac_alloc(struct device *dev);
diff --git a/target/linux/generic/hack-4.19/835-misc-owl_loader.patch b/target/linux/generic/hack-4.19/835-misc-owl_loader.patch
deleted file mode 100644 (file)
index bf0fa59..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From dd36f935973d91644449bd9749f6062a2bed821b Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@googlemail.com>
-Date: Fri, 7 Jul 2017 17:26:46 +0200
-Subject: misc: owl-loader for delayed Atheros ath9k fixup
-
-Some devices (like the Cisco Meraki Z1 Cloud Managed Teleworker Gateway)
-need to be able to initialize the PCIe wifi device. Normally, this is done
-during the early stages of booting linux, because the necessary init code
-is read from the memory mapped SPI and passed to pci_enable_ath9k_fixup.
-However,this isn't possible for devices which have the init code for the
-Atheros chip stored on NAND in an UBI volume. Hence, this module can be
-used to initialze the chip when the user-space is ready to extract the
-init code.
-
-Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
----
- drivers/misc/Kconfig  | 12 ++++++++++++
- drivers/misc/Makefile |  1 +
- 2 files changed, 13 insertions(+)
-
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -164,6 +164,18 @@ config SGI_IOC4
-         If you have an SGI Altix with an IOC4-based card say Y.
-         Otherwise say N.
-+config OWL_LOADER
-+      tristate "Owl loader for initializing Atheros PCI(e) Wifi chips"
-+      depends on PCI
-+      ---help---
-+      This kernel module helps to initialize certain Qualcomm
-+      Atheros' PCI(e) Wifi chips, which have the init data
-+      (which contains the PCI device ID for example) stored
-+      together with the calibration data in the file system.
-+
-+      This is necessary for devices like the Cisco Meraki Z1, say M.
-+      Otherwise say N.
-+
- config TIFM_CORE
-       tristate "TI Flash Media interface support"
-       depends on PCI
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_ATMEL_TCLIB)    += atmel_tclib
- obj-$(CONFIG_DUMMY_IRQ)               += dummy-irq.o
- obj-$(CONFIG_ICS932S401)      += ics932s401.o
- obj-$(CONFIG_LKDTM)           += lkdtm/
-+obj-$(CONFIG_OWL_LOADER)      += owl-loader.o
- obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
- obj-$(CONFIG_TIFM_7XX1)               += tifm_7xx1.o
- obj-$(CONFIG_PHANTOM)         += phantom.o
diff --git a/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch
deleted file mode 100644 (file)
index 33c8b72..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-From 3b6115d6b57a263bdc8c9b1df273bd4a7955eead Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:16:31 +0200
-Subject: debloat: add some debloat patches, strip down procfs and make O_DIRECT support optional, saves ~15K after lzma on MIPS
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/Kconfig         | 3 +++
- net/core/Makefile   | 3 ++-
- net/core/sock.c     | 2 ++
- net/ipv4/Kconfig    | 1 +
- net/netlink/Kconfig | 1 +
- net/packet/Kconfig  | 1 +
- net/unix/Kconfig    | 1 +
- 7 files changed, 11 insertions(+), 1 deletion(-)
-
---- a/net/Kconfig
-+++ b/net/Kconfig
-@@ -98,6 +98,9 @@ source "net/netlabel/Kconfig"
- endif # if INET
-+config SOCK_DIAG
-+      bool
-+
- config NETWORK_SECMARK
-       bool "Security Marking"
-       help
---- a/net/core/Makefile
-+++ b/net/core/Makefile
-@@ -10,9 +10,10 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
- obj-y              += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
-                       neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
--                      sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \
-+                      dev_ioctl.o tso.o sock_reuseport.o \
-                       fib_notifier.o xdp.o
-+obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
- obj-y += net-sysfs.o
- obj-$(CONFIG_PAGE_POOL) += page_pool.o
- obj-$(CONFIG_PROC_FS) += net-procfs.o
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -490,6 +490,18 @@ discard_and_relse:
- }
- EXPORT_SYMBOL(__sk_receive_skb);
-+u64 sock_gen_cookie(struct sock *sk)
-+{
-+      while (1) {
-+              u64 res = atomic64_read(&sk->sk_cookie);
-+
-+              if (res)
-+                      return res;
-+              res = atomic64_inc_return(&sock_net(sk)->cookie_gen);
-+              atomic64_cmpxchg(&sk->sk_cookie, 0, res);
-+      }
-+}
-+
- struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
- {
-       struct dst_entry *dst = __sk_dst_get(sk);
-@@ -1601,9 +1613,11 @@ static void __sk_free(struct sock *sk)
-       if (likely(sk->sk_net_refcnt))
-               sock_inuse_add(sock_net(sk), -1);
-+#ifdef CONFIG_SOCK_DIAG
-       if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk)))
-               sock_diag_broadcast_destroy(sk);
-       else
-+#endif
-               sk_destruct(sk);
- }
---- a/net/core/sock_diag.c
-+++ b/net/core/sock_diag.c
-@@ -20,18 +20,6 @@ static int (*inet_rcv_compat)(struct sk_
- static DEFINE_MUTEX(sock_diag_table_mutex);
- static struct workqueue_struct *broadcast_wq;
--u64 sock_gen_cookie(struct sock *sk)
--{
--      while (1) {
--              u64 res = atomic64_read(&sk->sk_cookie);
--
--              if (res)
--                      return res;
--              res = atomic64_inc_return(&sock_net(sk)->cookie_gen);
--              atomic64_cmpxchg(&sk->sk_cookie, 0, res);
--      }
--}
--
- int sock_diag_check_cookie(struct sock *sk, const __u32 *cookie)
- {
-       u64 res;
---- a/net/ipv4/Kconfig
-+++ b/net/ipv4/Kconfig
-@@ -425,6 +425,7 @@ config INET_XFRM_MODE_BEET
- config INET_DIAG
-       tristate "INET: socket monitoring interface"
-+      select SOCK_DIAG
-       default y
-       ---help---
-         Support for INET (TCP, DCCP, etc) socket monitoring interface used by
---- a/net/netlink/Kconfig
-+++ b/net/netlink/Kconfig
-@@ -4,6 +4,7 @@
- config NETLINK_DIAG
-       tristate "NETLINK: socket monitoring interface"
-+      select SOCK_DIAG
-       default n
-       ---help---
-         Support for NETLINK socket monitoring interface used by the ss tool.
---- a/net/packet/Kconfig
-+++ b/net/packet/Kconfig
-@@ -18,6 +18,7 @@ config PACKET
- config PACKET_DIAG
-       tristate "Packet: sockets monitoring interface"
-       depends on PACKET
-+      select SOCK_DIAG
-       default n
-       ---help---
-         Support for PF_PACKET sockets monitoring interface used by the ss tool.
---- a/net/unix/Kconfig
-+++ b/net/unix/Kconfig
-@@ -22,6 +22,7 @@ config UNIX
- config UNIX_DIAG
-       tristate "UNIX: socket monitoring interface"
-       depends on UNIX
-+      select SOCK_DIAG
-       default n
-       ---help---
-         Support for UNIX socket monitoring interface used by the ss tool.
diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch
deleted file mode 100644 (file)
index 89d9cf0..0000000
+++ /dev/null
@@ -1,405 +0,0 @@
-From 9e3f1d0805b2d919904dd9a4ff0d956314cc3cba Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:20:09 +0200
-Subject: debloat: procfs
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- fs/locks.c               |  2 ++
- fs/proc/Kconfig          |  5 +++++
- fs/proc/consoles.c       |  3 +++
- fs/proc/proc_tty.c       | 11 ++++++++++-
- include/net/snmp.h       | 18 +++++++++++++++++-
- ipc/msg.c                |  3 +++
- ipc/sem.c                |  2 ++
- ipc/shm.c                |  2 ++
- ipc/util.c               |  3 +++
- kernel/exec_domain.c     |  2 ++
- kernel/irq/proc.c        |  9 +++++++++
- kernel/time/timer_list.c |  2 ++
- mm/vmalloc.c             |  2 ++
- mm/vmstat.c              |  8 +++++---
- net/8021q/vlanproc.c     |  6 ++++++
- net/core/net-procfs.c    | 18 ++++++++++++------
- net/core/sock.c          |  2 ++
- net/ipv4/fib_trie.c      | 18 ++++++++++++------
- net/ipv4/proc.c          |  3 +++
- net/ipv4/route.c         |  3 +++
- 20 files changed, 105 insertions(+), 17 deletions(-)
-
---- a/fs/locks.c
-+++ b/fs/locks.c
-@@ -2786,6 +2786,8 @@ static const struct seq_operations locks
- static int __init proc_locks_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       proc_create_seq_private("locks", 0, NULL, &locks_seq_operations,
-                       sizeof(struct locks_iterator), NULL);
-       return 0;
---- a/fs/proc/Kconfig
-+++ b/fs/proc/Kconfig
-@@ -97,3 +97,8 @@ config PROC_CHILDREN
-         Say Y if you are running any user-space software which takes benefit from
-         this interface. For example, rkt is such a piece of software.
-+
-+config PROC_STRIPPED
-+      default n
-+      depends on EXPERT
-+      bool "Strip non-essential /proc functionality to reduce code size"
---- a/fs/proc/consoles.c
-+++ b/fs/proc/consoles.c
-@@ -93,6 +93,9 @@ static const struct seq_operations conso
- static int __init proc_consoles_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       proc_create_seq("consoles", 0, NULL, &consoles_op);
-       return 0;
- }
---- a/fs/proc/proc_tty.c
-+++ b/fs/proc/proc_tty.c
-@@ -133,7 +133,10 @@ static const struct seq_operations tty_d
- void proc_tty_register_driver(struct tty_driver *driver)
- {
-       struct proc_dir_entry *ent;
--              
-+
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       if (!driver->driver_name || driver->proc_entry ||
-           !driver->ops->proc_show)
-               return;
-@@ -150,6 +153,9 @@ void proc_tty_unregister_driver(struct t
- {
-       struct proc_dir_entry *ent;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       ent = driver->proc_entry;
-       if (!ent)
-               return;
-@@ -164,6 +170,9 @@ void proc_tty_unregister_driver(struct t
-  */
- void __init proc_tty_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       if (!proc_mkdir("tty", NULL))
-               return;
-       proc_mkdir("tty/ldisc", NULL);  /* Preserved: it's userspace visible */
---- a/include/net/snmp.h
-+++ b/include/net/snmp.h
-@@ -123,6 +123,21 @@ struct linux_xfrm_mib {
- #define DECLARE_SNMP_STAT(type, name) \
-       extern __typeof__(type) __percpu *name
-+#ifdef CONFIG_PROC_STRIPPED
-+#define __SNMP_STATS_DUMMY(mib)       \
-+      do { (void) mib->mibs[0]; } while(0)
-+
-+#define __SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_INC_STATS_ATOMIC_LONG(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_DEC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define __SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
-+#define __SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
-+
-+#else
-+
- #define __SNMP_INC_STATS(mib, field)  \
-                       __this_cpu_inc(mib->mibs[field])
-@@ -153,8 +168,9 @@ struct linux_xfrm_mib {
-               __this_cpu_add(ptr[basefield##OCTETS], addend); \
-       } while (0)
-+#endif
--#if BITS_PER_LONG==32
-+#if (BITS_PER_LONG==32) && !defined(CONFIG_PROC_STRIPPED)
- #define __SNMP_ADD_STATS64(mib, field, addend)                                \
-       do {                                                            \
---- a/ipc/msg.c
-+++ b/ipc/msg.c
-@@ -1291,6 +1291,9 @@ void __init msg_init(void)
- {
-       msg_init_ns(&init_ipc_ns);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       ipc_init_proc_interface("sysvipc/msg",
-                               "       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
-                               IPC_MSG_IDS, sysvipc_msg_proc_show);
---- a/ipc/sem.c
-+++ b/ipc/sem.c
-@@ -243,6 +243,8 @@ void sem_exit_ns(struct ipc_namespace *n
- void __init sem_init(void)
- {
-       sem_init_ns(&init_ipc_ns);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-       ipc_init_proc_interface("sysvipc/sem",
-                               "       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
-                               IPC_SEM_IDS, sysvipc_sem_proc_show);
---- a/ipc/shm.c
-+++ b/ipc/shm.c
-@@ -144,6 +144,8 @@ pure_initcall(ipc_ns_init);
- void __init shm_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-       ipc_init_proc_interface("sysvipc/shm",
- #if BITS_PER_LONG <= 32
-                               "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
---- a/ipc/util.c
-+++ b/ipc/util.c
-@@ -140,6 +140,9 @@ void __init ipc_init_proc_interface(cons
-       struct proc_dir_entry *pde;
-       struct ipc_proc_iface *iface;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       iface = kmalloc(sizeof(*iface), GFP_KERNEL);
-       if (!iface)
-               return;
---- a/kernel/exec_domain.c
-+++ b/kernel/exec_domain.c
-@@ -29,6 +29,8 @@ static int execdomains_proc_show(struct
- static int __init proc_execdomains_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       proc_create_single("execdomains", 0, NULL, execdomains_proc_show);
-       return 0;
- }
---- a/kernel/irq/proc.c
-+++ b/kernel/irq/proc.c
-@@ -333,6 +333,9 @@ void register_irq_proc(unsigned int irq,
-       void __maybe_unused *irqp = (void *)(unsigned long) irq;
-       char name [MAX_NAMELEN];
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
-+              return;
-+
-       if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip))
-               return;
-@@ -386,6 +389,9 @@ void unregister_irq_proc(unsigned int ir
- {
-       char name [MAX_NAMELEN];
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
-+              return;
-+
-       if (!root_irq_dir || !desc->dir)
-               return;
- #ifdef CONFIG_SMP
-@@ -424,6 +430,9 @@ void init_irq_proc(void)
-       unsigned int irq;
-       struct irq_desc *desc;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
-+              return;
-+
-       /* create /proc/irq */
-       root_irq_dir = proc_mkdir("irq", NULL);
-       if (!root_irq_dir)
---- a/kernel/time/timer_list.c
-+++ b/kernel/time/timer_list.c
-@@ -374,6 +374,8 @@ static int __init init_timer_list_procfs
- {
-       struct proc_dir_entry *pe;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       pe = proc_create_seq_private("timer_list", 0400, NULL, &timer_list_sops,
-                       sizeof(struct timer_list_iter), NULL);
-       if (!pe)
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -2740,6 +2740,8 @@ static const struct seq_operations vmall
- static int __init proc_vmalloc_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       if (IS_ENABLED(CONFIG_NUMA))
-               proc_create_seq_private("vmallocinfo", 0400, NULL,
-                               &vmalloc_op,
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -1971,10 +1971,12 @@ void __init init_mm_internals(void)
-       start_shepherd_timer();
- #endif
- #ifdef CONFIG_PROC_FS
--      proc_create_seq("buddyinfo", 0444, NULL, &fragmentation_op);
--      proc_create_seq("pagetypeinfo", 0444, NULL, &pagetypeinfo_op);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
-+              proc_create_seq("buddyinfo", 0444, NULL, &fragmentation_op);
-+              proc_create_seq("pagetypeinfo", 0444, NULL, &pagetypeinfo_op);
-+              proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op);
-+      }
-       proc_create_seq("vmstat", 0444, NULL, &vmstat_op);
--      proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op);
- #endif
- }
---- a/net/8021q/vlanproc.c
-+++ b/net/8021q/vlanproc.c
-@@ -96,6 +96,9 @@ void vlan_proc_cleanup(struct net *net)
- {
-       struct vlan_net *vn = net_generic(net, vlan_net_id);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       if (vn->proc_vlan_conf)
-               remove_proc_entry(name_conf, vn->proc_vlan_dir);
-@@ -115,6 +118,9 @@ int __net_init vlan_proc_init(struct net
- {
-       struct vlan_net *vn = net_generic(net, vlan_net_id);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
-       if (!vn->proc_vlan_dir)
-               goto err;
---- a/net/core/net-procfs.c
-+++ b/net/core/net-procfs.c
-@@ -279,10 +279,12 @@ static int __net_init dev_proc_net_init(
-       if (!proc_create_net("dev", 0444, net->proc_net, &dev_seq_ops,
-                       sizeof(struct seq_net_private)))
-               goto out;
--      if (!proc_create_seq("softnet_stat", 0444, net->proc_net,
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+                      !proc_create_seq("softnet_stat", 0444, net->proc_net,
-                        &softnet_seq_ops))
-               goto out_dev;
--      if (!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+                      !proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
-                       sizeof(struct seq_net_private)))
-               goto out_softnet;
-@@ -292,9 +294,11 @@ static int __net_init dev_proc_net_init(
- out:
-       return rc;
- out_ptype:
--      remove_proc_entry("ptype", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("ptype", net->proc_net);
- out_softnet:
--      remove_proc_entry("softnet_stat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("softnet_stat", net->proc_net);
- out_dev:
-       remove_proc_entry("dev", net->proc_net);
-       goto out;
-@@ -304,8 +308,10 @@ static void __net_exit dev_proc_net_exit
- {
-       wext_proc_exit(net);
--      remove_proc_entry("ptype", net->proc_net);
--      remove_proc_entry("softnet_stat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
-+              remove_proc_entry("ptype", net->proc_net);
-+              remove_proc_entry("softnet_stat", net->proc_net);
-+      }
-       remove_proc_entry("dev", net->proc_net);
- }
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -3483,6 +3483,8 @@ static __net_initdata struct pernet_oper
- static int __init proto_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       return register_pernet_subsys(&proto_net_ops);
- }
---- a/net/ipv4/fib_trie.c
-+++ b/net/ipv4/fib_trie.c
-@@ -2717,11 +2717,13 @@ static const struct seq_operations fib_r
- int __net_init fib_proc_init(struct net *net)
- {
--      if (!proc_create_net("fib_trie", 0444, net->proc_net, &fib_trie_seq_ops,
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+                      !proc_create_net("fib_trie", 0444, net->proc_net, &fib_trie_seq_ops,
-                       sizeof(struct fib_trie_iter)))
-               goto out1;
--      if (!proc_create_net_single("fib_triestat", 0444, net->proc_net,
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+                      !proc_create_net_single("fib_triestat", 0444, net->proc_net,
-                       fib_triestat_seq_show, NULL))
-               goto out2;
-@@ -2732,17 +2734,21 @@ int __net_init fib_proc_init(struct net
-       return 0;
- out3:
--      remove_proc_entry("fib_triestat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("fib_triestat", net->proc_net);
- out2:
--      remove_proc_entry("fib_trie", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("fib_trie", net->proc_net);
- out1:
-       return -ENOMEM;
- }
- void __net_exit fib_proc_exit(struct net *net)
- {
--      remove_proc_entry("fib_trie", net->proc_net);
--      remove_proc_entry("fib_triestat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
-+              remove_proc_entry("fib_trie", net->proc_net);
-+              remove_proc_entry("fib_triestat", net->proc_net);
-+      }
-       remove_proc_entry("route", net->proc_net);
- }
---- a/net/ipv4/proc.c
-+++ b/net/ipv4/proc.c
-@@ -523,5 +523,8 @@ static __net_initdata struct pernet_oper
- int __init ip_misc_proc_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       return register_pernet_subsys(&ip_proc_ops);
- }
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -410,6 +410,9 @@ static struct pernet_operations ip_rt_pr
- static int __init ip_rt_proc_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       return register_pernet_subsys(&ip_rt_proc_ops);
- }
diff --git a/target/linux/generic/hack-4.19/904-debloat_dma_buf.patch b/target/linux/generic/hack-4.19/904-debloat_dma_buf.patch
deleted file mode 100644 (file)
index a4b6e36..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:20:43 +0200
-Subject: debloat: dmabuf
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/base/Kconfig      |  2 +-
- drivers/dma-buf/Makefile  | 10 +++++++---
- drivers/dma-buf/dma-buf.c |  4 +++-
- kernel/sched/core.c       |  1 +
- 4 files changed, 12 insertions(+), 5 deletions(-)
-
---- a/drivers/base/Kconfig
-+++ b/drivers/base/Kconfig
-@@ -172,7 +172,7 @@ config SOC_BUS
- source "drivers/base/regmap/Kconfig"
- config DMA_SHARED_BUFFER
--      bool
-+      tristate
-       default n
-       select ANON_INODES
-       select IRQ_WORK
---- a/drivers/dma-buf/Makefile
-+++ b/drivers/dma-buf/Makefile
-@@ -1,3 +1,7 @@
--obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o
--obj-$(CONFIG_SYNC_FILE)               += sync_file.o
--obj-$(CONFIG_SW_SYNC)         += sw_sync.o sync_debug.o
-+obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o
-+
-+dma-buf-objs-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o
-+dma-buf-objs-$(CONFIG_SYNC_FILE)              += sync_file.o
-+dma-buf-objs-$(CONFIG_SW_SYNC)                += sw_sync.o sync_debug.o
-+
-+dma-shared-buffer-objs :=  $(dma-buf-objs-y)
---- a/drivers/dma-buf/dma-buf.c
-+++ b/drivers/dma-buf/dma-buf.c
-@@ -34,6 +34,7 @@
- #include <linux/poll.h>
- #include <linux/reservation.h>
- #include <linux/mm.h>
-+#include <linux/module.h>
- #include <uapi/linux/dma-buf.h>
-@@ -1158,4 +1159,5 @@ static void __exit dma_buf_deinit(void)
- {
-       dma_buf_uninit_debugfs();
- }
--__exitcall(dma_buf_deinit);
-+module_exit(dma_buf_deinit);
-+MODULE_LICENSE("GPL");
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -2129,6 +2129,7 @@ int wake_up_state(struct task_struct *p,
- {
-       return try_to_wake_up(p, state, 0);
- }
-+EXPORT_SYMBOL_GPL(wake_up_state);
- /*
-  * Perform scheduler related setup for a newly forked process p.
diff --git a/target/linux/generic/hack-4.19/910-kobject_uevent.patch b/target/linux/generic/hack-4.19/910-kobject_uevent.patch
deleted file mode 100644 (file)
index c4c41ca..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 16 Jul 2017 16:56:10 +0200
-Subject: lib: add uevent_next_seqnum()
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/kobject.h |  5 +++++
- lib/kobject_uevent.c    | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 42 insertions(+)
-
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -179,6 +179,18 @@ out:
-       return r;
- }
-+u64 uevent_next_seqnum(void)
-+{
-+      u64 seq;
-+
-+      mutex_lock(&uevent_sock_mutex);
-+      seq = ++uevent_seqnum;
-+      mutex_unlock(&uevent_sock_mutex);
-+
-+      return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_synth_uevent - send synthetic uevent with arguments
-  *
diff --git a/target/linux/generic/hack-4.19/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-4.19/911-kobject_add_broadcast_uevent.patch
deleted file mode 100644 (file)
index 06b9411..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 16 Jul 2017 16:56:10 +0200
-Subject: lib: add uevent_next_seqnum()
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/kobject.h |  5 +++++
- lib/kobject_uevent.c    | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 42 insertions(+)
-
---- a/include/linux/kobject.h
-+++ b/include/linux/kobject.h
-@@ -32,6 +32,8 @@
- #define UEVENT_NUM_ENVP                       32      /* number of env pointers */
- #define UEVENT_BUFFER_SIZE            2048    /* buffer for the variables */
-+struct sk_buff;
-+
- #ifdef CONFIG_UEVENT_HELPER
- /* path to the userspace helper executed on an event */
- extern char uevent_helper[];
-@@ -244,4 +246,7 @@ int kobject_synth_uevent(struct kobject
- __printf(2, 3)
- int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...);
-+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
-+                   gfp_t allocation);
-+
- #endif /* _KOBJECT_H_ */
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -688,6 +688,43 @@ int add_uevent_var(struct kobj_uevent_en
- EXPORT_SYMBOL_GPL(add_uevent_var);
- #if defined(CONFIG_NET)
-+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
-+                   gfp_t allocation)
-+{
-+      struct uevent_sock *ue_sk;
-+      int err = 0;
-+
-+      /* send netlink message */
-+      mutex_lock(&uevent_sock_mutex);
-+      list_for_each_entry(ue_sk, &uevent_sock_list, list) {
-+              struct sock *uevent_sock = ue_sk->sk;
-+              struct sk_buff *skb2;
-+
-+              skb2 = skb_clone(skb, allocation);
-+              if (!skb2)
-+                      break;
-+
-+              err = netlink_broadcast(uevent_sock, skb2, pid, group,
-+                                      allocation);
-+              if (err)
-+                      break;
-+      }
-+      mutex_unlock(&uevent_sock_mutex);
-+
-+      kfree_skb(skb);
-+      return err;
-+}
-+#else
-+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
-+                   gfp_t allocation)
-+{
-+      kfree_skb(skb);
-+      return 0;
-+}
-+#endif
-+EXPORT_SYMBOL_GPL(broadcast_uevent);
-+
-+#if defined(CONFIG_NET)
- static int uevent_net_broadcast(struct sock *usk, struct sk_buff *skb,
-                               struct netlink_ext_ack *extack)
- {
diff --git a/target/linux/generic/hack-4.19/921-always-create-console-node-in-initramfs.patch b/target/linux/generic/hack-4.19/921-always-create-console-node-in-initramfs.patch
deleted file mode 100644 (file)
index e437579..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5d301596fdc72f6cb672f72eb3c66e7cddefb103 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:26:02 +0200
-Subject: initramfs: always create console node
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- usr/gen_initramfs_list.sh | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/usr/gen_initramfs_list.sh
-+++ b/usr/gen_initramfs_list.sh
-@@ -59,6 +59,18 @@ default_initramfs() {
-       EOF
- }
-+list_openwrt_initramfs() {
-+      :
-+}
-+
-+openwrt_initramfs() {
-+      # make sure that /dev/console exists
-+      cat <<-EOF >> ${output}
-+              dir /dev 0755 0 0
-+              nod /dev/console 0600 0 0 c 5 1
-+      EOF
-+}
-+
- filetype() {
-       local argv1="$1"
-@@ -180,6 +192,8 @@ dir_filelist() {
-       if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
-               ${dep_list}print_mtime "$1"
-+              ${dep_list}openwrt_initramfs
-+
-               echo "${dirlist}" | \
-               while read x; do
-                       ${dep_list}parse ${x}
diff --git a/target/linux/generic/hack-4.19/930-crashlog.patch b/target/linux/generic/hack-4.19/930-crashlog.patch
deleted file mode 100644 (file)
index 890c72b..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-From 6b1ab74a9917012d0c559edc4ed299d9228ac89f Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:26:47 +0200
-Subject: kernel: add the new 'crashlog' feature
-
-this tries to store kernel oops/panic logs in a fixed location in RAM to
-recover them available to user space using debugfs
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/crashlog.h |  17 ++++
- init/Kconfig             |   4 +
- kernel/Makefile          |   1 +
- kernel/crashlog.c        | 213 +++++++++++++++++++++++++++++++++++++++++++++++
- kernel/module.c          |   3 +
- mm/bootmem.c             |   2 +
- mm/memblock.c            |   5 ++
- 7 files changed, 245 insertions(+)
- create mode 100644 include/linux/crashlog.h
- create mode 100644 kernel/crashlog.c
-
---- /dev/null
-+++ b/include/linux/crashlog.h
-@@ -0,0 +1,17 @@
-+#ifndef __CRASHLOG_H
-+#define __CRASHLOG_H
-+
-+#ifdef CONFIG_CRASHLOG
-+void crashlog_init_bootmem(struct bootmem_data *bdata);
-+void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
-+#else
-+static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
-+{
-+}
-+
-+static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
-+{
-+}
-+#endif
-+
-+#endif
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1049,6 +1049,10 @@ config RELAY
-         If unsure, say N.
-+config CRASHLOG
-+      bool "Crash logging"
-+      depends on (!NO_BOOTMEM || HAVE_MEMBLOCK)
-+
- config BLK_DEV_INITRD
-       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
-       help
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -116,6 +116,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
- obj-$(CONFIG_HAS_IOMEM) += iomem.o
- obj-$(CONFIG_ZONE_DEVICE) += memremap.o
- obj-$(CONFIG_RSEQ) += rseq.o
-+obj-$(CONFIG_CRASHLOG) += crashlog.o
- $(obj)/configs.o: $(obj)/config_data.h
---- /dev/null
-+++ b/kernel/crashlog.c
-@@ -0,0 +1,213 @@
-+/*
-+ * Crash information logger
-+ * Copyright (C) 2010 Felix Fietkau <nbd@nbd.name>
-+ *
-+ * Based on ramoops.c
-+ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
-+ *
-+ * 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.
-+ *
-+ * 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 St, Fifth Floor, Boston, MA
-+ * 02110-1301 USA
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/bootmem.h>
-+#include <linux/memblock.h>
-+#include <linux/debugfs.h>
-+#include <linux/crashlog.h>
-+#include <linux/kmsg_dump.h>
-+#include <linux/module.h>
-+#include <linux/pfn.h>
-+#include <linux/vmalloc.h>
-+#include <asm/io.h>
-+
-+#define CRASHLOG_PAGES        4
-+#define CRASHLOG_SIZE (CRASHLOG_PAGES * PAGE_SIZE)
-+#define CRASHLOG_MAGIC        0xa1eedead
-+
-+/*
-+ * Start the log at 1M before the end of RAM, as some boot loaders like
-+ * to use the end of the RAM for stack usage and other things
-+ * If this fails, fall back to using the last part.
-+ */
-+#define CRASHLOG_OFFSET       (1024 * 1024)
-+
-+struct crashlog_data {
-+      u32 magic;
-+      u32 len;
-+      u8 data[];
-+};
-+
-+static struct debugfs_blob_wrapper crashlog_blob;
-+static unsigned long crashlog_addr = 0;
-+static struct crashlog_data *crashlog_buf;
-+static struct kmsg_dumper dump;
-+static bool first = true;
-+
-+extern struct list_head *crashlog_modules;
-+
-+static bool crashlog_set_addr(phys_addr_t addr, phys_addr_t size)
-+{
-+      /* Limit to lower 64 MB to avoid highmem */
-+      phys_addr_t limit = 64 * 1024 * 1024;
-+
-+      if (crashlog_addr)
-+              return false;
-+
-+      if (addr > limit)
-+              return false;
-+
-+      if (addr + size > limit)
-+              size = limit - addr;
-+
-+      crashlog_addr = addr;
-+
-+      if (addr + size > CRASHLOG_OFFSET)
-+              crashlog_addr += size - CRASHLOG_OFFSET;
-+
-+      return true;
-+}
-+
-+#ifndef CONFIG_NO_BOOTMEM
-+void __init crashlog_init_bootmem(bootmem_data_t *bdata)
-+{
-+      phys_addr_t start, end;
-+
-+      start = PFN_PHYS(bdata->node_low_pfn);
-+      end = PFN_PHYS(bdata->node_min_pfn);
-+      if (!crashlog_set_addr(start, end - start))
-+              return;
-+
-+      if (reserve_bootmem(crashlog_addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
-+              printk("Crashlog failed to allocate RAM at address 0x%lx\n",
-+                     crashlog_addr);
-+              crashlog_addr = 0;
-+      }
-+}
-+#endif
-+
-+#ifdef CONFIG_HAVE_MEMBLOCK
-+void __init_memblock crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
-+{
-+      if (!crashlog_set_addr(addr, size))
-+              return;
-+
-+      if (memblock_reserve(crashlog_addr, CRASHLOG_SIZE)) {
-+              printk("Crashlog failed to allocate RAM at address 0x%lx\n",
-+                     crashlog_addr);
-+              crashlog_addr = 0;
-+      }
-+}
-+#endif
-+
-+static void __init crashlog_copy(void)
-+{
-+      if (crashlog_buf->magic != CRASHLOG_MAGIC)
-+              return;
-+
-+      if (!crashlog_buf->len || crashlog_buf->len >
-+          CRASHLOG_SIZE - sizeof(*crashlog_buf))
-+              return;
-+
-+      crashlog_blob.size = crashlog_buf->len;
-+      crashlog_blob.data = kmemdup(crashlog_buf->data,
-+              crashlog_buf->len, GFP_KERNEL);
-+
-+      debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
-+}
-+
-+static int get_maxlen(void)
-+{
-+      return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
-+}
-+
-+static void crashlog_printf(const char *fmt, ...)
-+{
-+      va_list args;
-+      int len = get_maxlen();
-+
-+      if (!len)
-+              return;
-+
-+      va_start(args, fmt);
-+      crashlog_buf->len += vscnprintf(
-+              &crashlog_buf->data[crashlog_buf->len],
-+              len, fmt, args);
-+      va_end(args);
-+}
-+
-+static void crashlog_do_dump(struct kmsg_dumper *dumper,
-+              enum kmsg_dump_reason reason)
-+{
-+      struct timeval tv;
-+      struct module *m;
-+      char *buf;
-+      size_t len;
-+
-+      if (!first)
-+              crashlog_printf("\n===================================\n");
-+
-+      do_gettimeofday(&tv);
-+      crashlog_printf("Time: %lu.%lu\n",
-+              (long)tv.tv_sec, (long)tv.tv_usec);
-+
-+      if (first) {
-+              crashlog_printf("Modules:");
-+              list_for_each_entry(m, crashlog_modules, list) {
-+                      crashlog_printf("\t%s@%p+%x", m->name,
-+                      m->core_layout.base, m->core_layout.size,
-+                      m->init_layout.base, m->init_layout.size);
-+              }
-+              crashlog_printf("\n");
-+              first = false;
-+      }
-+
-+      buf = (char *)&crashlog_buf->data[crashlog_buf->len];
-+
-+      kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
-+
-+      crashlog_buf->len += len;
-+}
-+
-+
-+int __init crashlog_init_fs(void)
-+{
-+      struct page *pages[CRASHLOG_PAGES];
-+      pgprot_t prot;
-+      int i;
-+
-+      if (!crashlog_addr) {
-+              printk("No memory allocated for crashlog\n");
-+              return -ENOMEM;
-+      }
-+
-+      printk("Crashlog allocated RAM at address 0x%lx\n", (unsigned long) crashlog_addr);
-+      for (i = 0; i < CRASHLOG_PAGES; i++)
-+              pages[i] = pfn_to_page((crashlog_addr >> PAGE_SHIFT) + i);
-+
-+      prot = pgprot_writecombine(PAGE_KERNEL);
-+      crashlog_buf = vmap(pages, CRASHLOG_PAGES, VM_MAP, prot);
-+
-+      crashlog_copy();
-+
-+      crashlog_buf->magic = CRASHLOG_MAGIC;
-+      crashlog_buf->len = 0;
-+
-+      dump.max_reason = KMSG_DUMP_OOPS;
-+      dump.dump = crashlog_do_dump;
-+      kmsg_dump_register(&dump);
-+
-+      return 0;
-+}
-+module_init(crashlog_init_fs);
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -256,6 +256,9 @@ static void mod_update_bounds(struct mod
- #ifdef CONFIG_KGDB_KDB
- struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
- #endif /* CONFIG_KGDB_KDB */
-+#ifdef CONFIG_CRASHLOG
-+struct list_head *crashlog_modules = &modules;
-+#endif
- static void module_assert_mutex(void)
- {
---- a/mm/bootmem.c
-+++ b/mm/bootmem.c
-@@ -15,6 +15,7 @@
- #include <linux/export.h>
- #include <linux/kmemleak.h>
- #include <linux/range.h>
-+#include <linux/crashlog.h>
- #include <linux/bug.h>
- #include <linux/io.h>
- #include <linux/bootmem.h>
-@@ -215,6 +216,7 @@ static unsigned long __init free_all_boo
-       if (!bdata->node_bootmem_map)
-               return 0;
-+      crashlog_init_bootmem(bdata);
-       map = bdata->node_bootmem_map;
-       start = bdata->node_min_pfn;
-       end = bdata->node_low_pfn;
---- a/mm/memblock.c
-+++ b/mm/memblock.c
-@@ -21,6 +21,7 @@
- #include <linux/seq_file.h>
- #include <linux/memblock.h>
- #include <linux/bootmem.h>
-+#include <linux/crashlog.h>
- #include <asm/sections.h>
- #include <linux/io.h>
-@@ -547,6 +548,8 @@ static void __init_memblock memblock_ins
-       memblock_set_region_node(rgn, nid);
-       type->cnt++;
-       type->total_size += size;
-+      if (type == &memblock.memory)
-+              crashlog_init_memblock(base, size);
- }
- /**
-@@ -586,6 +589,8 @@ int __init_memblock memblock_add_range(s
-               type->regions[0].flags = flags;
-               memblock_set_region_node(&type->regions[0], nid);
-               type->total_size = size;
-+              if (type == &memblock.memory)
-+                      crashlog_init_memblock(base, size);
-               return 0;
-       }
- repeat:
diff --git a/target/linux/generic/hack-4.19/940-cleanup-offload-hooks-on-netdev-unregister.patch b/target/linux/generic/hack-4.19/940-cleanup-offload-hooks-on-netdev-unregister.patch
deleted file mode 100644 (file)
index 6db6112..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From ae56e27e30122f82d244f9eb35fcab8fa60e0d31 Mon Sep 17 00:00:00 2001
-From: Chen Minqiang <ptpt52@gmail.com>
-Date: Sun, 29 Apr 2018 14:08:57 +0800
-Subject: [PATCH] cleanup offload hooks on netdev unregister
-
-This should fix crashdump on reboot when FLOWOFFLOAD enabled
-
-kmsg:
-[   84.188081] Workqueue: events_power_efficient xt_flowoffload_hook_work [xt_FLOWOFFLOAD]
-[   84.209326] task: ffff88000ecd0c80 task.stack: ffffc90000068000
-[   84.224706] RIP: 0010:__nf_unregister_net_hook+0x1/0x90
-[   84.242911] RSP: 0018:ffffc9000006be30 EFLAGS: 00010202
-[   84.257405] RAX: 0000000000000000 RBX: ffff88000c5b3228 RCX: 0000000100170001
-[   84.292175] RDX: ffff88000ecd0c80 RSI: ffff88000c5b3228 RDI: 6b6b6b6b6b6b6b6b
-[   84.305095] RBP: ffffc9000006be58 R08: ffff88000c5b3578 R09: ffff88000c5b3538
-[   84.325980] R10: ffffc9000006be50 R11: ffff88000fc1f310 R12: ffffffff81e6c580
-[   84.396514] R13: ffff88000d1723d0 R14: ffff88000ec0fc00 R15: 0000000000000000
-[   84.459500] FS:  0000000000000000(0000) GS:ffff88000fc00000(0000) knlGS:0000000000000000
-[   84.525121] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
-[   84.565460] CR2: 0000000000a931d8 CR3: 0000000001e08006 CR4: 00000000000606f0
-[   84.638311] Call Trace:
-[   84.655229]  ? nf_unregister_net_hook+0x88/0xd0
-[   84.706898]  xt_flowoffload_hook_work+0x12a/0x17a [xt_FLOWOFFLOAD]
-[   84.765504]  process_one_work+0x1c4/0x310
-[   84.799558]  worker_thread+0x20b/0x3c0
-[   84.850119]  kthread+0x112/0x120
-[   84.884839]  ? process_one_work+0x310/0x310
-[   84.923571]  ? kthread_create_on_node+0x40/0x40
-[   84.966100]  ret_from_fork+0x35/0x40
-[   84.981738] Code: 41 5c 41 5d 41 5e 41 5f 5d c3 48 8b 05 c1 f1 99 00 55 48 89 e5 48 85 c0 75 02 0f 0b e8 b9 f6 30 00 5d c3 0f 1f 80 00 00 00 00 55 <0f> b7 0f 48 89 e5 48 89 c8 48 c1 e0 04 48 8d 54 07 08 31 c0 eb
-[   85.100453] RIP: __nf_unregister_net_hook+0x1/0x90 RSP: ffffc9000006be30
-[   85.111658] ---[ end trace 5c25a390045cac75 ]---
-[   85.124535] Kernel panic - not syncing: Fatal exception
-
-Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
----
- net/netfilter/xt_FLOWOFFLOAD.c | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
---- a/net/netfilter/xt_FLOWOFFLOAD.c
-+++ b/net/netfilter/xt_FLOWOFFLOAD.c
-@@ -338,10 +338,41 @@ static void xt_flowoffload_table_cleanup
-       nf_flow_table_free(table);
- }
-+static int flow_offload_netdev_event(struct notifier_block *this,
-+                                   unsigned long event, void *ptr)
-+{
-+      struct xt_flowoffload_hook *hook = NULL;
-+      struct net_device *dev = netdev_notifier_info_to_dev(ptr);
-+
-+      if (event != NETDEV_UNREGISTER)
-+              return NOTIFY_DONE;
-+
-+      spin_lock_bh(&hooks_lock);
-+      hook = flow_offload_lookup_hook(dev);
-+      if (hook) {
-+              hlist_del(&hook->list);
-+      }
-+      spin_unlock_bh(&hooks_lock);
-+      if (hook) {
-+              nf_unregister_net_hook(hook->net, &hook->ops);
-+              kfree(hook);
-+      }
-+
-+      nf_flow_table_cleanup(dev_net(dev), dev);
-+
-+      return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block flow_offload_netdev_notifier = {
-+      .notifier_call  = flow_offload_netdev_event,
-+};
-+
- static int __init xt_flowoffload_tg_init(void)
- {
-       int ret;
-+      register_netdevice_notifier(&flow_offload_netdev_notifier);
-+
-       INIT_DELAYED_WORK(&hook_work, xt_flowoffload_hook_work);
-       ret = xt_flowoffload_table_init(&nf_flowtable);
-@@ -359,6 +390,7 @@ static void __exit xt_flowoffload_tg_exi
- {
-       xt_unregister_target(&offload_tg_reg);
-       xt_flowoffload_table_cleanup(&nf_flowtable);
-+      unregister_netdevice_notifier(&flow_offload_netdev_notifier);
- }
- MODULE_LICENSE("GPL");
diff --git a/target/linux/generic/hack-4.9/204-module_strip.patch b/target/linux/generic/hack-4.9/204-module_strip.patch
deleted file mode 100644 (file)
index fcca6bd..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-From a779a482fb9b9f8fcdf8b2519c789b4b9bb5dd05 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 16:56:48 +0200
-Subject: build: add a hack for removing non-essential module info
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/module.h      | 13 ++++++++-----
- include/linux/moduleparam.h | 15 ++++++++++++---
- init/Kconfig                |  7 +++++++
- kernel/module.c             |  5 ++++-
- scripts/mod/modpost.c       | 12 ++++++++++++
- 5 files changed, 43 insertions(+), 9 deletions(-)
-
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -159,6 +159,7 @@ extern void cleanup_module(void);
- /* Generic info of form tag = "info" */
- #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
-+#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
- /* For userspace: you can also call me... */
- #define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
-@@ -202,12 +203,12 @@ extern void cleanup_module(void);
-  * Author(s), use "Name <email>" or just "Name", for multiple
-  * authors use multiple MODULE_AUTHOR() statements/lines.
-  */
--#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
-+#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
- /* What your module does. */
--#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
-+#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
--#ifdef MODULE
-+#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
- /* Creates an alias so file2alias.c can find device table. */
- #define MODULE_DEVICE_TABLE(type, name)                                       \
- extern const typeof(name) __mod_##type##__##name##_device_table               \
-@@ -234,7 +235,9 @@ extern const typeof(name) __mod_##type##
-  */
- #if defined(MODULE) || !defined(CONFIG_SYSFS)
--#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
-+#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
-+#elif defined(CONFIG_MODULE_STRIPPED)
-+#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
- #else
- #define MODULE_VERSION(_version)                                      \
-       static struct module_version_attribute ___modver_attr = {       \
-@@ -256,7 +259,7 @@ extern const typeof(name) __mod_##type##
- /* Optional firmware file (or files) needed by the module
-  * format is simply firmware file name.  Multiple firmware
-  * files require multiple MODULE_FIRMWARE() specifiers */
--#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
-+#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
- struct notifier_block;
---- a/include/linux/moduleparam.h
-+++ b/include/linux/moduleparam.h
-@@ -16,6 +16,16 @@
- /* Chosen so that structs with an unsigned long line up. */
- #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
-+/* This struct is here for syntactic coherency, it is not used */
-+#define __MODULE_INFO_DISABLED(name)                                    \
-+  struct __UNIQUE_ID(name) {}
-+
-+#ifdef CONFIG_MODULE_STRIPPED
-+#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
-+#else
-+#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
-+#endif
-+
- #ifdef MODULE
- #define __MODULE_INFO(tag, name, info)                                          \
- static const char __UNIQUE_ID(name)[]                                   \
-@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]
-   = __stringify(tag) "=" info
- #else  /* !MODULE */
- /* This struct is here for syntactic coherency, it is not used */
--#define __MODULE_INFO(tag, name, info)                                          \
--  struct __UNIQUE_ID(name) {}
-+#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name)
- #endif
- #define __MODULE_PARM_TYPE(name, _type)                                         \
-   __MODULE_INFO(parmtype, name##type, #name ":" _type)
-@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]
- /* One for each parameter, describing how to use it.  Some files do
-    multiple of these per line, so can't just use MODULE_INFO. */
- #define MODULE_PARM_DESC(_parm, desc) \
--      __MODULE_INFO(parm, _parm, #_parm ":" desc)
-+      __MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
- struct kernel_param;
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -2122,6 +2122,13 @@ config TRIM_UNUSED_KSYMS
-         If unsure, or if you need to build out-of-tree modules, say N.
-+config MODULE_STRIPPED
-+      bool "Reduce module size"
-+      depends on MODULES
-+      help
-+        Remove module parameter descriptions, author info, version, aliases,
-+        device tables, etc.
-+
- endif # MODULES
- config MODULES_TREE_LOOKUP
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2968,9 +2968,11 @@ static struct module *setup_load_info(st
- static int check_modinfo(struct module *mod, struct load_info *info, int flags)
- {
--      const char *modmagic = get_modinfo(info, "vermagic");
-       int err;
-+#ifndef CONFIG_MODULE_STRIPPED
-+      const char *modmagic = get_modinfo(info, "vermagic");
-+
-       if (flags & MODULE_INIT_IGNORE_VERMAGIC)
-               modmagic = NULL;
-@@ -2991,6 +2993,7 @@ static int check_modinfo(struct module *
-                               mod->name);
-               add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
-       }
-+#endif
-       check_modinfo_retpoline(mod, info);
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -1967,7 +1967,9 @@ static void read_symbols(char *modname)
-               symname = remove_dot(info.strtab + sym->st_name);
-               handle_modversions(mod, &info, sym, symname);
-+#ifndef CONFIG_MODULE_STRIPPED
-               handle_moddevtable(mod, &info, sym, symname);
-+#endif
-       }
-       if (!is_vmlinux(modname) ||
-            (is_vmlinux(modname) && vmlinux_section_warnings))
-@@ -2111,7 +2113,9 @@ static void add_header(struct buffer *b,
-       buf_printf(b, "#include <linux/vermagic.h>\n");
-       buf_printf(b, "#include <linux/compiler.h>\n");
-       buf_printf(b, "\n");
-+#ifndef CONFIG_MODULE_STRIPPED
-       buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
-+#endif
-       buf_printf(b, "\n");
-       buf_printf(b, "__visible struct module __this_module\n");
-       buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-@@ -2128,24 +2132,30 @@ static void add_header(struct buffer *b,
- static void add_intree_flag(struct buffer *b, int is_intree)
- {
-+#ifndef CONFIG_MODULE_STRIPPED
-       if (is_intree)
-               buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
-+#endif
- }
- /* Cannot check for assembler */
- static void add_retpoline(struct buffer *b)
- {
-+#ifndef CONFIG_MODULE_STRIPPED
-       buf_printf(b, "\n#ifdef RETPOLINE\n");
-       buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n");
-       buf_printf(b, "#endif\n");
-+#endif
- }
- static void add_staging_flag(struct buffer *b, const char *name)
- {
-+#ifndef CONFIG_MODULE_STRIPPED
-       static const char *staging_dir = "drivers/staging";
-       if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
-               buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
-+#endif
- }
- /* In kernel, this size is defined in linux/module.h;
-@@ -2249,11 +2259,13 @@ static void add_depends(struct buffer *b
- static void add_srcversion(struct buffer *b, struct module *mod)
- {
-+#ifndef CONFIG_MODULE_STRIPPED
-       if (mod->srcversion[0]) {
-               buf_printf(b, "\n");
-               buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
-                          mod->srcversion);
-       }
-+#endif
- }
- static void write_if_changed(struct buffer *b, const char *fname)
-@@ -2488,7 +2500,9 @@ int main(int argc, char **argv)
-               add_staging_flag(&buf, mod->name);
-               err |= add_versions(&buf, mod);
-               add_depends(&buf, mod, modules);
-+#ifndef CONFIG_MODULE_STRIPPED
-               add_moddevtable(&buf, mod);
-+#endif
-               add_srcversion(&buf, mod);
-               sprintf(fname, "%s.mod.c", mod->name);
diff --git a/target/linux/generic/hack-4.9/207-disable-modorder.patch b/target/linux/generic/hack-4.9/207-disable-modorder.patch
deleted file mode 100644 (file)
index e92f4fa..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From c9ef4ab0f54356ee9f91d9676ea0ec123840ddc7 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 16:57:33 +0200
-Subject: kernel: do not build modules.order
-
-It is not needed for anything on the system and skipping this saves some
-build time, especially in cases where there is nothing to do.
-
-lede-commit: afc1675833a7bf5df094f59f7250369520646d04
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile               | 2 --
- scripts/Makefile.build | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -1226,7 +1226,6 @@ all: modules
- PHONY += modules
- modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
--      $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
-       @$(kecho) '  Building modules, stage 2.';
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
-@@ -1256,7 +1255,6 @@ _modinst_:
-               rm -f $(MODLIB)/build ; \
-               ln -s $(CURDIR) $(MODLIB)/build ; \
-       fi
--      @cp -f $(objtree)/modules.order $(MODLIB)/
-       @cp -f $(objtree)/modules.builtin $(MODLIB)/
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
---- a/scripts/Makefile.build
-+++ b/scripts/Makefile.build
-@@ -93,7 +93,7 @@ modorder-target := $(obj)/modules.order
- # We keep a list of all modules in $(MODVERDIR)
- __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
--       $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \
-+       $(if $(KBUILD_MODULES),$(obj-m)) \
-        $(subdir-ym) $(always)
-       @:
diff --git a/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch b/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch
deleted file mode 100644 (file)
index bdf4114..0000000
+++ /dev/null
@@ -1,3065 +0,0 @@
-From db7c30dcd9a0391bf13b62c9f91e144d762ef43a Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Fri, 7 Jul 2017 17:00:49 +0200
-Subject: Add an OSX specific patch to make the kernel be compiled
-
-lede-commit: 3fc2a24f0422b2f55f9ed43f116db3111f700526
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- scripts/kconfig/Makefile   |    3 +
- scripts/mod/elf.h          | 3007 ++++++++++++++++++++++++++++++++++++++++++++
- scripts/mod/mk_elfconfig.c |    4 +
- scripts/mod/modpost.h      |    4 +
- 4 files changed, 3018 insertions(+)
- create mode 100644 scripts/mod/elf.h
-
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -163,6 +163,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
-                     -DLOCALE
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- # ===========================================================================
- # Shared Makefile for the various kconfig executables:
---- /dev/null
-+++ b/scripts/mod/elf.h
-@@ -0,0 +1,3007 @@
-+/* This file defines standard ELF types, structures, and macros.
-+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef _ELF_H
-+#define       _ELF_H 1
-+
-+/* Standard ELF types.  */
-+
-+#include <stdint.h>
-+
-+/* Type for a 16-bit quantity.  */
-+typedef uint16_t Elf32_Half;
-+typedef uint16_t Elf64_Half;
-+
-+/* Types for signed and unsigned 32-bit quantities.  */
-+typedef uint32_t Elf32_Word;
-+typedef       int32_t  Elf32_Sword;
-+typedef uint32_t Elf64_Word;
-+typedef       int32_t  Elf64_Sword;
-+
-+/* Types for signed and unsigned 64-bit quantities.  */
-+typedef uint64_t Elf32_Xword;
-+typedef       int64_t  Elf32_Sxword;
-+typedef uint64_t Elf64_Xword;
-+typedef       int64_t  Elf64_Sxword;
-+
-+/* Type of addresses.  */
-+typedef uint32_t Elf32_Addr;
-+typedef uint64_t Elf64_Addr;
-+
-+/* Type of file offsets.  */
-+typedef uint32_t Elf32_Off;
-+typedef uint64_t Elf64_Off;
-+
-+/* Type for section indices, which are 16-bit quantities.  */
-+typedef uint16_t Elf32_Section;
-+typedef uint16_t Elf64_Section;
-+
-+/* Type for version symbol information.  */
-+typedef Elf32_Half Elf32_Versym;
-+typedef Elf64_Half Elf64_Versym;
-+
-+
-+/* The ELF file header.  This appears at the start of every ELF file.  */
-+
-+#define EI_NIDENT (16)
-+
-+typedef struct
-+{
-+  unsigned char       e_ident[EI_NIDENT];     /* Magic number and other info */
-+  Elf32_Half  e_type;                 /* Object file type */
-+  Elf32_Half  e_machine;              /* Architecture */
-+  Elf32_Word  e_version;              /* Object file version */
-+  Elf32_Addr  e_entry;                /* Entry point virtual address */
-+  Elf32_Off   e_phoff;                /* Program header table file offset */
-+  Elf32_Off   e_shoff;                /* Section header table file offset */
-+  Elf32_Word  e_flags;                /* Processor-specific flags */
-+  Elf32_Half  e_ehsize;               /* ELF header size in bytes */
-+  Elf32_Half  e_phentsize;            /* Program header table entry size */
-+  Elf32_Half  e_phnum;                /* Program header table entry count */
-+  Elf32_Half  e_shentsize;            /* Section header table entry size */
-+  Elf32_Half  e_shnum;                /* Section header table entry count */
-+  Elf32_Half  e_shstrndx;             /* Section header string table index */
-+} Elf32_Ehdr;
-+
-+typedef struct
-+{
-+  unsigned char       e_ident[EI_NIDENT];     /* Magic number and other info */
-+  Elf64_Half  e_type;                 /* Object file type */
-+  Elf64_Half  e_machine;              /* Architecture */
-+  Elf64_Word  e_version;              /* Object file version */
-+  Elf64_Addr  e_entry;                /* Entry point virtual address */
-+  Elf64_Off   e_phoff;                /* Program header table file offset */
-+  Elf64_Off   e_shoff;                /* Section header table file offset */
-+  Elf64_Word  e_flags;                /* Processor-specific flags */
-+  Elf64_Half  e_ehsize;               /* ELF header size in bytes */
-+  Elf64_Half  e_phentsize;            /* Program header table entry size */
-+  Elf64_Half  e_phnum;                /* Program header table entry count */
-+  Elf64_Half  e_shentsize;            /* Section header table entry size */
-+  Elf64_Half  e_shnum;                /* Section header table entry count */
-+  Elf64_Half  e_shstrndx;             /* Section header string table index */
-+} Elf64_Ehdr;
-+
-+/* Fields in the e_ident array.  The EI_* macros are indices into the
-+   array.  The macros under each EI_* macro are the values the byte
-+   may have.  */
-+
-+#define EI_MAG0               0               /* File identification byte 0 index */
-+#define ELFMAG0               0x7f            /* Magic number byte 0 */
-+
-+#define EI_MAG1               1               /* File identification byte 1 index */
-+#define ELFMAG1               'E'             /* Magic number byte 1 */
-+
-+#define EI_MAG2               2               /* File identification byte 2 index */
-+#define ELFMAG2               'L'             /* Magic number byte 2 */
-+
-+#define EI_MAG3               3               /* File identification byte 3 index */
-+#define ELFMAG3               'F'             /* Magic number byte 3 */
-+
-+/* Conglomeration of the identification bytes, for easy testing as a word.  */
-+#define       ELFMAG          "\177ELF"
-+#define       SELFMAG         4
-+
-+#define EI_CLASS      4               /* File class byte index */
-+#define ELFCLASSNONE  0               /* Invalid class */
-+#define ELFCLASS32    1               /* 32-bit objects */
-+#define ELFCLASS64    2               /* 64-bit objects */
-+#define ELFCLASSNUM   3
-+
-+#define EI_DATA               5               /* Data encoding byte index */
-+#define ELFDATANONE   0               /* Invalid data encoding */
-+#define ELFDATA2LSB   1               /* 2's complement, little endian */
-+#define ELFDATA2MSB   2               /* 2's complement, big endian */
-+#define ELFDATANUM    3
-+
-+#define EI_VERSION    6               /* File version byte index */
-+                                      /* Value must be EV_CURRENT */
-+
-+#define EI_OSABI      7               /* OS ABI identification */
-+#define ELFOSABI_NONE         0       /* UNIX System V ABI */
-+#define ELFOSABI_SYSV         0       /* Alias.  */
-+#define ELFOSABI_HPUX         1       /* HP-UX */
-+#define ELFOSABI_NETBSD               2       /* NetBSD.  */
-+#define ELFOSABI_GNU          3       /* Object uses GNU ELF extensions.  */
-+#define ELFOSABI_LINUX                ELFOSABI_GNU /* Compatibility alias.  */
-+#define ELFOSABI_SOLARIS      6       /* Sun Solaris.  */
-+#define ELFOSABI_AIX          7       /* IBM AIX.  */
-+#define ELFOSABI_IRIX         8       /* SGI Irix.  */
-+#define ELFOSABI_FREEBSD      9       /* FreeBSD.  */
-+#define ELFOSABI_TRU64                10      /* Compaq TRU64 UNIX.  */
-+#define ELFOSABI_MODESTO      11      /* Novell Modesto.  */
-+#define ELFOSABI_OPENBSD      12      /* OpenBSD.  */
-+#define ELFOSABI_ARM_AEABI    64      /* ARM EABI */
-+#define ELFOSABI_ARM          97      /* ARM */
-+#define ELFOSABI_STANDALONE   255     /* Standalone (embedded) application */
-+
-+#define EI_ABIVERSION 8               /* ABI version */
-+
-+#define EI_PAD                9               /* Byte index of padding bytes */
-+
-+/* Legal values for e_type (object file type).  */
-+
-+#define ET_NONE               0               /* No file type */
-+#define ET_REL                1               /* Relocatable file */
-+#define ET_EXEC               2               /* Executable file */
-+#define ET_DYN                3               /* Shared object file */
-+#define ET_CORE               4               /* Core file */
-+#define       ET_NUM          5               /* Number of defined types */
-+#define ET_LOOS               0xfe00          /* OS-specific range start */
-+#define ET_HIOS               0xfeff          /* OS-specific range end */
-+#define ET_LOPROC     0xff00          /* Processor-specific range start */
-+#define ET_HIPROC     0xffff          /* Processor-specific range end */
-+
-+/* Legal values for e_machine (architecture).  */
-+
-+#define EM_NONE                0              /* No machine */
-+#define EM_M32                 1              /* AT&T WE 32100 */
-+#define EM_SPARC       2              /* SUN SPARC */
-+#define EM_386                 3              /* Intel 80386 */
-+#define EM_68K                 4              /* Motorola m68k family */
-+#define EM_88K                 5              /* Motorola m88k family */
-+#define EM_860                 7              /* Intel 80860 */
-+#define EM_MIPS                8              /* MIPS R3000 big-endian */
-+#define EM_S370                9              /* IBM System/370 */
-+#define EM_MIPS_RS3_LE        10              /* MIPS R3000 little-endian */
-+
-+#define EM_PARISC     15              /* HPPA */
-+#define EM_VPP500     17              /* Fujitsu VPP500 */
-+#define EM_SPARC32PLUS        18              /* Sun's "v8plus" */
-+#define EM_960                19              /* Intel 80960 */
-+#define EM_PPC                20              /* PowerPC */
-+#define EM_PPC64      21              /* PowerPC 64-bit */
-+#define EM_S390               22              /* IBM S390 */
-+
-+#define EM_V800               36              /* NEC V800 series */
-+#define EM_FR20               37              /* Fujitsu FR20 */
-+#define EM_RH32               38              /* TRW RH-32 */
-+#define EM_RCE                39              /* Motorola RCE */
-+#define EM_ARM                40              /* ARM */
-+#define EM_FAKE_ALPHA 41              /* Digital Alpha */
-+#define EM_SH         42              /* Hitachi SH */
-+#define EM_SPARCV9    43              /* SPARC v9 64-bit */
-+#define EM_TRICORE    44              /* Siemens Tricore */
-+#define EM_ARC                45              /* Argonaut RISC Core */
-+#define EM_H8_300     46              /* Hitachi H8/300 */
-+#define EM_H8_300H    47              /* Hitachi H8/300H */
-+#define EM_H8S                48              /* Hitachi H8S */
-+#define EM_H8_500     49              /* Hitachi H8/500 */
-+#define EM_IA_64      50              /* Intel Merced */
-+#define EM_MIPS_X     51              /* Stanford MIPS-X */
-+#define EM_COLDFIRE   52              /* Motorola Coldfire */
-+#define EM_68HC12     53              /* Motorola M68HC12 */
-+#define EM_MMA                54              /* Fujitsu MMA Multimedia Accelerator*/
-+#define EM_PCP                55              /* Siemens PCP */
-+#define EM_NCPU               56              /* Sony nCPU embeeded RISC */
-+#define EM_NDR1               57              /* Denso NDR1 microprocessor */
-+#define EM_STARCORE   58              /* Motorola Start*Core processor */
-+#define EM_ME16               59              /* Toyota ME16 processor */
-+#define EM_ST100      60              /* STMicroelectronic ST100 processor */
-+#define EM_TINYJ      61              /* Advanced Logic Corp. Tinyj emb.fam*/
-+#define EM_X86_64     62              /* AMD x86-64 architecture */
-+#define EM_PDSP               63              /* Sony DSP Processor */
-+
-+#define EM_FX66               66              /* Siemens FX66 microcontroller */
-+#define EM_ST9PLUS    67              /* STMicroelectronics ST9+ 8/16 mc */
-+#define EM_ST7                68              /* STmicroelectronics ST7 8 bit mc */
-+#define EM_68HC16     69              /* Motorola MC68HC16 microcontroller */
-+#define EM_68HC11     70              /* Motorola MC68HC11 microcontroller */
-+#define EM_68HC08     71              /* Motorola MC68HC08 microcontroller */
-+#define EM_68HC05     72              /* Motorola MC68HC05 microcontroller */
-+#define EM_SVX                73              /* Silicon Graphics SVx */
-+#define EM_ST19               74              /* STMicroelectronics ST19 8 bit mc */
-+#define EM_VAX                75              /* Digital VAX */
-+#define EM_CRIS               76              /* Axis Communications 32-bit embedded processor */
-+#define EM_JAVELIN    77              /* Infineon Technologies 32-bit embedded processor */
-+#define EM_FIREPATH   78              /* Element 14 64-bit DSP Processor */
-+#define EM_ZSP                79              /* LSI Logic 16-bit DSP Processor */
-+#define EM_MMIX               80              /* Donald Knuth's educational 64-bit processor */
-+#define EM_HUANY      81              /* Harvard University machine-independent object files */
-+#define EM_PRISM      82              /* SiTera Prism */
-+#define EM_AVR                83              /* Atmel AVR 8-bit microcontroller */
-+#define EM_FR30               84              /* Fujitsu FR30 */
-+#define EM_D10V               85              /* Mitsubishi D10V */
-+#define EM_D30V               86              /* Mitsubishi D30V */
-+#define EM_V850               87              /* NEC v850 */
-+#define EM_M32R               88              /* Mitsubishi M32R */
-+#define EM_MN10300    89              /* Matsushita MN10300 */
-+#define EM_MN10200    90              /* Matsushita MN10200 */
-+#define EM_PJ         91              /* picoJava */
-+#define EM_OPENRISC   92              /* OpenRISC 32-bit embedded processor */
-+#define EM_ARC_A5     93              /* ARC Cores Tangent-A5 */
-+#define EM_XTENSA     94              /* Tensilica Xtensa Architecture */
-+#define EM_TILEPRO    188             /* Tilera TILEPro */
-+#define EM_TILEGX     191             /* Tilera TILE-Gx */
-+#define EM_NUM                192
-+
-+/* If it is necessary to assign new unofficial EM_* values, please
-+   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
-+   chances of collision with official or non-GNU unofficial values.  */
-+
-+#define EM_ALPHA      0x9026
-+
-+/* Legal values for e_version (version).  */
-+
-+#define EV_NONE               0               /* Invalid ELF version */
-+#define EV_CURRENT    1               /* Current version */
-+#define EV_NUM                2
-+
-+/* Section header.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  sh_name;                /* Section name (string tbl index) */
-+  Elf32_Word  sh_type;                /* Section type */
-+  Elf32_Word  sh_flags;               /* Section flags */
-+  Elf32_Addr  sh_addr;                /* Section virtual addr at execution */
-+  Elf32_Off   sh_offset;              /* Section file offset */
-+  Elf32_Word  sh_size;                /* Section size in bytes */
-+  Elf32_Word  sh_link;                /* Link to another section */
-+  Elf32_Word  sh_info;                /* Additional section information */
-+  Elf32_Word  sh_addralign;           /* Section alignment */
-+  Elf32_Word  sh_entsize;             /* Entry size if section holds table */
-+} Elf32_Shdr;
-+
-+typedef struct
-+{
-+  Elf64_Word  sh_name;                /* Section name (string tbl index) */
-+  Elf64_Word  sh_type;                /* Section type */
-+  Elf64_Xword sh_flags;               /* Section flags */
-+  Elf64_Addr  sh_addr;                /* Section virtual addr at execution */
-+  Elf64_Off   sh_offset;              /* Section file offset */
-+  Elf64_Xword sh_size;                /* Section size in bytes */
-+  Elf64_Word  sh_link;                /* Link to another section */
-+  Elf64_Word  sh_info;                /* Additional section information */
-+  Elf64_Xword sh_addralign;           /* Section alignment */
-+  Elf64_Xword sh_entsize;             /* Entry size if section holds table */
-+} Elf64_Shdr;
-+
-+/* Special section indices.  */
-+
-+#define SHN_UNDEF     0               /* Undefined section */
-+#define SHN_LORESERVE 0xff00          /* Start of reserved indices */
-+#define SHN_LOPROC    0xff00          /* Start of processor-specific */
-+#define SHN_BEFORE    0xff00          /* Order section before all others
-+                                         (Solaris).  */
-+#define SHN_AFTER     0xff01          /* Order section after all others
-+                                         (Solaris).  */
-+#define SHN_HIPROC    0xff1f          /* End of processor-specific */
-+#define SHN_LOOS      0xff20          /* Start of OS-specific */
-+#define SHN_HIOS      0xff3f          /* End of OS-specific */
-+#define SHN_ABS               0xfff1          /* Associated symbol is absolute */
-+#define SHN_COMMON    0xfff2          /* Associated symbol is common */
-+#define SHN_XINDEX    0xffff          /* Index is in extra table.  */
-+#define SHN_HIRESERVE 0xffff          /* End of reserved indices */
-+
-+/* Legal values for sh_type (section type).  */
-+
-+#define SHT_NULL        0             /* Section header table entry unused */
-+#define SHT_PROGBITS    1             /* Program data */
-+#define SHT_SYMTAB      2             /* Symbol table */
-+#define SHT_STRTAB      3             /* String table */
-+#define SHT_RELA        4             /* Relocation entries with addends */
-+#define SHT_HASH        5             /* Symbol hash table */
-+#define SHT_DYNAMIC     6             /* Dynamic linking information */
-+#define SHT_NOTE        7             /* Notes */
-+#define SHT_NOBITS      8             /* Program space with no data (bss) */
-+#define SHT_REL                 9             /* Relocation entries, no addends */
-+#define SHT_SHLIB       10            /* Reserved */
-+#define SHT_DYNSYM      11            /* Dynamic linker symbol table */
-+#define SHT_INIT_ARRAY          14            /* Array of constructors */
-+#define SHT_FINI_ARRAY          15            /* Array of destructors */
-+#define SHT_PREINIT_ARRAY 16          /* Array of pre-constructors */
-+#define SHT_GROUP       17            /* Section group */
-+#define SHT_SYMTAB_SHNDX  18          /* Extended section indeces */
-+#define       SHT_NUM           19            /* Number of defined types.  */
-+#define SHT_LOOS        0x60000000    /* Start OS-specific.  */
-+#define SHT_GNU_ATTRIBUTES 0x6ffffff5 /* Object attributes.  */
-+#define SHT_GNU_HASH    0x6ffffff6    /* GNU-style hash table.  */
-+#define SHT_GNU_LIBLIST         0x6ffffff7    /* Prelink library list */
-+#define SHT_CHECKSUM    0x6ffffff8    /* Checksum for DSO content.  */
-+#define SHT_LOSUNW      0x6ffffffa    /* Sun-specific low bound.  */
-+#define SHT_SUNW_move   0x6ffffffa
-+#define SHT_SUNW_COMDAT   0x6ffffffb
-+#define SHT_SUNW_syminfo  0x6ffffffc
-+#define SHT_GNU_verdef          0x6ffffffd    /* Version definition section.  */
-+#define SHT_GNU_verneed         0x6ffffffe    /* Version needs section.  */
-+#define SHT_GNU_versym          0x6fffffff    /* Version symbol table.  */
-+#define SHT_HISUNW      0x6fffffff    /* Sun-specific high bound.  */
-+#define SHT_HIOS        0x6fffffff    /* End OS-specific type */
-+#define SHT_LOPROC      0x70000000    /* Start of processor-specific */
-+#define SHT_HIPROC      0x7fffffff    /* End of processor-specific */
-+#define SHT_LOUSER      0x80000000    /* Start of application-specific */
-+#define SHT_HIUSER      0x8fffffff    /* End of application-specific */
-+
-+/* Legal values for sh_flags (section flags).  */
-+
-+#define SHF_WRITE          (1 << 0)   /* Writable */
-+#define SHF_ALLOC          (1 << 1)   /* Occupies memory during execution */
-+#define SHF_EXECINSTR      (1 << 2)   /* Executable */
-+#define SHF_MERGE          (1 << 4)   /* Might be merged */
-+#define SHF_STRINGS        (1 << 5)   /* Contains nul-terminated strings */
-+#define SHF_INFO_LINK      (1 << 6)   /* `sh_info' contains SHT index */
-+#define SHF_LINK_ORDER             (1 << 7)   /* Preserve order after combining */
-+#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling
-+                                         required */
-+#define SHF_GROUP          (1 << 9)   /* Section is member of a group.  */
-+#define SHF_TLS                    (1 << 10)  /* Section hold thread-local data.  */
-+#define SHF_MASKOS         0x0ff00000 /* OS-specific.  */
-+#define SHF_MASKPROC       0xf0000000 /* Processor-specific */
-+#define SHF_ORDERED        (1 << 30)  /* Special ordering requirement
-+                                         (Solaris).  */
-+#define SHF_EXCLUDE        (1 << 31)  /* Section is excluded unless
-+                                         referenced or allocated (Solaris).*/
-+
-+/* Section group handling.  */
-+#define GRP_COMDAT    0x1             /* Mark group as COMDAT.  */
-+
-+/* Symbol table entry.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  st_name;                /* Symbol name (string tbl index) */
-+  Elf32_Addr  st_value;               /* Symbol value */
-+  Elf32_Word  st_size;                /* Symbol size */
-+  unsigned char       st_info;                /* Symbol type and binding */
-+  unsigned char       st_other;               /* Symbol visibility */
-+  Elf32_Section       st_shndx;               /* Section index */
-+} Elf32_Sym;
-+
-+typedef struct
-+{
-+  Elf64_Word  st_name;                /* Symbol name (string tbl index) */
-+  unsigned char       st_info;                /* Symbol type and binding */
-+  unsigned char st_other;             /* Symbol visibility */
-+  Elf64_Section       st_shndx;               /* Section index */
-+  Elf64_Addr  st_value;               /* Symbol value */
-+  Elf64_Xword st_size;                /* Symbol size */
-+} Elf64_Sym;
-+
-+/* The syminfo section if available contains additional information about
-+   every dynamic symbol.  */
-+
-+typedef struct
-+{
-+  Elf32_Half si_boundto;              /* Direct bindings, symbol bound to */
-+  Elf32_Half si_flags;                        /* Per symbol flags */
-+} Elf32_Syminfo;
-+
-+typedef struct
-+{
-+  Elf64_Half si_boundto;              /* Direct bindings, symbol bound to */
-+  Elf64_Half si_flags;                        /* Per symbol flags */
-+} Elf64_Syminfo;
-+
-+/* Possible values for si_boundto.  */
-+#define SYMINFO_BT_SELF               0xffff  /* Symbol bound to self */
-+#define SYMINFO_BT_PARENT     0xfffe  /* Symbol bound to parent */
-+#define SYMINFO_BT_LOWRESERVE 0xff00  /* Beginning of reserved entries */
-+
-+/* Possible bitmasks for si_flags.  */
-+#define SYMINFO_FLG_DIRECT    0x0001  /* Direct bound symbol */
-+#define SYMINFO_FLG_PASSTHRU  0x0002  /* Pass-thru symbol for translator */
-+#define SYMINFO_FLG_COPY      0x0004  /* Symbol is a copy-reloc */
-+#define SYMINFO_FLG_LAZYLOAD  0x0008  /* Symbol bound to object to be lazy
-+                                         loaded */
-+/* Syminfo version values.  */
-+#define SYMINFO_NONE          0
-+#define SYMINFO_CURRENT               1
-+#define SYMINFO_NUM           2
-+
-+
-+/* How to extract and insert information held in the st_info field.  */
-+
-+#define ELF32_ST_BIND(val)            (((unsigned char) (val)) >> 4)
-+#define ELF32_ST_TYPE(val)            ((val) & 0xf)
-+#define ELF32_ST_INFO(bind, type)     (((bind) << 4) + ((type) & 0xf))
-+
-+/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
-+#define ELF64_ST_BIND(val)            ELF32_ST_BIND (val)
-+#define ELF64_ST_TYPE(val)            ELF32_ST_TYPE (val)
-+#define ELF64_ST_INFO(bind, type)     ELF32_ST_INFO ((bind), (type))
-+
-+/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
-+
-+#define STB_LOCAL     0               /* Local symbol */
-+#define STB_GLOBAL    1               /* Global symbol */
-+#define STB_WEAK      2               /* Weak symbol */
-+#define       STB_NUM         3               /* Number of defined types.  */
-+#define STB_LOOS      10              /* Start of OS-specific */
-+#define STB_GNU_UNIQUE        10              /* Unique symbol.  */
-+#define STB_HIOS      12              /* End of OS-specific */
-+#define STB_LOPROC    13              /* Start of processor-specific */
-+#define STB_HIPROC    15              /* End of processor-specific */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-+
-+#define STT_NOTYPE    0               /* Symbol type is unspecified */
-+#define STT_OBJECT    1               /* Symbol is a data object */
-+#define STT_FUNC      2               /* Symbol is a code object */
-+#define STT_SECTION   3               /* Symbol associated with a section */
-+#define STT_FILE      4               /* Symbol's name is file name */
-+#define STT_COMMON    5               /* Symbol is a common data object */
-+#define STT_TLS               6               /* Symbol is thread-local data object*/
-+#define       STT_NUM         7               /* Number of defined types.  */
-+#define STT_LOOS      10              /* Start of OS-specific */
-+#define STT_GNU_IFUNC 10              /* Symbol is indirect code object */
-+#define STT_HIOS      12              /* End of OS-specific */
-+#define STT_LOPROC    13              /* Start of processor-specific */
-+#define STT_HIPROC    15              /* End of processor-specific */
-+
-+
-+/* Symbol table indices are found in the hash buckets and chain table
-+   of a symbol hash table section.  This special index value indicates
-+   the end of a chain, meaning no further symbols are found in that bucket.  */
-+
-+#define STN_UNDEF     0               /* End of a chain.  */
-+
-+
-+/* How to extract and insert information held in the st_other field.  */
-+
-+#define ELF32_ST_VISIBILITY(o)        ((o) & 0x03)
-+
-+/* For ELF64 the definitions are the same.  */
-+#define ELF64_ST_VISIBILITY(o)        ELF32_ST_VISIBILITY (o)
-+
-+/* Symbol visibility specification encoded in the st_other field.  */
-+#define STV_DEFAULT   0               /* Default symbol visibility rules */
-+#define STV_INTERNAL  1               /* Processor specific hidden class */
-+#define STV_HIDDEN    2               /* Sym unavailable in other modules */
-+#define STV_PROTECTED 3               /* Not preemptible, not exported */
-+
-+
-+/* Relocation table entry without addend (in section of type SHT_REL).  */
-+
-+typedef struct
-+{
-+  Elf32_Addr  r_offset;               /* Address */
-+  Elf32_Word  r_info;                 /* Relocation type and symbol index */
-+} Elf32_Rel;
-+
-+/* I have seen two different definitions of the Elf64_Rel and
-+   Elf64_Rela structures, so we'll leave them out until Novell (or
-+   whoever) gets their act together.  */
-+/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
-+
-+typedef struct
-+{
-+  Elf64_Addr  r_offset;               /* Address */
-+  Elf64_Xword r_info;                 /* Relocation type and symbol index */
-+} Elf64_Rel;
-+
-+/* Relocation table entry with addend (in section of type SHT_RELA).  */
-+
-+typedef struct
-+{
-+  Elf32_Addr  r_offset;               /* Address */
-+  Elf32_Word  r_info;                 /* Relocation type and symbol index */
-+  Elf32_Sword r_addend;               /* Addend */
-+} Elf32_Rela;
-+
-+typedef struct
-+{
-+  Elf64_Addr  r_offset;               /* Address */
-+  Elf64_Xword r_info;                 /* Relocation type and symbol index */
-+  Elf64_Sxword        r_addend;               /* Addend */
-+} Elf64_Rela;
-+
-+/* How to extract and insert information held in the r_info field.  */
-+
-+#define ELF32_R_SYM(val)              ((val) >> 8)
-+#define ELF32_R_TYPE(val)             ((val) & 0xff)
-+#define ELF32_R_INFO(sym, type)               (((sym) << 8) + ((type) & 0xff))
-+
-+#define ELF64_R_SYM(i)                        ((i) >> 32)
-+#define ELF64_R_TYPE(i)                       ((i) & 0xffffffff)
-+#define ELF64_R_INFO(sym,type)                ((((Elf64_Xword) (sym)) << 32) + (type))
-+
-+/* Program segment header.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  p_type;                 /* Segment type */
-+  Elf32_Off   p_offset;               /* Segment file offset */
-+  Elf32_Addr  p_vaddr;                /* Segment virtual address */
-+  Elf32_Addr  p_paddr;                /* Segment physical address */
-+  Elf32_Word  p_filesz;               /* Segment size in file */
-+  Elf32_Word  p_memsz;                /* Segment size in memory */
-+  Elf32_Word  p_flags;                /* Segment flags */
-+  Elf32_Word  p_align;                /* Segment alignment */
-+} Elf32_Phdr;
-+
-+typedef struct
-+{
-+  Elf64_Word  p_type;                 /* Segment type */
-+  Elf64_Word  p_flags;                /* Segment flags */
-+  Elf64_Off   p_offset;               /* Segment file offset */
-+  Elf64_Addr  p_vaddr;                /* Segment virtual address */
-+  Elf64_Addr  p_paddr;                /* Segment physical address */
-+  Elf64_Xword p_filesz;               /* Segment size in file */
-+  Elf64_Xword p_memsz;                /* Segment size in memory */
-+  Elf64_Xword p_align;                /* Segment alignment */
-+} Elf64_Phdr;
-+
-+/* Special value for e_phnum.  This indicates that the real number of
-+   program headers is too large to fit into e_phnum.  Instead the real
-+   value is in the field sh_info of section 0.  */
-+
-+#define PN_XNUM               0xffff
-+
-+/* Legal values for p_type (segment type).  */
-+
-+#define       PT_NULL         0               /* Program header table entry unused */
-+#define PT_LOAD               1               /* Loadable program segment */
-+#define PT_DYNAMIC    2               /* Dynamic linking information */
-+#define PT_INTERP     3               /* Program interpreter */
-+#define PT_NOTE               4               /* Auxiliary information */
-+#define PT_SHLIB      5               /* Reserved */
-+#define PT_PHDR               6               /* Entry for header table itself */
-+#define PT_TLS                7               /* Thread-local storage segment */
-+#define       PT_NUM          8               /* Number of defined types */
-+#define PT_LOOS               0x60000000      /* Start of OS-specific */
-+#define PT_GNU_EH_FRAME       0x6474e550      /* GCC .eh_frame_hdr segment */
-+#define PT_GNU_STACK  0x6474e551      /* Indicates stack executability */
-+#define PT_GNU_RELRO  0x6474e552      /* Read-only after relocation */
-+#define PT_LOSUNW     0x6ffffffa
-+#define PT_SUNWBSS    0x6ffffffa      /* Sun Specific segment */
-+#define PT_SUNWSTACK  0x6ffffffb      /* Stack segment */
-+#define PT_HISUNW     0x6fffffff
-+#define PT_HIOS               0x6fffffff      /* End of OS-specific */
-+#define PT_LOPROC     0x70000000      /* Start of processor-specific */
-+#define PT_HIPROC     0x7fffffff      /* End of processor-specific */
-+
-+/* Legal values for p_flags (segment flags).  */
-+
-+#define PF_X          (1 << 0)        /* Segment is executable */
-+#define PF_W          (1 << 1)        /* Segment is writable */
-+#define PF_R          (1 << 2)        /* Segment is readable */
-+#define PF_MASKOS     0x0ff00000      /* OS-specific */
-+#define PF_MASKPROC   0xf0000000      /* Processor-specific */
-+
-+/* Legal values for note segment descriptor types for core files. */
-+
-+#define NT_PRSTATUS   1               /* Contains copy of prstatus struct */
-+#define NT_FPREGSET   2               /* Contains copy of fpregset struct */
-+#define NT_PRPSINFO   3               /* Contains copy of prpsinfo struct */
-+#define NT_PRXREG     4               /* Contains copy of prxregset struct */
-+#define NT_TASKSTRUCT 4               /* Contains copy of task structure */
-+#define NT_PLATFORM   5               /* String from sysinfo(SI_PLATFORM) */
-+#define NT_AUXV               6               /* Contains copy of auxv array */
-+#define NT_GWINDOWS   7               /* Contains copy of gwindows struct */
-+#define NT_ASRS               8               /* Contains copy of asrset struct */
-+#define NT_PSTATUS    10              /* Contains copy of pstatus struct */
-+#define NT_PSINFO     13              /* Contains copy of psinfo struct */
-+#define NT_PRCRED     14              /* Contains copy of prcred struct */
-+#define NT_UTSNAME    15              /* Contains copy of utsname struct */
-+#define NT_LWPSTATUS  16              /* Contains copy of lwpstatus struct */
-+#define NT_LWPSINFO   17              /* Contains copy of lwpinfo struct */
-+#define NT_PRFPXREG   20              /* Contains copy of fprxregset struct */
-+#define NT_PRXFPREG   0x46e62b7f      /* Contains copy of user_fxsr_struct */
-+#define NT_PPC_VMX    0x100           /* PowerPC Altivec/VMX registers */
-+#define NT_PPC_SPE    0x101           /* PowerPC SPE/EVR registers */
-+#define NT_PPC_VSX    0x102           /* PowerPC VSX registers */
-+#define NT_386_TLS    0x200           /* i386 TLS slots (struct user_desc) */
-+#define NT_386_IOPERM 0x201           /* x86 io permission bitmap (1=deny) */
-+#define NT_X86_XSTATE 0x202           /* x86 extended state using xsave */
-+
-+/* Legal values for the note segment descriptor types for object files.  */
-+
-+#define NT_VERSION    1               /* Contains a version string.  */
-+
-+
-+/* Dynamic section entry.  */
-+
-+typedef struct
-+{
-+  Elf32_Sword d_tag;                  /* Dynamic entry type */
-+  union
-+    {
-+      Elf32_Word d_val;                       /* Integer value */
-+      Elf32_Addr d_ptr;                       /* Address value */
-+    } d_un;
-+} Elf32_Dyn;
-+
-+typedef struct
-+{
-+  Elf64_Sxword        d_tag;                  /* Dynamic entry type */
-+  union
-+    {
-+      Elf64_Xword d_val;              /* Integer value */
-+      Elf64_Addr d_ptr;                       /* Address value */
-+    } d_un;
-+} Elf64_Dyn;
-+
-+/* Legal values for d_tag (dynamic entry type).  */
-+
-+#define DT_NULL               0               /* Marks end of dynamic section */
-+#define DT_NEEDED     1               /* Name of needed library */
-+#define DT_PLTRELSZ   2               /* Size in bytes of PLT relocs */
-+#define DT_PLTGOT     3               /* Processor defined value */
-+#define DT_HASH               4               /* Address of symbol hash table */
-+#define DT_STRTAB     5               /* Address of string table */
-+#define DT_SYMTAB     6               /* Address of symbol table */
-+#define DT_RELA               7               /* Address of Rela relocs */
-+#define DT_RELASZ     8               /* Total size of Rela relocs */
-+#define DT_RELAENT    9               /* Size of one Rela reloc */
-+#define DT_STRSZ      10              /* Size of string table */
-+#define DT_SYMENT     11              /* Size of one symbol table entry */
-+#define DT_INIT               12              /* Address of init function */
-+#define DT_FINI               13              /* Address of termination function */
-+#define DT_SONAME     14              /* Name of shared object */
-+#define DT_RPATH      15              /* Library search path (deprecated) */
-+#define DT_SYMBOLIC   16              /* Start symbol search here */
-+#define DT_REL                17              /* Address of Rel relocs */
-+#define DT_RELSZ      18              /* Total size of Rel relocs */
-+#define DT_RELENT     19              /* Size of one Rel reloc */
-+#define DT_PLTREL     20              /* Type of reloc in PLT */
-+#define DT_DEBUG      21              /* For debugging; unspecified */
-+#define DT_TEXTREL    22              /* Reloc might modify .text */
-+#define DT_JMPREL     23              /* Address of PLT relocs */
-+#define       DT_BIND_NOW     24              /* Process relocations of object */
-+#define       DT_INIT_ARRAY   25              /* Array with addresses of init fct */
-+#define       DT_FINI_ARRAY   26              /* Array with addresses of fini fct */
-+#define       DT_INIT_ARRAYSZ 27              /* Size in bytes of DT_INIT_ARRAY */
-+#define       DT_FINI_ARRAYSZ 28              /* Size in bytes of DT_FINI_ARRAY */
-+#define DT_RUNPATH    29              /* Library search path */
-+#define DT_FLAGS      30              /* Flags for the object being loaded */
-+#define DT_ENCODING   32              /* Start of encoded range */
-+#define DT_PREINIT_ARRAY 32           /* Array with addresses of preinit fct*/
-+#define DT_PREINIT_ARRAYSZ 33         /* size in bytes of DT_PREINIT_ARRAY */
-+#define       DT_NUM          34              /* Number used */
-+#define DT_LOOS               0x6000000d      /* Start of OS-specific */
-+#define DT_HIOS               0x6ffff000      /* End of OS-specific */
-+#define DT_LOPROC     0x70000000      /* Start of processor-specific */
-+#define DT_HIPROC     0x7fffffff      /* End of processor-specific */
-+#define       DT_PROCNUM      DT_MIPS_NUM     /* Most used by any processor */
-+
-+/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
-+   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
-+   approach.  */
-+#define DT_VALRNGLO   0x6ffffd00
-+#define DT_GNU_PRELINKED 0x6ffffdf5   /* Prelinking timestamp */
-+#define DT_GNU_CONFLICTSZ 0x6ffffdf6  /* Size of conflict section */
-+#define DT_GNU_LIBLISTSZ 0x6ffffdf7   /* Size of library list */
-+#define DT_CHECKSUM   0x6ffffdf8
-+#define DT_PLTPADSZ   0x6ffffdf9
-+#define DT_MOVEENT    0x6ffffdfa
-+#define DT_MOVESZ     0x6ffffdfb
-+#define DT_FEATURE_1  0x6ffffdfc      /* Feature selection (DTF_*).  */
-+#define DT_POSFLAG_1  0x6ffffdfd      /* Flags for DT_* entries, effecting
-+                                         the following DT_* entry.  */
-+#define DT_SYMINSZ    0x6ffffdfe      /* Size of syminfo table (in bytes) */
-+#define DT_SYMINENT   0x6ffffdff      /* Entry size of syminfo */
-+#define DT_VALRNGHI   0x6ffffdff
-+#define DT_VALTAGIDX(tag)     (DT_VALRNGHI - (tag))   /* Reverse order! */
-+#define DT_VALNUM 12
-+
-+/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
-+   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
-+
-+   If any adjustment is made to the ELF object after it has been
-+   built these entries will need to be adjusted.  */
-+#define DT_ADDRRNGLO  0x6ffffe00
-+#define DT_GNU_HASH   0x6ffffef5      /* GNU-style hash table.  */
-+#define DT_TLSDESC_PLT        0x6ffffef6
-+#define DT_TLSDESC_GOT        0x6ffffef7
-+#define DT_GNU_CONFLICT       0x6ffffef8      /* Start of conflict section */
-+#define DT_GNU_LIBLIST        0x6ffffef9      /* Library list */
-+#define DT_CONFIG     0x6ffffefa      /* Configuration information.  */
-+#define DT_DEPAUDIT   0x6ffffefb      /* Dependency auditing.  */
-+#define DT_AUDIT      0x6ffffefc      /* Object auditing.  */
-+#define       DT_PLTPAD       0x6ffffefd      /* PLT padding.  */
-+#define       DT_MOVETAB      0x6ffffefe      /* Move table.  */
-+#define DT_SYMINFO    0x6ffffeff      /* Syminfo table.  */
-+#define DT_ADDRRNGHI  0x6ffffeff
-+#define DT_ADDRTAGIDX(tag)    (DT_ADDRRNGHI - (tag))  /* Reverse order! */
-+#define DT_ADDRNUM 11
-+
-+/* The versioning entry types.  The next are defined as part of the
-+   GNU extension.  */
-+#define DT_VERSYM     0x6ffffff0
-+
-+#define DT_RELACOUNT  0x6ffffff9
-+#define DT_RELCOUNT   0x6ffffffa
-+
-+/* These were chosen by Sun.  */
-+#define DT_FLAGS_1    0x6ffffffb      /* State flags, see DF_1_* below.  */
-+#define       DT_VERDEF       0x6ffffffc      /* Address of version definition
-+                                         table */
-+#define       DT_VERDEFNUM    0x6ffffffd      /* Number of version definitions */
-+#define       DT_VERNEED      0x6ffffffe      /* Address of table with needed
-+                                         versions */
-+#define       DT_VERNEEDNUM   0x6fffffff      /* Number of needed versions */
-+#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */
-+#define DT_VERSIONTAGNUM 16
-+
-+/* Sun added these machine-independent extensions in the "processor-specific"
-+   range.  Be compatible.  */
-+#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
-+#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
-+#define DT_EXTRATAGIDX(tag)   ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-+#define DT_EXTRANUM   3
-+
-+/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
-+#define DF_ORIGIN     0x00000001      /* Object may use DF_ORIGIN */
-+#define DF_SYMBOLIC   0x00000002      /* Symbol resolutions starts here */
-+#define DF_TEXTREL    0x00000004      /* Object contains text relocations */
-+#define DF_BIND_NOW   0x00000008      /* No lazy binding for this object */
-+#define DF_STATIC_TLS 0x00000010      /* Module uses the static TLS model */
-+
-+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
-+   entry in the dynamic section.  */
-+#define DF_1_NOW      0x00000001      /* Set RTLD_NOW for this object.  */
-+#define DF_1_GLOBAL   0x00000002      /* Set RTLD_GLOBAL for this object.  */
-+#define DF_1_GROUP    0x00000004      /* Set RTLD_GROUP for this object.  */
-+#define DF_1_NODELETE 0x00000008      /* Set RTLD_NODELETE for this object.*/
-+#define DF_1_LOADFLTR 0x00000010      /* Trigger filtee loading at runtime.*/
-+#define DF_1_INITFIRST        0x00000020      /* Set RTLD_INITFIRST for this object*/
-+#define DF_1_NOOPEN   0x00000040      /* Set RTLD_NOOPEN for this object.  */
-+#define DF_1_ORIGIN   0x00000080      /* $ORIGIN must be handled.  */
-+#define DF_1_DIRECT   0x00000100      /* Direct binding enabled.  */
-+#define DF_1_TRANS    0x00000200
-+#define DF_1_INTERPOSE        0x00000400      /* Object is used to interpose.  */
-+#define DF_1_NODEFLIB 0x00000800      /* Ignore default lib search path.  */
-+#define DF_1_NODUMP   0x00001000      /* Object can't be dldump'ed.  */
-+#define DF_1_CONFALT  0x00002000      /* Configuration alternative created.*/
-+#define DF_1_ENDFILTEE        0x00004000      /* Filtee terminates filters search. */
-+#define       DF_1_DISPRELDNE 0x00008000      /* Disp reloc applied at build time. */
-+#define       DF_1_DISPRELPND 0x00010000      /* Disp reloc applied at run-time.  */
-+
-+/* Flags for the feature selection in DT_FEATURE_1.  */
-+#define DTF_1_PARINIT 0x00000001
-+#define DTF_1_CONFEXP 0x00000002
-+
-+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
-+#define DF_P1_LAZYLOAD        0x00000001      /* Lazyload following object.  */
-+#define DF_P1_GROUPPERM       0x00000002      /* Symbols from next object are not
-+                                         generally available.  */
-+
-+/* Version definition sections.  */
-+
-+typedef struct
-+{
-+  Elf32_Half  vd_version;             /* Version revision */
-+  Elf32_Half  vd_flags;               /* Version information */
-+  Elf32_Half  vd_ndx;                 /* Version Index */
-+  Elf32_Half  vd_cnt;                 /* Number of associated aux entries */
-+  Elf32_Word  vd_hash;                /* Version name hash value */
-+  Elf32_Word  vd_aux;                 /* Offset in bytes to verdaux array */
-+  Elf32_Word  vd_next;                /* Offset in bytes to next verdef
-+                                         entry */
-+} Elf32_Verdef;
-+
-+typedef struct
-+{
-+  Elf64_Half  vd_version;             /* Version revision */
-+  Elf64_Half  vd_flags;               /* Version information */
-+  Elf64_Half  vd_ndx;                 /* Version Index */
-+  Elf64_Half  vd_cnt;                 /* Number of associated aux entries */
-+  Elf64_Word  vd_hash;                /* Version name hash value */
-+  Elf64_Word  vd_aux;                 /* Offset in bytes to verdaux array */
-+  Elf64_Word  vd_next;                /* Offset in bytes to next verdef
-+                                         entry */
-+} Elf64_Verdef;
-+
-+
-+/* Legal values for vd_version (version revision).  */
-+#define VER_DEF_NONE  0               /* No version */
-+#define VER_DEF_CURRENT       1               /* Current version */
-+#define VER_DEF_NUM   2               /* Given version number */
-+
-+/* Legal values for vd_flags (version information flags).  */
-+#define VER_FLG_BASE  0x1             /* Version definition of file itself */
-+#define VER_FLG_WEAK  0x2             /* Weak version identifier */
-+
-+/* Versym symbol index values.  */
-+#define       VER_NDX_LOCAL           0       /* Symbol is local.  */
-+#define       VER_NDX_GLOBAL          1       /* Symbol is global.  */
-+#define       VER_NDX_LORESERVE       0xff00  /* Beginning of reserved entries.  */
-+#define       VER_NDX_ELIMINATE       0xff01  /* Symbol is to be eliminated.  */
-+
-+/* Auxialiary version information.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  vda_name;               /* Version or dependency names */
-+  Elf32_Word  vda_next;               /* Offset in bytes to next verdaux
-+                                         entry */
-+} Elf32_Verdaux;
-+
-+typedef struct
-+{
-+  Elf64_Word  vda_name;               /* Version or dependency names */
-+  Elf64_Word  vda_next;               /* Offset in bytes to next verdaux
-+                                         entry */
-+} Elf64_Verdaux;
-+
-+
-+/* Version dependency section.  */
-+
-+typedef struct
-+{
-+  Elf32_Half  vn_version;             /* Version of structure */
-+  Elf32_Half  vn_cnt;                 /* Number of associated aux entries */
-+  Elf32_Word  vn_file;                /* Offset of filename for this
-+                                         dependency */
-+  Elf32_Word  vn_aux;                 /* Offset in bytes to vernaux array */
-+  Elf32_Word  vn_next;                /* Offset in bytes to next verneed
-+                                         entry */
-+} Elf32_Verneed;
-+
-+typedef struct
-+{
-+  Elf64_Half  vn_version;             /* Version of structure */
-+  Elf64_Half  vn_cnt;                 /* Number of associated aux entries */
-+  Elf64_Word  vn_file;                /* Offset of filename for this
-+                                         dependency */
-+  Elf64_Word  vn_aux;                 /* Offset in bytes to vernaux array */
-+  Elf64_Word  vn_next;                /* Offset in bytes to next verneed
-+                                         entry */
-+} Elf64_Verneed;
-+
-+
-+/* Legal values for vn_version (version revision).  */
-+#define VER_NEED_NONE  0              /* No version */
-+#define VER_NEED_CURRENT 1            /* Current version */
-+#define VER_NEED_NUM   2              /* Given version number */
-+
-+/* Auxiliary needed version information.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  vna_hash;               /* Hash value of dependency name */
-+  Elf32_Half  vna_flags;              /* Dependency specific information */
-+  Elf32_Half  vna_other;              /* Unused */
-+  Elf32_Word  vna_name;               /* Dependency name string offset */
-+  Elf32_Word  vna_next;               /* Offset in bytes to next vernaux
-+                                         entry */
-+} Elf32_Vernaux;
-+
-+typedef struct
-+{
-+  Elf64_Word  vna_hash;               /* Hash value of dependency name */
-+  Elf64_Half  vna_flags;              /* Dependency specific information */
-+  Elf64_Half  vna_other;              /* Unused */
-+  Elf64_Word  vna_name;               /* Dependency name string offset */
-+  Elf64_Word  vna_next;               /* Offset in bytes to next vernaux
-+                                         entry */
-+} Elf64_Vernaux;
-+
-+
-+/* Legal values for vna_flags.  */
-+#define VER_FLG_WEAK  0x2             /* Weak version identifier */
-+
-+
-+/* Auxiliary vector.  */
-+
-+/* This vector is normally only used by the program interpreter.  The
-+   usual definition in an ABI supplement uses the name auxv_t.  The
-+   vector is not usually defined in a standard <elf.h> file, but it
-+   can't hurt.  We rename it to avoid conflicts.  The sizes of these
-+   types are an arrangement between the exec server and the program
-+   interpreter, so we don't fully specify them here.  */
-+
-+typedef struct
-+{
-+  uint32_t a_type;            /* Entry type */
-+  union
-+    {
-+      uint32_t a_val;         /* Integer value */
-+      /* We use to have pointer elements added here.  We cannot do that,
-+       though, since it does not work when using 32-bit definitions
-+       on 64-bit platforms and vice versa.  */
-+    } a_un;
-+} Elf32_auxv_t;
-+
-+typedef struct
-+{
-+  uint64_t a_type;            /* Entry type */
-+  union
-+    {
-+      uint64_t a_val;         /* Integer value */
-+      /* We use to have pointer elements added here.  We cannot do that,
-+       though, since it does not work when using 32-bit definitions
-+       on 64-bit platforms and vice versa.  */
-+    } a_un;
-+} Elf64_auxv_t;
-+
-+/* Legal values for a_type (entry type).  */
-+
-+#define AT_NULL               0               /* End of vector */
-+#define AT_IGNORE     1               /* Entry should be ignored */
-+#define AT_EXECFD     2               /* File descriptor of program */
-+#define AT_PHDR               3               /* Program headers for program */
-+#define AT_PHENT      4               /* Size of program header entry */
-+#define AT_PHNUM      5               /* Number of program headers */
-+#define AT_PAGESZ     6               /* System page size */
-+#define AT_BASE               7               /* Base address of interpreter */
-+#define AT_FLAGS      8               /* Flags */
-+#define AT_ENTRY      9               /* Entry point of program */
-+#define AT_NOTELF     10              /* Program is not ELF */
-+#define AT_UID                11              /* Real uid */
-+#define AT_EUID               12              /* Effective uid */
-+#define AT_GID                13              /* Real gid */
-+#define AT_EGID               14              /* Effective gid */
-+#define AT_CLKTCK     17              /* Frequency of times() */
-+
-+/* Some more special a_type values describing the hardware.  */
-+#define AT_PLATFORM   15              /* String identifying platform.  */
-+#define AT_HWCAP      16              /* Machine dependent hints about
-+                                         processor capabilities.  */
-+
-+/* This entry gives some information about the FPU initialization
-+   performed by the kernel.  */
-+#define AT_FPUCW      18              /* Used FPU control word.  */
-+
-+/* Cache block sizes.  */
-+#define AT_DCACHEBSIZE        19              /* Data cache block size.  */
-+#define AT_ICACHEBSIZE        20              /* Instruction cache block size.  */
-+#define AT_UCACHEBSIZE        21              /* Unified cache block size.  */
-+
-+/* A special ignored value for PPC, used by the kernel to control the
-+   interpretation of the AUXV. Must be > 16.  */
-+#define AT_IGNOREPPC  22              /* Entry should be ignored.  */
-+
-+#define       AT_SECURE       23              /* Boolean, was exec setuid-like?  */
-+
-+#define AT_BASE_PLATFORM 24           /* String identifying real platforms.*/
-+
-+#define AT_RANDOM     25              /* Address of 16 random bytes.  */
-+
-+#define AT_EXECFN     31              /* Filename of executable.  */
-+
-+/* Pointer to the global system page used for system calls and other
-+   nice things.  */
-+#define AT_SYSINFO    32
-+#define AT_SYSINFO_EHDR       33
-+
-+/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
-+   log2 of line size; mask those to get cache size.  */
-+#define AT_L1I_CACHESHAPE     34
-+#define AT_L1D_CACHESHAPE     35
-+#define AT_L2_CACHESHAPE      36
-+#define AT_L3_CACHESHAPE      37
-+
-+/* Note section contents.  Each entry in the note section begins with
-+   a header of a fixed form.  */
-+
-+typedef struct
-+{
-+  Elf32_Word n_namesz;                        /* Length of the note's name.  */
-+  Elf32_Word n_descsz;                        /* Length of the note's descriptor.  */
-+  Elf32_Word n_type;                  /* Type of the note.  */
-+} Elf32_Nhdr;
-+
-+typedef struct
-+{
-+  Elf64_Word n_namesz;                        /* Length of the note's name.  */
-+  Elf64_Word n_descsz;                        /* Length of the note's descriptor.  */
-+  Elf64_Word n_type;                  /* Type of the note.  */
-+} Elf64_Nhdr;
-+
-+/* Known names of notes.  */
-+
-+/* Solaris entries in the note section have this name.  */
-+#define ELF_NOTE_SOLARIS      "SUNW Solaris"
-+
-+/* Note entries for GNU systems have this name.  */
-+#define ELF_NOTE_GNU          "GNU"
-+
-+
-+/* Defined types of notes for Solaris.  */
-+
-+/* Value of descriptor (one word) is desired pagesize for the binary.  */
-+#define ELF_NOTE_PAGESIZE_HINT        1
-+
-+
-+/* Defined note types for GNU systems.  */
-+
-+/* ABI information.  The descriptor consists of words:
-+   word 0: OS descriptor
-+   word 1: major version of the ABI
-+   word 2: minor version of the ABI
-+   word 3: subminor version of the ABI
-+*/
-+#define NT_GNU_ABI_TAG        1
-+#define ELF_NOTE_ABI  NT_GNU_ABI_TAG /* Old name.  */
-+
-+/* Known OSes.  These values can appear in word 0 of an
-+   NT_GNU_ABI_TAG note section entry.  */
-+#define ELF_NOTE_OS_LINUX     0
-+#define ELF_NOTE_OS_GNU               1
-+#define ELF_NOTE_OS_SOLARIS2  2
-+#define ELF_NOTE_OS_FREEBSD   3
-+
-+/* Synthetic hwcap information.  The descriptor begins with two words:
-+   word 0: number of entries
-+   word 1: bitmask of enabled entries
-+   Then follow variable-length entries, one byte followed by a
-+   '\0'-terminated hwcap name string.  The byte gives the bit
-+   number to test if enabled, (1U << bit) & bitmask.  */
-+#define NT_GNU_HWCAP  2
-+
-+/* Build ID bits as generated by ld --build-id.
-+   The descriptor consists of any nonzero number of bytes.  */
-+#define NT_GNU_BUILD_ID       3
-+
-+/* Version note generated by GNU gold containing a version string.  */
-+#define NT_GNU_GOLD_VERSION   4
-+
-+
-+/* Move records.  */
-+typedef struct
-+{
-+  Elf32_Xword m_value;                /* Symbol value.  */
-+  Elf32_Word m_info;          /* Size and index.  */
-+  Elf32_Word m_poffset;               /* Symbol offset.  */
-+  Elf32_Half m_repeat;                /* Repeat count.  */
-+  Elf32_Half m_stride;                /* Stride info.  */
-+} Elf32_Move;
-+
-+typedef struct
-+{
-+  Elf64_Xword m_value;                /* Symbol value.  */
-+  Elf64_Xword m_info;         /* Size and index.  */
-+  Elf64_Xword m_poffset;      /* Symbol offset.  */
-+  Elf64_Half m_repeat;                /* Repeat count.  */
-+  Elf64_Half m_stride;                /* Stride info.  */
-+} Elf64_Move;
-+
-+/* Macro to construct move records.  */
-+#define ELF32_M_SYM(info)     ((info) >> 8)
-+#define ELF32_M_SIZE(info)    ((unsigned char) (info))
-+#define ELF32_M_INFO(sym, size)       (((sym) << 8) + (unsigned char) (size))
-+
-+#define ELF64_M_SYM(info)     ELF32_M_SYM (info)
-+#define ELF64_M_SIZE(info)    ELF32_M_SIZE (info)
-+#define ELF64_M_INFO(sym, size)       ELF32_M_INFO (sym, size)
-+
-+
-+/* Motorola 68k specific definitions.  */
-+
-+/* Values for Elf32_Ehdr.e_flags.  */
-+#define EF_CPU32      0x00810000
-+
-+/* m68k relocs.  */
-+
-+#define R_68K_NONE    0               /* No reloc */
-+#define R_68K_32      1               /* Direct 32 bit  */
-+#define R_68K_16      2               /* Direct 16 bit  */
-+#define R_68K_8               3               /* Direct 8 bit  */
-+#define R_68K_PC32    4               /* PC relative 32 bit */
-+#define R_68K_PC16    5               /* PC relative 16 bit */
-+#define R_68K_PC8     6               /* PC relative 8 bit */
-+#define R_68K_GOT32   7               /* 32 bit PC relative GOT entry */
-+#define R_68K_GOT16   8               /* 16 bit PC relative GOT entry */
-+#define R_68K_GOT8    9               /* 8 bit PC relative GOT entry */
-+#define R_68K_GOT32O  10              /* 32 bit GOT offset */
-+#define R_68K_GOT16O  11              /* 16 bit GOT offset */
-+#define R_68K_GOT8O   12              /* 8 bit GOT offset */
-+#define R_68K_PLT32   13              /* 32 bit PC relative PLT address */
-+#define R_68K_PLT16   14              /* 16 bit PC relative PLT address */
-+#define R_68K_PLT8    15              /* 8 bit PC relative PLT address */
-+#define R_68K_PLT32O  16              /* 32 bit PLT offset */
-+#define R_68K_PLT16O  17              /* 16 bit PLT offset */
-+#define R_68K_PLT8O   18              /* 8 bit PLT offset */
-+#define R_68K_COPY    19              /* Copy symbol at runtime */
-+#define R_68K_GLOB_DAT        20              /* Create GOT entry */
-+#define R_68K_JMP_SLOT        21              /* Create PLT entry */
-+#define R_68K_RELATIVE        22              /* Adjust by program base */
-+#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
-+#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
-+#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
-+#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
-+#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
-+#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
-+#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
-+#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
-+#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
-+#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
-+#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
-+#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
-+#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
-+                                         static TLS block */
-+#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
-+                                         static TLS block */
-+#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
-+                                         static TLS block */
-+#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
-+#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
-+#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
-+/* Keep this the last entry.  */
-+#define R_68K_NUM     43
-+
-+/* Intel 80386 specific definitions.  */
-+
-+/* i386 relocs.  */
-+
-+#define R_386_NONE       0            /* No reloc */
-+#define R_386_32         1            /* Direct 32 bit  */
-+#define R_386_PC32       2            /* PC relative 32 bit */
-+#define R_386_GOT32      3            /* 32 bit GOT entry */
-+#define R_386_PLT32      4            /* 32 bit PLT address */
-+#define R_386_COPY       5            /* Copy symbol at runtime */
-+#define R_386_GLOB_DAT           6            /* Create GOT entry */
-+#define R_386_JMP_SLOT           7            /* Create PLT entry */
-+#define R_386_RELATIVE           8            /* Adjust by program base */
-+#define R_386_GOTOFF     9            /* 32 bit offset to GOT */
-+#define R_386_GOTPC      10           /* 32 bit PC relative offset to GOT */
-+#define R_386_32PLT      11
-+#define R_386_TLS_TPOFF          14           /* Offset in static TLS block */
-+#define R_386_TLS_IE     15           /* Address of GOT entry for static TLS
-+                                         block offset */
-+#define R_386_TLS_GOTIE          16           /* GOT entry for static TLS block
-+                                         offset */
-+#define R_386_TLS_LE     17           /* Offset relative to static TLS
-+                                         block */
-+#define R_386_TLS_GD     18           /* Direct 32 bit for GNU version of
-+                                         general dynamic thread local data */
-+#define R_386_TLS_LDM    19           /* Direct 32 bit for GNU version of
-+                                         local dynamic thread local data
-+                                         in LE code */
-+#define R_386_16         20
-+#define R_386_PC16       21
-+#define R_386_8                  22
-+#define R_386_PC8        23
-+#define R_386_TLS_GD_32          24           /* Direct 32 bit for general dynamic
-+                                         thread local data */
-+#define R_386_TLS_GD_PUSH  25         /* Tag for pushl in GD TLS code */
-+#define R_386_TLS_GD_CALL  26         /* Relocation for call to
-+                                         __tls_get_addr() */
-+#define R_386_TLS_GD_POP   27         /* Tag for popl in GD TLS code */
-+#define R_386_TLS_LDM_32   28         /* Direct 32 bit for local dynamic
-+                                         thread local data in LE code */
-+#define R_386_TLS_LDM_PUSH 29         /* Tag for pushl in LDM TLS code */
-+#define R_386_TLS_LDM_CALL 30         /* Relocation for call to
-+                                         __tls_get_addr() in LDM code */
-+#define R_386_TLS_LDM_POP  31         /* Tag for popl in LDM TLS code */
-+#define R_386_TLS_LDO_32   32         /* Offset relative to TLS block */
-+#define R_386_TLS_IE_32          33           /* GOT entry for negated static TLS
-+                                         block offset */
-+#define R_386_TLS_LE_32          34           /* Negated offset relative to static
-+                                         TLS block */
-+#define R_386_TLS_DTPMOD32 35         /* ID of module containing symbol */
-+#define R_386_TLS_DTPOFF32 36         /* Offset in TLS block */
-+#define R_386_TLS_TPOFF32  37         /* Negated offset in static TLS block */
-+/* 38? */
-+#define R_386_TLS_GOTDESC  39         /* GOT offset for TLS descriptor.  */
-+#define R_386_TLS_DESC_CALL 40                /* Marker of call through TLS
-+                                         descriptor for
-+                                         relaxation.  */
-+#define R_386_TLS_DESC     41         /* TLS descriptor containing
-+                                         pointer to code and to
-+                                         argument, returning the TLS
-+                                         offset for the symbol.  */
-+#define R_386_IRELATIVE          42           /* Adjust indirectly by program base */
-+/* Keep this the last entry.  */
-+#define R_386_NUM        43
-+
-+/* SUN SPARC specific definitions.  */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-+
-+#define STT_SPARC_REGISTER    13      /* Global register reserved to app. */
-+
-+/* Values for Elf64_Ehdr.e_flags.  */
-+
-+#define EF_SPARCV9_MM         3
-+#define EF_SPARCV9_TSO                0
-+#define EF_SPARCV9_PSO                1
-+#define EF_SPARCV9_RMO                2
-+#define EF_SPARC_LEDATA               0x800000 /* little endian data */
-+#define EF_SPARC_EXT_MASK     0xFFFF00
-+#define EF_SPARC_32PLUS               0x000100 /* generic V8+ features */
-+#define EF_SPARC_SUN_US1      0x000200 /* Sun UltraSPARC1 extensions */
-+#define EF_SPARC_HAL_R1               0x000400 /* HAL R1 extensions */
-+#define EF_SPARC_SUN_US3      0x000800 /* Sun UltraSPARCIII extensions */
-+
-+/* SPARC relocs.  */
-+
-+#define R_SPARC_NONE          0       /* No reloc */
-+#define R_SPARC_8             1       /* Direct 8 bit */
-+#define R_SPARC_16            2       /* Direct 16 bit */
-+#define R_SPARC_32            3       /* Direct 32 bit */
-+#define R_SPARC_DISP8         4       /* PC relative 8 bit */
-+#define R_SPARC_DISP16                5       /* PC relative 16 bit */
-+#define R_SPARC_DISP32                6       /* PC relative 32 bit */
-+#define R_SPARC_WDISP30               7       /* PC relative 30 bit shifted */
-+#define R_SPARC_WDISP22               8       /* PC relative 22 bit shifted */
-+#define R_SPARC_HI22          9       /* High 22 bit */
-+#define R_SPARC_22            10      /* Direct 22 bit */
-+#define R_SPARC_13            11      /* Direct 13 bit */
-+#define R_SPARC_LO10          12      /* Truncated 10 bit */
-+#define R_SPARC_GOT10         13      /* Truncated 10 bit GOT entry */
-+#define R_SPARC_GOT13         14      /* 13 bit GOT entry */
-+#define R_SPARC_GOT22         15      /* 22 bit GOT entry shifted */
-+#define R_SPARC_PC10          16      /* PC relative 10 bit truncated */
-+#define R_SPARC_PC22          17      /* PC relative 22 bit shifted */
-+#define R_SPARC_WPLT30                18      /* 30 bit PC relative PLT address */
-+#define R_SPARC_COPY          19      /* Copy symbol at runtime */
-+#define R_SPARC_GLOB_DAT      20      /* Create GOT entry */
-+#define R_SPARC_JMP_SLOT      21      /* Create PLT entry */
-+#define R_SPARC_RELATIVE      22      /* Adjust by program base */
-+#define R_SPARC_UA32          23      /* Direct 32 bit unaligned */
-+
-+/* Additional Sparc64 relocs.  */
-+
-+#define R_SPARC_PLT32         24      /* Direct 32 bit ref to PLT entry */
-+#define R_SPARC_HIPLT22               25      /* High 22 bit PLT entry */
-+#define R_SPARC_LOPLT10               26      /* Truncated 10 bit PLT entry */
-+#define R_SPARC_PCPLT32               27      /* PC rel 32 bit ref to PLT entry */
-+#define R_SPARC_PCPLT22               28      /* PC rel high 22 bit PLT entry */
-+#define R_SPARC_PCPLT10               29      /* PC rel trunc 10 bit PLT entry */
-+#define R_SPARC_10            30      /* Direct 10 bit */
-+#define R_SPARC_11            31      /* Direct 11 bit */
-+#define R_SPARC_64            32      /* Direct 64 bit */
-+#define R_SPARC_OLO10         33      /* 10bit with secondary 13bit addend */
-+#define R_SPARC_HH22          34      /* Top 22 bits of direct 64 bit */
-+#define R_SPARC_HM10          35      /* High middle 10 bits of ... */
-+#define R_SPARC_LM22          36      /* Low middle 22 bits of ... */
-+#define R_SPARC_PC_HH22               37      /* Top 22 bits of pc rel 64 bit */
-+#define R_SPARC_PC_HM10               38      /* High middle 10 bit of ... */
-+#define R_SPARC_PC_LM22               39      /* Low miggle 22 bits of ... */
-+#define R_SPARC_WDISP16               40      /* PC relative 16 bit shifted */
-+#define R_SPARC_WDISP19               41      /* PC relative 19 bit shifted */
-+#define R_SPARC_GLOB_JMP      42      /* was part of v9 ABI but was removed */
-+#define R_SPARC_7             43      /* Direct 7 bit */
-+#define R_SPARC_5             44      /* Direct 5 bit */
-+#define R_SPARC_6             45      /* Direct 6 bit */
-+#define R_SPARC_DISP64                46      /* PC relative 64 bit */
-+#define R_SPARC_PLT64         47      /* Direct 64 bit ref to PLT entry */
-+#define R_SPARC_HIX22         48      /* High 22 bit complemented */
-+#define R_SPARC_LOX10         49      /* Truncated 11 bit complemented */
-+#define R_SPARC_H44           50      /* Direct high 12 of 44 bit */
-+#define R_SPARC_M44           51      /* Direct mid 22 of 44 bit */
-+#define R_SPARC_L44           52      /* Direct low 10 of 44 bit */
-+#define R_SPARC_REGISTER      53      /* Global register usage */
-+#define R_SPARC_UA64          54      /* Direct 64 bit unaligned */
-+#define R_SPARC_UA16          55      /* Direct 16 bit unaligned */
-+#define R_SPARC_TLS_GD_HI22   56
-+#define R_SPARC_TLS_GD_LO10   57
-+#define R_SPARC_TLS_GD_ADD    58
-+#define R_SPARC_TLS_GD_CALL   59
-+#define R_SPARC_TLS_LDM_HI22  60
-+#define R_SPARC_TLS_LDM_LO10  61
-+#define R_SPARC_TLS_LDM_ADD   62
-+#define R_SPARC_TLS_LDM_CALL  63
-+#define R_SPARC_TLS_LDO_HIX22 64
-+#define R_SPARC_TLS_LDO_LOX10 65
-+#define R_SPARC_TLS_LDO_ADD   66
-+#define R_SPARC_TLS_IE_HI22   67
-+#define R_SPARC_TLS_IE_LO10   68
-+#define R_SPARC_TLS_IE_LD     69
-+#define R_SPARC_TLS_IE_LDX    70
-+#define R_SPARC_TLS_IE_ADD    71
-+#define R_SPARC_TLS_LE_HIX22  72
-+#define R_SPARC_TLS_LE_LOX10  73
-+#define R_SPARC_TLS_DTPMOD32  74
-+#define R_SPARC_TLS_DTPMOD64  75
-+#define R_SPARC_TLS_DTPOFF32  76
-+#define R_SPARC_TLS_DTPOFF64  77
-+#define R_SPARC_TLS_TPOFF32   78
-+#define R_SPARC_TLS_TPOFF64   79
-+#define R_SPARC_GOTDATA_HIX22 80
-+#define R_SPARC_GOTDATA_LOX10 81
-+#define R_SPARC_GOTDATA_OP_HIX22      82
-+#define R_SPARC_GOTDATA_OP_LOX10      83
-+#define R_SPARC_GOTDATA_OP    84
-+#define R_SPARC_H34           85
-+#define R_SPARC_SIZE32                86
-+#define R_SPARC_SIZE64                87
-+#define R_SPARC_WDISP10               88
-+#define R_SPARC_JMP_IREL      248
-+#define R_SPARC_IRELATIVE     249
-+#define R_SPARC_GNU_VTINHERIT 250
-+#define R_SPARC_GNU_VTENTRY   251
-+#define R_SPARC_REV32         252
-+/* Keep this the last entry.  */
-+#define R_SPARC_NUM           253
-+
-+/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
-+
-+#define DT_SPARC_REGISTER 0x70000001
-+#define DT_SPARC_NUM  2
-+
-+/* MIPS R3000 specific definitions.  */
-+
-+/* Legal values for e_flags field of Elf32_Ehdr.  */
-+
-+#define EF_MIPS_NOREORDER   1         /* A .noreorder directive was used */
-+#define EF_MIPS_PIC       2           /* Contains PIC code */
-+#define EF_MIPS_CPIC      4           /* Uses PIC calling sequence */
-+#define EF_MIPS_XGOT      8
-+#define EF_MIPS_64BIT_WHIRL 16
-+#define EF_MIPS_ABI2      32
-+#define EF_MIPS_ABI_ON32    64
-+#define EF_MIPS_ARCH      0xf0000000  /* MIPS architecture level */
-+
-+/* Legal values for MIPS architecture level.  */
-+
-+#define EF_MIPS_ARCH_1            0x00000000  /* -mips1 code.  */
-+#define EF_MIPS_ARCH_2            0x10000000  /* -mips2 code.  */
-+#define EF_MIPS_ARCH_3            0x20000000  /* -mips3 code.  */
-+#define EF_MIPS_ARCH_4            0x30000000  /* -mips4 code.  */
-+#define EF_MIPS_ARCH_5            0x40000000  /* -mips5 code.  */
-+#define EF_MIPS_ARCH_32           0x60000000  /* MIPS32 code.  */
-+#define EF_MIPS_ARCH_64           0x70000000  /* MIPS64 code.  */
-+
-+/* The following are non-official names and should not be used.  */
-+
-+#define E_MIPS_ARCH_1   0x00000000    /* -mips1 code.  */
-+#define E_MIPS_ARCH_2   0x10000000    /* -mips2 code.  */
-+#define E_MIPS_ARCH_3   0x20000000    /* -mips3 code.  */
-+#define E_MIPS_ARCH_4   0x30000000    /* -mips4 code.  */
-+#define E_MIPS_ARCH_5   0x40000000    /* -mips5 code.  */
-+#define E_MIPS_ARCH_32          0x60000000    /* MIPS32 code.  */
-+#define E_MIPS_ARCH_64          0x70000000    /* MIPS64 code.  */
-+
-+/* Special section indices.  */
-+
-+#define SHN_MIPS_ACOMMON    0xff00    /* Allocated common symbols */
-+#define SHN_MIPS_TEXT     0xff01      /* Allocated test symbols.  */
-+#define SHN_MIPS_DATA     0xff02      /* Allocated data symbols.  */
-+#define SHN_MIPS_SCOMMON    0xff03    /* Small common symbols */
-+#define SHN_MIPS_SUNDEFINED 0xff04    /* Small undefined symbols */
-+
-+/* Legal values for sh_type field of Elf32_Shdr.  */
-+
-+#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
-+#define SHT_MIPS_MSYM        0x70000001
-+#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
-+#define SHT_MIPS_GPTAB               0x70000003 /* Global data area sizes */
-+#define SHT_MIPS_UCODE               0x70000004 /* Reserved for SGI/MIPS compilers */
-+#define SHT_MIPS_DEBUG               0x70000005 /* MIPS ECOFF debugging information*/
-+#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
-+#define SHT_MIPS_PACKAGE       0x70000007
-+#define SHT_MIPS_PACKSYM       0x70000008
-+#define SHT_MIPS_RELD        0x70000009
-+#define SHT_MIPS_IFACE         0x7000000b
-+#define SHT_MIPS_CONTENT       0x7000000c
-+#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
-+#define SHT_MIPS_SHDR        0x70000010
-+#define SHT_MIPS_FDESC               0x70000011
-+#define SHT_MIPS_EXTSYM              0x70000012
-+#define SHT_MIPS_DENSE               0x70000013
-+#define SHT_MIPS_PDESC               0x70000014
-+#define SHT_MIPS_LOCSYM              0x70000015
-+#define SHT_MIPS_AUXSYM              0x70000016
-+#define SHT_MIPS_OPTSYM              0x70000017
-+#define SHT_MIPS_LOCSTR              0x70000018
-+#define SHT_MIPS_LINE        0x70000019
-+#define SHT_MIPS_RFDESC              0x7000001a
-+#define SHT_MIPS_DELTASYM      0x7000001b
-+#define SHT_MIPS_DELTAINST     0x7000001c
-+#define SHT_MIPS_DELTACLASS    0x7000001d
-+#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
-+#define SHT_MIPS_DELTADECL     0x7000001f
-+#define SHT_MIPS_SYMBOL_LIB    0x70000020
-+#define SHT_MIPS_EVENTS              0x70000021 /* Event section.  */
-+#define SHT_MIPS_TRANSLATE     0x70000022
-+#define SHT_MIPS_PIXIE               0x70000023
-+#define SHT_MIPS_XLATE               0x70000024
-+#define SHT_MIPS_XLATE_DEBUG   0x70000025
-+#define SHT_MIPS_WHIRL               0x70000026
-+#define SHT_MIPS_EH_REGION     0x70000027
-+#define SHT_MIPS_XLATE_OLD     0x70000028
-+#define SHT_MIPS_PDR_EXCEPTION 0x70000029
-+
-+/* Legal values for sh_flags field of Elf32_Shdr.  */
-+
-+#define SHF_MIPS_GPREL         0x10000000     /* Must be part of global data area */
-+#define SHF_MIPS_MERGE         0x20000000
-+#define SHF_MIPS_ADDR  0x40000000
-+#define SHF_MIPS_STRINGS 0x80000000
-+#define SHF_MIPS_NOSTRIP 0x08000000
-+#define SHF_MIPS_LOCAL         0x04000000
-+#define SHF_MIPS_NAMES         0x02000000
-+#define SHF_MIPS_NODUPE        0x01000000
-+
-+
-+/* Symbol tables.  */
-+
-+/* MIPS specific values for `st_other'.  */
-+#define STO_MIPS_DEFAULT              0x0
-+#define STO_MIPS_INTERNAL             0x1
-+#define STO_MIPS_HIDDEN                       0x2
-+#define STO_MIPS_PROTECTED            0x3
-+#define STO_MIPS_PLT                  0x8
-+#define STO_MIPS_SC_ALIGN_UNUSED      0xff
-+
-+/* MIPS specific values for `st_info'.  */
-+#define STB_MIPS_SPLIT_COMMON         13
-+
-+/* Entries found in sections of type SHT_MIPS_GPTAB.  */
-+
-+typedef union
-+{
-+  struct
-+    {
-+      Elf32_Word gt_current_g_value;  /* -G value used for compilation */
-+      Elf32_Word gt_unused;           /* Not used */
-+    } gt_header;                      /* First entry in section */
-+  struct
-+    {
-+      Elf32_Word gt_g_value;          /* If this value were used for -G */
-+      Elf32_Word gt_bytes;            /* This many bytes would be used */
-+    } gt_entry;                               /* Subsequent entries in section */
-+} Elf32_gptab;
-+
-+/* Entry found in sections of type SHT_MIPS_REGINFO.  */
-+
-+typedef struct
-+{
-+  Elf32_Word  ri_gprmask;             /* General registers used */
-+  Elf32_Word  ri_cprmask[4];          /* Coprocessor registers used */
-+  Elf32_Sword ri_gp_value;            /* $gp register value */
-+} Elf32_RegInfo;
-+
-+/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
-+
-+typedef struct
-+{
-+  unsigned char kind;         /* Determines interpretation of the
-+                                 variable part of descriptor.  */
-+  unsigned char size;         /* Size of descriptor, including header.  */
-+  Elf32_Section section;      /* Section header index of section affected,
-+                                 0 for global options.  */
-+  Elf32_Word info;            /* Kind-specific information.  */
-+} Elf_Options;
-+
-+/* Values for `kind' field in Elf_Options.  */
-+
-+#define ODK_NULL      0       /* Undefined.  */
-+#define ODK_REGINFO   1       /* Register usage information.  */
-+#define ODK_EXCEPTIONS        2       /* Exception processing options.  */
-+#define ODK_PAD               3       /* Section padding options.  */
-+#define ODK_HWPATCH   4       /* Hardware workarounds performed */
-+#define ODK_FILL      5       /* record the fill value used by the linker. */
-+#define ODK_TAGS      6       /* reserve space for desktop tools to write. */
-+#define ODK_HWAND     7       /* HW workarounds.  'AND' bits when merging. */
-+#define ODK_HWOR      8       /* HW workarounds.  'OR' bits when merging.  */
-+
-+/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
-+
-+#define OEX_FPU_MIN   0x1f    /* FPE's which MUST be enabled.  */
-+#define OEX_FPU_MAX   0x1f00  /* FPE's which MAY be enabled.  */
-+#define OEX_PAGE0     0x10000 /* page zero must be mapped.  */
-+#define OEX_SMM               0x20000 /* Force sequential memory mode?  */
-+#define OEX_FPDBUG    0x40000 /* Force floating point debug mode?  */
-+#define OEX_PRECISEFP OEX_FPDBUG
-+#define OEX_DISMISS   0x80000 /* Dismiss invalid address faults?  */
-+
-+#define OEX_FPU_INVAL 0x10
-+#define OEX_FPU_DIV0  0x08
-+#define OEX_FPU_OFLO  0x04
-+#define OEX_FPU_UFLO  0x02
-+#define OEX_FPU_INEX  0x01
-+
-+/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
-+
-+#define OHW_R4KEOP    0x1     /* R4000 end-of-page patch.  */
-+#define OHW_R8KPFETCH 0x2     /* may need R8000 prefetch patch.  */
-+#define OHW_R5KEOP    0x4     /* R5000 end-of-page patch.  */
-+#define OHW_R5KCVTL   0x8     /* R5000 cvt.[ds].l bug.  clean=1.  */
-+
-+#define OPAD_PREFIX   0x1
-+#define OPAD_POSTFIX  0x2
-+#define OPAD_SYMBOL   0x4
-+
-+/* Entry found in `.options' section.  */
-+
-+typedef struct
-+{
-+  Elf32_Word hwp_flags1;      /* Extra flags.  */
-+  Elf32_Word hwp_flags2;      /* Extra flags.  */
-+} Elf_Options_Hw;
-+
-+/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
-+
-+#define OHWA0_R4KEOP_CHECKED  0x00000001
-+#define OHWA1_R4KEOP_CLEAN    0x00000002
-+
-+/* MIPS relocs.  */
-+
-+#define R_MIPS_NONE           0       /* No reloc */
-+#define R_MIPS_16             1       /* Direct 16 bit */
-+#define R_MIPS_32             2       /* Direct 32 bit */
-+#define R_MIPS_REL32          3       /* PC relative 32 bit */
-+#define R_MIPS_26             4       /* Direct 26 bit shifted */
-+#define R_MIPS_HI16           5       /* High 16 bit */
-+#define R_MIPS_LO16           6       /* Low 16 bit */
-+#define R_MIPS_GPREL16                7       /* GP relative 16 bit */
-+#define R_MIPS_LITERAL                8       /* 16 bit literal entry */
-+#define R_MIPS_GOT16          9       /* 16 bit GOT entry */
-+#define R_MIPS_PC16           10      /* PC relative 16 bit */
-+#define R_MIPS_CALL16         11      /* 16 bit GOT entry for function */
-+#define R_MIPS_GPREL32                12      /* GP relative 32 bit */
-+
-+#define R_MIPS_SHIFT5         16
-+#define R_MIPS_SHIFT6         17
-+#define R_MIPS_64             18
-+#define R_MIPS_GOT_DISP               19
-+#define R_MIPS_GOT_PAGE               20
-+#define R_MIPS_GOT_OFST               21
-+#define R_MIPS_GOT_HI16               22
-+#define R_MIPS_GOT_LO16               23
-+#define R_MIPS_SUB            24
-+#define R_MIPS_INSERT_A               25
-+#define R_MIPS_INSERT_B               26
-+#define R_MIPS_DELETE         27
-+#define R_MIPS_HIGHER         28
-+#define R_MIPS_HIGHEST                29
-+#define R_MIPS_CALL_HI16      30
-+#define R_MIPS_CALL_LO16      31
-+#define R_MIPS_SCN_DISP               32
-+#define R_MIPS_REL16          33
-+#define R_MIPS_ADD_IMMEDIATE  34
-+#define R_MIPS_PJUMP          35
-+#define R_MIPS_RELGOT         36
-+#define R_MIPS_JALR           37
-+#define R_MIPS_TLS_DTPMOD32   38      /* Module number 32 bit */
-+#define R_MIPS_TLS_DTPREL32   39      /* Module-relative offset 32 bit */
-+#define R_MIPS_TLS_DTPMOD64   40      /* Module number 64 bit */
-+#define R_MIPS_TLS_DTPREL64   41      /* Module-relative offset 64 bit */
-+#define R_MIPS_TLS_GD         42      /* 16 bit GOT offset for GD */
-+#define R_MIPS_TLS_LDM                43      /* 16 bit GOT offset for LDM */
-+#define R_MIPS_TLS_DTPREL_HI16        44      /* Module-relative offset, high 16 bits */
-+#define R_MIPS_TLS_DTPREL_LO16        45      /* Module-relative offset, low 16 bits */
-+#define R_MIPS_TLS_GOTTPREL   46      /* 16 bit GOT offset for IE */
-+#define R_MIPS_TLS_TPREL32    47      /* TP-relative offset, 32 bit */
-+#define R_MIPS_TLS_TPREL64    48      /* TP-relative offset, 64 bit */
-+#define R_MIPS_TLS_TPREL_HI16 49      /* TP-relative offset, high 16 bits */
-+#define R_MIPS_TLS_TPREL_LO16 50      /* TP-relative offset, low 16 bits */
-+#define R_MIPS_GLOB_DAT               51
-+#define R_MIPS_COPY           126
-+#define R_MIPS_JUMP_SLOT        127
-+/* Keep this the last entry.  */
-+#define R_MIPS_NUM            128
-+
-+/* Legal values for p_type field of Elf32_Phdr.  */
-+
-+#define PT_MIPS_REGINFO       0x70000000      /* Register usage information */
-+#define PT_MIPS_RTPROC  0x70000001    /* Runtime procedure table. */
-+#define PT_MIPS_OPTIONS 0x70000002
-+
-+/* Special program header types.  */
-+
-+#define PF_MIPS_LOCAL 0x10000000
-+
-+/* Legal values for d_tag field of Elf32_Dyn.  */
-+
-+#define DT_MIPS_RLD_VERSION  0x70000001       /* Runtime linker interface version */
-+#define DT_MIPS_TIME_STAMP   0x70000002       /* Timestamp */
-+#define DT_MIPS_ICHECKSUM    0x70000003       /* Checksum */
-+#define DT_MIPS_IVERSION     0x70000004       /* Version string (string tbl index) */
-+#define DT_MIPS_FLAGS      0x70000005 /* Flags */
-+#define DT_MIPS_BASE_ADDRESS 0x70000006       /* Base address */
-+#define DT_MIPS_MSYM       0x70000007
-+#define DT_MIPS_CONFLICT     0x70000008       /* Address of CONFLICT section */
-+#define DT_MIPS_LIBLIST            0x70000009 /* Address of LIBLIST section */
-+#define DT_MIPS_LOCAL_GOTNO  0x7000000a       /* Number of local GOT entries */
-+#define DT_MIPS_CONFLICTNO   0x7000000b       /* Number of CONFLICT entries */
-+#define DT_MIPS_LIBLISTNO    0x70000010       /* Number of LIBLIST entries */
-+#define DT_MIPS_SYMTABNO     0x70000011       /* Number of DYNSYM entries */
-+#define DT_MIPS_UNREFEXTNO   0x70000012       /* First external DYNSYM */
-+#define DT_MIPS_GOTSYM             0x70000013 /* First GOT entry in DYNSYM */
-+#define DT_MIPS_HIPAGENO     0x70000014       /* Number of GOT page table entries */
-+#define DT_MIPS_RLD_MAP            0x70000016 /* Address of run time loader map.  */
-+#define DT_MIPS_DELTA_CLASS  0x70000017       /* Delta C++ class definition.  */
-+#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
-+                                              DT_MIPS_DELTA_CLASS.  */
-+#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
-+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
-+                                              DT_MIPS_DELTA_INSTANCE.  */
-+#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
-+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
-+                                           DT_MIPS_DELTA_RELOC.  */
-+#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
-+                                         relocations refer to.  */
-+#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
-+                                         DT_MIPS_DELTA_SYM.  */
-+#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
-+                                           class declaration.  */
-+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
-+                                              DT_MIPS_DELTA_CLASSSYM.  */
-+#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
-+#define DT_MIPS_PIXIE_INIT   0x70000023
-+#define DT_MIPS_SYMBOL_LIB   0x70000024
-+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-+#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-+#define DT_MIPS_OPTIONS            0x70000029 /* Address of .options.  */
-+#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
-+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-+#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
-+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
-+                                                  function stored in GOT.  */
-+#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
-+                                         by rld on dlopen() calls.  */
-+#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
-+#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
-+#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
-+/* The address of .got.plt in an executable using the new non-PIC ABI.  */
-+#define DT_MIPS_PLTGOT             0x70000032
-+/* The base of the PLT in an executable using the new non-PIC ABI if that
-+   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
-+   value.  */
-+#define DT_MIPS_RWPLT        0x70000034
-+#define DT_MIPS_NUM        0x35
-+
-+/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
-+
-+#define RHF_NONE                 0            /* No flags */
-+#define RHF_QUICKSTART                   (1 << 0)     /* Use quickstart */
-+#define RHF_NOTPOT               (1 << 1)     /* Hash size not power of 2 */
-+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)   /* Ignore LD_LIBRARY_PATH */
-+#define RHF_NO_MOVE              (1 << 3)
-+#define RHF_SGI_ONLY             (1 << 4)
-+#define RHF_GUARANTEE_INIT       (1 << 5)
-+#define RHF_DELTA_C_PLUS_PLUS    (1 << 6)
-+#define RHF_GUARANTEE_START_INIT   (1 << 7)
-+#define RHF_PIXIE                (1 << 8)
-+#define RHF_DEFAULT_DELAY_LOAD           (1 << 9)
-+#define RHF_REQUICKSTART         (1 << 10)
-+#define RHF_REQUICKSTARTED       (1 << 11)
-+#define RHF_CORD                 (1 << 12)
-+#define RHF_NO_UNRES_UNDEF       (1 << 13)
-+#define RHF_RLD_ORDER_SAFE       (1 << 14)
-+
-+/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
-+
-+typedef struct
-+{
-+  Elf32_Word l_name;          /* Name (string table index) */
-+  Elf32_Word l_time_stamp;    /* Timestamp */
-+  Elf32_Word l_checksum;      /* Checksum */
-+  Elf32_Word l_version;               /* Interface version */
-+  Elf32_Word l_flags;         /* Flags */
-+} Elf32_Lib;
-+
-+typedef struct
-+{
-+  Elf64_Word l_name;          /* Name (string table index) */
-+  Elf64_Word l_time_stamp;    /* Timestamp */
-+  Elf64_Word l_checksum;      /* Checksum */
-+  Elf64_Word l_version;               /* Interface version */
-+  Elf64_Word l_flags;         /* Flags */
-+} Elf64_Lib;
-+
-+
-+/* Legal values for l_flags.  */
-+
-+#define LL_NONE                 0
-+#define LL_EXACT_MATCH          (1 << 0)      /* Require exact match */
-+#define LL_IGNORE_INT_VER (1 << 1)    /* Ignore interface version */
-+#define LL_REQUIRE_MINOR  (1 << 2)
-+#define LL_EXPORTS      (1 << 3)
-+#define LL_DELAY_LOAD   (1 << 4)
-+#define LL_DELTA        (1 << 5)
-+
-+/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
-+
-+typedef Elf32_Addr Elf32_Conflict;
-+
-+
-+/* HPPA specific definitions.  */
-+
-+/* Legal values for e_flags field of Elf32_Ehdr.  */
-+
-+#define EF_PARISC_TRAPNIL     0x00010000 /* Trap nil pointer dereference.  */
-+#define EF_PARISC_EXT         0x00020000 /* Program uses arch. extensions. */
-+#define EF_PARISC_LSB         0x00040000 /* Program expects little endian. */
-+#define EF_PARISC_WIDE                0x00080000 /* Program expects wide mode.  */
-+#define EF_PARISC_NO_KABP     0x00100000 /* No kernel assisted branch
-+                                            prediction.  */
-+#define EF_PARISC_LAZYSWAP    0x00400000 /* Allow lazy swapping.  */
-+#define EF_PARISC_ARCH                0x0000ffff /* Architecture version.  */
-+
-+/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
-+
-+#define EFA_PARISC_1_0                    0x020b /* PA-RISC 1.0 big-endian.  */
-+#define EFA_PARISC_1_1                    0x0210 /* PA-RISC 1.1 big-endian.  */
-+#define EFA_PARISC_2_0                    0x0214 /* PA-RISC 2.0 big-endian.  */
-+
-+/* Additional section indeces.  */
-+
-+#define SHN_PARISC_ANSI_COMMON        0xff00     /* Section for tenatively declared
-+                                            symbols in ANSI C.  */
-+#define SHN_PARISC_HUGE_COMMON        0xff01     /* Common blocks in huge model.  */
-+
-+/* Legal values for sh_type field of Elf32_Shdr.  */
-+
-+#define SHT_PARISC_EXT                0x70000000 /* Contains product specific ext. */
-+#define SHT_PARISC_UNWIND     0x70000001 /* Unwind information.  */
-+#define SHT_PARISC_DOC                0x70000002 /* Debug info for optimized code. */
-+
-+/* Legal values for sh_flags field of Elf32_Shdr.  */
-+
-+#define SHF_PARISC_SHORT      0x20000000 /* Section with short addressing. */
-+#define SHF_PARISC_HUGE               0x40000000 /* Section far from gp.  */
-+#define SHF_PARISC_SBP                0x80000000 /* Static branch prediction code. */
-+
-+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-+
-+#define STT_PARISC_MILLICODE  13      /* Millicode function entry point.  */
-+
-+#define STT_HP_OPAQUE         (STT_LOOS + 0x1)
-+#define STT_HP_STUB           (STT_LOOS + 0x2)
-+
-+/* HPPA relocs.  */
-+
-+#define R_PARISC_NONE         0       /* No reloc.  */
-+#define R_PARISC_DIR32                1       /* Direct 32-bit reference.  */
-+#define R_PARISC_DIR21L               2       /* Left 21 bits of eff. address.  */
-+#define R_PARISC_DIR17R               3       /* Right 17 bits of eff. address.  */
-+#define R_PARISC_DIR17F               4       /* 17 bits of eff. address.  */
-+#define R_PARISC_DIR14R               6       /* Right 14 bits of eff. address.  */
-+#define R_PARISC_PCREL32      9       /* 32-bit rel. address.  */
-+#define R_PARISC_PCREL21L     10      /* Left 21 bits of rel. address.  */
-+#define R_PARISC_PCREL17R     11      /* Right 17 bits of rel. address.  */
-+#define R_PARISC_PCREL17F     12      /* 17 bits of rel. address.  */
-+#define R_PARISC_PCREL14R     14      /* Right 14 bits of rel. address.  */
-+#define R_PARISC_DPREL21L     18      /* Left 21 bits of rel. address.  */
-+#define R_PARISC_DPREL14R     22      /* Right 14 bits of rel. address.  */
-+#define R_PARISC_GPREL21L     26      /* GP-relative, left 21 bits.  */
-+#define R_PARISC_GPREL14R     30      /* GP-relative, right 14 bits.  */
-+#define R_PARISC_LTOFF21L     34      /* LT-relative, left 21 bits.  */
-+#define R_PARISC_LTOFF14R     38      /* LT-relative, right 14 bits.  */
-+#define R_PARISC_SECREL32     41      /* 32 bits section rel. address.  */
-+#define R_PARISC_SEGBASE      48      /* No relocation, set segment base.  */
-+#define R_PARISC_SEGREL32     49      /* 32 bits segment rel. address.  */
-+#define R_PARISC_PLTOFF21L    50      /* PLT rel. address, left 21 bits.  */
-+#define R_PARISC_PLTOFF14R    54      /* PLT rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF_FPTR32 57      /* 32 bits LT-rel. function pointer. */
-+#define R_PARISC_LTOFF_FPTR21L        58      /* LT-rel. fct ptr, left 21 bits. */
-+#define R_PARISC_LTOFF_FPTR14R        62      /* LT-rel. fct ptr, right 14 bits. */
-+#define R_PARISC_FPTR64               64      /* 64 bits function address.  */
-+#define R_PARISC_PLABEL32     65      /* 32 bits function address.  */
-+#define R_PARISC_PLABEL21L    66      /* Left 21 bits of fdesc address.  */
-+#define R_PARISC_PLABEL14R    70      /* Right 14 bits of fdesc address.  */
-+#define R_PARISC_PCREL64      72      /* 64 bits PC-rel. address.  */
-+#define R_PARISC_PCREL22F     74      /* 22 bits PC-rel. address.  */
-+#define R_PARISC_PCREL14WR    75      /* PC-rel. address, right 14 bits.  */
-+#define R_PARISC_PCREL14DR    76      /* PC rel. address, right 14 bits.  */
-+#define R_PARISC_PCREL16F     77      /* 16 bits PC-rel. address.  */
-+#define R_PARISC_PCREL16WF    78      /* 16 bits PC-rel. address.  */
-+#define R_PARISC_PCREL16DF    79      /* 16 bits PC-rel. address.  */
-+#define R_PARISC_DIR64                80      /* 64 bits of eff. address.  */
-+#define R_PARISC_DIR14WR      83      /* 14 bits of eff. address.  */
-+#define R_PARISC_DIR14DR      84      /* 14 bits of eff. address.  */
-+#define R_PARISC_DIR16F               85      /* 16 bits of eff. address.  */
-+#define R_PARISC_DIR16WF      86      /* 16 bits of eff. address.  */
-+#define R_PARISC_DIR16DF      87      /* 16 bits of eff. address.  */
-+#define R_PARISC_GPREL64      88      /* 64 bits of GP-rel. address.  */
-+#define R_PARISC_GPREL14WR    91      /* GP-rel. address, right 14 bits.  */
-+#define R_PARISC_GPREL14DR    92      /* GP-rel. address, right 14 bits.  */
-+#define R_PARISC_GPREL16F     93      /* 16 bits GP-rel. address.  */
-+#define R_PARISC_GPREL16WF    94      /* 16 bits GP-rel. address.  */
-+#define R_PARISC_GPREL16DF    95      /* 16 bits GP-rel. address.  */
-+#define R_PARISC_LTOFF64      96      /* 64 bits LT-rel. address.  */
-+#define R_PARISC_LTOFF14WR    99      /* LT-rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF14DR    100     /* LT-rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF16F     101     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_LTOFF16WF    102     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_LTOFF16DF    103     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_SECREL64     104     /* 64 bits section rel. address.  */
-+#define R_PARISC_SEGREL64     112     /* 64 bits segment rel. address.  */
-+#define R_PARISC_PLTOFF14WR   115     /* PLT-rel. address, right 14 bits.  */
-+#define R_PARISC_PLTOFF14DR   116     /* PLT-rel. address, right 14 bits.  */
-+#define R_PARISC_PLTOFF16F    117     /* 16 bits LT-rel. address.  */
-+#define R_PARISC_PLTOFF16WF   118     /* 16 bits PLT-rel. address.  */
-+#define R_PARISC_PLTOFF16DF   119     /* 16 bits PLT-rel. address.  */
-+#define R_PARISC_LTOFF_FPTR64 120     /* 64 bits LT-rel. function ptr.  */
-+#define R_PARISC_LTOFF_FPTR14WR       123     /* LT-rel. fct. ptr., right 14 bits. */
-+#define R_PARISC_LTOFF_FPTR14DR       124     /* LT-rel. fct. ptr., right 14 bits. */
-+#define R_PARISC_LTOFF_FPTR16F        125     /* 16 bits LT-rel. function ptr.  */
-+#define R_PARISC_LTOFF_FPTR16WF       126     /* 16 bits LT-rel. function ptr.  */
-+#define R_PARISC_LTOFF_FPTR16DF       127     /* 16 bits LT-rel. function ptr.  */
-+#define R_PARISC_LORESERVE    128
-+#define R_PARISC_COPY         128     /* Copy relocation.  */
-+#define R_PARISC_IPLT         129     /* Dynamic reloc, imported PLT */
-+#define R_PARISC_EPLT         130     /* Dynamic reloc, exported PLT */
-+#define R_PARISC_TPREL32      153     /* 32 bits TP-rel. address.  */
-+#define R_PARISC_TPREL21L     154     /* TP-rel. address, left 21 bits.  */
-+#define R_PARISC_TPREL14R     158     /* TP-rel. address, right 14 bits.  */
-+#define R_PARISC_LTOFF_TP21L  162     /* LT-TP-rel. address, left 21 bits. */
-+#define R_PARISC_LTOFF_TP14R  166     /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP14F  167     /* 14 bits LT-TP-rel. address.  */
-+#define R_PARISC_TPREL64      216     /* 64 bits TP-rel. address.  */
-+#define R_PARISC_TPREL14WR    219     /* TP-rel. address, right 14 bits.  */
-+#define R_PARISC_TPREL14DR    220     /* TP-rel. address, right 14 bits.  */
-+#define R_PARISC_TPREL16F     221     /* 16 bits TP-rel. address.  */
-+#define R_PARISC_TPREL16WF    222     /* 16 bits TP-rel. address.  */
-+#define R_PARISC_TPREL16DF    223     /* 16 bits TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP64   224     /* 64 bits LT-TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP14WR 227     /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP14DR 228     /* LT-TP-rel. address, right 14 bits.*/
-+#define R_PARISC_LTOFF_TP16F  229     /* 16 bits LT-TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP16WF 230     /* 16 bits LT-TP-rel. address.  */
-+#define R_PARISC_LTOFF_TP16DF 231     /* 16 bits LT-TP-rel. address.  */
-+#define R_PARISC_GNU_VTENTRY  232
-+#define R_PARISC_GNU_VTINHERIT        233
-+#define R_PARISC_TLS_GD21L    234     /* GD 21-bit left.  */
-+#define R_PARISC_TLS_GD14R    235     /* GD 14-bit right.  */
-+#define R_PARISC_TLS_GDCALL   236     /* GD call to __t_g_a.  */
-+#define R_PARISC_TLS_LDM21L   237     /* LD module 21-bit left.  */
-+#define R_PARISC_TLS_LDM14R   238     /* LD module 14-bit right.  */
-+#define R_PARISC_TLS_LDMCALL  239     /* LD module call to __t_g_a.  */
-+#define R_PARISC_TLS_LDO21L   240     /* LD offset 21-bit left.  */
-+#define R_PARISC_TLS_LDO14R   241     /* LD offset 14-bit right.  */
-+#define R_PARISC_TLS_DTPMOD32 242     /* DTP module 32-bit.  */
-+#define R_PARISC_TLS_DTPMOD64 243     /* DTP module 64-bit.  */
-+#define R_PARISC_TLS_DTPOFF32 244     /* DTP offset 32-bit.  */
-+#define R_PARISC_TLS_DTPOFF64 245     /* DTP offset 32-bit.  */
-+#define R_PARISC_TLS_LE21L    R_PARISC_TPREL21L
-+#define R_PARISC_TLS_LE14R    R_PARISC_TPREL14R
-+#define R_PARISC_TLS_IE21L    R_PARISC_LTOFF_TP21L
-+#define R_PARISC_TLS_IE14R    R_PARISC_LTOFF_TP14R
-+#define R_PARISC_TLS_TPREL32  R_PARISC_TPREL32
-+#define R_PARISC_TLS_TPREL64  R_PARISC_TPREL64
-+#define R_PARISC_HIRESERVE    255
-+
-+/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
-+
-+#define PT_HP_TLS             (PT_LOOS + 0x0)
-+#define PT_HP_CORE_NONE               (PT_LOOS + 0x1)
-+#define PT_HP_CORE_VERSION    (PT_LOOS + 0x2)
-+#define PT_HP_CORE_KERNEL     (PT_LOOS + 0x3)
-+#define PT_HP_CORE_COMM               (PT_LOOS + 0x4)
-+#define PT_HP_CORE_PROC               (PT_LOOS + 0x5)
-+#define PT_HP_CORE_LOADABLE   (PT_LOOS + 0x6)
-+#define PT_HP_CORE_STACK      (PT_LOOS + 0x7)
-+#define PT_HP_CORE_SHM                (PT_LOOS + 0x8)
-+#define PT_HP_CORE_MMF                (PT_LOOS + 0x9)
-+#define PT_HP_PARALLEL                (PT_LOOS + 0x10)
-+#define PT_HP_FASTBIND                (PT_LOOS + 0x11)
-+#define PT_HP_OPT_ANNOT               (PT_LOOS + 0x12)
-+#define PT_HP_HSL_ANNOT               (PT_LOOS + 0x13)
-+#define PT_HP_STACK           (PT_LOOS + 0x14)
-+
-+#define PT_PARISC_ARCHEXT     0x70000000
-+#define PT_PARISC_UNWIND      0x70000001
-+
-+/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
-+
-+#define PF_PARISC_SBP         0x08000000
-+
-+#define PF_HP_PAGE_SIZE               0x00100000
-+#define PF_HP_FAR_SHARED      0x00200000
-+#define PF_HP_NEAR_SHARED     0x00400000
-+#define PF_HP_CODE            0x01000000
-+#define PF_HP_MODIFY          0x02000000
-+#define PF_HP_LAZYSWAP                0x04000000
-+#define PF_HP_SBP             0x08000000
-+
-+
-+/* Alpha specific definitions.  */
-+
-+/* Legal values for e_flags field of Elf64_Ehdr.  */
-+
-+#define EF_ALPHA_32BIT                1       /* All addresses must be < 2GB.  */
-+#define EF_ALPHA_CANRELAX     2       /* Relocations for relaxing exist.  */
-+
-+/* Legal values for sh_type field of Elf64_Shdr.  */
-+
-+/* These two are primerily concerned with ECOFF debugging info.  */
-+#define SHT_ALPHA_DEBUG               0x70000001
-+#define SHT_ALPHA_REGINFO     0x70000002
-+
-+/* Legal values for sh_flags field of Elf64_Shdr.  */
-+
-+#define SHF_ALPHA_GPREL               0x10000000
-+
-+/* Legal values for st_other field of Elf64_Sym.  */
-+#define STO_ALPHA_NOPV                0x80    /* No PV required.  */
-+#define STO_ALPHA_STD_GPLOAD  0x88    /* PV only used for initial ldgp.  */
-+
-+/* Alpha relocs.  */
-+
-+#define R_ALPHA_NONE          0       /* No reloc */
-+#define R_ALPHA_REFLONG               1       /* Direct 32 bit */
-+#define R_ALPHA_REFQUAD               2       /* Direct 64 bit */
-+#define R_ALPHA_GPREL32               3       /* GP relative 32 bit */
-+#define R_ALPHA_LITERAL               4       /* GP relative 16 bit w/optimization */
-+#define R_ALPHA_LITUSE                5       /* Optimization hint for LITERAL */
-+#define R_ALPHA_GPDISP                6       /* Add displacement to GP */
-+#define R_ALPHA_BRADDR                7       /* PC+4 relative 23 bit shifted */
-+#define R_ALPHA_HINT          8       /* PC+4 relative 16 bit shifted */
-+#define R_ALPHA_SREL16                9       /* PC relative 16 bit */
-+#define R_ALPHA_SREL32                10      /* PC relative 32 bit */
-+#define R_ALPHA_SREL64                11      /* PC relative 64 bit */
-+#define R_ALPHA_GPRELHIGH     17      /* GP relative 32 bit, high 16 bits */
-+#define R_ALPHA_GPRELLOW      18      /* GP relative 32 bit, low 16 bits */
-+#define R_ALPHA_GPREL16               19      /* GP relative 16 bit */
-+#define R_ALPHA_COPY          24      /* Copy symbol at runtime */
-+#define R_ALPHA_GLOB_DAT      25      /* Create GOT entry */
-+#define R_ALPHA_JMP_SLOT      26      /* Create PLT entry */
-+#define R_ALPHA_RELATIVE      27      /* Adjust by program base */
-+#define R_ALPHA_TLS_GD_HI     28
-+#define R_ALPHA_TLSGD         29
-+#define R_ALPHA_TLS_LDM               30
-+#define R_ALPHA_DTPMOD64      31
-+#define R_ALPHA_GOTDTPREL     32
-+#define R_ALPHA_DTPREL64      33
-+#define R_ALPHA_DTPRELHI      34
-+#define R_ALPHA_DTPRELLO      35
-+#define R_ALPHA_DTPREL16      36
-+#define R_ALPHA_GOTTPREL      37
-+#define R_ALPHA_TPREL64               38
-+#define R_ALPHA_TPRELHI               39
-+#define R_ALPHA_TPRELLO               40
-+#define R_ALPHA_TPREL16               41
-+/* Keep this the last entry.  */
-+#define R_ALPHA_NUM           46
-+
-+/* Magic values of the LITUSE relocation addend.  */
-+#define LITUSE_ALPHA_ADDR     0
-+#define LITUSE_ALPHA_BASE     1
-+#define LITUSE_ALPHA_BYTOFF   2
-+#define LITUSE_ALPHA_JSR      3
-+#define LITUSE_ALPHA_TLS_GD   4
-+#define LITUSE_ALPHA_TLS_LDM  5
-+
-+/* Legal values for d_tag of Elf64_Dyn.  */
-+#define DT_ALPHA_PLTRO                (DT_LOPROC + 0)
-+#define DT_ALPHA_NUM          1
-+
-+/* PowerPC specific declarations */
-+
-+/* Values for Elf32/64_Ehdr.e_flags.  */
-+#define EF_PPC_EMB            0x80000000      /* PowerPC embedded flag */
-+
-+/* Cygnus local bits below */
-+#define EF_PPC_RELOCATABLE    0x00010000      /* PowerPC -mrelocatable flag*/
-+#define EF_PPC_RELOCATABLE_LIB        0x00008000      /* PowerPC -mrelocatable-lib
-+                                                 flag */
-+
-+/* PowerPC relocations defined by the ABIs */
-+#define R_PPC_NONE            0
-+#define R_PPC_ADDR32          1       /* 32bit absolute address */
-+#define R_PPC_ADDR24          2       /* 26bit address, 2 bits ignored.  */
-+#define R_PPC_ADDR16          3       /* 16bit absolute address */
-+#define R_PPC_ADDR16_LO               4       /* lower 16bit of absolute address */
-+#define R_PPC_ADDR16_HI               5       /* high 16bit of absolute address */
-+#define R_PPC_ADDR16_HA               6       /* adjusted high 16bit */
-+#define R_PPC_ADDR14          7       /* 16bit address, 2 bits ignored */
-+#define R_PPC_ADDR14_BRTAKEN  8
-+#define R_PPC_ADDR14_BRNTAKEN 9
-+#define R_PPC_REL24           10      /* PC relative 26 bit */
-+#define R_PPC_REL14           11      /* PC relative 16 bit */
-+#define R_PPC_REL14_BRTAKEN   12
-+#define R_PPC_REL14_BRNTAKEN  13
-+#define R_PPC_GOT16           14
-+#define R_PPC_GOT16_LO                15
-+#define R_PPC_GOT16_HI                16
-+#define R_PPC_GOT16_HA                17
-+#define R_PPC_PLTREL24                18
-+#define R_PPC_COPY            19
-+#define R_PPC_GLOB_DAT                20
-+#define R_PPC_JMP_SLOT                21
-+#define R_PPC_RELATIVE                22
-+#define R_PPC_LOCAL24PC               23
-+#define R_PPC_UADDR32         24
-+#define R_PPC_UADDR16         25
-+#define R_PPC_REL32           26
-+#define R_PPC_PLT32           27
-+#define R_PPC_PLTREL32                28
-+#define R_PPC_PLT16_LO                29
-+#define R_PPC_PLT16_HI                30
-+#define R_PPC_PLT16_HA                31
-+#define R_PPC_SDAREL16                32
-+#define R_PPC_SECTOFF         33
-+#define R_PPC_SECTOFF_LO      34
-+#define R_PPC_SECTOFF_HI      35
-+#define R_PPC_SECTOFF_HA      36
-+
-+/* PowerPC relocations defined for the TLS access ABI.  */
-+#define R_PPC_TLS             67 /* none      (sym+add)@tls */
-+#define R_PPC_DTPMOD32                68 /* word32    (sym+add)@dtpmod */
-+#define R_PPC_TPREL16         69 /* half16*   (sym+add)@tprel */
-+#define R_PPC_TPREL16_LO      70 /* half16    (sym+add)@tprel@l */
-+#define R_PPC_TPREL16_HI      71 /* half16    (sym+add)@tprel@h */
-+#define R_PPC_TPREL16_HA      72 /* half16    (sym+add)@tprel@ha */
-+#define R_PPC_TPREL32         73 /* word32    (sym+add)@tprel */
-+#define R_PPC_DTPREL16                74 /* half16*   (sym+add)@dtprel */
-+#define R_PPC_DTPREL16_LO     75 /* half16    (sym+add)@dtprel@l */
-+#define R_PPC_DTPREL16_HI     76 /* half16    (sym+add)@dtprel@h */
-+#define R_PPC_DTPREL16_HA     77 /* half16    (sym+add)@dtprel@ha */
-+#define R_PPC_DTPREL32                78 /* word32    (sym+add)@dtprel */
-+#define R_PPC_GOT_TLSGD16     79 /* half16*   (sym+add)@got@tlsgd */
-+#define R_PPC_GOT_TLSGD16_LO  80 /* half16    (sym+add)@got@tlsgd@l */
-+#define R_PPC_GOT_TLSGD16_HI  81 /* half16    (sym+add)@got@tlsgd@h */
-+#define R_PPC_GOT_TLSGD16_HA  82 /* half16    (sym+add)@got@tlsgd@ha */
-+#define R_PPC_GOT_TLSLD16     83 /* half16*   (sym+add)@got@tlsld */
-+#define R_PPC_GOT_TLSLD16_LO  84 /* half16    (sym+add)@got@tlsld@l */
-+#define R_PPC_GOT_TLSLD16_HI  85 /* half16    (sym+add)@got@tlsld@h */
-+#define R_PPC_GOT_TLSLD16_HA  86 /* half16    (sym+add)@got@tlsld@ha */
-+#define R_PPC_GOT_TPREL16     87 /* half16*   (sym+add)@got@tprel */
-+#define R_PPC_GOT_TPREL16_LO  88 /* half16    (sym+add)@got@tprel@l */
-+#define R_PPC_GOT_TPREL16_HI  89 /* half16    (sym+add)@got@tprel@h */
-+#define R_PPC_GOT_TPREL16_HA  90 /* half16    (sym+add)@got@tprel@ha */
-+#define R_PPC_GOT_DTPREL16    91 /* half16*   (sym+add)@got@dtprel */
-+#define R_PPC_GOT_DTPREL16_LO 92 /* half16*   (sym+add)@got@dtprel@l */
-+#define R_PPC_GOT_DTPREL16_HI 93 /* half16*   (sym+add)@got@dtprel@h */
-+#define R_PPC_GOT_DTPREL16_HA 94 /* half16*   (sym+add)@got@dtprel@ha */
-+
-+/* The remaining relocs are from the Embedded ELF ABI, and are not
-+   in the SVR4 ELF ABI.  */
-+#define R_PPC_EMB_NADDR32     101
-+#define R_PPC_EMB_NADDR16     102
-+#define R_PPC_EMB_NADDR16_LO  103
-+#define R_PPC_EMB_NADDR16_HI  104
-+#define R_PPC_EMB_NADDR16_HA  105
-+#define R_PPC_EMB_SDAI16      106
-+#define R_PPC_EMB_SDA2I16     107
-+#define R_PPC_EMB_SDA2REL     108
-+#define R_PPC_EMB_SDA21               109     /* 16 bit offset in SDA */
-+#define R_PPC_EMB_MRKREF      110
-+#define R_PPC_EMB_RELSEC16    111
-+#define R_PPC_EMB_RELST_LO    112
-+#define R_PPC_EMB_RELST_HI    113
-+#define R_PPC_EMB_RELST_HA    114
-+#define R_PPC_EMB_BIT_FLD     115
-+#define R_PPC_EMB_RELSDA      116     /* 16 bit relative offset in SDA */
-+
-+/* Diab tool relocations.  */
-+#define R_PPC_DIAB_SDA21_LO   180     /* like EMB_SDA21, but lower 16 bit */
-+#define R_PPC_DIAB_SDA21_HI   181     /* like EMB_SDA21, but high 16 bit */
-+#define R_PPC_DIAB_SDA21_HA   182     /* like EMB_SDA21, adjusted high 16 */
-+#define R_PPC_DIAB_RELSDA_LO  183     /* like EMB_RELSDA, but lower 16 bit */
-+#define R_PPC_DIAB_RELSDA_HI  184     /* like EMB_RELSDA, but high 16 bit */
-+#define R_PPC_DIAB_RELSDA_HA  185     /* like EMB_RELSDA, adjusted high 16 */
-+
-+/* GNU extension to support local ifunc.  */
-+#define R_PPC_IRELATIVE               248
-+
-+/* GNU relocs used in PIC code sequences.  */
-+#define R_PPC_REL16           249     /* half16   (sym+add-.) */
-+#define R_PPC_REL16_LO                250     /* half16   (sym+add-.)@l */
-+#define R_PPC_REL16_HI                251     /* half16   (sym+add-.)@h */
-+#define R_PPC_REL16_HA                252     /* half16   (sym+add-.)@ha */
-+
-+/* This is a phony reloc to handle any old fashioned TOC16 references
-+   that may still be in object files.  */
-+#define R_PPC_TOC16           255
-+
-+/* PowerPC specific values for the Dyn d_tag field.  */
-+#define DT_PPC_GOT            (DT_LOPROC + 0)
-+#define DT_PPC_NUM            1
-+
-+/* PowerPC64 relocations defined by the ABIs */
-+#define R_PPC64_NONE          R_PPC_NONE
-+#define R_PPC64_ADDR32                R_PPC_ADDR32 /* 32bit absolute address */
-+#define R_PPC64_ADDR24                R_PPC_ADDR24 /* 26bit address, word aligned */
-+#define R_PPC64_ADDR16                R_PPC_ADDR16 /* 16bit absolute address */
-+#define R_PPC64_ADDR16_LO     R_PPC_ADDR16_LO /* lower 16bits of address */
-+#define R_PPC64_ADDR16_HI     R_PPC_ADDR16_HI /* high 16bits of address. */
-+#define R_PPC64_ADDR16_HA     R_PPC_ADDR16_HA /* adjusted high 16bits.  */
-+#define R_PPC64_ADDR14                R_PPC_ADDR14 /* 16bit address, word aligned */
-+#define R_PPC64_ADDR14_BRTAKEN        R_PPC_ADDR14_BRTAKEN
-+#define R_PPC64_ADDR14_BRNTAKEN       R_PPC_ADDR14_BRNTAKEN
-+#define R_PPC64_REL24         R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
-+#define R_PPC64_REL14         R_PPC_REL14 /* PC relative 16 bit */
-+#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
-+#define R_PPC64_REL14_BRNTAKEN        R_PPC_REL14_BRNTAKEN
-+#define R_PPC64_GOT16         R_PPC_GOT16
-+#define R_PPC64_GOT16_LO      R_PPC_GOT16_LO
-+#define R_PPC64_GOT16_HI      R_PPC_GOT16_HI
-+#define R_PPC64_GOT16_HA      R_PPC_GOT16_HA
-+
-+#define R_PPC64_COPY          R_PPC_COPY
-+#define R_PPC64_GLOB_DAT      R_PPC_GLOB_DAT
-+#define R_PPC64_JMP_SLOT      R_PPC_JMP_SLOT
-+#define R_PPC64_RELATIVE      R_PPC_RELATIVE
-+
-+#define R_PPC64_UADDR32               R_PPC_UADDR32
-+#define R_PPC64_UADDR16               R_PPC_UADDR16
-+#define R_PPC64_REL32         R_PPC_REL32
-+#define R_PPC64_PLT32         R_PPC_PLT32
-+#define R_PPC64_PLTREL32      R_PPC_PLTREL32
-+#define R_PPC64_PLT16_LO      R_PPC_PLT16_LO
-+#define R_PPC64_PLT16_HI      R_PPC_PLT16_HI
-+#define R_PPC64_PLT16_HA      R_PPC_PLT16_HA
-+
-+#define R_PPC64_SECTOFF               R_PPC_SECTOFF
-+#define R_PPC64_SECTOFF_LO    R_PPC_SECTOFF_LO
-+#define R_PPC64_SECTOFF_HI    R_PPC_SECTOFF_HI
-+#define R_PPC64_SECTOFF_HA    R_PPC_SECTOFF_HA
-+#define R_PPC64_ADDR30                37 /* word30 (S + A - P) >> 2 */
-+#define R_PPC64_ADDR64                38 /* doubleword64 S + A */
-+#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A) */
-+#define R_PPC64_ADDR16_HIGHERA        40 /* half16 #highera(S + A) */
-+#define R_PPC64_ADDR16_HIGHEST        41 /* half16 #highest(S + A) */
-+#define R_PPC64_ADDR16_HIGHESTA       42 /* half16 #highesta(S + A) */
-+#define R_PPC64_UADDR64               43 /* doubleword64 S + A */
-+#define R_PPC64_REL64         44 /* doubleword64 S + A - P */
-+#define R_PPC64_PLT64         45 /* doubleword64 L + A */
-+#define R_PPC64_PLTREL64      46 /* doubleword64 L + A - P */
-+#define R_PPC64_TOC16         47 /* half16* S + A - .TOC */
-+#define R_PPC64_TOC16_LO      48 /* half16 #lo(S + A - .TOC.) */
-+#define R_PPC64_TOC16_HI      49 /* half16 #hi(S + A - .TOC.) */
-+#define R_PPC64_TOC16_HA      50 /* half16 #ha(S + A - .TOC.) */
-+#define R_PPC64_TOC           51 /* doubleword64 .TOC */
-+#define R_PPC64_PLTGOT16      52 /* half16* M + A */
-+#define R_PPC64_PLTGOT16_LO   53 /* half16 #lo(M + A) */
-+#define R_PPC64_PLTGOT16_HI   54 /* half16 #hi(M + A) */
-+#define R_PPC64_PLTGOT16_HA   55 /* half16 #ha(M + A) */
-+
-+#define R_PPC64_ADDR16_DS     56 /* half16ds* (S + A) >> 2 */
-+#define R_PPC64_ADDR16_LO_DS  57 /* half16ds  #lo(S + A) >> 2 */
-+#define R_PPC64_GOT16_DS      58 /* half16ds* (G + A) >> 2 */
-+#define R_PPC64_GOT16_LO_DS   59 /* half16ds  #lo(G + A) >> 2 */
-+#define R_PPC64_PLT16_LO_DS   60 /* half16ds  #lo(L + A) >> 2 */
-+#define R_PPC64_SECTOFF_DS    61 /* half16ds* (R + A) >> 2 */
-+#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds  #lo(R + A) >> 2 */
-+#define R_PPC64_TOC16_DS      63 /* half16ds* (S + A - .TOC.) >> 2 */
-+#define R_PPC64_TOC16_LO_DS   64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
-+#define R_PPC64_PLTGOT16_DS   65 /* half16ds* (M + A) >> 2 */
-+#define R_PPC64_PLTGOT16_LO_DS        66 /* half16ds  #lo(M + A) >> 2 */
-+
-+/* PowerPC64 relocations defined for the TLS access ABI.  */
-+#define R_PPC64_TLS           67 /* none      (sym+add)@tls */
-+#define R_PPC64_DTPMOD64      68 /* doubleword64 (sym+add)@dtpmod */
-+#define R_PPC64_TPREL16               69 /* half16*   (sym+add)@tprel */
-+#define R_PPC64_TPREL16_LO    70 /* half16    (sym+add)@tprel@l */
-+#define R_PPC64_TPREL16_HI    71 /* half16    (sym+add)@tprel@h */
-+#define R_PPC64_TPREL16_HA    72 /* half16    (sym+add)@tprel@ha */
-+#define R_PPC64_TPREL64               73 /* doubleword64 (sym+add)@tprel */
-+#define R_PPC64_DTPREL16      74 /* half16*   (sym+add)@dtprel */
-+#define R_PPC64_DTPREL16_LO   75 /* half16    (sym+add)@dtprel@l */
-+#define R_PPC64_DTPREL16_HI   76 /* half16    (sym+add)@dtprel@h */
-+#define R_PPC64_DTPREL16_HA   77 /* half16    (sym+add)@dtprel@ha */
-+#define R_PPC64_DTPREL64      78 /* doubleword64 (sym+add)@dtprel */
-+#define R_PPC64_GOT_TLSGD16   79 /* half16*   (sym+add)@got@tlsgd */
-+#define R_PPC64_GOT_TLSGD16_LO        80 /* half16    (sym+add)@got@tlsgd@l */
-+#define R_PPC64_GOT_TLSGD16_HI        81 /* half16    (sym+add)@got@tlsgd@h */
-+#define R_PPC64_GOT_TLSGD16_HA        82 /* half16    (sym+add)@got@tlsgd@ha */
-+#define R_PPC64_GOT_TLSLD16   83 /* half16*   (sym+add)@got@tlsld */
-+#define R_PPC64_GOT_TLSLD16_LO        84 /* half16    (sym+add)@got@tlsld@l */
-+#define R_PPC64_GOT_TLSLD16_HI        85 /* half16    (sym+add)@got@tlsld@h */
-+#define R_PPC64_GOT_TLSLD16_HA        86 /* half16    (sym+add)@got@tlsld@ha */
-+#define R_PPC64_GOT_TPREL16_DS        87 /* half16ds* (sym+add)@got@tprel */
-+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
-+#define R_PPC64_GOT_TPREL16_HI        89 /* half16    (sym+add)@got@tprel@h */
-+#define R_PPC64_GOT_TPREL16_HA        90 /* half16    (sym+add)@got@tprel@ha */
-+#define R_PPC64_GOT_DTPREL16_DS       91 /* half16ds* (sym+add)@got@dtprel */
-+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
-+#define R_PPC64_GOT_DTPREL16_HI       93 /* half16    (sym+add)@got@dtprel@h */
-+#define R_PPC64_GOT_DTPREL16_HA       94 /* half16    (sym+add)@got@dtprel@ha */
-+#define R_PPC64_TPREL16_DS    95 /* half16ds* (sym+add)@tprel */
-+#define R_PPC64_TPREL16_LO_DS 96 /* half16ds  (sym+add)@tprel@l */
-+#define R_PPC64_TPREL16_HIGHER        97 /* half16    (sym+add)@tprel@higher */
-+#define R_PPC64_TPREL16_HIGHERA       98 /* half16    (sym+add)@tprel@highera */
-+#define R_PPC64_TPREL16_HIGHEST       99 /* half16    (sym+add)@tprel@highest */
-+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16        (sym+add)@tprel@highesta */
-+#define R_PPC64_DTPREL16_DS   101 /* half16ds* (sym+add)@dtprel */
-+#define R_PPC64_DTPREL16_LO_DS        102 /* half16ds (sym+add)@dtprel@l */
-+#define R_PPC64_DTPREL16_HIGHER       103 /* half16   (sym+add)@dtprel@higher */
-+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16        (sym+add)@dtprel@highera */
-+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16        (sym+add)@dtprel@highest */
-+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16       (sym+add)@dtprel@highesta */
-+
-+/* GNU extension to support local ifunc.  */
-+#define R_PPC64_JMP_IREL      247
-+#define R_PPC64_IRELATIVE     248
-+#define R_PPC64_REL16         249     /* half16   (sym+add-.) */
-+#define R_PPC64_REL16_LO      250     /* half16   (sym+add-.)@l */
-+#define R_PPC64_REL16_HI      251     /* half16   (sym+add-.)@h */
-+#define R_PPC64_REL16_HA      252     /* half16   (sym+add-.)@ha */
-+
-+/* PowerPC64 specific values for the Dyn d_tag field.  */
-+#define DT_PPC64_GLINK  (DT_LOPROC + 0)
-+#define DT_PPC64_OPD  (DT_LOPROC + 1)
-+#define DT_PPC64_OPDSZ        (DT_LOPROC + 2)
-+#define DT_PPC64_NUM    3
-+
-+
-+/* ARM specific declarations */
-+
-+/* Processor specific flags for the ELF header e_flags field.  */
-+#define EF_ARM_RELEXEC                0x01
-+#define EF_ARM_HASENTRY               0x02
-+#define EF_ARM_INTERWORK      0x04
-+#define EF_ARM_APCS_26                0x08
-+#define EF_ARM_APCS_FLOAT     0x10
-+#define EF_ARM_PIC            0x20
-+#define EF_ARM_ALIGN8         0x40 /* 8-bit structure alignment is in use */
-+#define EF_ARM_NEW_ABI                0x80
-+#define EF_ARM_OLD_ABI                0x100
-+#define EF_ARM_SOFT_FLOAT     0x200
-+#define EF_ARM_VFP_FLOAT      0x400
-+#define EF_ARM_MAVERICK_FLOAT 0x800
-+
-+
-+/* Other constants defined in the ARM ELF spec. version B-01.  */
-+/* NB. These conflict with values defined above.  */
-+#define EF_ARM_SYMSARESORTED  0x04
-+#define EF_ARM_DYNSYMSUSESEGIDX       0x08
-+#define EF_ARM_MAPSYMSFIRST   0x10
-+#define EF_ARM_EABIMASK               0XFF000000
-+
-+/* Constants defined in AAELF.  */
-+#define EF_ARM_BE8        0x00800000
-+#define EF_ARM_LE8        0x00400000
-+
-+#define EF_ARM_EABI_VERSION(flags)    ((flags) & EF_ARM_EABIMASK)
-+#define EF_ARM_EABI_UNKNOWN   0x00000000
-+#define EF_ARM_EABI_VER1      0x01000000
-+#define EF_ARM_EABI_VER2      0x02000000
-+#define EF_ARM_EABI_VER3      0x03000000
-+#define EF_ARM_EABI_VER4      0x04000000
-+#define EF_ARM_EABI_VER5      0x05000000
-+
-+/* Additional symbol types for Thumb.  */
-+#define STT_ARM_TFUNC         STT_LOPROC /* A Thumb function.  */
-+#define STT_ARM_16BIT         STT_HIPROC /* A Thumb label.  */
-+
-+/* ARM-specific values for sh_flags */
-+#define SHF_ARM_ENTRYSECT     0x10000000 /* Section contains an entry point */
-+#define SHF_ARM_COMDEF                0x80000000 /* Section may be multiply defined
-+                                            in the input to a link step.  */
-+
-+/* ARM-specific program header flags */
-+#define PF_ARM_SB             0x10000000 /* Segment contains the location
-+                                            addressed by the static base. */
-+#define PF_ARM_PI             0x20000000 /* Position-independent segment.  */
-+#define PF_ARM_ABS            0x40000000 /* Absolute segment.  */
-+
-+/* Processor specific values for the Phdr p_type field.  */
-+#define PT_ARM_EXIDX          (PT_LOPROC + 1) /* ARM unwind segment.  */
-+
-+/* Processor specific values for the Shdr sh_type field.  */
-+#define SHT_ARM_EXIDX         (SHT_LOPROC + 1) /* ARM unwind section.  */
-+#define SHT_ARM_PREEMPTMAP    (SHT_LOPROC + 2) /* Preemption details.  */
-+#define SHT_ARM_ATTRIBUTES    (SHT_LOPROC + 3) /* ARM attributes section.  */
-+
-+
-+/* ARM relocs.  */
-+
-+#define R_ARM_NONE            0       /* No reloc */
-+#define R_ARM_PC24            1       /* PC relative 26 bit branch */
-+#define R_ARM_ABS32           2       /* Direct 32 bit  */
-+#define R_ARM_REL32           3       /* PC relative 32 bit */
-+#define R_ARM_PC13            4
-+#define R_ARM_ABS16           5       /* Direct 16 bit */
-+#define R_ARM_ABS12           6       /* Direct 12 bit */
-+#define R_ARM_THM_ABS5                7
-+#define R_ARM_ABS8            8       /* Direct 8 bit */
-+#define R_ARM_SBREL32         9
-+#define R_ARM_THM_PC22                10
-+#define R_ARM_THM_PC8         11
-+#define R_ARM_AMP_VCALL9      12
-+#define R_ARM_SWI24           13      /* Obsolete static relocation.  */
-+#define R_ARM_TLS_DESC                13      /* Dynamic relocation.  */
-+#define R_ARM_THM_SWI8                14
-+#define R_ARM_XPC25           15
-+#define R_ARM_THM_XPC22               16
-+#define R_ARM_TLS_DTPMOD32    17      /* ID of module containing symbol */
-+#define R_ARM_TLS_DTPOFF32    18      /* Offset in TLS block */
-+#define R_ARM_TLS_TPOFF32     19      /* Offset in static TLS block */
-+#define R_ARM_COPY            20      /* Copy symbol at runtime */
-+#define R_ARM_GLOB_DAT                21      /* Create GOT entry */
-+#define R_ARM_JUMP_SLOT               22      /* Create PLT entry */
-+#define R_ARM_RELATIVE                23      /* Adjust by program base */
-+#define R_ARM_GOTOFF          24      /* 32 bit offset to GOT */
-+#define R_ARM_GOTPC           25      /* 32 bit PC relative offset to GOT */
-+#define R_ARM_GOT32           26      /* 32 bit GOT entry */
-+#define R_ARM_PLT32           27      /* 32 bit PLT address */
-+#define R_ARM_ALU_PCREL_7_0   32
-+#define R_ARM_ALU_PCREL_15_8  33
-+#define R_ARM_ALU_PCREL_23_15 34
-+#define R_ARM_LDR_SBREL_11_0  35
-+#define R_ARM_ALU_SBREL_19_12 36
-+#define R_ARM_ALU_SBREL_27_20 37
-+#define R_ARM_TLS_GOTDESC     90
-+#define R_ARM_TLS_CALL                91
-+#define R_ARM_TLS_DESCSEQ     92
-+#define R_ARM_THM_TLS_CALL    93
-+#define R_ARM_GNU_VTENTRY     100
-+#define R_ARM_GNU_VTINHERIT   101
-+#define R_ARM_THM_PC11                102     /* thumb unconditional branch */
-+#define R_ARM_THM_PC9         103     /* thumb conditional branch */
-+#define R_ARM_TLS_GD32                104     /* PC-rel 32 bit for global dynamic
-+                                         thread local data */
-+#define R_ARM_TLS_LDM32               105     /* PC-rel 32 bit for local dynamic
-+                                         thread local data */
-+#define R_ARM_TLS_LDO32               106     /* 32 bit offset relative to TLS
-+                                         block */
-+#define R_ARM_TLS_IE32                107     /* PC-rel 32 bit for GOT entry of
-+                                         static TLS block offset */
-+#define R_ARM_TLS_LE32                108     /* 32 bit offset relative to static
-+                                         TLS block */
-+#define       R_ARM_THM_TLS_DESCSEQ   129
-+#define R_ARM_IRELATIVE               160
-+#define R_ARM_RXPC25          249
-+#define R_ARM_RSBREL32                250
-+#define R_ARM_THM_RPC22               251
-+#define R_ARM_RREL32          252
-+#define R_ARM_RABS22          253
-+#define R_ARM_RPC24           254
-+#define R_ARM_RBASE           255
-+/* Keep this the last entry.  */
-+#define R_ARM_NUM             256
-+
-+/* IA-64 specific declarations.  */
-+
-+/* Processor specific flags for the Ehdr e_flags field.  */
-+#define EF_IA_64_MASKOS               0x0000000f      /* os-specific flags */
-+#define EF_IA_64_ABI64                0x00000010      /* 64-bit ABI */
-+#define EF_IA_64_ARCH         0xff000000      /* arch. version mask */
-+
-+/* Processor specific values for the Phdr p_type field.  */
-+#define PT_IA_64_ARCHEXT      (PT_LOPROC + 0) /* arch extension bits */
-+#define PT_IA_64_UNWIND               (PT_LOPROC + 1) /* ia64 unwind bits */
-+#define PT_IA_64_HP_OPT_ANOT  (PT_LOOS + 0x12)
-+#define PT_IA_64_HP_HSL_ANOT  (PT_LOOS + 0x13)
-+#define PT_IA_64_HP_STACK     (PT_LOOS + 0x14)
-+
-+/* Processor specific flags for the Phdr p_flags field.  */
-+#define PF_IA_64_NORECOV      0x80000000      /* spec insns w/o recovery */
-+
-+/* Processor specific values for the Shdr sh_type field.  */
-+#define SHT_IA_64_EXT         (SHT_LOPROC + 0) /* extension bits */
-+#define SHT_IA_64_UNWIND      (SHT_LOPROC + 1) /* unwind bits */
-+
-+/* Processor specific flags for the Shdr sh_flags field.  */
-+#define SHF_IA_64_SHORT               0x10000000      /* section near gp */
-+#define SHF_IA_64_NORECOV     0x20000000      /* spec insns w/o recovery */
-+
-+/* Processor specific values for the Dyn d_tag field.  */
-+#define DT_IA_64_PLT_RESERVE  (DT_LOPROC + 0)
-+#define DT_IA_64_NUM          1
-+
-+/* IA-64 relocations.  */
-+#define R_IA64_NONE           0x00    /* none */
-+#define R_IA64_IMM14          0x21    /* symbol + addend, add imm14 */
-+#define R_IA64_IMM22          0x22    /* symbol + addend, add imm22 */
-+#define R_IA64_IMM64          0x23    /* symbol + addend, mov imm64 */
-+#define R_IA64_DIR32MSB               0x24    /* symbol + addend, data4 MSB */
-+#define R_IA64_DIR32LSB               0x25    /* symbol + addend, data4 LSB */
-+#define R_IA64_DIR64MSB               0x26    /* symbol + addend, data8 MSB */
-+#define R_IA64_DIR64LSB               0x27    /* symbol + addend, data8 LSB */
-+#define R_IA64_GPREL22                0x2a    /* @gprel(sym + add), add imm22 */
-+#define R_IA64_GPREL64I               0x2b    /* @gprel(sym + add), mov imm64 */
-+#define R_IA64_GPREL32MSB     0x2c    /* @gprel(sym + add), data4 MSB */
-+#define R_IA64_GPREL32LSB     0x2d    /* @gprel(sym + add), data4 LSB */
-+#define R_IA64_GPREL64MSB     0x2e    /* @gprel(sym + add), data8 MSB */
-+#define R_IA64_GPREL64LSB     0x2f    /* @gprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF22                0x32    /* @ltoff(sym + add), add imm22 */
-+#define R_IA64_LTOFF64I               0x33    /* @ltoff(sym + add), mov imm64 */
-+#define R_IA64_PLTOFF22               0x3a    /* @pltoff(sym + add), add imm22 */
-+#define R_IA64_PLTOFF64I      0x3b    /* @pltoff(sym + add), mov imm64 */
-+#define R_IA64_PLTOFF64MSB    0x3e    /* @pltoff(sym + add), data8 MSB */
-+#define R_IA64_PLTOFF64LSB    0x3f    /* @pltoff(sym + add), data8 LSB */
-+#define R_IA64_FPTR64I                0x43    /* @fptr(sym + add), mov imm64 */
-+#define R_IA64_FPTR32MSB      0x44    /* @fptr(sym + add), data4 MSB */
-+#define R_IA64_FPTR32LSB      0x45    /* @fptr(sym + add), data4 LSB */
-+#define R_IA64_FPTR64MSB      0x46    /* @fptr(sym + add), data8 MSB */
-+#define R_IA64_FPTR64LSB      0x47    /* @fptr(sym + add), data8 LSB */
-+#define R_IA64_PCREL60B               0x48    /* @pcrel(sym + add), brl */
-+#define R_IA64_PCREL21B               0x49    /* @pcrel(sym + add), ptb, call */
-+#define R_IA64_PCREL21M               0x4a    /* @pcrel(sym + add), chk.s */
-+#define R_IA64_PCREL21F               0x4b    /* @pcrel(sym + add), fchkf */
-+#define R_IA64_PCREL32MSB     0x4c    /* @pcrel(sym + add), data4 MSB */
-+#define R_IA64_PCREL32LSB     0x4d    /* @pcrel(sym + add), data4 LSB */
-+#define R_IA64_PCREL64MSB     0x4e    /* @pcrel(sym + add), data8 MSB */
-+#define R_IA64_PCREL64LSB     0x4f    /* @pcrel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_FPTR22   0x52    /* @ltoff(@fptr(s+a)), imm22 */
-+#define R_IA64_LTOFF_FPTR64I  0x53    /* @ltoff(@fptr(s+a)), imm64 */
-+#define R_IA64_LTOFF_FPTR32MSB        0x54    /* @ltoff(@fptr(s+a)), data4 MSB */
-+#define R_IA64_LTOFF_FPTR32LSB        0x55    /* @ltoff(@fptr(s+a)), data4 LSB */
-+#define R_IA64_LTOFF_FPTR64MSB        0x56    /* @ltoff(@fptr(s+a)), data8 MSB */
-+#define R_IA64_LTOFF_FPTR64LSB        0x57    /* @ltoff(@fptr(s+a)), data8 LSB */
-+#define R_IA64_SEGREL32MSB    0x5c    /* @segrel(sym + add), data4 MSB */
-+#define R_IA64_SEGREL32LSB    0x5d    /* @segrel(sym + add), data4 LSB */
-+#define R_IA64_SEGREL64MSB    0x5e    /* @segrel(sym + add), data8 MSB */
-+#define R_IA64_SEGREL64LSB    0x5f    /* @segrel(sym + add), data8 LSB */
-+#define R_IA64_SECREL32MSB    0x64    /* @secrel(sym + add), data4 MSB */
-+#define R_IA64_SECREL32LSB    0x65    /* @secrel(sym + add), data4 LSB */
-+#define R_IA64_SECREL64MSB    0x66    /* @secrel(sym + add), data8 MSB */
-+#define R_IA64_SECREL64LSB    0x67    /* @secrel(sym + add), data8 LSB */
-+#define R_IA64_REL32MSB               0x6c    /* data 4 + REL */
-+#define R_IA64_REL32LSB               0x6d    /* data 4 + REL */
-+#define R_IA64_REL64MSB               0x6e    /* data 8 + REL */
-+#define R_IA64_REL64LSB               0x6f    /* data 8 + REL */
-+#define R_IA64_LTV32MSB               0x74    /* symbol + addend, data4 MSB */
-+#define R_IA64_LTV32LSB               0x75    /* symbol + addend, data4 LSB */
-+#define R_IA64_LTV64MSB               0x76    /* symbol + addend, data8 MSB */
-+#define R_IA64_LTV64LSB               0x77    /* symbol + addend, data8 LSB */
-+#define R_IA64_PCREL21BI      0x79    /* @pcrel(sym + add), 21bit inst */
-+#define R_IA64_PCREL22                0x7a    /* @pcrel(sym + add), 22bit inst */
-+#define R_IA64_PCREL64I               0x7b    /* @pcrel(sym + add), 64bit inst */
-+#define R_IA64_IPLTMSB                0x80    /* dynamic reloc, imported PLT, MSB */
-+#define R_IA64_IPLTLSB                0x81    /* dynamic reloc, imported PLT, LSB */
-+#define R_IA64_COPY           0x84    /* copy relocation */
-+#define R_IA64_SUB            0x85    /* Addend and symbol difference */
-+#define R_IA64_LTOFF22X               0x86    /* LTOFF22, relaxable.  */
-+#define R_IA64_LDXMOV         0x87    /* Use of LTOFF22X.  */
-+#define R_IA64_TPREL14                0x91    /* @tprel(sym + add), imm14 */
-+#define R_IA64_TPREL22                0x92    /* @tprel(sym + add), imm22 */
-+#define R_IA64_TPREL64I               0x93    /* @tprel(sym + add), imm64 */
-+#define R_IA64_TPREL64MSB     0x96    /* @tprel(sym + add), data8 MSB */
-+#define R_IA64_TPREL64LSB     0x97    /* @tprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_TPREL22  0x9a    /* @ltoff(@tprel(s+a)), imm2 */
-+#define R_IA64_DTPMOD64MSB    0xa6    /* @dtpmod(sym + add), data8 MSB */
-+#define R_IA64_DTPMOD64LSB    0xa7    /* @dtpmod(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_DTPMOD22 0xaa    /* @ltoff(@dtpmod(sym + add)), imm22 */
-+#define R_IA64_DTPREL14               0xb1    /* @dtprel(sym + add), imm14 */
-+#define R_IA64_DTPREL22               0xb2    /* @dtprel(sym + add), imm22 */
-+#define R_IA64_DTPREL64I      0xb3    /* @dtprel(sym + add), imm64 */
-+#define R_IA64_DTPREL32MSB    0xb4    /* @dtprel(sym + add), data4 MSB */
-+#define R_IA64_DTPREL32LSB    0xb5    /* @dtprel(sym + add), data4 LSB */
-+#define R_IA64_DTPREL64MSB    0xb6    /* @dtprel(sym + add), data8 MSB */
-+#define R_IA64_DTPREL64LSB    0xb7    /* @dtprel(sym + add), data8 LSB */
-+#define R_IA64_LTOFF_DTPREL22 0xba    /* @ltoff(@dtprel(s+a)), imm22 */
-+
-+/* SH specific declarations */
-+
-+/* Processor specific flags for the ELF header e_flags field.  */
-+#define EF_SH_MACH_MASK               0x1f
-+#define EF_SH_UNKNOWN         0x0
-+#define EF_SH1                        0x1
-+#define EF_SH2                        0x2
-+#define EF_SH3                        0x3
-+#define EF_SH_DSP             0x4
-+#define EF_SH3_DSP            0x5
-+#define EF_SH4AL_DSP          0x6
-+#define EF_SH3E                       0x8
-+#define EF_SH4                        0x9
-+#define EF_SH2E                       0xb
-+#define EF_SH4A                       0xc
-+#define EF_SH2A                       0xd
-+#define EF_SH4_NOFPU          0x10
-+#define EF_SH4A_NOFPU         0x11
-+#define EF_SH4_NOMMU_NOFPU    0x12
-+#define EF_SH2A_NOFPU         0x13
-+#define EF_SH3_NOMMU          0x14
-+#define EF_SH2A_SH4_NOFPU     0x15
-+#define EF_SH2A_SH3_NOFPU     0x16
-+#define EF_SH2A_SH4           0x17
-+#define EF_SH2A_SH3E          0x18
-+
-+/* SH relocs.  */
-+#define       R_SH_NONE               0
-+#define       R_SH_DIR32              1
-+#define       R_SH_REL32              2
-+#define       R_SH_DIR8WPN            3
-+#define       R_SH_IND12W             4
-+#define       R_SH_DIR8WPL            5
-+#define       R_SH_DIR8WPZ            6
-+#define       R_SH_DIR8BP             7
-+#define       R_SH_DIR8W              8
-+#define       R_SH_DIR8L              9
-+#define       R_SH_SWITCH16           25
-+#define       R_SH_SWITCH32           26
-+#define       R_SH_USES               27
-+#define       R_SH_COUNT              28
-+#define       R_SH_ALIGN              29
-+#define       R_SH_CODE               30
-+#define       R_SH_DATA               31
-+#define       R_SH_LABEL              32
-+#define       R_SH_SWITCH8            33
-+#define       R_SH_GNU_VTINHERIT      34
-+#define       R_SH_GNU_VTENTRY        35
-+#define       R_SH_TLS_GD_32          144
-+#define       R_SH_TLS_LD_32          145
-+#define       R_SH_TLS_LDO_32         146
-+#define       R_SH_TLS_IE_32          147
-+#define       R_SH_TLS_LE_32          148
-+#define       R_SH_TLS_DTPMOD32       149
-+#define       R_SH_TLS_DTPOFF32       150
-+#define       R_SH_TLS_TPOFF32        151
-+#define       R_SH_GOT32              160
-+#define       R_SH_PLT32              161
-+#define       R_SH_COPY               162
-+#define       R_SH_GLOB_DAT           163
-+#define       R_SH_JMP_SLOT           164
-+#define       R_SH_RELATIVE           165
-+#define       R_SH_GOTOFF             166
-+#define       R_SH_GOTPC              167
-+/* Keep this the last entry.  */
-+#define       R_SH_NUM                256
-+
-+/* S/390 specific definitions.  */
-+
-+/* Valid values for the e_flags field.  */
-+
-+#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
-+
-+/* Additional s390 relocs */
-+
-+#define R_390_NONE            0       /* No reloc.  */
-+#define R_390_8                       1       /* Direct 8 bit.  */
-+#define R_390_12              2       /* Direct 12 bit.  */
-+#define R_390_16              3       /* Direct 16 bit.  */
-+#define R_390_32              4       /* Direct 32 bit.  */
-+#define R_390_PC32            5       /* PC relative 32 bit.  */
-+#define R_390_GOT12           6       /* 12 bit GOT offset.  */
-+#define R_390_GOT32           7       /* 32 bit GOT offset.  */
-+#define R_390_PLT32           8       /* 32 bit PC relative PLT address.  */
-+#define R_390_COPY            9       /* Copy symbol at runtime.  */
-+#define R_390_GLOB_DAT                10      /* Create GOT entry.  */
-+#define R_390_JMP_SLOT                11      /* Create PLT entry.  */
-+#define R_390_RELATIVE                12      /* Adjust by program base.  */
-+#define R_390_GOTOFF32                13      /* 32 bit offset to GOT.         */
-+#define R_390_GOTPC           14      /* 32 bit PC relative offset to GOT.  */
-+#define R_390_GOT16           15      /* 16 bit GOT offset.  */
-+#define R_390_PC16            16      /* PC relative 16 bit.  */
-+#define R_390_PC16DBL         17      /* PC relative 16 bit shifted by 1.  */
-+#define R_390_PLT16DBL                18      /* 16 bit PC rel. PLT shifted by 1.  */
-+#define R_390_PC32DBL         19      /* PC relative 32 bit shifted by 1.  */
-+#define R_390_PLT32DBL                20      /* 32 bit PC rel. PLT shifted by 1.  */
-+#define R_390_GOTPCDBL                21      /* 32 bit PC rel. GOT shifted by 1.  */
-+#define R_390_64              22      /* Direct 64 bit.  */
-+#define R_390_PC64            23      /* PC relative 64 bit.  */
-+#define R_390_GOT64           24      /* 64 bit GOT offset.  */
-+#define R_390_PLT64           25      /* 64 bit PC relative PLT address.  */
-+#define R_390_GOTENT          26      /* 32 bit PC rel. to GOT entry >> 1. */
-+#define R_390_GOTOFF16                27      /* 16 bit offset to GOT. */
-+#define R_390_GOTOFF64                28      /* 64 bit offset to GOT. */
-+#define R_390_GOTPLT12                29      /* 12 bit offset to jump slot.  */
-+#define R_390_GOTPLT16                30      /* 16 bit offset to jump slot.  */
-+#define R_390_GOTPLT32                31      /* 32 bit offset to jump slot.  */
-+#define R_390_GOTPLT64                32      /* 64 bit offset to jump slot.  */
-+#define R_390_GOTPLTENT               33      /* 32 bit rel. offset to jump slot.  */
-+#define R_390_PLTOFF16                34      /* 16 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF32                35      /* 32 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF64                36      /* 16 bit offset from GOT to PLT. */
-+#define R_390_TLS_LOAD                37      /* Tag for load insn in TLS code.  */
-+#define R_390_TLS_GDCALL      38      /* Tag for function call in general
-+                                         dynamic TLS code. */
-+#define R_390_TLS_LDCALL      39      /* Tag for function call in local
-+                                         dynamic TLS code. */
-+#define R_390_TLS_GD32                40      /* Direct 32 bit for general dynamic
-+                                         thread local data.  */
-+#define R_390_TLS_GD64                41      /* Direct 64 bit for general dynamic
-+                                        thread local data.  */
-+#define R_390_TLS_GOTIE12     42      /* 12 bit GOT offset for static TLS
-+                                         block offset.  */
-+#define R_390_TLS_GOTIE32     43      /* 32 bit GOT offset for static TLS
-+                                         block offset.  */
-+#define R_390_TLS_GOTIE64     44      /* 64 bit GOT offset for static TLS
-+                                         block offset. */
-+#define R_390_TLS_LDM32               45      /* Direct 32 bit for local dynamic
-+                                         thread local data in LE code.  */
-+#define R_390_TLS_LDM64               46      /* Direct 64 bit for local dynamic
-+                                         thread local data in LE code.  */
-+#define R_390_TLS_IE32                47      /* 32 bit address of GOT entry for
-+                                         negated static TLS block offset.  */
-+#define R_390_TLS_IE64                48      /* 64 bit address of GOT entry for
-+                                         negated static TLS block offset.  */
-+#define R_390_TLS_IEENT               49      /* 32 bit rel. offset to GOT entry for
-+                                         negated static TLS block offset.  */
-+#define R_390_TLS_LE32                50      /* 32 bit negated offset relative to
-+                                         static TLS block.  */
-+#define R_390_TLS_LE64                51      /* 64 bit negated offset relative to
-+                                         static TLS block.  */
-+#define R_390_TLS_LDO32               52      /* 32 bit offset relative to TLS
-+                                         block.  */
-+#define R_390_TLS_LDO64               53      /* 64 bit offset relative to TLS
-+                                         block.  */
-+#define R_390_TLS_DTPMOD      54      /* ID of module containing symbol.  */
-+#define R_390_TLS_DTPOFF      55      /* Offset in TLS block.  */
-+#define R_390_TLS_TPOFF               56      /* Negated offset in static TLS
-+                                         block.  */
-+#define R_390_20              57      /* Direct 20 bit.  */
-+#define R_390_GOT20           58      /* 20 bit GOT offset.  */
-+#define R_390_GOTPLT20                59      /* 20 bit offset to jump slot.  */
-+#define R_390_TLS_GOTIE20     60      /* 20 bit GOT offset for static TLS
-+                                         block offset.  */
-+#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
-+/* Keep this the last entry.  */
-+#define R_390_NUM             62
-+
-+
-+/* CRIS relocations.  */
-+#define R_CRIS_NONE           0
-+#define R_CRIS_8              1
-+#define R_CRIS_16             2
-+#define R_CRIS_32             3
-+#define R_CRIS_8_PCREL                4
-+#define R_CRIS_16_PCREL               5
-+#define R_CRIS_32_PCREL               6
-+#define R_CRIS_GNU_VTINHERIT  7
-+#define R_CRIS_GNU_VTENTRY    8
-+#define R_CRIS_COPY           9
-+#define R_CRIS_GLOB_DAT               10
-+#define R_CRIS_JUMP_SLOT      11
-+#define R_CRIS_RELATIVE               12
-+#define R_CRIS_16_GOT         13
-+#define R_CRIS_32_GOT         14
-+#define R_CRIS_16_GOTPLT      15
-+#define R_CRIS_32_GOTPLT      16
-+#define R_CRIS_32_GOTREL      17
-+#define R_CRIS_32_PLT_GOTREL  18
-+#define R_CRIS_32_PLT_PCREL   19
-+
-+#define R_CRIS_NUM            20
-+
-+
-+/* AMD x86-64 relocations.  */
-+#define R_X86_64_NONE         0       /* No reloc */
-+#define R_X86_64_64           1       /* Direct 64 bit  */
-+#define R_X86_64_PC32         2       /* PC relative 32 bit signed */
-+#define R_X86_64_GOT32                3       /* 32 bit GOT entry */
-+#define R_X86_64_PLT32                4       /* 32 bit PLT address */
-+#define R_X86_64_COPY         5       /* Copy symbol at runtime */
-+#define R_X86_64_GLOB_DAT     6       /* Create GOT entry */
-+#define R_X86_64_JUMP_SLOT    7       /* Create PLT entry */
-+#define R_X86_64_RELATIVE     8       /* Adjust by program base */
-+#define R_X86_64_GOTPCREL     9       /* 32 bit signed PC relative
-+                                         offset to GOT */
-+#define R_X86_64_32           10      /* Direct 32 bit zero extended */
-+#define R_X86_64_32S          11      /* Direct 32 bit sign extended */
-+#define R_X86_64_16           12      /* Direct 16 bit zero extended */
-+#define R_X86_64_PC16         13      /* 16 bit sign extended pc relative */
-+#define R_X86_64_8            14      /* Direct 8 bit sign extended  */
-+#define R_X86_64_PC8          15      /* 8 bit sign extended pc relative */
-+#define R_X86_64_DTPMOD64     16      /* ID of module containing symbol */
-+#define R_X86_64_DTPOFF64     17      /* Offset in module's TLS block */
-+#define R_X86_64_TPOFF64      18      /* Offset in initial TLS block */
-+#define R_X86_64_TLSGD                19      /* 32 bit signed PC relative offset
-+                                         to two GOT entries for GD symbol */
-+#define R_X86_64_TLSLD                20      /* 32 bit signed PC relative offset
-+                                         to two GOT entries for LD symbol */
-+#define R_X86_64_DTPOFF32     21      /* Offset in TLS block */
-+#define R_X86_64_GOTTPOFF     22      /* 32 bit signed PC relative offset
-+                                         to GOT entry for IE symbol */
-+#define R_X86_64_TPOFF32      23      /* Offset in initial TLS block */
-+#define R_X86_64_PC64         24      /* PC relative 64 bit */
-+#define R_X86_64_GOTOFF64     25      /* 64 bit offset to GOT */
-+#define R_X86_64_GOTPC32      26      /* 32 bit signed pc relative
-+                                         offset to GOT */
-+#define R_X86_64_GOT64                27      /* 64-bit GOT entry offset */
-+#define R_X86_64_GOTPCREL64   28      /* 64-bit PC relative offset
-+                                         to GOT entry */
-+#define R_X86_64_GOTPC64      29      /* 64-bit PC relative offset to GOT */
-+#define R_X86_64_GOTPLT64     30      /* like GOT64, says PLT entry needed */
-+#define R_X86_64_PLTOFF64     31      /* 64-bit GOT relative offset
-+                                         to PLT entry */
-+#define R_X86_64_SIZE32               32      /* Size of symbol plus 32-bit addend */
-+#define R_X86_64_SIZE64               33      /* Size of symbol plus 64-bit addend */
-+#define R_X86_64_GOTPC32_TLSDESC 34   /* GOT offset for TLS descriptor.  */
-+#define R_X86_64_TLSDESC_CALL   35    /* Marker for call through TLS
-+                                         descriptor.  */
-+#define R_X86_64_TLSDESC        36    /* TLS descriptor.  */
-+#define R_X86_64_IRELATIVE    37      /* Adjust indirectly by program base */
-+#define R_X86_64_RELATIVE64   38      /* 64-bit adjust by program base */
-+
-+#define R_X86_64_NUM          39
-+
-+
-+/* AM33 relocations.  */
-+#define R_MN10300_NONE                0       /* No reloc.  */
-+#define R_MN10300_32          1       /* Direct 32 bit.  */
-+#define R_MN10300_16          2       /* Direct 16 bit.  */
-+#define R_MN10300_8           3       /* Direct 8 bit.  */
-+#define R_MN10300_PCREL32     4       /* PC-relative 32-bit.  */
-+#define R_MN10300_PCREL16     5       /* PC-relative 16-bit signed.  */
-+#define R_MN10300_PCREL8      6       /* PC-relative 8-bit signed.  */
-+#define R_MN10300_GNU_VTINHERIT       7       /* Ancient C++ vtable garbage... */
-+#define R_MN10300_GNU_VTENTRY 8       /* ... collection annotation.  */
-+#define R_MN10300_24          9       /* Direct 24 bit.  */
-+#define R_MN10300_GOTPC32     10      /* 32-bit PCrel offset to GOT.  */
-+#define R_MN10300_GOTPC16     11      /* 16-bit PCrel offset to GOT.  */
-+#define R_MN10300_GOTOFF32    12      /* 32-bit offset from GOT.  */
-+#define R_MN10300_GOTOFF24    13      /* 24-bit offset from GOT.  */
-+#define R_MN10300_GOTOFF16    14      /* 16-bit offset from GOT.  */
-+#define R_MN10300_PLT32               15      /* 32-bit PCrel to PLT entry.  */
-+#define R_MN10300_PLT16               16      /* 16-bit PCrel to PLT entry.  */
-+#define R_MN10300_GOT32               17      /* 32-bit offset to GOT entry.  */
-+#define R_MN10300_GOT24               18      /* 24-bit offset to GOT entry.  */
-+#define R_MN10300_GOT16               19      /* 16-bit offset to GOT entry.  */
-+#define R_MN10300_COPY                20      /* Copy symbol at runtime.  */
-+#define R_MN10300_GLOB_DAT    21      /* Create GOT entry.  */
-+#define R_MN10300_JMP_SLOT    22      /* Create PLT entry.  */
-+#define R_MN10300_RELATIVE    23      /* Adjust by program base.  */
-+
-+#define R_MN10300_NUM         24
-+
-+
-+/* M32R relocs.  */
-+#define R_M32R_NONE           0       /* No reloc. */
-+#define R_M32R_16             1       /* Direct 16 bit. */
-+#define R_M32R_32             2       /* Direct 32 bit. */
-+#define R_M32R_24             3       /* Direct 24 bit. */
-+#define R_M32R_10_PCREL               4       /* PC relative 10 bit shifted. */
-+#define R_M32R_18_PCREL               5       /* PC relative 18 bit shifted. */
-+#define R_M32R_26_PCREL               6       /* PC relative 26 bit shifted. */
-+#define R_M32R_HI16_ULO               7       /* High 16 bit with unsigned low. */
-+#define R_M32R_HI16_SLO               8       /* High 16 bit with signed low. */
-+#define R_M32R_LO16           9       /* Low 16 bit. */
-+#define R_M32R_SDA16          10      /* 16 bit offset in SDA. */
-+#define R_M32R_GNU_VTINHERIT  11
-+#define R_M32R_GNU_VTENTRY    12
-+/* M32R relocs use SHT_RELA.  */
-+#define R_M32R_16_RELA                33      /* Direct 16 bit. */
-+#define R_M32R_32_RELA                34      /* Direct 32 bit. */
-+#define R_M32R_24_RELA                35      /* Direct 24 bit. */
-+#define R_M32R_10_PCREL_RELA  36      /* PC relative 10 bit shifted. */
-+#define R_M32R_18_PCREL_RELA  37      /* PC relative 18 bit shifted. */
-+#define R_M32R_26_PCREL_RELA  38      /* PC relative 26 bit shifted. */
-+#define R_M32R_HI16_ULO_RELA  39      /* High 16 bit with unsigned low */
-+#define R_M32R_HI16_SLO_RELA  40      /* High 16 bit with signed low */
-+#define R_M32R_LO16_RELA      41      /* Low 16 bit */
-+#define R_M32R_SDA16_RELA     42      /* 16 bit offset in SDA */
-+#define R_M32R_RELA_GNU_VTINHERIT     43
-+#define R_M32R_RELA_GNU_VTENTRY       44
-+#define R_M32R_REL32          45      /* PC relative 32 bit.  */
-+
-+#define R_M32R_GOT24          48      /* 24 bit GOT entry */
-+#define R_M32R_26_PLTREL      49      /* 26 bit PC relative to PLT shifted */
-+#define R_M32R_COPY           50      /* Copy symbol at runtime */
-+#define R_M32R_GLOB_DAT               51      /* Create GOT entry */
-+#define R_M32R_JMP_SLOT               52      /* Create PLT entry */
-+#define R_M32R_RELATIVE               53      /* Adjust by program base */
-+#define R_M32R_GOTOFF         54      /* 24 bit offset to GOT */
-+#define R_M32R_GOTPC24                55      /* 24 bit PC relative offset to GOT */
-+#define R_M32R_GOT16_HI_ULO   56      /* High 16 bit GOT entry with unsigned
-+                                         low */
-+#define R_M32R_GOT16_HI_SLO   57      /* High 16 bit GOT entry with signed
-+                                         low */
-+#define R_M32R_GOT16_LO               58      /* Low 16 bit GOT entry */
-+#define R_M32R_GOTPC_HI_ULO   59      /* High 16 bit PC relative offset to
-+                                         GOT with unsigned low */
-+#define R_M32R_GOTPC_HI_SLO   60      /* High 16 bit PC relative offset to
-+                                         GOT with signed low */
-+#define R_M32R_GOTPC_LO               61      /* Low 16 bit PC relative offset to
-+                                         GOT */
-+#define R_M32R_GOTOFF_HI_ULO  62      /* High 16 bit offset to GOT
-+                                         with unsigned low */
-+#define R_M32R_GOTOFF_HI_SLO  63      /* High 16 bit offset to GOT
-+                                         with signed low */
-+#define R_M32R_GOTOFF_LO      64      /* Low 16 bit offset to GOT */
-+#define R_M32R_NUM            256     /* Keep this the last entry. */
-+
-+
-+/* TILEPro relocations.  */
-+#define R_TILEPRO_NONE                0       /* No reloc */
-+#define R_TILEPRO_32          1       /* Direct 32 bit */
-+#define R_TILEPRO_16          2       /* Direct 16 bit */
-+#define R_TILEPRO_8           3       /* Direct 8 bit */
-+#define R_TILEPRO_32_PCREL    4       /* PC relative 32 bit */
-+#define R_TILEPRO_16_PCREL    5       /* PC relative 16 bit */
-+#define R_TILEPRO_8_PCREL     6       /* PC relative 8 bit */
-+#define R_TILEPRO_LO16                7       /* Low 16 bit */
-+#define R_TILEPRO_HI16                8       /* High 16 bit */
-+#define R_TILEPRO_HA16                9       /* High 16 bit, adjusted */
-+#define R_TILEPRO_COPY                10      /* Copy relocation */
-+#define R_TILEPRO_GLOB_DAT    11      /* Create GOT entry */
-+#define R_TILEPRO_JMP_SLOT    12      /* Create PLT entry */
-+#define R_TILEPRO_RELATIVE    13      /* Adjust by program base */
-+#define R_TILEPRO_BROFF_X1    14      /* X1 pipe branch offset */
-+#define R_TILEPRO_JOFFLONG_X1 15      /* X1 pipe jump offset */
-+#define R_TILEPRO_JOFFLONG_X1_PLT 16  /* X1 pipe jump offset to PLT */
-+#define R_TILEPRO_IMM8_X0     17      /* X0 pipe 8-bit */
-+#define R_TILEPRO_IMM8_Y0     18      /* Y0 pipe 8-bit */
-+#define R_TILEPRO_IMM8_X1     19      /* X1 pipe 8-bit */
-+#define R_TILEPRO_IMM8_Y1     20      /* Y1 pipe 8-bit */
-+#define R_TILEPRO_MT_IMM15_X1 21      /* X1 pipe mtspr */
-+#define R_TILEPRO_MF_IMM15_X1 22      /* X1 pipe mfspr */
-+#define R_TILEPRO_IMM16_X0    23      /* X0 pipe 16-bit */
-+#define R_TILEPRO_IMM16_X1    24      /* X1 pipe 16-bit */
-+#define R_TILEPRO_IMM16_X0_LO 25      /* X0 pipe low 16-bit */
-+#define R_TILEPRO_IMM16_X1_LO 26      /* X1 pipe low 16-bit */
-+#define R_TILEPRO_IMM16_X0_HI 27      /* X0 pipe high 16-bit */
-+#define R_TILEPRO_IMM16_X1_HI 28      /* X1 pipe high 16-bit */
-+#define R_TILEPRO_IMM16_X0_HA 29      /* X0 pipe high 16-bit, adjusted */
-+#define R_TILEPRO_IMM16_X1_HA 30      /* X1 pipe high 16-bit, adjusted */
-+#define R_TILEPRO_IMM16_X0_PCREL 31   /* X0 pipe PC relative 16 bit */
-+#define R_TILEPRO_IMM16_X1_PCREL 32   /* X1 pipe PC relative 16 bit */
-+#define R_TILEPRO_IMM16_X0_LO_PCREL 33        /* X0 pipe PC relative low 16 bit */
-+#define R_TILEPRO_IMM16_X1_LO_PCREL 34        /* X1 pipe PC relative low 16 bit */
-+#define R_TILEPRO_IMM16_X0_HI_PCREL 35        /* X0 pipe PC relative high 16 bit */
-+#define R_TILEPRO_IMM16_X1_HI_PCREL 36        /* X1 pipe PC relative high 16 bit */
-+#define R_TILEPRO_IMM16_X0_HA_PCREL 37        /* X0 pipe PC relative ha() 16 bit */
-+#define R_TILEPRO_IMM16_X1_HA_PCREL 38        /* X1 pipe PC relative ha() 16 bit */
-+#define R_TILEPRO_IMM16_X0_GOT        39      /* X0 pipe 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT        40      /* X1 pipe 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X0_GOT_LO 41  /* X0 pipe low 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT_LO 42  /* X1 pipe low 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X0_GOT_HI 43  /* X0 pipe high 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT_HI 44  /* X1 pipe high 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X0_GOT_HA 45  /* X0 pipe ha() 16-bit GOT offset */
-+#define R_TILEPRO_IMM16_X1_GOT_HA 46  /* X1 pipe ha() 16-bit GOT offset */
-+#define R_TILEPRO_MMSTART_X0  47      /* X0 pipe mm "start" */
-+#define R_TILEPRO_MMEND_X0    48      /* X0 pipe mm "end" */
-+#define R_TILEPRO_MMSTART_X1  49      /* X1 pipe mm "start" */
-+#define R_TILEPRO_MMEND_X1    50      /* X1 pipe mm "end" */
-+#define R_TILEPRO_SHAMT_X0    51      /* X0 pipe shift amount */
-+#define R_TILEPRO_SHAMT_X1    52      /* X1 pipe shift amount */
-+#define R_TILEPRO_SHAMT_Y0    53      /* Y0 pipe shift amount */
-+#define R_TILEPRO_SHAMT_Y1    54      /* Y1 pipe shift amount */
-+#define R_TILEPRO_DEST_IMM8_X1        55      /* X1 pipe destination 8-bit */
-+/* Relocs 56-59 are currently not defined.  */
-+#define R_TILEPRO_TLS_GD_CALL 60      /* "jal" for TLS GD */
-+#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61       /* X0 pipe "addi" for TLS GD */
-+#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62       /* X1 pipe "addi" for TLS GD */
-+#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63       /* Y0 pipe "addi" for TLS GD */
-+#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64       /* Y1 pipe "addi" for TLS GD */
-+#define R_TILEPRO_TLS_IE_LOAD 65      /* "lw_tls" for TLS IE */
-+#define R_TILEPRO_IMM16_X0_TLS_GD 66  /* X0 pipe 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD 67  /* X1 pipe 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68       /* X0 pipe low 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69       /* X1 pipe low 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70       /* X0 pipe high 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71       /* X1 pipe high 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72       /* X0 pipe ha() 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73       /* X1 pipe ha() 16-bit TLS GD offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE 74  /* X0 pipe 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE 75  /* X1 pipe 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76       /* X0 pipe low 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77       /* X1 pipe low 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78       /* X0 pipe high 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79       /* X1 pipe high 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80       /* X0 pipe ha() 16-bit TLS IE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81       /* X1 pipe ha() 16-bit TLS IE offset */
-+#define R_TILEPRO_TLS_DTPMOD32        82      /* ID of module containing symbol */
-+#define R_TILEPRO_TLS_DTPOFF32        83      /* Offset in TLS block */
-+#define R_TILEPRO_TLS_TPOFF32 84      /* Offset in static TLS block */
-+#define R_TILEPRO_IMM16_X0_TLS_LE 85  /* X0 pipe 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE 86  /* X1 pipe 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87       /* X0 pipe low 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88       /* X1 pipe low 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89       /* X0 pipe high 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90       /* X1 pipe high 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91       /* X0 pipe ha() 16-bit TLS LE offset */
-+#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92       /* X1 pipe ha() 16-bit TLS LE offset */
-+
-+#define R_TILEPRO_GNU_VTINHERIT       128     /* GNU C++ vtable hierarchy */
-+#define R_TILEPRO_GNU_VTENTRY 129     /* GNU C++ vtable member usage */
-+
-+#define R_TILEPRO_NUM         130
-+
-+
-+/* TILE-Gx relocations.  */
-+#define R_TILEGX_NONE         0       /* No reloc */
-+#define R_TILEGX_64           1       /* Direct 64 bit */
-+#define R_TILEGX_32           2       /* Direct 32 bit */
-+#define R_TILEGX_16           3       /* Direct 16 bit */
-+#define R_TILEGX_8            4       /* Direct 8 bit */
-+#define R_TILEGX_64_PCREL     5       /* PC relative 64 bit */
-+#define R_TILEGX_32_PCREL     6       /* PC relative 32 bit */
-+#define R_TILEGX_16_PCREL     7       /* PC relative 16 bit */
-+#define R_TILEGX_8_PCREL      8       /* PC relative 8 bit */
-+#define R_TILEGX_HW0          9       /* hword 0 16-bit */
-+#define R_TILEGX_HW1          10      /* hword 1 16-bit */
-+#define R_TILEGX_HW2          11      /* hword 2 16-bit */
-+#define R_TILEGX_HW3          12      /* hword 3 16-bit */
-+#define R_TILEGX_HW0_LAST     13      /* last hword 0 16-bit */
-+#define R_TILEGX_HW1_LAST     14      /* last hword 1 16-bit */
-+#define R_TILEGX_HW2_LAST     15      /* last hword 2 16-bit */
-+#define R_TILEGX_COPY         16      /* Copy relocation */
-+#define R_TILEGX_GLOB_DAT     17      /* Create GOT entry */
-+#define R_TILEGX_JMP_SLOT     18      /* Create PLT entry */
-+#define R_TILEGX_RELATIVE     19      /* Adjust by program base */
-+#define R_TILEGX_BROFF_X1     20      /* X1 pipe branch offset */
-+#define R_TILEGX_JUMPOFF_X1   21      /* X1 pipe jump offset */
-+#define R_TILEGX_JUMPOFF_X1_PLT       22      /* X1 pipe jump offset to PLT */
-+#define R_TILEGX_IMM8_X0      23      /* X0 pipe 8-bit */
-+#define R_TILEGX_IMM8_Y0      24      /* Y0 pipe 8-bit */
-+#define R_TILEGX_IMM8_X1      25      /* X1 pipe 8-bit */
-+#define R_TILEGX_IMM8_Y1      26      /* Y1 pipe 8-bit */
-+#define R_TILEGX_DEST_IMM8_X1 27      /* X1 pipe destination 8-bit */
-+#define R_TILEGX_MT_IMM14_X1  28      /* X1 pipe mtspr */
-+#define R_TILEGX_MF_IMM14_X1  29      /* X1 pipe mfspr */
-+#define R_TILEGX_MMSTART_X0   30      /* X0 pipe mm "start" */
-+#define R_TILEGX_MMEND_X0     31      /* X0 pipe mm "end" */
-+#define R_TILEGX_SHAMT_X0     32      /* X0 pipe shift amount */
-+#define R_TILEGX_SHAMT_X1     33      /* X1 pipe shift amount */
-+#define R_TILEGX_SHAMT_Y0     34      /* Y0 pipe shift amount */
-+#define R_TILEGX_SHAMT_Y1     35      /* Y1 pipe shift amount */
-+#define R_TILEGX_IMM16_X0_HW0 36      /* X0 pipe hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0 37      /* X1 pipe hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1 38      /* X0 pipe hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1 39      /* X1 pipe hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2 40      /* X0 pipe hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2 41      /* X1 pipe hword 2 */
-+#define R_TILEGX_IMM16_X0_HW3 42      /* X0 pipe hword 3 */
-+#define R_TILEGX_IMM16_X1_HW3 43      /* X1 pipe hword 3 */
-+#define R_TILEGX_IMM16_X0_HW0_LAST 44 /* X0 pipe last hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0_LAST 45 /* X1 pipe last hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1_LAST 46 /* X0 pipe last hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1_LAST 47 /* X1 pipe last hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2_LAST 48 /* X0 pipe last hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2_LAST 49 /* X1 pipe last hword 2 */
-+#define R_TILEGX_IMM16_X0_HW0_PCREL 50        /* X0 pipe PC relative hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0_PCREL 51        /* X1 pipe PC relative hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1_PCREL 52        /* X0 pipe PC relative hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1_PCREL 53        /* X1 pipe PC relative hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2_PCREL 54        /* X0 pipe PC relative hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2_PCREL 55        /* X1 pipe PC relative hword 2 */
-+#define R_TILEGX_IMM16_X0_HW3_PCREL 56        /* X0 pipe PC relative hword 3 */
-+#define R_TILEGX_IMM16_X1_HW3_PCREL 57        /* X1 pipe PC relative hword 3 */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
-+#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
-+#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
-+#define R_TILEGX_IMM16_X0_HW0_GOT 64  /* X0 pipe hword 0 GOT offset */
-+#define R_TILEGX_IMM16_X1_HW0_GOT 65  /* X1 pipe hword 0 GOT offset */
-+/* Relocs 66-71 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
-+/* Relocs 76-77 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78       /* X0 pipe hword 0 TLS GD offset */
-+#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79       /* X1 pipe hword 0 TLS GD offset */
-+#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80       /* X0 pipe hword 0 TLS LE offset */
-+#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81       /* X1 pipe hword 0 TLS LE offset */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
-+/* Relocs 90-91 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92       /* X0 pipe hword 0 TLS IE offset */
-+#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93       /* X1 pipe hword 0 TLS IE offset */
-+/* Relocs 94-99 are currently not defined.  */
-+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
-+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
-+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
-+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
-+/* Relocs 104-105 are currently not defined.  */
-+#define R_TILEGX_TLS_DTPMOD64 106     /* 64-bit ID of symbol's module */
-+#define R_TILEGX_TLS_DTPOFF64 107     /* 64-bit offset in TLS block */
-+#define R_TILEGX_TLS_TPOFF64  108     /* 64-bit offset in static TLS block */
-+#define R_TILEGX_TLS_DTPMOD32 109     /* 32-bit ID of symbol's module */
-+#define R_TILEGX_TLS_DTPOFF32 110     /* 32-bit offset in TLS block */
-+#define R_TILEGX_TLS_TPOFF32  111     /* 32-bit offset in static TLS block */
-+#define R_TILEGX_TLS_GD_CALL  112     /* "jal" for TLS GD */
-+#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113       /* X0 pipe "addi" for TLS GD */
-+#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114       /* X1 pipe "addi" for TLS GD */
-+#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115       /* Y0 pipe "addi" for TLS GD */
-+#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116       /* Y1 pipe "addi" for TLS GD */
-+#define R_TILEGX_TLS_IE_LOAD  117     /* "ld_tls" for TLS IE */
-+#define R_TILEGX_IMM8_X0_TLS_ADD 118  /* X0 pipe "addi" for TLS GD/IE */
-+#define R_TILEGX_IMM8_X1_TLS_ADD 119  /* X1 pipe "addi" for TLS GD/IE */
-+#define R_TILEGX_IMM8_Y0_TLS_ADD 120  /* Y0 pipe "addi" for TLS GD/IE */
-+#define R_TILEGX_IMM8_Y1_TLS_ADD 121  /* Y1 pipe "addi" for TLS GD/IE */
-+
-+#define R_TILEGX_GNU_VTINHERIT        128     /* GNU C++ vtable hierarchy */
-+#define R_TILEGX_GNU_VTENTRY  129     /* GNU C++ vtable member usage */
-+
-+#define R_TILEGX_NUM          130
-+
-+#endif        /* elf.h */
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "elf.h"
-+#endif
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "elf.h"
-+#endif
- #include "elfconfig.h"
diff --git a/target/linux/generic/hack-4.9/211-host_tools_portability.patch b/target/linux/generic/hack-4.9/211-host_tools_portability.patch
deleted file mode 100644 (file)
index e4d6851..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7f698012384ccb1ed10cc758acfd085096fdb307 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:02:03 +0200
-Subject: kernel: fix linux 4.9 host tools portability issues
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- tools/build/Build.include       | 2 +-
- tools/perf/pmu-events/jevents.c | 1 +
- tools/perf/pmu-events/json.c    | 1 -
- 3 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/tools/build/Build.include
-+++ b/tools/build/Build.include
-@@ -96,4 +96,4 @@ cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $(
- ###
- ## HOSTCC C flags
--host_c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
-+host_c_flags = -MD -MF $(depfile) -MT $@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
---- a/tools/perf/pmu-events/jevents.c
-+++ b/tools/perf/pmu-events/jevents.c
-@@ -35,6 +35,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- #include <unistd.h>
- #include <stdarg.h>
---- a/tools/perf/pmu-events/json.c
-+++ b/tools/perf/pmu-events/json.c
-@@ -38,7 +38,6 @@
- #include <unistd.h>
- #include "jsmn.h"
- #include "json.h"
--#include <linux/kernel.h>
- static char *mapfile(const char *fn, size_t *size)
diff --git a/target/linux/generic/hack-4.9/212-byteshift_portability.patch b/target/linux/generic/hack-4.9/212-byteshift_portability.patch
deleted file mode 100644 (file)
index 6def12d..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 48232d3d931c95953ce2ddfe7da7bb164aef6a73 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:03:16 +0200
-Subject: linux-3.6: fix portability of some includes files in tools/ used on the host
-
-lede-commit: 6040b1d29ab1f047c5e49b748abcb6a3196add28
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- tools/include/tools/be_byteshift.h |  4 ++++
- tools/include/tools/le_byteshift.h |  4 ++++
- tools/include/tools/linux_types.h  | 22 ++++++++++++++++++++++
- 3 files changed, 30 insertions(+)
- create mode 100644 tools/include/tools/linux_types.h
-
---- a/tools/include/tools/be_byteshift.h
-+++ b/tools/include/tools/be_byteshift.h
-@@ -1,6 +1,10 @@
- #ifndef _TOOLS_BE_BYTESHIFT_H
- #define _TOOLS_BE_BYTESHIFT_H
-+#ifndef __linux__
-+#include "linux_types.h"
-+#endif
-+
- #include <stdint.h>
- static inline uint16_t __get_unaligned_be16(const uint8_t *p)
---- a/tools/include/tools/le_byteshift.h
-+++ b/tools/include/tools/le_byteshift.h
-@@ -1,6 +1,10 @@
- #ifndef _TOOLS_LE_BYTESHIFT_H
- #define _TOOLS_LE_BYTESHIFT_H
-+#ifndef __linux__
-+#include "linux_types.h"
-+#endif
-+
- #include <stdint.h>
- static inline uint16_t __get_unaligned_le16(const uint8_t *p)
---- /dev/null
-+++ b/tools/include/tools/linux_types.h
-@@ -0,0 +1,22 @@
-+#ifndef __LINUX_TYPES_H
-+#define __LINUX_TYPES_H
-+
-+#include <stdint.h>
-+
-+typedef uint8_t __u8;
-+typedef uint8_t __be8;
-+typedef uint8_t __le8;
-+
-+typedef uint16_t __u16;
-+typedef uint16_t __be16;
-+typedef uint16_t __le16;
-+
-+typedef uint32_t __u32;
-+typedef uint32_t __be32;
-+typedef uint32_t __le32;
-+
-+typedef uint64_t __u64;
-+typedef uint64_t __be64;
-+typedef uint64_t __le64;
-+
-+#endif
diff --git a/target/linux/generic/hack-4.9/214-spidev_h_portability.patch b/target/linux/generic/hack-4.9/214-spidev_h_portability.patch
deleted file mode 100644 (file)
index ad4706c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From be9be95ff10e16a5b4ad36f903978d0cc5747024 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:04:08 +0200
-Subject: kernel: fix linux/spi/spidev.h portability issues with musl
-
-Felix will try to get this define included into musl
-
-lede-commit: 795e7cf60de19e7a076a46874fab7bb88b43bbff
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/uapi/linux/spi/spidev.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/uapi/linux/spi/spidev.h
-+++ b/include/uapi/linux/spi/spidev.h
-@@ -112,7 +112,7 @@ struct spi_ioc_transfer {
- /* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
- #define SPI_MSGSIZE(N) \
--      ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
-+      ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << 13)) \
-               ? ((N)*(sizeof (struct spi_ioc_transfer))) : 0)
- #define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)])
diff --git a/target/linux/generic/hack-4.9/220-gc_sections.patch b/target/linux/generic/hack-4.9/220-gc_sections.patch
deleted file mode 100644 (file)
index 732e38a..0000000
+++ /dev/null
@@ -1,448 +0,0 @@
-From e3d8676f5722b7622685581e06e8f53e6138e3ab Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 15 Jul 2017 23:42:36 +0200
-Subject: use -ffunction-sections, -fdata-sections and --gc-sections
-
-In combination with kernel symbol export stripping this significantly reduces
-the kernel image size. Used on both ARM and MIPS architectures.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- Makefile                          | 10 +++----
- arch/arm/Kconfig                  |  1 +
- arch/arm/boot/compressed/Makefile |  1 +
- arch/arm/kernel/vmlinux.lds.S     | 26 ++++++++--------
- arch/mips/Kconfig                 |  1 +
- arch/mips/kernel/vmlinux.lds.S    |  4 +--
- include/asm-generic/vmlinux.lds.h | 63 ++++++++++++++++++++-------------------
- 7 files changed, 55 insertions(+), 51 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -401,6 +401,11 @@ KBUILD_CFLAGS_MODULE  := -DMODULE
- KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s)
- GCC_PLUGINS_CFLAGS :=
-+ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
-+KBUILD_CFLAGS_KERNEL  += $(call cc-option,-ffunction-sections,)
-+KBUILD_CFLAGS_KERNEL  += $(call cc-option,-fdata-sections,)
-+endif
-+
- # Read KERNELRELEASE from include/config/kernel.release (if it exists)
- KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
- KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
-@@ -649,11 +654,6 @@ KBUILD_CFLAGS     += $(call cc-disable-warni
- KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
- KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)
--ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
--KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,)
--KBUILD_CFLAGS += $(call cc-option,-fdata-sections,)
--endif
--
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
- else
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -81,6 +81,7 @@ config ARM
-       select HAVE_UID16
-       select HAVE_VIRT_CPU_ACCOUNTING_GEN
-       select IRQ_FORCED_THREADING
-+      select LD_DEAD_CODE_DATA_ELIMINATION
-       select MODULES_USE_ELF_REL
-       select NO_BOOTMEM
-       select OF_EARLY_FLATTREE if OF
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -102,6 +102,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
- KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
- endif
-+KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
- # -fstack-protector-strong triggers protection checks in this code,
- # but it is being used too early to link to meaningful stack_chk logic.
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -17,7 +17,7 @@
- #define PROC_INFO                                                     \
-       . = ALIGN(4);                                                   \
-       VMLINUX_SYMBOL(__proc_info_begin) = .;                          \
--      *(.proc.info.init)                                              \
-+      KEEP(*(.proc.info.init))                                        \
-       VMLINUX_SYMBOL(__proc_info_end) = .;
- #define HYPERVISOR_TEXT                                                       \
-@@ -28,11 +28,11 @@
- #define IDMAP_TEXT                                                    \
-       ALIGN_FUNCTION();                                               \
-       VMLINUX_SYMBOL(__idmap_text_start) = .;                         \
--      *(.idmap.text)                                                  \
-+      KEEP(*(.idmap.text))                                            \
-       VMLINUX_SYMBOL(__idmap_text_end) = .;                           \
-       . = ALIGN(PAGE_SIZE);                                           \
-       VMLINUX_SYMBOL(__hyp_idmap_text_start) = .;                     \
--      *(.hyp.idmap.text)                                              \
-+      KEEP(*(.hyp.idmap.text))                                        \
-       VMLINUX_SYMBOL(__hyp_idmap_text_end) = .;
- #ifdef CONFIG_HOTPLUG_CPU
-@@ -105,7 +105,7 @@ SECTIONS
-               _stext = .;             /* Text and read-only data      */
-                       IDMAP_TEXT
-                       __exception_text_start = .;
--                      *(.exception.text)
-+                      KEEP(*(.exception.text))
-                       __exception_text_end = .;
-                       IRQENTRY_TEXT
-                       SOFTIRQENTRY_TEXT
-@@ -134,7 +134,7 @@ SECTIONS
-       __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
-               __start___ex_table = .;
- #ifdef CONFIG_MMU
--              *(__ex_table)
-+              KEEP(*(__ex_table))
- #endif
-               __stop___ex_table = .;
-       }
-@@ -146,12 +146,12 @@ SECTIONS
-       . = ALIGN(8);
-       .ARM.unwind_idx : {
-               __start_unwind_idx = .;
--              *(.ARM.exidx*)
-+              KEEP(*(.ARM.exidx*))
-               __stop_unwind_idx = .;
-       }
-       .ARM.unwind_tab : {
-               __start_unwind_tab = .;
--              *(.ARM.extab*)
-+              KEEP(*(.ARM.extab*))
-               __stop_unwind_tab = .;
-       }
- #endif
-@@ -171,14 +171,14 @@ SECTIONS
-        */
-       __vectors_start = .;
-       .vectors 0xffff0000 : AT(__vectors_start) {
--              *(.vectors)
-+              KEEP(*(.vectors))
-       }
-       . = __vectors_start + SIZEOF(.vectors);
-       __vectors_end = .;
-       __stubs_start = .;
-       .stubs ADDR(.vectors) + 0x1000 : AT(__stubs_start) {
--              *(.stubs)
-+              KEEP(*(.stubs))
-       }
-       . = __stubs_start + SIZEOF(.stubs);
-       __stubs_end = .;
-@@ -194,24 +194,24 @@ SECTIONS
-       }
-       .init.arch.info : {
-               __arch_info_begin = .;
--              *(.arch.info.init)
-+              KEEP(*(.arch.info.init))
-               __arch_info_end = .;
-       }
-       .init.tagtable : {
-               __tagtable_begin = .;
--              *(.taglist.init)
-+              KEEP(*(.taglist.init))
-               __tagtable_end = .;
-       }
- #ifdef CONFIG_SMP_ON_UP
-       .init.smpalt : {
-               __smpalt_begin = .;
--              *(.alt.smp.init)
-+              KEEP(*(.alt.smp.init))
-               __smpalt_end = .;
-       }
- #endif
-       .init.pv_table : {
-               __pv_table_begin = .;
--              *(.pv_table)
-+              KEEP(*(.pv_table))
-               __pv_table_end = .;
-       }
-       .init.data : {
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -55,6 +55,7 @@ config MIPS
-       select CLONE_BACKWARDS
-       select HAVE_DEBUG_STACKOVERFLOW
-       select HAVE_CC_STACKPROTECTOR
-+      select LD_DEAD_CODE_DATA_ELIMINATION
-       select CPU_PM if CPU_IDLE
-       select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
-       select ARCH_BINFMT_ELF_STATE
---- a/arch/mips/kernel/vmlinux.lds.S
-+++ b/arch/mips/kernel/vmlinux.lds.S
-@@ -71,7 +71,7 @@ SECTIONS
-       /* Exception table for data bus errors */
-       __dbe_table : {
-               __start___dbe_table = .;
--              *(__dbe_table)
-+              KEEP(*(__dbe_table))
-               __stop___dbe_table = .;
-       }
-@@ -121,7 +121,7 @@ SECTIONS
-       . = ALIGN(4);
-       .mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
-               __mips_machines_start = .;
--              *(.mips.machines.init)
-+              KEEP(*(.mips.machines.init))
-               __mips_machines_end = .;
-       }
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -105,7 +105,7 @@
- #ifdef CONFIG_FTRACE_MCOUNT_RECORD
- #define MCOUNT_REC()  . = ALIGN(8);                           \
-                       VMLINUX_SYMBOL(__start_mcount_loc) = .; \
--                      *(__mcount_loc)                         \
-+                      KEEP(*(__mcount_loc))                   \
-                       VMLINUX_SYMBOL(__stop_mcount_loc) = .;
- #else
- #define MCOUNT_REC()
-@@ -113,7 +113,7 @@
- #ifdef CONFIG_TRACE_BRANCH_PROFILING
- #define LIKELY_PROFILE()      VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
--                              *(_ftrace_annotated_branch)                           \
-+                              KEEP(*(_ftrace_annotated_branch))                     \
-                               VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
- #else
- #define LIKELY_PROFILE()
-@@ -121,7 +121,7 @@
- #ifdef CONFIG_PROFILE_ALL_BRANCHES
- #define BRANCH_PROFILE()      VMLINUX_SYMBOL(__start_branch_profile) = .;   \
--                              *(_ftrace_branch)                             \
-+                              KEEP(*(_ftrace_branch))                       \
-                               VMLINUX_SYMBOL(__stop_branch_profile) = .;
- #else
- #define BRANCH_PROFILE()
-@@ -130,7 +130,7 @@
- #ifdef CONFIG_KPROBES
- #define KPROBE_BLACKLIST()    . = ALIGN(8);                                 \
-                               VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \
--                              *(_kprobe_blacklist)                          \
-+                              KEEP(*(_kprobe_blacklist))                    \
-                               VMLINUX_SYMBOL(__stop_kprobe_blacklist) = .;
- #else
- #define KPROBE_BLACKLIST()
-@@ -139,10 +139,10 @@
- #ifdef CONFIG_EVENT_TRACING
- #define FTRACE_EVENTS()       . = ALIGN(8);                                   \
-                       VMLINUX_SYMBOL(__start_ftrace_events) = .;      \
--                      *(_ftrace_events)                               \
-+                      KEEP(*(_ftrace_events))                         \
-                       VMLINUX_SYMBOL(__stop_ftrace_events) = .;       \
-                       VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .;   \
--                      *(_ftrace_enum_map)                             \
-+                      KEEP(*(_ftrace_enum_map))                       \
-                       VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .;
- #else
- #define FTRACE_EVENTS()
-@@ -163,7 +163,7 @@
- #ifdef CONFIG_FTRACE_SYSCALLS
- #define TRACE_SYSCALLS() . = ALIGN(8);                                        \
-                        VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \
--                       *(__syscalls_metadata)                         \
-+                       KEEP(*(__syscalls_metadata))                   \
-                        VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
- #else
- #define TRACE_SYSCALLS()
-@@ -172,7 +172,7 @@
- #ifdef CONFIG_SERIAL_EARLYCON
- #define EARLYCON_TABLE() . = ALIGN(8);                                \
-                        VMLINUX_SYMBOL(__earlycon_table) = .;  \
--                       *(__earlycon_table)                    \
-+                       KEEP(*(__earlycon_table))              \
-                        VMLINUX_SYMBOL(__earlycon_table_end) = .;
- #else
- #define EARLYCON_TABLE()
-@@ -185,8 +185,8 @@
- #define _OF_TABLE_1(name)                                             \
-       . = ALIGN(8);                                                   \
-       VMLINUX_SYMBOL(__##name##_of_table) = .;                        \
--      *(__##name##_of_table)                                          \
--      *(__##name##_of_table_end)
-+      KEEP(*(__##name##_of_table))                                    \
-+      KEEP(*(__##name##_of_table_end))
- #define CLKSRC_OF_TABLES()    OF_TABLE(CONFIG_CLKSRC_OF, clksrc)
- #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
-@@ -209,7 +209,7 @@
- #define KERNEL_DTB()                                                  \
-       STRUCT_ALIGN();                                                 \
-       VMLINUX_SYMBOL(__dtb_start) = .;                                \
--      *(.dtb.init.rodata)                                             \
-+      KEEP(*(.dtb.init.rodata))                                       \
-       VMLINUX_SYMBOL(__dtb_end) = .;
- /*
-@@ -227,16 +227,17 @@
-       /* implement dynamic printk debug */                            \
-       . = ALIGN(8);                                                   \
-       VMLINUX_SYMBOL(__start___jump_table) = .;                       \
--      *(__jump_table)                                                 \
-+      KEEP(*(__jump_table))                                           \
-       VMLINUX_SYMBOL(__stop___jump_table) = .;                        \
-       . = ALIGN(8);                                                   \
-       VMLINUX_SYMBOL(__start___verbose) = .;                          \
--      *(__verbose)                                                    \
-+      KEEP(*(__verbose))                                              \
-       VMLINUX_SYMBOL(__stop___verbose) = .;                           \
-       LIKELY_PROFILE()                                                \
-       BRANCH_PROFILE()                                                \
-       TRACE_PRINTKS()                                                 \
--      TRACEPOINT_STR()
-+      TRACEPOINT_STR()                                                \
-+      *(.data.[a-zA-Z_]*)
- /*
-  * Data section helpers
-@@ -304,35 +305,35 @@
-       /* PCI quirks */                                                \
-       .pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {        \
-               VMLINUX_SYMBOL(__start_pci_fixups_early) = .;           \
--              *(.pci_fixup_early)                                     \
-+              KEEP(*(.pci_fixup_early))                               \
-               VMLINUX_SYMBOL(__end_pci_fixups_early) = .;             \
-               VMLINUX_SYMBOL(__start_pci_fixups_header) = .;          \
--              *(.pci_fixup_header)                                    \
-+              KEEP(*(.pci_fixup_header))                              \
-               VMLINUX_SYMBOL(__end_pci_fixups_header) = .;            \
-               VMLINUX_SYMBOL(__start_pci_fixups_final) = .;           \
--              *(.pci_fixup_final)                                     \
-+              KEEP(*(.pci_fixup_final))                               \
-               VMLINUX_SYMBOL(__end_pci_fixups_final) = .;             \
-               VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;          \
--              *(.pci_fixup_enable)                                    \
-+              KEEP(*(.pci_fixup_enable))                              \
-               VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;            \
-               VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;          \
--              *(.pci_fixup_resume)                                    \
-+              KEEP(*(.pci_fixup_resume))                              \
-               VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;            \
-               VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;    \
--              *(.pci_fixup_resume_early)                              \
-+              KEEP(*(.pci_fixup_resume_early))                        \
-               VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;      \
-               VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;         \
--              *(.pci_fixup_suspend)                                   \
-+              KEEP(*(.pci_fixup_suspend))                             \
-               VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;           \
-               VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .;    \
--              *(.pci_fixup_suspend_late)                              \
-+              KEEP(*(.pci_fixup_suspend_late))                        \
-               VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .;      \
-       }                                                               \
-                                                                       \
-       /* Built-in firmware blobs */                                   \
-       .builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {      \
-               VMLINUX_SYMBOL(__start_builtin_fw) = .;                 \
--              *(.builtin_fw)                                          \
-+              KEEP(*(.builtin_fw))                                    \
-               VMLINUX_SYMBOL(__end_builtin_fw) = .;                   \
-       }                                                               \
-                                                                       \
-@@ -410,7 +411,7 @@
-                                                                       \
-       /* Kernel symbol table: strings */                              \
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {       \
--              KEEP(*(__ksymtab_strings))                              \
-+              *(__ksymtab_strings)                                    \
-       }                                                               \
-                                                                       \
-       /* __*init sections */                                          \
-@@ -423,14 +424,14 @@
-       /* Built-in module parameters. */                               \
-       __param : AT(ADDR(__param) - LOAD_OFFSET) {                     \
-               VMLINUX_SYMBOL(__start___param) = .;                    \
--              *(__param)                                              \
-+              KEEP(*(__param))                                        \
-               VMLINUX_SYMBOL(__stop___param) = .;                     \
-       }                                                               \
-                                                                       \
-       /* Built-in module versions. */                                 \
-       __modver : AT(ADDR(__modver) - LOAD_OFFSET) {                   \
-               VMLINUX_SYMBOL(__start___modver) = .;                   \
--              *(__modver)                                             \
-+              KEEP(*(__modver))                                       \
-               VMLINUX_SYMBOL(__stop___modver) = .;                    \
-               . = ALIGN((align));                                     \
-               VMLINUX_SYMBOL(__end_rodata) = .;                       \
-@@ -496,7 +497,7 @@
- #define ENTRY_TEXT                                                    \
-               ALIGN_FUNCTION();                                       \
-               VMLINUX_SYMBOL(__entry_text_start) = .;                 \
--              *(.entry.text)                                          \
-+              KEEP(*(.entry.text))                                    \
-               VMLINUX_SYMBOL(__entry_text_end) = .;
- #if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
-@@ -534,7 +535,7 @@
-       . = ALIGN(align);                                               \
-       __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {               \
-               VMLINUX_SYMBOL(__start___ex_table) = .;                 \
--              *(__ex_table)                                           \
-+              KEEP(*(__ex_table))                                             \
-               VMLINUX_SYMBOL(__stop___ex_table) = .;                  \
-       }
-@@ -550,9 +551,9 @@
- #ifdef CONFIG_CONSTRUCTORS
- #define KERNEL_CTORS()        . = ALIGN(8);                      \
-                       VMLINUX_SYMBOL(__ctors_start) = .; \
--                      *(.ctors)                          \
-+                      KEEP(*(.ctors))                    \
-                       *(SORT(.init_array.*))             \
--                      *(.init_array)                     \
-+                      KEEP(*(.init_array))               \
-                       VMLINUX_SYMBOL(__ctors_end) = .;
- #else
- #define KERNEL_CTORS()
-@@ -609,7 +610,7 @@
- #define SBSS(sbss_align)                                              \
-       . = ALIGN(sbss_align);                                          \
-       .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {                         \
--              *(.sbss)                                                \
-+              *(.sbss .sbss.*)                                        \
-               *(.scommon)                                             \
-       }
-@@ -676,7 +677,7 @@
-       . = ALIGN(8);                                                   \
-       __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {             \
-               VMLINUX_SYMBOL(__start___bug_table) = .;                \
--              *(__bug_table)                                          \
-+              KEEP(*(__bug_table))                                    \
-               VMLINUX_SYMBOL(__stop___bug_table) = .;                 \
-       }
- #else
-@@ -688,7 +689,7 @@
-       . = ALIGN(4);                                                   \
-       .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {               \
-               VMLINUX_SYMBOL(__tracedata_start) = .;                  \
--              *(.tracedata)                                           \
-+              KEEP(*(.tracedata))                                     \
-               VMLINUX_SYMBOL(__tracedata_end) = .;                    \
-       }
- #else
-@@ -705,7 +706,7 @@
- #define INIT_SETUP(initsetup_align)                                   \
-               . = ALIGN(initsetup_align);                             \
-               VMLINUX_SYMBOL(__setup_start) = .;                      \
--              *(.init.setup)                                          \
-+              KEEP(*(.init.setup))                                    \
-               VMLINUX_SYMBOL(__setup_end) = .;
- #define INIT_CALLS_LEVEL(level)                                               \
diff --git a/target/linux/generic/hack-4.9/221-module_exports.patch b/target/linux/generic/hack-4.9/221-module_exports.patch
deleted file mode 100644 (file)
index f357d73..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-From b14784e7883390c20ed3ff904892255404a5914b Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:05:53 +0200
-Subject: add an optional config option for stripping all unnecessary symbol exports from the kernel image
-
-lede-commit: bb5a40c64b7c4f4848509fa0a6625055fc9e66cc
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/asm-generic/vmlinux.lds.h | 18 +++++++++++++++---
- include/linux/export.h            |  9 ++++++++-
- scripts/Makefile.build            |  2 +-
- 3 files changed, 24 insertions(+), 5 deletions(-)
-
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -54,6 +54,16 @@
- #define LOAD_OFFSET 0
- #endif
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*)))
-+#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*)))
-+#endif
-+
-+#ifndef SYMTAB_DISCARD
-+#define SYMTAB_DISCARD
-+#define SYMTAB_DISCARD_GPL
-+#endif
-+
- #include <linux/export.h>
- /* Align . to a 8 byte boundary equals to maximum function alignment. */
-@@ -342,14 +352,14 @@
-       /* Kernel symbol table: Normal symbols */                       \
-       __ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {         \
-               VMLINUX_SYMBOL(__start___ksymtab) = .;                  \
--              KEEP(*(SORT(___ksymtab+*)))                             \
-+              SYMTAB_KEEP                                             \
-               VMLINUX_SYMBOL(__stop___ksymtab) = .;                   \
-       }                                                               \
-                                                                       \
-       /* Kernel symbol table: GPL-only symbols */                     \
-       __ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {     \
-               VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;              \
--              KEEP(*(SORT(___ksymtab_gpl+*)))                         \
-+              SYMTAB_KEEP_GPL                                         \
-               VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;               \
-       }                                                               \
-                                                                       \
-@@ -411,7 +421,7 @@
-                                                                       \
-       /* Kernel symbol table: strings */                              \
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {       \
--              *(__ksymtab_strings)                                    \
-+              *(__ksymtab_strings+*)                                  \
-       }                                                               \
-                                                                       \
-       /* __*init sections */                                          \
-@@ -763,6 +773,8 @@
-       EXIT_TEXT                                                       \
-       EXIT_DATA                                                       \
-       EXIT_CALL                                                       \
-+      SYMTAB_DISCARD                                                  \
-+      SYMTAB_DISCARD_GPL                                              \
-       *(.discard)                                                     \
-       *(.discard.*)                                                   \
-       }
---- a/include/linux/export.h
-+++ b/include/linux/export.h
-@@ -53,12 +53,19 @@ extern struct module __this_module;
- #define __CRC_SYMBOL(sym, sec)
- #endif
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "+" #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define ___EXPORT_SYMBOL(sym, sec)                                    \
-       extern typeof(sym) sym;                                         \
-       __CRC_SYMBOL(sym, sec)                                          \
-       static const char __kstrtab_##sym[]                             \
--      __attribute__((section("__ksymtab_strings"), aligned(1)))       \
-+      __attribute__((section("__ksymtab_strings"                      \
-+        __EXPORT_SUFFIX(sym)), aligned(1)))                           \
-       = VMLINUX_SYMBOL_STR(sym);                                      \
-       static const struct kernel_symbol __ksymtab_##sym               \
-       __used                                                          \
---- a/scripts/Makefile.build
-+++ b/scripts/Makefile.build
-@@ -409,7 +409,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
- # Linker scripts preprocessor (.lds.S -> .lds)
- # ---------------------------------------------------------------------------
- quiet_cmd_cpp_lds_S = LDS     $@
--      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
-+      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \
-                            -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
- $(obj)/%.lds: $(src)/%.lds.S FORCE
diff --git a/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch b/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch
deleted file mode 100644 (file)
index b3c4442..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From b3d00b452467f621317953d9e4c6f9ae8dcfd271 Mon Sep 17 00:00:00 2001
-From: Imre Kaloz <kaloz@openwrt.org>
-Date: Fri, 7 Jul 2017 17:06:55 +0200
-Subject: use the openwrt lzma options for now
-
-lede-commit: 548de949f392049420a6a1feeef118b30ab8ea8c
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- lib/decompress.c              |  1 +
- scripts/Makefile.lib          |  2 +-
- scripts/gen_initramfs_list.sh | 10 +++++-----
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -48,6 +48,7 @@ static const struct compress_format comp
-       { {0x1f, 0x9e}, "gzip", gunzip },
-       { {0x42, 0x5a}, "bzip2", bunzip2 },
-       { {0x5d, 0x00}, "lzma", unlzma },
-+      { {0x6d, 0x00}, "lzma-openwrt", unlzma },
-       { {0xfd, 0x37}, "xz", unxz },
-       { {0x89, 0x4c}, "lzo", unlzo },
-       { {0x02, 0x21}, "lz4", unlz4 },
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -344,7 +344,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--      lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+      lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-       (rm -f $@ ; false)
- quiet_cmd_lzo = LZO     $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -229,7 +229,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -n -9 -f"
-+compr="gzip -n -9 -f -"
- arg="$1"
- case "$arg" in
-@@ -245,13 +245,13 @@ case "$arg" in
-               output=${cpio_list}
-               echo "$output_file" | grep -q "\.gz$" \
-                 && [ -x "`which gzip 2> /dev/null`" ] \
--                && compr="gzip -n -9 -f"
-+                && compr="gzip -n -9 -f -"
-               echo "$output_file" | grep -q "\.bz2$" \
-                 && [ -x "`which bzip2 2> /dev/null`" ] \
--                && compr="bzip2 -9 -f"
-+                && compr="bzip2 -9 -f -"
-               echo "$output_file" | grep -q "\.lzma$" \
-                 && [ -x "`which lzma 2> /dev/null`" ] \
--                && compr="lzma -9 -f"
-+                && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
-               echo "$output_file" | grep -q "\.xz$" \
-                 && [ -x "`which xz 2> /dev/null`" ] \
-                 && compr="xz --check=crc32 --lzma2=dict=1MiB"
-@@ -318,7 +318,7 @@ if [ ! -z ${output_file} ]; then
-       if [ "${is_cpio_compressed}" = "compressed" ]; then
-               cat ${cpio_tfile} > ${output_file}
-       else
--              (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+              (cat ${cpio_tfile} | ${compr} > ${output_file}) \
-               || (rm -f ${output_file} ; false)
-       fi
-       [ -z ${cpio_file} ] && rm ${cpio_tfile}
diff --git a/target/linux/generic/hack-4.9/250-netfilter_depends.patch b/target/linux/generic/hack-4.9/250-netfilter_depends.patch
deleted file mode 100644 (file)
index f6e1c1d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: hack: net: remove bogus netfilter dependencies
-
-lede-commit: 589d2a377dee27d206fc3725325309cf649e4df6
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/Kconfig | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -218,7 +218,6 @@ config NF_CONNTRACK_FTP
- config NF_CONNTRACK_H323
-       tristate "H.323 protocol support"
--      depends on IPV6 || IPV6=n
-       depends on NETFILTER_ADVANCED
-       help
-         H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -968,7 +967,6 @@ config NETFILTER_XT_TARGET_SECMARK
- config NETFILTER_XT_TARGET_TCPMSS
-       tristate '"TCPMSS" target support'
--      depends on IPV6 || IPV6=n
-       default m if NETFILTER_ADVANCED=n
-       ---help---
-         This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic/hack-4.9/251-sound_kconfig.patch b/target/linux/generic/hack-4.9/251-sound_kconfig.patch
deleted file mode 100644 (file)
index d01bdfb..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-From da3c50704f14132f4adf80d48e9a4cd5d46e54c9 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 7 Jul 2017 17:09:21 +0200
-Subject: kconfig: owrt specifc dependencies
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- crypto/Kconfig        | 10 +++++-----
- drivers/bcma/Kconfig  |  1 +
- drivers/ssb/Kconfig   |  3 ++-
- lib/Kconfig           |  8 ++++----
- net/netfilter/Kconfig |  2 +-
- net/wireless/Kconfig  | 17 ++++++++++-------
- sound/core/Kconfig    |  4 ++--
- 7 files changed, 25 insertions(+), 20 deletions(-)
-
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -32,7 +32,7 @@ config CRYPTO_FIPS
-         this is.
- config CRYPTO_ALGAPI
--      tristate
-+      tristate "ALGAPI"
-       select CRYPTO_ALGAPI2
-       help
-         This option provides the API for cryptographic algorithms.
-@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
-       tristate
- config CRYPTO_AEAD
--      tristate
-+      tristate "AEAD"
-       select CRYPTO_AEAD2
-       select CRYPTO_ALGAPI
-@@ -52,7 +52,7 @@ config CRYPTO_AEAD2
-       select CRYPTO_RNG2
- config CRYPTO_BLKCIPHER
--      tristate
-+      tristate "BLKCIPHER"
-       select CRYPTO_BLKCIPHER2
-       select CRYPTO_ALGAPI
-@@ -63,7 +63,7 @@ config CRYPTO_BLKCIPHER2
-       select CRYPTO_WORKQUEUE
- config CRYPTO_HASH
--      tristate
-+      tristate "HASH"
-       select CRYPTO_HASH2
-       select CRYPTO_ALGAPI
-@@ -72,7 +72,7 @@ config CRYPTO_HASH2
-       select CRYPTO_ALGAPI2
- config CRYPTO_RNG
--      tristate
-+      tristate "RNG"
-       select CRYPTO_RNG2
-       select CRYPTO_ALGAPI
---- a/drivers/bcma/Kconfig
-+++ b/drivers/bcma/Kconfig
-@@ -17,6 +17,7 @@ config BCMA
- config BCMA_BLOCKIO
-       bool
-       depends on BCMA
-+      default y
- config BCMA_HOST_PCI_POSSIBLE
-       bool
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
-       bool
-       depends on SSB
-+      default y
- config SSB_PCIHOST_POSSIBLE
-       bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
-       bool
-       depends on SSB_PCIHOST
--      default n
-+      default y
- config SSB_PCMCIAHOST_POSSIBLE
-       bool
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -340,16 +340,16 @@ config BCH_CONST_T
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--      bool
-+      boolean "Textsearch support"
- config TEXTSEARCH_KMP
--      tristate
-+      tristate "Textsearch KMP"
- config TEXTSEARCH_BM
--      tristate
-+      tristate "Textsearch BM"
- config TEXTSEARCH_FSM
--      tristate
-+      tristate "Textsearch FSM"
- config BTREE
-       bool
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -10,7 +10,7 @@ config NETFILTER_INGRESS
-         infrastructure.
- config NETFILTER_NETLINK
--      tristate
-+      tristate "Netfilter NFNETLINK interface"
- config NETFILTER_NETLINK_ACCT
- tristate "Netfilter NFACCT over NFNETLINK interface"
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,5 +1,5 @@
- config WIRELESS_EXT
--      bool
-+      bool "Wireless extensions"
- config WEXT_CORE
-       def_bool y
-@@ -11,10 +11,10 @@ config WEXT_PROC
-       depends on WEXT_CORE
- config WEXT_SPY
--      bool
-+      bool "WEXT_SPY"
- config WEXT_PRIV
--      bool
-+      bool "WEXT_PRIV"
- config CFG80211
-       tristate "cfg80211 - wireless configuration API"
-@@ -188,7 +188,7 @@ config CFG80211_WEXT_EXPORT
-         wext compatibility symbols to be exported.
- config LIB80211
--      tristate
-+      tristate "LIB80211"
-       default n
-       help
-         This options enables a library of common routines used
-@@ -197,13 +197,16 @@ config LIB80211
-         Drivers should select this themselves if needed.
- config LIB80211_CRYPT_WEP
--      tristate
-+      tristate "LIB80211_CRYPT_WEP"
-+      select LIB80211
- config LIB80211_CRYPT_CCMP
--      tristate
-+      tristate "LIB80211_CRYPT_CCMP"
-+      select LIB80211
- config LIB80211_CRYPT_TKIP
--      tristate
-+      tristate "LIB80211_CRYPT_TKIP"
-+      select LIB80211
- config LIB80211_DEBUG
-       bool "lib80211 debugging messages"
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -16,13 +16,13 @@ config SND_DMAENGINE_PCM
-       tristate
- config SND_HWDEP
--      tristate
-+      tristate "Sound hardware support"
- config SND_RAWMIDI
-       tristate
- config SND_COMPRESS_OFFLOAD
--      tristate
-+      tristate "Compression offloading support"
- config SND_JACK
-       bool
diff --git a/target/linux/generic/hack-4.9/259-regmap_dynamic.patch b/target/linux/generic/hack-4.9/259-regmap_dynamic.patch
deleted file mode 100644 (file)
index 237c209..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-From 811d9e2268a62b830cfe93cd8bc929afcb8b198b Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 15 Jul 2017 21:12:38 +0200
-Subject: kernel: move regmap bloat out of the kernel image if it is only being used in modules
-
-lede-commit: 96f39119815028073583e4fca3a9c5fe9141e998
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/base/regmap/Kconfig  | 15 ++++++++++-----
- drivers/base/regmap/Makefile | 12 ++++++++----
- drivers/base/regmap/regmap.c |  3 +++
- include/linux/regmap.h       |  2 +-
- 4 files changed, 22 insertions(+), 10 deletions(-)
-
---- a/drivers/base/regmap/Kconfig
-+++ b/drivers/base/regmap/Kconfig
-@@ -3,9 +3,8 @@
- # subsystems should select the appropriate symbols.
- config REGMAP
--      default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
-       select IRQ_DOMAIN if REGMAP_IRQ
--      bool
-+      tristate
- config REGCACHE_COMPRESSED
-       select LZO_COMPRESS
-@@ -17,18 +16,24 @@ config REGMAP_AC97
- config REGMAP_I2C
-       tristate
-+      select REGMAP
-       depends on I2C
- config REGMAP_SPI
-       tristate
-+      select REGMAP
-+      depends on SPI_MASTER
-       depends on SPI
- config REGMAP_SPMI
-+      select REGMAP
-       tristate
-       depends on SPMI
- config REGMAP_MMIO
-       tristate
-+      select REGMAP
- config REGMAP_IRQ
-+      select REGMAP
-       bool
---- a/drivers/base/regmap/Makefile
-+++ b/drivers/base/regmap/Makefile
-@@ -1,10 +1,14 @@
- # For include/trace/define_trace.h to include trace.h
- CFLAGS_regmap.o := -I$(src)
--obj-$(CONFIG_REGMAP) += regmap.o regcache.o
--obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o
--obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o
--obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
-+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-flat.o
-+ifdef CONFIG_DEBUG_FS
-+regmap-core-objs += regmap-debugfs.o
-+endif
-+ifdef CONFIG_REGCACHE_COMPRESSED
-+regmap-core-objs += regcache-lzo.o
-+endif
-+obj-$(CONFIG_REGMAP) += regmap-core.o
- obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o
- obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
- obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
---- a/drivers/base/regmap/regmap.c
-+++ b/drivers/base/regmap/regmap.c
-@@ -13,6 +13,7 @@
- #include <linux/device.h>
- #include <linux/slab.h>
- #include <linux/export.h>
-+#include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/err.h>
- #include <linux/of.h>
-@@ -2913,3 +2914,5 @@ static int __init regmap_initcall(void)
-       return 0;
- }
- postcore_initcall(regmap_initcall);
-+
-+MODULE_LICENSE("GPL");
---- a/include/linux/regmap.h
-+++ b/include/linux/regmap.h
-@@ -135,7 +135,7 @@ struct reg_sequence {
-       pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
- })
--#ifdef CONFIG_REGMAP
-+#if IS_ENABLED(CONFIG_REGMAP)
- enum regmap_endian {
-       /* Unspecified -> 0 -> Backwards compatible default */
diff --git a/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch b/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch
deleted file mode 100644 (file)
index f2570f5..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From fd1799b0bf5efa46dd3e6dfbbf3955564807e508 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:12:51 +0200
-Subject: kernel: prevent cryptomgr from pulling in useless extra dependencies for tests that are not run
-
-Reduces kernel size after LZMA by about 5k on MIPS
-
-lede-commit: 044c316167e076479a344c59905e5b435b84a77f
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- crypto/Kconfig   | 13 ++++++-------
- crypto/algboss.c |  4 ++++
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -132,12 +132,12 @@ config CRYPTO_MANAGER
-         cbc(aes).
- config CRYPTO_MANAGER2
--      def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
--      select CRYPTO_AEAD2
--      select CRYPTO_HASH2
--      select CRYPTO_BLKCIPHER2
--      select CRYPTO_AKCIPHER2
--      select CRYPTO_KPP2
-+      def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS)
-+      select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
-+      select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS
- config CRYPTO_USER
-       tristate "Userspace cryptographic algorithm configuration"
-@@ -150,7 +150,6 @@ config CRYPTO_USER
- config CRYPTO_MANAGER_DISABLE_TESTS
-       bool "Disable run-time self tests"
-       default y
--      depends on CRYPTO_MANAGER2
-       help
-         Disable run-time self tests that normally take place at
-         algorithm registration.
---- a/crypto/algboss.c
-+++ b/crypto/algboss.c
-@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc
-       type = alg->cra_flags;
-       /* This piece of crap needs to disappear into per-type test hooks. */
-+#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
-+      type |= CRYPTO_ALG_TESTED;
-+#else
-       if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
-             CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
-           ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
-            CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
-                                        alg->cra_ablkcipher.ivsize))
-               type |= CRYPTO_ALG_TESTED;
-+#endif
-       param->type = type;
diff --git a/target/linux/generic/hack-4.9/280-rfkill-stubs.patch b/target/linux/generic/hack-4.9/280-rfkill-stubs.patch
deleted file mode 100644 (file)
index b4dcb45..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-From 236c1acdfef5958010ac9814a9872e0a46fd78ee Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 7 Jul 2017 17:13:44 +0200
-Subject: rfkill: add fake rfkill support
-
-allow building of modules depending on RFKILL even if RFKILL is not enabled.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- include/linux/rfkill.h |  2 +-
- net/Makefile           |  2 +-
- net/rfkill/Kconfig     | 14 +++++++++-----
- net/rfkill/Makefile    |  2 +-
- 4 files changed, 12 insertions(+), 8 deletions(-)
-
---- a/include/linux/rfkill.h
-+++ b/include/linux/rfkill.h
-@@ -64,7 +64,7 @@ struct rfkill_ops {
-       int     (*set_block)(void *data, bool blocked);
- };
--#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
-+#if defined(CONFIG_RFKILL_FULL) || defined(CONFIG_RFKILL_FULL_MODULE)
- /**
-  * rfkill_alloc - allocate rfkill structure
-  * @name: name of the struct -- the string is not copied internally
---- a/net/Makefile
-+++ b/net/Makefile
-@@ -51,7 +51,7 @@ obj-$(CONFIG_MAC80211)               += mac80211/
- obj-$(CONFIG_TIPC)            += tipc/
- obj-$(CONFIG_NETLABEL)                += netlabel/
- obj-$(CONFIG_IUCV)            += iucv/
--obj-$(CONFIG_RFKILL)          += rfkill/
-+obj-$(CONFIG_RFKILL_FULL)     += rfkill/
- obj-$(CONFIG_NET_9P)          += 9p/
- obj-$(CONFIG_CAIF)            += caif/
- ifneq ($(CONFIG_DCB),)
---- a/net/rfkill/Kconfig
-+++ b/net/rfkill/Kconfig
-@@ -1,7 +1,11 @@
- #
- # RF switch subsystem configuration
- #
--menuconfig RFKILL
-+config RFKILL
-+      bool
-+      default y
-+
-+menuconfig RFKILL_FULL
-       tristate "RF switch subsystem support"
-       help
-         Say Y here if you want to have control over RF switches
-@@ -13,19 +17,19 @@ menuconfig RFKILL
- # LED trigger support
- config RFKILL_LEDS
-       bool
--      depends on RFKILL
-+      depends on RFKILL_FULL
-       depends on LEDS_TRIGGERS = y || RFKILL = LEDS_TRIGGERS
-       default y
- config RFKILL_INPUT
-       bool "RF switch input support" if EXPERT
--      depends on RFKILL
-+      depends on RFKILL_FULL
-       depends on INPUT = y || RFKILL = INPUT
-       default y if !EXPERT
- config RFKILL_REGULATOR
-       tristate "Generic rfkill regulator driver"
--      depends on RFKILL || !RFKILL
-+      depends on RFKILL_FULL || !RFKILL_FULL
-       depends on REGULATOR
-       help
-           This options enable controlling radio transmitters connected to
-@@ -36,7 +40,7 @@ config RFKILL_REGULATOR
- config RFKILL_GPIO
-       tristate "GPIO RFKILL driver"
--      depends on RFKILL
-+      depends on RFKILL_FULL
-       depends on GPIOLIB || COMPILE_TEST
-       default n
-       help
---- a/net/rfkill/Makefile
-+++ b/net/rfkill/Makefile
-@@ -4,6 +4,6 @@
- rfkill-y                      += core.o
- rfkill-$(CONFIG_RFKILL_INPUT) += input.o
--obj-$(CONFIG_RFKILL)          += rfkill.o
-+obj-$(CONFIG_RFKILL_FULL)     += rfkill.o
- obj-$(CONFIG_RFKILL_REGULATOR)        += rfkill-regulator.o
- obj-$(CONFIG_RFKILL_GPIO)     += rfkill-gpio.o
diff --git a/target/linux/generic/hack-4.9/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch b/target/linux/generic/hack-4.9/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch
deleted file mode 100644 (file)
index 690b30e..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Ben Menchaca <ben.menchaca@qca.qualcomm.com>
-Date: Fri, 7 Jun 2013 18:35:22 -0500
-Subject: MIPS: r4k_cache: use more efficient cache blast
-
-Optimize the compiler output for larger cache blast cases that are
-common for DMA-based networking.
-
-Signed-off-by: Ben Menchaca <ben.menchaca@qca.qualcomm.com>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
---- a/arch/mips/include/asm/r4kcache.h
-+++ b/arch/mips/include/asm/r4kcache.h
-@@ -665,16 +665,48 @@ static inline void prot##extra##blast_##
-                                                   unsigned long end)  \
- {                                                                     \
-       unsigned long lsize = cpu_##desc##_line_size();                 \
-+      unsigned long lsize_2 = lsize * 2;                              \
-+      unsigned long lsize_3 = lsize * 3;                              \
-+      unsigned long lsize_4 = lsize * 4;                              \
-+      unsigned long lsize_5 = lsize * 5;                              \
-+      unsigned long lsize_6 = lsize * 6;                              \
-+      unsigned long lsize_7 = lsize * 7;                              \
-+      unsigned long lsize_8 = lsize * 8;                              \
-       unsigned long addr = start & ~(lsize - 1);                      \
--      unsigned long aend = (end - 1) & ~(lsize - 1);                  \
-+      unsigned long aend = (end + lsize - 1) & ~(lsize - 1);          \
-+      int lines = (aend - addr) / lsize;                              \
-                                                                       \
-       __##pfx##flush_prologue                                         \
-                                                                       \
--      while (1) {                                                     \
-+      while (lines >= 8) {                                            \
-+              prot##cache_op(hitop, addr);                            \
-+              prot##cache_op(hitop, addr + lsize);                    \
-+              prot##cache_op(hitop, addr + lsize_2);                  \
-+              prot##cache_op(hitop, addr + lsize_3);                  \
-+              prot##cache_op(hitop, addr + lsize_4);                  \
-+              prot##cache_op(hitop, addr + lsize_5);                  \
-+              prot##cache_op(hitop, addr + lsize_6);                  \
-+              prot##cache_op(hitop, addr + lsize_7);                  \
-+              addr += lsize_8;                                        \
-+              lines -= 8;                                             \
-+      }                                                               \
-+                                                                      \
-+      if (lines & 0x4) {                                              \
-+              prot##cache_op(hitop, addr);                            \
-+              prot##cache_op(hitop, addr + lsize);                    \
-+              prot##cache_op(hitop, addr + lsize_2);                  \
-+              prot##cache_op(hitop, addr + lsize_3);                  \
-+              addr += lsize_4;                                        \
-+      }                                                               \
-+                                                                      \
-+      if (lines & 0x2) {                                              \
-+              prot##cache_op(hitop, addr);                            \
-+              prot##cache_op(hitop, addr + lsize);                    \
-+              addr += lsize_2;                                        \
-+      }                                                               \
-+                                                                      \
-+      if (lines & 0x1) {                                              \
-               prot##cache_op(hitop, addr);                            \
--              if (addr == aend)                                       \
--                      break;                                          \
--              addr += lsize;                                          \
-       }                                                               \
-                                                                       \
-       __##pfx##flush_epilogue                                         \
diff --git a/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch
deleted file mode 100644 (file)
index 9bcd2a4..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: John Crispin <john@phrozen.org>
-Subject: hack: kernel: add generic image_cmdline hack to MIPS targets
-
-lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- arch/mips/Kconfig       | 4 ++++
- arch/mips/kernel/head.S | 6 ++++++
- 2 files changed, 10 insertions(+)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1159,6 +1159,10 @@ config SYNC_R4K
- config MIPS_MACHINE
-       def_bool n
-+config IMAGE_CMDLINE_HACK
-+      bool "OpenWrt specific image command line hack"
-+      default n
-+
- config NO_IOPORT_MAP
-       def_bool n
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry)
-       j       kernel_entry
- #endif
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+      .ascii  "CMDLINE:"
-+EXPORT(__image_cmdline)
-+      .fill   0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
-       __REF
- NESTED(kernel_entry, 16, sp)                  # kernel entry point
diff --git a/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch
deleted file mode 100644 (file)
index 8c6ed8c..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 107c0964cb8db7ca28ac5199426414fdab3c274d Mon Sep 17 00:00:00 2001
-From: "Alexandros C. Couloumbis" <alex@ozo.com>
-Date: Fri, 7 Jul 2017 17:14:51 +0200
-Subject: hack: arch: powerpc: drop register save/restore library from modules
-
-Upstream GCC uses a libgcc function for saving/restoring registers. This
-makes the code bigger, and upstream kernels need to carry that function
-for every single kernel module. Our GCC is patched to avoid those
-references, so we can drop the extra bloat for modules.
-
-lede-commit: e8e1084654f50904e6bf77b70b2de3f137d7b3ec
-Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
----
- arch/powerpc/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -188,7 +188,6 @@ else
- CHECKFLAGS    += -D__LITTLE_ENDIAN__
- endif
--KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
- ifeq ($(CONFIG_476FPE_ERR46),y)
-       KBUILD_LDFLAGS_MODULE += --ppc476-workaround \
diff --git a/target/linux/generic/hack-4.9/531-debloat_lzma.patch b/target/linux/generic/hack-4.9/531-debloat_lzma.patch
deleted file mode 100644 (file)
index 2e453cc..0000000
+++ /dev/null
@@ -1,1040 +0,0 @@
-From 3fd297761ac246c54d7723c57fca95c112b99465 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 15 Jul 2017 21:15:44 +0200
-Subject: lzma: de-bloat the lzma library used by jffs2
-
-lede-commit: 3fd1dd08fbcbb78b34efefd32c3032e5c99108d6
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/lzma/LzFind.h  |  17 ---
- include/linux/lzma/LzmaDec.h | 101 ---------------
- include/linux/lzma/LzmaEnc.h |  20 ---
- lib/lzma/LzFind.c            | 287 ++++---------------------------------------
- lib/lzma/LzmaDec.c           |  86 +------------
- lib/lzma/LzmaEnc.c           | 172 ++------------------------
- 6 files changed, 42 insertions(+), 641 deletions(-)
-
---- a/include/linux/lzma/LzFind.h
-+++ b/include/linux/lzma/LzFind.h
-@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
- #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
--int MatchFinder_NeedMove(CMatchFinder *p);
--Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
--void MatchFinder_MoveBlock(CMatchFinder *p);
--void MatchFinder_ReadIfRequired(CMatchFinder *p);
--
- void MatchFinder_Construct(CMatchFinder *p);
- /* Conditions:
-@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
-     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-     ISzAlloc *alloc);
- void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
--void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
--void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
--
--UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
--    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
--    UInt32 *distances, UInt32 maxLen);
- /*
- Conditions:
-@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
- void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
--void MatchFinder_Init(CMatchFinder *p);
--UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
--UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
--void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
--void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
--
- #ifdef __cplusplus
- }
- #endif
---- a/include/linux/lzma/LzmaDec.h
-+++ b/include/linux/lzma/LzmaDec.h
-@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
-   UInt32 dicSize;
- } CLzmaProps;
--/* LzmaProps_Decode - decodes properties
--Returns:
--  SZ_OK
--  SZ_ERROR_UNSUPPORTED - Unsupported properties
--*/
--
--SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
--
- /* ---------- LZMA Decoder state ---------- */
-@@ -70,8 +62,6 @@ typedef struct
- #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
--void LzmaDec_Init(CLzmaDec *p);
--
- /* There are two types of LZMA streams:
-      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-@@ -108,97 +98,6 @@ typedef enum
- /* ELzmaStatus is used only as output value for function call */
--
--/* ---------- Interfaces ---------- */
--
--/* There are 3 levels of interfaces:
--     1) Dictionary Interface
--     2) Buffer Interface
--     3) One Call Interface
--   You can select any of these interfaces, but don't mix functions from different
--   groups for same object. */
--
--
--/* There are two variants to allocate state for Dictionary Interface:
--     1) LzmaDec_Allocate / LzmaDec_Free
--     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
--   You can use variant 2, if you set dictionary buffer manually.
--   For Buffer Interface you must always use variant 1.
--
--LzmaDec_Allocate* can return:
--  SZ_OK
--  SZ_ERROR_MEM         - Memory allocation error
--  SZ_ERROR_UNSUPPORTED - Unsupported properties
--*/
--   
--SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
--void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
--
--SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
--void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
--
--/* ---------- Dictionary Interface ---------- */
--
--/* You can use it, if you want to eliminate the overhead for data copying from
--   dictionary to some other external buffer.
--   You must work with CLzmaDec variables directly in this interface.
--
--   STEPS:
--     LzmaDec_Constr()
--     LzmaDec_Allocate()
--     for (each new stream)
--     {
--       LzmaDec_Init()
--       while (it needs more decompression)
--       {
--         LzmaDec_DecodeToDic()
--         use data from CLzmaDec::dic and update CLzmaDec::dicPos
--       }
--     }
--     LzmaDec_Free()
--*/
--
--/* LzmaDec_DecodeToDic
--   
--   The decoding to internal dictionary buffer (CLzmaDec::dic).
--   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
--
--finishMode:
--  It has meaning only if the decoding reaches output limit (dicLimit).
--  LZMA_FINISH_ANY - Decode just dicLimit bytes.
--  LZMA_FINISH_END - Stream must be finished after dicLimit.
--
--Returns:
--  SZ_OK
--    status:
--      LZMA_STATUS_FINISHED_WITH_MARK
--      LZMA_STATUS_NOT_FINISHED
--      LZMA_STATUS_NEEDS_MORE_INPUT
--      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
--  SZ_ERROR_DATA - Data error
--*/
--
--SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
--    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
--
--
--/* ---------- Buffer Interface ---------- */
--
--/* It's zlib-like interface.
--   See LzmaDec_DecodeToDic description for information about STEPS and return results,
--   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
--   to work with CLzmaDec variables manually.
--
--finishMode:
--  It has meaning only if the decoding reaches output limit (*destLen).
--  LZMA_FINISH_ANY - Decode just destLen bytes.
--  LZMA_FINISH_END - Stream must be finished after (*destLen).
--*/
--
--SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
--    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
--
--
- /* ---------- One Call Interface ---------- */
- /* LzmaDecode
---- a/include/linux/lzma/LzmaEnc.h
-+++ b/include/linux/lzma/LzmaEnc.h
-@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
- } CLzmaEncProps;
- void LzmaEncProps_Init(CLzmaEncProps *p);
--void LzmaEncProps_Normalize(CLzmaEncProps *p);
--UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
--
- /* ---------- CLzmaEncHandle Interface ---------- */
-@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
- void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
- SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
- SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
--SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
--    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
- SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
--/* ---------- One Call Interface ---------- */
--
--/* LzmaEncode
--Return code:
--  SZ_OK               - OK
--  SZ_ERROR_MEM        - Memory allocation error
--  SZ_ERROR_PARAM      - Incorrect paramater
--  SZ_ERROR_OUTPUT_EOF - output buffer overflow
--  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
--*/
--
--SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
--    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
--    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
--
- #ifdef __cplusplus
- }
- #endif
---- a/lib/lzma/LzFind.c
-+++ b/lib/lzma/LzFind.c
-@@ -14,9 +14,15 @@
- #define kStartMaxLen 3
-+#if 0
-+#define DIRECT_INPUT  p->directInput
-+#else
-+#define DIRECT_INPUT  1
-+#endif
-+
- static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
- {
--  if (!p->directInput)
-+  if (!DIRECT_INPUT)
-   {
-     alloc->Free(alloc, p->bufferBase);
-     p->bufferBase = 0;
-@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder
- static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
- {
-   UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
--  if (p->directInput)
-+  if (DIRECT_INPUT)
-   {
-     p->blockSize = blockSize;
-     return 1;
-@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde
-   return (p->bufferBase != 0);
- }
--Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
--Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-+static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-+static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
--UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-+static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
--void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-+static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
- {
-   p->posLimit -= subValue;
-   p->pos -= subValue;
-@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch
- {
-   if (p->streamEndWasReached || p->result != SZ_OK)
-     return;
--  if (p->directInput)
-+  if (DIRECT_INPUT)
-   {
-     UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-     if (curSize > p->directInputRem)
-@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch
-   }
- }
--void MatchFinder_MoveBlock(CMatchFinder *p)
-+static void MatchFinder_MoveBlock(CMatchFinder *p)
- {
-   memmove(p->bufferBase,
-     p->buffer - p->keepSizeBefore,
-@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder
-   p->buffer = p->bufferBase + p->keepSizeBefore;
- }
--int MatchFinder_NeedMove(CMatchFinder *p)
-+static int MatchFinder_NeedMove(CMatchFinder *p)
- {
--  if (p->directInput)
-+  if (DIRECT_INPUT)
-     return 0;
-   /* if (p->streamEndWasReached) return 0; */
-   return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
- }
--void MatchFinder_ReadIfRequired(CMatchFinder *p)
--{
--  if (p->streamEndWasReached)
--    return;
--  if (p->keepSizeAfter >= p->streamPos - p->pos)
--    MatchFinder_ReadBlock(p);
--}
--
- static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
- {
-   if (MatchFinder_NeedMove(p))
-@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch
-   p->posLimit = p->pos + limit;
- }
--void MatchFinder_Init(CMatchFinder *p)
-+static void MatchFinder_Init(CMatchFinder *p)
- {
-   UInt32 i;
-   for (i = 0; i < p->hashSizeSum; i++)
-@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM
-   return (p->pos - p->historySize - 1) & kNormalizeMask;
- }
--void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-+static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
- {
-   UInt32 i;
-   for (i = 0; i < numItems; i++)
-@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat
-   MatchFinder_SetLimits(p);
- }
--static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
--    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
--    UInt32 *distances, UInt32 maxLen)
--{
--  son[_cyclicBufferPos] = curMatch;
--  for (;;)
--  {
--    UInt32 delta = pos - curMatch;
--    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
--      return distances;
--    {
--      const Byte *pb = cur - delta;
--      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
--      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
--      {
--        UInt32 len = 0;
--        while (++len != lenLimit)
--          if (pb[len] != cur[len])
--            break;
--        if (maxLen < len)
--        {
--          *distances++ = maxLen = len;
--          *distances++ = delta - 1;
--          if (len == lenLimit)
--            return distances;
--        }
--      }
--    }
--  }
--}
--
--UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-     UInt32 *distances, UInt32 maxLen)
- {
-@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi
-   p->buffer++; \
-   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
--#define MOVE_POS_RET MOVE_POS return offset;
--
- static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-+#define MOVE_POS_RET MatchFinder_MovePos(p); return offset;
-+
- #define GET_MATCHES_HEADER2(minLen, ret_op) \
-   UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-   lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi
-   distances + offset, maxLen) - distances); MOVE_POS_RET;
- #define SKIP_FOOTER \
--  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
--
--static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 offset;
--  GET_MATCHES_HEADER(2)
--  HASH2_CALC;
--  curMatch = p->hash[hashValue];
--  p->hash[hashValue] = p->pos;
--  offset = 0;
--  GET_MATCHES_FOOTER(offset, 1)
--}
--
--UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 offset;
--  GET_MATCHES_HEADER(3)
--  HASH_ZIP_CALC;
--  curMatch = p->hash[hashValue];
--  p->hash[hashValue] = p->pos;
--  offset = 0;
--  GET_MATCHES_FOOTER(offset, 2)
--}
--
--static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 hash2Value, delta2, maxLen, offset;
--  GET_MATCHES_HEADER(3)
--
--  HASH3_CALC;
--
--  delta2 = p->pos - p->hash[hash2Value];
--  curMatch = p->hash[kFix3HashSize + hashValue];
--  
--  p->hash[hash2Value] =
--  p->hash[kFix3HashSize + hashValue] = p->pos;
--
--
--  maxLen = 2;
--  offset = 0;
--  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
--  {
--    for (; maxLen != lenLimit; maxLen++)
--      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
--        break;
--    distances[0] = maxLen;
--    distances[1] = delta2 - 1;
--    offset = 2;
--    if (maxLen == lenLimit)
--    {
--      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
--      MOVE_POS_RET;
--    }
--  }
--  GET_MATCHES_FOOTER(offset, maxLen)
--}
-+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p);
- static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
- {
-@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches
-   GET_MATCHES_FOOTER(offset, maxLen)
- }
--static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
--  GET_MATCHES_HEADER(4)
--
--  HASH4_CALC;
--
--  delta2 = p->pos - p->hash[                hash2Value];
--  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
--  curMatch = p->hash[kFix4HashSize + hashValue];
--
--  p->hash[                hash2Value] =
--  p->hash[kFix3HashSize + hash3Value] =
--  p->hash[kFix4HashSize + hashValue] = p->pos;
--
--  maxLen = 1;
--  offset = 0;
--  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
--  {
--    distances[0] = maxLen = 2;
--    distances[1] = delta2 - 1;
--    offset = 2;
--  }
--  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
--  {
--    maxLen = 3;
--    distances[offset + 1] = delta3 - 1;
--    offset += 2;
--    delta2 = delta3;
--  }
--  if (offset != 0)
--  {
--    for (; maxLen != lenLimit; maxLen++)
--      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
--        break;
--    distances[offset - 2] = maxLen;
--    if (maxLen == lenLimit)
--    {
--      p->son[p->cyclicBufferPos] = curMatch;
--      MOVE_POS_RET;
--    }
--  }
--  if (maxLen < 3)
--    maxLen = 3;
--  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
--    distances + offset, maxLen) - (distances));
--  MOVE_POS_RET
--}
--
--UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
--{
--  UInt32 offset;
--  GET_MATCHES_HEADER(3)
--  HASH_ZIP_CALC;
--  curMatch = p->hash[hashValue];
--  p->hash[hashValue] = p->pos;
--  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
--    distances, 2) - (distances));
--  MOVE_POS_RET
--}
--
--static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    SKIP_HEADER(2)
--    HASH2_CALC;
--    curMatch = p->hash[hashValue];
--    p->hash[hashValue] = p->pos;
--    SKIP_FOOTER
--  }
--  while (--num != 0);
--}
--
--void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    SKIP_HEADER(3)
--    HASH_ZIP_CALC;
--    curMatch = p->hash[hashValue];
--    p->hash[hashValue] = p->pos;
--    SKIP_FOOTER
--  }
--  while (--num != 0);
--}
--
--static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    UInt32 hash2Value;
--    SKIP_HEADER(3)
--    HASH3_CALC;
--    curMatch = p->hash[kFix3HashSize + hashValue];
--    p->hash[hash2Value] =
--    p->hash[kFix3HashSize + hashValue] = p->pos;
--    SKIP_FOOTER
--  }
--  while (--num != 0);
--}
--
- static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
- {
-   do
-@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF
-   while (--num != 0);
- }
--static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    UInt32 hash2Value, hash3Value;
--    SKIP_HEADER(4)
--    HASH4_CALC;
--    curMatch = p->hash[kFix4HashSize + hashValue];
--    p->hash[                hash2Value] =
--    p->hash[kFix3HashSize + hash3Value] =
--    p->hash[kFix4HashSize + hashValue] = p->pos;
--    p->son[p->cyclicBufferPos] = curMatch;
--    MOVE_POS
--  }
--  while (--num != 0);
--}
--
--void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
--{
--  do
--  {
--    SKIP_HEADER(3)
--    HASH_ZIP_CALC;
--    curMatch = p->hash[hashValue];
--    p->hash[hashValue] = p->pos;
--    p->son[p->cyclicBufferPos] = curMatch;
--    MOVE_POS
--  }
--  while (--num != 0);
--}
--
- void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
- {
-   vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-   vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-   vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-   vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
--  if (!p->btMode)
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
--  }
--  else if (p->numHashBytes == 2)
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
--  }
--  else if (p->numHashBytes == 3)
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
--  }
--  else
--  {
--    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
--    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
--  }
-+  vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-+  vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
- }
---- a/lib/lzma/LzmaDec.c
-+++ b/lib/lzma/LzmaDec.c
-@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
-   p->needFlush = 0;
- }
--void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-+static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
- {
-   p->needFlush = 1;
-   p->remainLen = 0;
-@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
-     p->needInitState = 1;
- }
--void LzmaDec_Init(CLzmaDec *p)
-+static void LzmaDec_Init(CLzmaDec *p)
- {
-   p->dicPos = 0;
-   LzmaDec_InitDicAndState(p, True, True);
-@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
-   p->needInitState = 0;
- }
--SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-+static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-     ELzmaFinishMode finishMode, ELzmaStatus *status)
- {
-   SizeT inSize = *srcLen;
-@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
-   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
- }
--SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
--{
--  SizeT outSize = *destLen;
--  SizeT inSize = *srcLen;
--  *srcLen = *destLen = 0;
--  for (;;)
--  {
--    SizeT inSizeCur = inSize, outSizeCur, dicPos;
--    ELzmaFinishMode curFinishMode;
--    SRes res;
--    if (p->dicPos == p->dicBufSize)
--      p->dicPos = 0;
--    dicPos = p->dicPos;
--    if (outSize > p->dicBufSize - dicPos)
--    {
--      outSizeCur = p->dicBufSize;
--      curFinishMode = LZMA_FINISH_ANY;
--    }
--    else
--    {
--      outSizeCur = dicPos + outSize;
--      curFinishMode = finishMode;
--    }
--
--    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
--    src += inSizeCur;
--    inSize -= inSizeCur;
--    *srcLen += inSizeCur;
--    outSizeCur = p->dicPos - dicPos;
--    memcpy(dest, p->dic + dicPos, outSizeCur);
--    dest += outSizeCur;
--    outSize -= outSizeCur;
--    *destLen += outSizeCur;
--    if (res != 0)
--      return res;
--    if (outSizeCur == 0 || outSize == 0)
--      return SZ_OK;
--  }
--}
--
--void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-+static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
- {
-   alloc->Free(alloc, p->probs);
-   p->probs = 0;
- }
--static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
--{
--  alloc->Free(alloc, p->dic);
--  p->dic = 0;
--}
--
--void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
--{
--  LzmaDec_FreeProbs(p, alloc);
--  LzmaDec_FreeDict(p, alloc);
--}
--
--SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-+static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
- {
-   UInt32 dicSize;
-   Byte d;
-@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
-   return SZ_OK;
- }
--SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
- {
-   CLzmaProps propNew;
-   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
-   p->prop = propNew;
-   return SZ_OK;
- }
--
--SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
--{
--  CLzmaProps propNew;
--  SizeT dicBufSize;
--  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
--  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
--  dicBufSize = propNew.dicSize;
--  if (p->dic == 0 || dicBufSize != p->dicBufSize)
--  {
--    LzmaDec_FreeDict(p, alloc);
--    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
--    if (p->dic == 0)
--    {
--      LzmaDec_FreeProbs(p, alloc);
--      return SZ_ERROR_MEM;
--    }
--  }
--  p->dicBufSize = dicBufSize;
--  p->prop = propNew;
--  return SZ_OK;
--}
- SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-     const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
---- a/lib/lzma/LzmaEnc.c
-+++ b/lib/lzma/LzmaEnc.c
-@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
-   p->writeEndMark = 0;
- }
--void LzmaEncProps_Normalize(CLzmaEncProps *p)
-+static void LzmaEncProps_Normalize(CLzmaEncProps *p)
- {
-   int level = p->level;
-   if (level < 0) level = 5;
-@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
-       #endif
- }
--UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-+static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
- {
-   CLzmaEncProps props = *props2;
-   LzmaEncProps_Normalize(&props);
-@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
- #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
--UInt32 GetPosSlot1(UInt32 pos)
-+static UInt32 GetPosSlot1(UInt32 pos)
- {
-   UInt32 res;
-   BSR2_RET(pos, res);
-@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
- #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
- #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
--void LzmaEnc_FastPosInit(Byte *g_FastPos)
-+static void LzmaEnc_FastPosInit(Byte *g_FastPos)
- {
-   int c = 2, slotFast;
-   g_FastPos[0] = 0;
-@@ -339,58 +339,6 @@ typedef struct
-   CSaveState saveState;
- } CLzmaEnc;
--void LzmaEnc_SaveState(CLzmaEncHandle pp)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  CSaveState *dest = &p->saveState;
--  int i;
--  dest->lenEnc = p->lenEnc;
--  dest->repLenEnc = p->repLenEnc;
--  dest->state = p->state;
--
--  for (i = 0; i < kNumStates; i++)
--  {
--    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
--    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
--  }
--  for (i = 0; i < kNumLenToPosStates; i++)
--    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
--  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
--  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
--  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
--  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
--  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
--  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
--  memcpy(dest->reps, p->reps, sizeof(p->reps));
--  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
--}
--
--void LzmaEnc_RestoreState(CLzmaEncHandle pp)
--{
--  CLzmaEnc *dest = (CLzmaEnc *)pp;
--  const CSaveState *p = &dest->saveState;
--  int i;
--  dest->lenEnc = p->lenEnc;
--  dest->repLenEnc = p->repLenEnc;
--  dest->state = p->state;
--
--  for (i = 0; i < kNumStates; i++)
--  {
--    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
--    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
--  }
--  for (i = 0; i < kNumLenToPosStates; i++)
--    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
--  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
--  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
--  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
--  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
--  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
--  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
--  memcpy(dest->reps, p->reps, sizeof(p->reps));
--  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
--}
--
- SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
- {
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE
-   while (symbol < 0x10000);
- }
--void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-+static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
- {
-   UInt32 i;
-   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc
-   p->matchPriceCount = 0;
- }
--void LzmaEnc_Construct(CLzmaEnc *p)
-+static void LzmaEnc_Construct(CLzmaEnc *p)
- {
-   RangeEnc_Construct(&p->rc);
-   MatchFinder_Construct(&p->matchFinderBase);
-@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
-   return p;
- }
--void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-+static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
- {
-   alloc->Free(alloc, p->litProbs);
-   alloc->Free(alloc, p->saveState.litProbs);
-@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl
-   p->saveState.litProbs = 0;
- }
--void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
- {
-   #ifndef _7ZIP_ST
-   MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U
-   return SZ_OK;
- }
--void LzmaEnc_Init(CLzmaEnc *p)
-+static void LzmaEnc_Init(CLzmaEnc *p)
- {
-   UInt32 i;
-   p->state = 0;
-@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p)
-   p->lpMask = (1 << p->lp) - 1;
- }
--void LzmaEnc_InitPrices(CLzmaEnc *p)
-+static void LzmaEnc_InitPrices(CLzmaEnc *p)
- {
-   if (!p->fastMode)
-   {
-@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
-   return SZ_OK;
- }
--static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
--    ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  p->matchFinderBase.stream = inStream;
--  p->needInit = 1;
--  p->rc.outStream = outStream;
--  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
--}
--
--SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
--    ISeqInStream *inStream, UInt32 keepWindowSize,
--    ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  p->matchFinderBase.stream = inStream;
--  p->needInit = 1;
--  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
--}
--
- static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
- {
-   p->matchFinderBase.directInput = 1;
-@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc
-   p->matchFinderBase.directInputRem = srcLen;
- }
--SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-+static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-     UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
- {
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
-   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
- }
--void LzmaEnc_Finish(CLzmaEncHandle pp)
-+static void LzmaEnc_Finish(CLzmaEncHandle pp)
- {
-   #ifndef _7ZIP_ST
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo
-   return size;
- }
--
--UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
--{
--  const CLzmaEnc *p = (CLzmaEnc *)pp;
--  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
--}
--
--const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
--{
--  const CLzmaEnc *p = (CLzmaEnc *)pp;
--  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
--}
--
--SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
--    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
--{
--  CLzmaEnc *p = (CLzmaEnc *)pp;
--  UInt64 nowPos64;
--  SRes res;
--  CSeqOutStreamBuf outStream;
--
--  outStream.funcTable.Write = MyWrite;
--  outStream.data = dest;
--  outStream.rem = *destLen;
--  outStream.overflow = False;
--
--  p->writeEndMark = False;
--  p->finished = False;
--  p->result = SZ_OK;
--
--  if (reInit)
--    LzmaEnc_Init(p);
--  LzmaEnc_InitPrices(p);
--  nowPos64 = p->nowPos64;
--  RangeEnc_Init(&p->rc);
--  p->rc.outStream = &outStream.funcTable;
--
--  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
--  
--  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
--  *destLen -= outStream.rem;
--  if (outStream.overflow)
--    return SZ_ERROR_OUTPUT_EOF;
--
--  return res;
--}
--
- static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
- {
-   SRes res = SZ_OK;
-@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p,
-   return res;
- }
--SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
--    ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
--  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
--}
--
- SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
- {
-   CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
-     return SZ_ERROR_OUTPUT_EOF;
-   return res;
- }
--
--SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
--    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
--    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
--{
--  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
--  SRes res;
--  if (p == 0)
--    return SZ_ERROR_MEM;
--
--  res = LzmaEnc_SetProps(p, props);
--  if (res == SZ_OK)
--  {
--    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
--    if (res == SZ_OK)
--      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
--          writeEndMark, progress, alloc, allocBig);
--  }
--
--  LzmaEnc_Destroy(p, alloc, allocBig);
--  return res;
--}
diff --git a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch
deleted file mode 100644 (file)
index ba87420..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:18:54 +0200
-Subject: bridge: only accept EAP locally
-
-When bridging, do not forward EAP frames to other ports, only deliver
-them locally, regardless of the state.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/bridge/br_input.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *n
-               }
-       }
-+      BR_INPUT_SKB_CB(skb)->brdev = br->dev;
-+
-+      if (skb->protocol == htons(ETH_P_PAE))
-+              return br_pass_frame_up(skb);
-+
-       if (p->state == BR_STATE_LEARNING)
-               goto drop;
--      BR_INPUT_SKB_CB(skb)->brdev = br->dev;
--
-       if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
-               br_do_proxy_arp(skb, br, vid, p);
diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch
deleted file mode 100644 (file)
index a436dd2..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From e988390850731aa1697ed09d47b0932fac1af175 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:20:03 +0200
-Subject: bridge: port isolate
-
-Isolating individual bridge ports
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/if_bridge.h | 1 +
- net/bridge/br_forward.c   | 5 +++++
- net/bridge/br_input.c     | 3 +++
- net/bridge/br_sysfs_if.c  | 2 ++
- 4 files changed, 11 insertions(+)
-
---- a/include/linux/if_bridge.h
-+++ b/include/linux/if_bridge.h
-@@ -47,6 +47,7 @@ struct br_ip_list {
- #define BR_PROXYARP_WIFI      BIT(10)
- #define BR_MCAST_FLOOD                BIT(11)
- #define BR_MULTICAST_TO_UNICAST       BIT(12)
-+#define BR_ISOLATE_MODE               BIT(13)
- #define BR_DEFAULT_AGEING_TIME        (300 * HZ)
---- a/net/bridge/br_forward.c
-+++ b/net/bridge/br_forward.c
-@@ -140,6 +140,9 @@ static int deliver_clone(const struct ne
- void br_forward(const struct net_bridge_port *to,
-               struct sk_buff *skb, bool local_rcv, bool local_orig)
- {
-+      if (to->flags & BR_ISOLATE_MODE && !local_orig)
-+              to = NULL;
-+
-       if (to && should_deliver(to, skb)) {
-               if (local_rcv)
-                       deliver_clone(to, skb, local_orig);
-@@ -205,6 +208,8 @@ void br_flood(struct net_bridge *br, str
-       struct net_bridge_port *p;
-       list_for_each_entry_rcu(p, &br->port_list, list) {
-+              if (!local_orig && (p->flags & BR_ISOLATE_MODE))
-+                      continue;
-               /* Do not flood unicast traffic to ports that turn it off */
-               if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD))
-                       continue;
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -175,6 +175,9 @@ int br_handle_frame_finish(struct net *n
-       if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
-               br_do_proxy_arp(skb, br, vid, p);
-+      if (p->flags & BR_ISOLATE_MODE)
-+              return br_pass_frame_up(skb);
-+
-       switch (pkt_type) {
-       case BR_PKT_MULTICAST:
-               mdst = br_mdb_get(br, skb, vid);
---- a/net/bridge/br_sysfs_if.c
-+++ b/net/bridge/br_sysfs_if.c
-@@ -172,6 +172,7 @@ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD
- BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
- BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
- BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);
-+BRPORT_ATTR_FLAG(isolated, BR_ISOLATE_MODE);
- #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
- static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
-@@ -220,6 +221,7 @@ static const struct brport_attribute *br
-       &brport_attr_proxyarp,
-       &brport_attr_proxyarp_wifi,
-       &brport_attr_multicast_flood,
-+      &brport_attr_isolated,
-       NULL
- };
diff --git a/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch b/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch
deleted file mode 100644 (file)
index a4699ae..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6d3bc769657b0ee7c7506dad9911111c4226a7ea Mon Sep 17 00:00:00 2001
-From: Imre Kaloz <kaloz@openwrt.org>
-Date: Fri, 7 Jul 2017 17:21:05 +0200
-Subject: mac80211: increase wireless mesh header size
-
-lede-commit 3d4466cfd8f75f717efdb1f96fdde3c70d865fc1
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- include/linux/netdevice.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -137,8 +137,8 @@ static inline bool dev_xmit_complete(int
- #if defined(CONFIG_HYPERV_NET)
- # define LL_MAX_HEADER 128
--#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
--# if defined(CONFIG_MAC80211_MESH)
-+#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || 1
-+# if defined(CONFIG_MAC80211_MESH) || 1
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch b/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch
deleted file mode 100644 (file)
index ea461e1..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From a6ccb238939b25851474a279b20367fd24a0e816 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:21:53 +0200
-Subject:  hack: net: fq_codel: tune defaults for small devices
-
-Assume that x86_64 devices always have a big memory and do not need this 
-optimization compared to devices with only 32 MB or 64 MB RAM.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/sched/sch_fq_codel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -485,7 +485,11 @@ static int fq_codel_init(struct Qdisc *s
-       sch->limit = 10*1024;
-       q->flows_cnt = 1024;
-+#ifdef CONFIG_X86_64
-       q->memory_limit = 32 << 20; /* 32 MBytes */
-+#else
-+      q->memory_limit = 4 << 20; /* 4 MBytes */
-+#endif
-       q->drop_batch_size = 64;
-       q->quantum = psched_mtu(qdisc_dev(sch));
-       q->perturbation = prandom_u32();
diff --git a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch
deleted file mode 100644 (file)
index 34fc2a3..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-From 1d418f7e88035ed7a94073f6354246c66e9193e9 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:22:58 +0200
-Subject: fq_codel: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/net/sch_generic.h | 3 ++-
- net/sched/Kconfig         | 3 ++-
- net/sched/sch_api.c       | 2 +-
- net/sched/sch_fq_codel.c  | 3 ++-
- net/sched/sch_generic.c   | 4 ++--
- 5 files changed, 9 insertions(+), 6 deletions(-)
-
---- a/include/net/sch_generic.h
-+++ b/include/net/sch_generic.h
-@@ -339,12 +339,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
- extern struct Qdisc_ops pfifo_fast_ops;
- extern struct Qdisc_ops mq_qdisc_ops;
- extern struct Qdisc_ops noqueue_qdisc_ops;
-+extern struct Qdisc_ops fq_codel_qdisc_ops;
- extern const struct Qdisc_ops *default_qdisc_ops;
- static inline const struct Qdisc_ops *
- get_default_qdisc_ops(const struct net_device *dev, int ntx)
- {
-       return ntx < dev->real_num_tx_queues ?
--                      default_qdisc_ops : &pfifo_fast_ops;
-+                      default_qdisc_ops : &fq_codel_qdisc_ops;
- }
- struct Qdisc_class_common {
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -3,8 +3,9 @@
- # 
- menuconfig NET_SCHED
--      bool "QoS and/or fair queueing"
-+      def_bool y
-       select NET_SCH_FIFO
-+      select NET_SCH_FQ_CODEL
-       ---help---
-         When the kernel has several packets to send out over a network
-         device, it has to decide which ones to send first, which ones to
---- a/net/sched/sch_api.c
-+++ b/net/sched/sch_api.c
-@@ -1977,7 +1977,7 @@ static int __init pktsched_init(void)
-               return err;
-       }
--      register_qdisc(&pfifo_fast_ops);
-+      register_qdisc(&fq_codel_qdisc_ops);
-       register_qdisc(&pfifo_qdisc_ops);
-       register_qdisc(&bfifo_qdisc_ops);
-       register_qdisc(&pfifo_head_drop_qdisc_ops);
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -715,7 +715,7 @@ static const struct Qdisc_class_ops fq_c
-       .walk           =       fq_codel_walk,
- };
--static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
-+struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
-       .cl_ops         =       &fq_codel_class_ops,
-       .id             =       "fq_codel",
-       .priv_size      =       sizeof(struct fq_codel_sched_data),
-@@ -730,6 +730,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
-       .dump_stats =   fq_codel_dump_stats,
-       .owner          =       THIS_MODULE,
- };
-+EXPORT_SYMBOL(fq_codel_qdisc_ops);
- static int __init fq_codel_module_init(void)
- {
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -31,7 +31,7 @@
- #include <net/dst.h>
- /* Qdisc to use by default */
--const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
-+const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops;
- EXPORT_SYMBOL(default_qdisc_ops);
- /* Main transmission queue. */
-@@ -760,7 +760,7 @@ static void attach_one_default_qdisc(str
-                                    void *_unused)
- {
-       struct Qdisc *qdisc;
--      const struct Qdisc_ops *ops = default_qdisc_ops;
-+      const struct Qdisc_ops *ops = &fq_codel_qdisc_ops;
-       if (dev->priv_flags & IFF_NO_QUEUE)
-               ops = &noqueue_qdisc_ops;
diff --git a/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch b/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch
deleted file mode 100644 (file)
index d9fba62..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-From b531d492d5ef1cf9dba0f4888eb5fd8624a6d762 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:23:42 +0200
-Subject: net: sched: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/sched/sch_generic.c | 140 ------------------------------------------------
- 1 file changed, 140 deletions(-)
-
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -449,146 +449,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea
-       .owner          =       THIS_MODULE,
- };
--static const u8 prio2band[TC_PRIO_MAX + 1] = {
--      1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
--};
--
--/* 3-band FIFO queue: old style, but should be a bit faster than
--   generic prio+fifo combination.
-- */
--
--#define PFIFO_FAST_BANDS 3
--
--/*
-- * Private data for a pfifo_fast scheduler containing:
-- *    - queues for the three band
-- *    - bitmap indicating which of the bands contain skbs
-- */
--struct pfifo_fast_priv {
--      u32 bitmap;
--      struct qdisc_skb_head q[PFIFO_FAST_BANDS];
--};
--
--/*
-- * Convert a bitmap to the first band number where an skb is queued, where:
-- *    bitmap=0 means there are no skbs on any band.
-- *    bitmap=1 means there is an skb on band 0.
-- *    bitmap=7 means there are skbs on all 3 bands, etc.
-- */
--static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
--
--static inline struct qdisc_skb_head *band2list(struct pfifo_fast_priv *priv,
--                                           int band)
--{
--      return priv->q + band;
--}
--
--static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc,
--                            struct sk_buff **to_free)
--{
--      if (qdisc->q.qlen < qdisc_dev(qdisc)->tx_queue_len) {
--              int band = prio2band[skb->priority & TC_PRIO_MAX];
--              struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--              struct qdisc_skb_head *list = band2list(priv, band);
--
--              priv->bitmap |= (1 << band);
--              qdisc->q.qlen++;
--              return __qdisc_enqueue_tail(skb, qdisc, list);
--      }
--
--      return qdisc_drop(skb, qdisc, to_free);
--}
--
--static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
--{
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--      int band = bitmap2band[priv->bitmap];
--
--      if (likely(band >= 0)) {
--              struct qdisc_skb_head *qh = band2list(priv, band);
--              struct sk_buff *skb = __qdisc_dequeue_head(qh);
--
--              if (likely(skb != NULL)) {
--                      qdisc_qstats_backlog_dec(qdisc, skb);
--                      qdisc_bstats_update(qdisc, skb);
--              }
--
--              qdisc->q.qlen--;
--              if (qh->qlen == 0)
--                      priv->bitmap &= ~(1 << band);
--
--              return skb;
--      }
--
--      return NULL;
--}
--
--static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
--{
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--      int band = bitmap2band[priv->bitmap];
--
--      if (band >= 0) {
--              struct qdisc_skb_head *qh = band2list(priv, band);
--
--              return qh->head;
--      }
--
--      return NULL;
--}
--
--static void pfifo_fast_reset(struct Qdisc *qdisc)
--{
--      int prio;
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--
--      for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
--              __qdisc_reset_queue(band2list(priv, prio));
--
--      priv->bitmap = 0;
--      qdisc->qstats.backlog = 0;
--      qdisc->q.qlen = 0;
--}
--
--static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
--{
--      struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
--
--      memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
--      if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
--              goto nla_put_failure;
--      return skb->len;
--
--nla_put_failure:
--      return -1;
--}
--
--static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
--{
--      int prio;
--      struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
--
--      for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
--              qdisc_skb_head_init(band2list(priv, prio));
--
--      /* Can by-pass the queue discipline */
--      qdisc->flags |= TCQ_F_CAN_BYPASS;
--      return 0;
--}
--
--struct Qdisc_ops pfifo_fast_ops __read_mostly = {
--      .id             =       "pfifo_fast",
--      .priv_size      =       sizeof(struct pfifo_fast_priv),
--      .enqueue        =       pfifo_fast_enqueue,
--      .dequeue        =       pfifo_fast_dequeue,
--      .peek           =       pfifo_fast_peek,
--      .init           =       pfifo_fast_init,
--      .reset          =       pfifo_fast_reset,
--      .dump           =       pfifo_fast_dump,
--      .owner          =       THIS_MODULE,
--};
--EXPORT_SYMBOL(pfifo_fast_ops);
--
- static struct lock_class_key qdisc_tx_busylock;
- static struct lock_class_key qdisc_running_key;
diff --git a/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch
deleted file mode 100644 (file)
index af8840f..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-From 36e516290611e613aa92996cb4339561452695b4 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:24:23 +0200
-Subject: net: swconfig: adds openwrt switch layer
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/net/phy/Kconfig   | 83 +++++++++++++++++++++++++++++++++++++++++++++++
- drivers/net/phy/Makefile  | 15 +++++++++
- include/uapi/linux/Kbuild |  1 +
- 3 files changed, 99 insertions(+)
-
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -147,6 +147,89 @@ config MDIO_XGENE
-         This module provides a driver for the MDIO busses found in the
-         APM X-Gene SoC's.
-+comment "Switch configuration API + drivers"
-+
-+config SWCONFIG
-+      tristate "Switch configuration API"
-+      ---help---
-+        Switch configuration API using netlink. This allows
-+        you to configure the VLAN features of certain switches.
-+
-+config SWCONFIG_LEDS
-+      bool "Switch LED trigger support"
-+      depends on (SWCONFIG && LEDS_TRIGGERS)
-+
-+config ADM6996_PHY
-+      tristate "Driver for ADM6996 switches"
-+      select SWCONFIG
-+      ---help---
-+        Currently supports the ADM6996FC and ADM6996M switches.
-+        Support for FC is very limited.
-+
-+config AR8216_PHY
-+      tristate "Driver for Atheros AR8216 switches"
-+      select ETHERNET_PACKET_MANGLE
-+      select SWCONFIG
-+
-+config AR8216_PHY_LEDS
-+      bool "Atheros AR8216 switch LED support"
-+      depends on (AR8216_PHY && LEDS_CLASS)
-+
-+source "drivers/net/phy/b53/Kconfig"
-+
-+config IP17XX_PHY
-+      tristate "Driver for IC+ IP17xx switches"
-+      select SWCONFIG
-+
-+config MVSWITCH_PHY
-+      tristate "Driver for Marvell 88E6060 switches"
-+      select ETHERNET_PACKET_MANGLE
-+
-+config MVSW61XX_PHY
-+      tristate "Driver for Marvell 88E6171/6172 switches"
-+      select SWCONFIG
-+
-+config PSB6970_PHY
-+      tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
-+      select SWCONFIG
-+      select ETHERNET_PACKET_MANGLE
-+
-+config RTL8306_PHY
-+      tristate "Driver for Realtek RTL8306S switches"
-+      select SWCONFIG
-+
-+config RTL8366_SMI
-+      tristate "Driver for the RTL8366 SMI interface"
-+      depends on GPIOLIB
-+      ---help---
-+        This module implements the SMI interface protocol which is used
-+        by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366_SMI_DEBUG_FS
-+      bool "RTL8366 SMI interface debugfs support"
-+        depends on DEBUG_FS
-+        default n
-+
-+config RTL8366S_PHY
-+      tristate "Driver for the Realtek RTL8366S switch"
-+      select SWCONFIG
-+
-+config RTL8366RB_PHY
-+      tristate "Driver for the Realtek RTL8366RB switch"
-+      select SWCONFIG
-+
-+config RTL8367_PHY
-+      tristate "Driver for the Realtek RTL8367R/M switches"
-+      select SWCONFIG
-+
-+config RTL8367B_PHY
-+      tristate "Driver fot the Realtek RTL8367R-VB switch"
-+      select SWCONFIG
-+
-+endif # RTL8366_SMI
-+
- comment "MII PHY device drivers"
- config AMD_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -5,6 +5,21 @@ libphy-$(CONFIG_SWPHY)                += swphy.o
- obj-$(CONFIG_PHYLIB)          += libphy.o
-+obj-$(CONFIG_SWCONFIG)                += swconfig.o
-+obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
-+obj-$(CONFIG_AR8216_PHY)      += ar8216.o ar8327.o
-+obj-$(CONFIG_SWCONFIG_B53)    += b53/
-+obj-$(CONFIG_IP17XX_PHY)      += ip17xx.o
-+obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
-+obj-$(CONFIG_MVSW61XX_PHY)    += mvsw61xx.o
-+obj-$(CONFIG_PSB6970_PHY)     += psb6970.o
-+obj-$(CONFIG_RTL8306_PHY)     += rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)     += rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)    += rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
-+obj-$(CONFIG_RTL8367_PHY)     += rtl8367.o
-+obj-$(CONFIG_RTL8367B_PHY)    += rtl8367b.o
-+
- obj-$(CONFIG_MDIO_BCM_IPROC)  += mdio-bcm-iproc.o
- obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o
- obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o
---- a/include/uapi/linux/Kbuild
-+++ b/include/uapi/linux/Kbuild
-@@ -399,6 +399,7 @@ header-y += stddef.h
- header-y += string.h
- header-y += suspend_ioctls.h
- header-y += swab.h
-+header-y += switch.h
- header-y += synclink.h
- header-y += sync_file.h
- header-y += sysctl.h
---- a/include/linux/platform_data/b53.h
-+++ b/include/linux/platform_data/b53.h
-@@ -25,6 +25,9 @@ struct b53_platform_data {
-       u32 chip_id;
-       u16 enabled_ports;
-+      /* allow to specify an ethX alias */
-+      const char *alias;
-+
-       /* only used by MMAP'd driver */
-       unsigned big_endian:1;
-       void __iomem *regs;
diff --git a/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch
deleted file mode 100644 (file)
index 1862375..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -495,6 +495,12 @@ struct phy_driver {
-       /* Determines the negotiated speed and duplex */
-       int (*read_status)(struct phy_device *phydev);
-+      /* 
-+       * Update the value in phydev->link to reflect the 
-+       * current link value
-+       */
-+      int (*update_link)(struct phy_device *phydev);
-+
-       /* Clears any pending interrupts */
-       int (*ack_interrupt)(struct phy_device *phydev);
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -1309,6 +1309,9 @@ int genphy_update_link(struct phy_device
- {
-       int status;
-+      if (phydev->drv && phydev->drv->update_link)
-+              return phydev->drv->update_link(phydev);
-+
-       /* Do a fake read */
-       status = phy_read(phydev, MII_BMSR);
-       if (status < 0)
diff --git a/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch
deleted file mode 100644 (file)
index 844f747..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
---- a/drivers/net/phy/mdio_bus.c
-+++ b/drivers/net/phy/mdio_bus.c
-@@ -80,6 +80,8 @@ bool mdiobus_is_registered_device(struct
- }
- EXPORT_SYMBOL(mdiobus_is_registered_device);
-+#include "mdio-boardinfo.h"
-+
- /**
-  * mdiobus_alloc_size - allocate a mii_bus structure
-  * @size: extra amount of memory to allocate for private storage.
-@@ -400,6 +402,17 @@ void mdiobus_free(struct mii_bus *bus)
- }
- EXPORT_SYMBOL(mdiobus_free);
-+static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus,
-+                                              struct phy_device *phydev,
-+                                              struct mdio_board_info *bi)
-+{
-+      if (strcmp(bus->id, bi->bus_id) ||
-+          bi->phy_addr != phydev->mdio.addr)
-+          return;
-+
-+      phydev->mdio.dev.platform_data = (void *) bi->platform_data;
-+}
-+
- /**
-  * mdiobus_scan - scan a bus for MDIO devices.
-  * @bus: mii_bus to scan
-@@ -415,6 +428,7 @@ EXPORT_SYMBOL(mdiobus_free);
- struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
- {
-       struct phy_device *phydev;
-+      struct mdio_board_entry *be;
-       int err;
-       phydev = get_phy_device(bus, addr, false);
-@@ -427,6 +441,12 @@ struct phy_device *mdiobus_scan(struct m
-        */
-       of_mdiobus_link_mdiodev(bus, &phydev->mdio);
-+      mutex_lock(&__mdio_board_lock);
-+      list_for_each_entry(be, &__mdio_board_list, list)
-+              mdiobus_setup_phydev_from_boardinfo(bus, phydev,
-+                                                  &be->board_info);
-+      mutex_unlock(&__mdio_board_lock);
-+
-       err = phy_device_register(phydev);
-       if (err) {
-               phy_device_free(phydev);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -870,6 +870,23 @@ void mdio_bus_exit(void);
- extern struct bus_type mdio_bus_type;
-+struct mdio_board_info {
-+      const char      *bus_id;
-+      int             phy_addr;
-+
-+      const void      *platform_data;
-+};
-+
-+#ifdef CONFIG_MDIO_BOARDINFO
-+int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n);
-+#else
-+static inline int
-+mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n)
-+{
-+      return 0;
-+}
-+#endif
-+
- /**
-  * module_phy_driver() - Helper macro for registering PHY drivers
-  * @__phy_drivers: array of PHY drivers to register
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -149,6 +149,10 @@ config MDIO_XGENE
- comment "Switch configuration API + drivers"
-+config MDIO_BOARDINFO
-+      bool
-+      default y
-+
- config SWCONFIG
-       tristate "Switch configuration API"
-       ---help---
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,8 @@
- libphy-y                      := phy.o phy_device.o mdio_bus.o mdio_device.o
- libphy-$(CONFIG_SWPHY)                += swphy.o
-+obj-$(CONFIG_MDIO_BOARDINFO)  += mdio-boardinfo.o
-+
- obj-$(CONFIG_PHYLIB)          += libphy.o
- obj-$(CONFIG_SWCONFIG)                += swconfig.o
---- /dev/null
-+++ b/drivers/net/phy/mdio-boardinfo.c
-@@ -0,0 +1,58 @@
-+/*
-+ * mdio-boardinfo.c - collect pre-declarations of PHY devices
-+ *
-+ * 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/phy.h>
-+#include <linux/slab.h>
-+#include <linux/export.h>
-+#include <linux/mutex.h>
-+#include <linux/phy.h>
-+
-+#include "mdio-boardinfo.h"
-+
-+/*
-+ * These symbols are exported ONLY FOR the mdio_bus component.
-+ * No other users will be supported.
-+ */
-+
-+LIST_HEAD(__mdio_board_list);
-+EXPORT_SYMBOL_GPL(__mdio_board_list);
-+
-+DEFINE_MUTEX(__mdio_board_lock);
-+EXPORT_SYMBOL_GPL(__mdio_board_lock);
-+
-+/**
-+ * mdio_register_board_info - register PHY devices for a given board
-+ * @info: array of chip descriptors
-+ * @n: how many descriptors are provided
-+ * Context: can sleep
-+ *
-+ * The board info passed can safely be __initdata ... but be careful of
-+ * any embedded pointers (platform_data, etc), they're copied as-is.
-+ */
-+int __init
-+mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n)
-+{
-+      struct mdio_board_entry *be;
-+      int i;
-+
-+      be = kzalloc(n * sizeof(*be), GFP_KERNEL);
-+      if (!be)
-+              return -ENOMEM;
-+
-+      for (i = 0; i < n; i++, be++, info++) {
-+              memcpy(&be->board_info, info, sizeof(*info));
-+              mutex_lock(&__mdio_board_lock);
-+              list_add_tail(&be->list, &__mdio_board_list);
-+              mutex_unlock(&__mdio_board_lock);
-+      }
-+
-+      return 0;
-+}
---- /dev/null
-+++ b/drivers/net/phy/mdio-boardinfo.h
-@@ -0,0 +1,22 @@
-+/*
-+ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component
-+ *
-+ * 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/mutex.h>
-+
-+struct mdio_board_entry {
-+      struct list_head        list;
-+      struct mdio_board_info  board_info;
-+};
-+
-+/* __mdio_board_lock protects __mdio_board_list
-+ * only mdio_bus components are allowed to use these symbols.
-+ */
-+extern struct mutex __mdio_board_lock;
-+extern struct list_head __mdio_board_list;
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -17,7 +17,7 @@ obj-$(CONFIG_MII) += mii.o
- obj-$(CONFIG_MDIO) += mdio.o
- obj-$(CONFIG_NET) += Space.o loopback.o
- obj-$(CONFIG_NETCONSOLE) += netconsole.o
--obj-$(CONFIG_PHYLIB) += phy/
-+obj-y += phy/
- obj-$(CONFIG_RIONET) += rionet.o
- obj-$(CONFIG_NET_TEAM) += team/
- obj-$(CONFIG_TUN) += tun.o
diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch
deleted file mode 100644 (file)
index d22c873..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-From ffe387740bbe88dd88bbe04d6375902708003d6e Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 7 Jul 2017 17:25:00 +0200
-Subject: net: add packet mangeling patch
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/netdevice.h | 11 +++++++++++
- include/linux/skbuff.h    | 14 ++++----------
- net/Kconfig               |  6 ++++++
- net/core/dev.c            | 18 ++++++++++++++----
- net/core/skbuff.c         | 17 +++++++++++++++++
- net/ethernet/eth.c        |  6 ++++++
- 6 files changed, 58 insertions(+), 14 deletions(-)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1400,6 +1400,7 @@ enum netdev_priv_flags {
-       IFF_PHONY_HEADROOM              = 1<<26,
-       IFF_MACSEC                      = 1<<27,
-       IFF_L3MDEV_RX_HANDLER           = 1<<28,
-+      IFF_NO_IP_ALIGN                 = 1<<29,
- };
- #define IFF_802_1Q_VLAN                       IFF_802_1Q_VLAN
-@@ -1430,6 +1431,7 @@ enum netdev_priv_flags {
- #define IFF_RXFH_CONFIGURED           IFF_RXFH_CONFIGURED
- #define IFF_MACSEC                    IFF_MACSEC
- #define IFF_L3MDEV_RX_HANDLER         IFF_L3MDEV_RX_HANDLER
-+#define IFF_NO_IP_ALIGN                       IFF_NO_IP_ALIGN
- /**
-  *    struct net_device - The DEVICE structure.
-@@ -1716,6 +1718,11 @@ struct net_device {
-       const struct ndisc_ops *ndisc_ops;
- #endif
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
-+      struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
-+#endif
-+
-       const struct header_ops *header_ops;
-       unsigned int            flags;
-@@ -1783,6 +1790,10 @@ struct net_device {
-       struct mpls_dev __rcu   *mpls_ptr;
- #endif
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      void                    *phy_ptr; /* PHY device specific data */
-+#endif
-+
- /*
-  * Cache lines mostly used on receive path (including eth_type_trans())
-  */
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -2339,6 +2339,10 @@ static inline int pskb_trim(struct sk_bu
-       return (len < skb->len) ? __pskb_trim(skb, len) : 0;
- }
-+extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
-+              unsigned int length, gfp_t gfp);
-+
-+
- /**
-  *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
-  *    @skb: buffer to alter
-@@ -2459,16 +2463,6 @@ static inline struct sk_buff *dev_alloc_
- }
--static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
--              unsigned int length, gfp_t gfp)
--{
--      struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
--
--      if (NET_IP_ALIGN && skb)
--              skb_reserve(skb, NET_IP_ALIGN);
--      return skb;
--}
--
- static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
-               unsigned int length)
- {
---- a/net/Kconfig
-+++ b/net/Kconfig
-@@ -25,6 +25,12 @@ menuconfig NET
- if NET
-+config ETHERNET_PACKET_MANGLE
-+      bool
-+      help
-+        This option can be selected by phy drivers that need to mangle
-+        packets going in or out of an ethernet device.
-+
- config WANT_COMPAT_NETLINK_MESSAGES
-       bool
-       help
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2972,10 +2972,20 @@ static int xmit_one(struct sk_buff *skb,
-       if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
-               dev_queue_xmit_nit(skb, dev);
--      len = skb->len;
--      trace_net_dev_start_xmit(skb, dev);
--      rc = netdev_start_xmit(skb, dev, txq, more);
--      trace_net_dev_xmit(skb, rc, dev, len);
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      if (!dev->eth_mangle_tx ||
-+          (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
-+#else
-+      if (1)
-+#endif
-+      {
-+              len = skb->len;
-+              trace_net_dev_start_xmit(skb, dev);
-+              rc = netdev_start_xmit(skb, dev, txq, more);
-+              trace_net_dev_xmit(skb, rc, dev, len);
-+      } else {
-+              rc = NETDEV_TX_OK;
-+      }
-       return rc;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -64,6 +64,7 @@
- #include <linux/errqueue.h>
- #include <linux/prefetch.h>
- #include <linux/if_vlan.h>
-+#include <linux/if.h>
- #include <net/protocol.h>
- #include <net/dst.h>
-@@ -533,6 +534,22 @@ skb_fail:
- }
- EXPORT_SYMBOL(__napi_alloc_skb);
-+struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
-+              unsigned int length, gfp_t gfp)
-+{
-+      struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
-+
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
-+              return skb;
-+#endif
-+
-+      if (NET_IP_ALIGN && skb)
-+              skb_reserve(skb, NET_IP_ALIGN);
-+      return skb;
-+}
-+EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
-+
- void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
-                    int size, unsigned int truesize)
- {
---- a/net/ethernet/eth.c
-+++ b/net/ethernet/eth.c
-@@ -171,6 +171,12 @@ __be16 eth_type_trans(struct sk_buff *sk
-       const struct ethhdr *eth;
-       skb->dev = dev;
-+
-+#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+      if (dev->eth_mangle_rx)
-+              dev->eth_mangle_rx(dev, skb);
-+#endif
-+
-       skb_reset_mac_header(skb);
-       eth = (struct ethhdr *)skb->data;
diff --git a/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch b/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch
deleted file mode 100644 (file)
index 55ebae7..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Fri, 7 Jul 2017 17:26:01 +0200
-Subject: bcm53xx: bgmac: use srab switch driver
-
-use the srab switch driver on these SoCs.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/net/ethernet/broadcom/bgmac-bcma.c |  1 +
- drivers/net/ethernet/broadcom/bgmac.c      | 24 ++++++++++++++++++++++++
- drivers/net/ethernet/broadcom/bgmac.h      |  4 ++++
- 3 files changed, 29 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
-@@ -243,6 +243,7 @@ static int bgmac_probe(struct bcma_devic
-               bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
-               bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
-               bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
-+              bgmac->feature_flags |= BGMAC_FEAT_SRAB;
-               break;
-       case BCMA_CHIP_ID_BCM53573:
-               bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -11,6 +11,7 @@
- #include <linux/bcma/bcma.h>
- #include <linux/etherdevice.h>
-+#include <linux/platform_data/b53.h>
- #include <linux/bcm47xx_nvram.h>
- #include "bgmac.h"
-@@ -1388,6 +1389,17 @@ static const struct ethtool_ops bgmac_et
-       .set_link_ksettings     = phy_ethtool_set_link_ksettings,
- };
-+static struct b53_platform_data bgmac_b53_pdata = {
-+};
-+
-+static struct platform_device bgmac_b53_dev = {
-+      .name           = "b53-srab-switch",
-+      .id             = -1,
-+      .dev            = {
-+              .platform_data = &bgmac_b53_pdata,
-+      },
-+};
-+
- /**************************************************
-  * MII
-  **************************************************/
-@@ -1534,6 +1546,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
-       net_dev->hw_features = net_dev->features;
-       net_dev->vlan_features = net_dev->features;
-+      if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
-+              bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
-+
-+              err = platform_device_register(&bgmac_b53_dev);
-+              if (!err)
-+                      bgmac->b53_device = &bgmac_b53_dev;
-+      }
-+
-       err = register_netdev(bgmac->net_dev);
-       if (err) {
-               dev_err(bgmac->dev, "Cannot register net device\n");
-@@ -1556,6 +1576,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
- void bgmac_enet_remove(struct bgmac *bgmac)
- {
-+      if (bgmac->b53_device)
-+              platform_device_unregister(&bgmac_b53_dev);
-+      bgmac->b53_device = NULL;
-+
-       unregister_netdev(bgmac->net_dev);
-       phy_disconnect(bgmac->net_dev->phydev);
-       netif_napi_del(&bgmac->napi);
---- a/drivers/net/ethernet/broadcom/bgmac.h
-+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -409,6 +409,7 @@
- #define BGMAC_FEAT_CC4_IF_SW_TYPE     BIT(17)
- #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII       BIT(18)
- #define BGMAC_FEAT_CC7_IF_TYPE_RGMII  BIT(19)
-+#define BGMAC_FEAT_SRAB                       BIT(20)
- struct bgmac_slot_info {
-       union {
-@@ -513,6 +514,9 @@ struct bgmac {
-       u32 (*get_bus_clock)(struct bgmac *bgmac);
-       void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
-                             u32 set);
-+
-+      /* platform device for associated switch */
-+      struct platform_device *b53_device;
- };
- struct bgmac *bgmac_alloc(struct device *dev);
diff --git a/target/linux/generic/hack-4.9/835-misc-owl_loader.patch b/target/linux/generic/hack-4.9/835-misc-owl_loader.patch
deleted file mode 100644 (file)
index 07cd4e5..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From dd36f935973d91644449bd9749f6062a2bed821b Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@googlemail.com>
-Date: Fri, 7 Jul 2017 17:26:46 +0200
-Subject: misc: owl-loader for delayed Atheros ath9k fixup
-
-Some devices (like the Cisco Meraki Z1 Cloud Managed Teleworker Gateway)
-need to be able to initialize the PCIe wifi device. Normally, this is done
-during the early stages of booting linux, because the necessary init code
-is read from the memory mapped SPI and passed to pci_enable_ath9k_fixup.
-However,this isn't possible for devices which have the init code for the
-Atheros chip stored on NAND in an UBI volume. Hence, this module can be
-used to initialze the chip when the user-space is ready to extract the
-init code.
-
-Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
----
- drivers/misc/Kconfig  | 12 ++++++++++++
- drivers/misc/Makefile |  1 +
- 2 files changed, 13 insertions(+)
-
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -151,6 +151,18 @@ config SGI_IOC4
-         If you have an SGI Altix with an IOC4-based card say Y.
-         Otherwise say N.
-+config OWL_LOADER
-+      tristate "Owl loader for initializing Atheros PCI(e) Wifi chips"
-+      depends on PCI
-+      ---help---
-+      This kernel module helps to initialize certain Qualcomm
-+      Atheros' PCI(e) Wifi chips, which have the init data
-+      (which contains the PCI device ID for example) stored
-+      together with the calibration data in the file system.
-+
-+      This is necessary for devices like the Cisco Meraki Z1, say M.
-+      Otherwise say N.
-+
- config TIFM_CORE
-       tristate "TI Flash Media interface support"
-       depends on PCI
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_ATMEL_TCLIB)    += atmel_tclib
- obj-$(CONFIG_DUMMY_IRQ)               += dummy-irq.o
- obj-$(CONFIG_ICS932S401)      += ics932s401.o
- obj-$(CONFIG_LKDTM)           += lkdtm.o
-+obj-$(CONFIG_OWL_LOADER)      += owl-loader.o
- obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
- obj-$(CONFIG_TIFM_7XX1)               += tifm_7xx1.o
- obj-$(CONFIG_PHANTOM)         += phantom.o
diff --git a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch
deleted file mode 100644 (file)
index 1d33ab3..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From 3b6115d6b57a263bdc8c9b1df273bd4a7955eead Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:16:31 +0200
-Subject: debloat: add some debloat patches, strip down procfs and make O_DIRECT support optional, saves ~15K after lzma on MIPS
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/Kconfig         | 3 +++
- net/core/Makefile   | 3 ++-
- net/core/sock.c     | 2 ++
- net/ipv4/Kconfig    | 1 +
- net/netlink/Kconfig | 1 +
- net/packet/Kconfig  | 1 +
- net/unix/Kconfig    | 1 +
- 7 files changed, 11 insertions(+), 1 deletion(-)
-
---- a/net/Kconfig
-+++ b/net/Kconfig
-@@ -95,6 +95,9 @@ source "net/netlabel/Kconfig"
- endif # if INET
-+config SOCK_DIAG
-+      bool
-+
- config NETWORK_SECMARK
-       bool "Security Marking"
-       help
---- a/net/core/Makefile
-+++ b/net/core/Makefile
-@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
- obj-y              += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
-                       neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
--                      sock_diag.o dev_ioctl.o tso.o sock_reuseport.o
-+                      dev_ioctl.o tso.o sock_reuseport.o
-+obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
- obj-$(CONFIG_XFRM) += flow.o
- obj-y += net-sysfs.o
- obj-$(CONFIG_PROC_FS) += net-procfs.o
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -1458,9 +1458,11 @@ void sk_destruct(struct sock *sk)
- static void __sk_free(struct sock *sk)
- {
-+#ifdef CONFIG_SOCK_DIAG
-       if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk)))
-               sock_diag_broadcast_destroy(sk);
-       else
-+#endif
-               sk_destruct(sk);
- }
---- a/net/ipv4/Kconfig
-+++ b/net/ipv4/Kconfig
-@@ -408,6 +408,7 @@ config INET_XFRM_MODE_BEET
- config INET_DIAG
-       tristate "INET: socket monitoring interface"
-+      select SOCK_DIAG
-       default y
-       ---help---
-         Support for INET (TCP, DCCP, etc) socket monitoring interface used by
---- a/net/netlink/Kconfig
-+++ b/net/netlink/Kconfig
-@@ -4,6 +4,7 @@
- config NETLINK_DIAG
-       tristate "NETLINK: socket monitoring interface"
-+      select SOCK_DIAG
-       default n
-       ---help---
-         Support for NETLINK socket monitoring interface used by the ss tool.
---- a/net/packet/Kconfig
-+++ b/net/packet/Kconfig
-@@ -18,6 +18,7 @@ config PACKET
- config PACKET_DIAG
-       tristate "Packet: sockets monitoring interface"
-       depends on PACKET
-+      select SOCK_DIAG
-       default n
-       ---help---
-         Support for PF_PACKET sockets monitoring interface used by the ss tool.
---- a/net/unix/Kconfig
-+++ b/net/unix/Kconfig
-@@ -22,6 +22,7 @@ config UNIX
- config UNIX_DIAG
-       tristate "UNIX: socket monitoring interface"
-       depends on UNIX
-+      select SOCK_DIAG
-       default n
-       ---help---
-         Support for UNIX socket monitoring interface used by the ss tool.
diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch
deleted file mode 100644 (file)
index ee72d98..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-From 9e3f1d0805b2d919904dd9a4ff0d956314cc3cba Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:20:09 +0200
-Subject: debloat: procfs
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- fs/locks.c               |  2 ++
- fs/proc/Kconfig          |  5 +++++
- fs/proc/consoles.c       |  3 +++
- fs/proc/proc_tty.c       | 11 ++++++++++-
- include/net/snmp.h       | 18 +++++++++++++++++-
- ipc/msg.c                |  3 +++
- ipc/sem.c                |  2 ++
- ipc/shm.c                |  2 ++
- ipc/util.c               |  3 +++
- kernel/exec_domain.c     |  2 ++
- kernel/irq/proc.c        |  9 +++++++++
- kernel/time/timer_list.c |  2 ++
- mm/vmalloc.c             |  2 ++
- mm/vmstat.c              |  8 +++++---
- net/8021q/vlanproc.c     |  6 ++++++
- net/core/net-procfs.c    | 18 ++++++++++++------
- net/core/sock.c          |  2 ++
- net/ipv4/fib_trie.c      | 18 ++++++++++++------
- net/ipv4/proc.c          |  3 +++
- net/ipv4/route.c         |  3 +++
- 20 files changed, 105 insertions(+), 17 deletions(-)
-
---- a/fs/locks.c
-+++ b/fs/locks.c
-@@ -2802,6 +2802,8 @@ static const struct file_operations proc
- static int __init proc_locks_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       proc_create("locks", 0, NULL, &proc_locks_operations);
-       return 0;
- }
---- a/fs/proc/Kconfig
-+++ b/fs/proc/Kconfig
-@@ -81,3 +81,8 @@ config PROC_CHILDREN
-         Say Y if you are running any user-space software which takes benefit from
-         this interface. For example, rkt is such a piece of software.
-+
-+config PROC_STRIPPED
-+      default n
-+      depends on EXPERT
-+      bool "Strip non-essential /proc functionality to reduce code size"
---- a/fs/proc/consoles.c
-+++ b/fs/proc/consoles.c
-@@ -106,6 +106,9 @@ static const struct file_operations proc
- static int __init proc_consoles_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       proc_create("consoles", 0, NULL, &proc_consoles_operations);
-       return 0;
- }
---- a/fs/proc/proc_tty.c
-+++ b/fs/proc/proc_tty.c
-@@ -144,7 +144,10 @@ static const struct file_operations proc
- void proc_tty_register_driver(struct tty_driver *driver)
- {
-       struct proc_dir_entry *ent;
--              
-+
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       if (!driver->driver_name || driver->proc_entry ||
-           !driver->ops->proc_fops)
-               return;
-@@ -161,6 +164,9 @@ void proc_tty_unregister_driver(struct t
- {
-       struct proc_dir_entry *ent;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       ent = driver->proc_entry;
-       if (!ent)
-               return;
-@@ -175,6 +181,9 @@ void proc_tty_unregister_driver(struct t
-  */
- void __init proc_tty_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       if (!proc_mkdir("tty", NULL))
-               return;
-       proc_mkdir("tty/ldisc", NULL);  /* Preserved: it's userspace visible */
---- a/include/net/snmp.h
-+++ b/include/net/snmp.h
-@@ -123,6 +123,21 @@ struct linux_xfrm_mib {
- #define DECLARE_SNMP_STAT(type, name) \
-       extern __typeof__(type) __percpu *name
-+#ifdef CONFIG_PROC_STRIPPED
-+#define __SNMP_STATS_DUMMY(mib)       \
-+      do { (void) mib->mibs[0]; } while(0)
-+
-+#define __SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_INC_STATS_ATOMIC_LONG(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_DEC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
-+#define __SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
-+#define SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
-+#define __SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
-+
-+#else
-+
- #define __SNMP_INC_STATS(mib, field)  \
-                       __this_cpu_inc(mib->mibs[field])
-@@ -153,8 +168,9 @@ struct linux_xfrm_mib {
-               __this_cpu_add(ptr[basefield##OCTETS], addend); \
-       } while (0)
-+#endif
--#if BITS_PER_LONG==32
-+#if (BITS_PER_LONG==32) && !defined(CONFIG_PROC_STRIPPED)
- #define __SNMP_ADD_STATS64(mib, field, addend)                                \
-       do {                                                            \
---- a/ipc/msg.c
-+++ b/ipc/msg.c
-@@ -1061,6 +1061,9 @@ void __init msg_init(void)
- {
-       msg_init_ns(&init_ipc_ns);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       ipc_init_proc_interface("sysvipc/msg",
-                               "       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
-                               IPC_MSG_IDS, sysvipc_msg_proc_show);
---- a/ipc/sem.c
-+++ b/ipc/sem.c
-@@ -205,6 +205,8 @@ void sem_exit_ns(struct ipc_namespace *n
- void __init sem_init(void)
- {
-       sem_init_ns(&init_ipc_ns);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-       ipc_init_proc_interface("sysvipc/sem",
-                               "       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
-                               IPC_SEM_IDS, sysvipc_sem_proc_show);
---- a/ipc/shm.c
-+++ b/ipc/shm.c
-@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init);
- void __init shm_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-       ipc_init_proc_interface("sysvipc/shm",
- #if BITS_PER_LONG <= 32
-                               "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
---- a/ipc/util.c
-+++ b/ipc/util.c
-@@ -121,6 +121,9 @@ void __init ipc_init_proc_interface(cons
-       struct proc_dir_entry *pde;
-       struct ipc_proc_iface *iface;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       iface = kmalloc(sizeof(*iface), GFP_KERNEL);
-       if (!iface)
-               return;
---- a/kernel/exec_domain.c
-+++ b/kernel/exec_domain.c
-@@ -41,6 +41,8 @@ static const struct file_operations exec
- static int __init proc_execdomains_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
-       return 0;
- }
---- a/kernel/irq/proc.c
-+++ b/kernel/irq/proc.c
-@@ -326,6 +326,9 @@ void register_irq_proc(unsigned int irq,
-       static DEFINE_MUTEX(register_lock);
-       char name [MAX_NAMELEN];
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
-+              return;
-+
-       if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip))
-               return;
-@@ -374,6 +377,9 @@ void unregister_irq_proc(unsigned int ir
- {
-       char name [MAX_NAMELEN];
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
-+              return;
-+
-       if (!root_irq_dir || !desc->dir)
-               return;
- #ifdef CONFIG_SMP
-@@ -408,6 +414,9 @@ void init_irq_proc(void)
-       unsigned int irq;
-       struct irq_desc *desc;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
-+              return;
-+
-       /* create /proc/irq */
-       root_irq_dir = proc_mkdir("irq", NULL);
-       if (!root_irq_dir)
---- a/kernel/time/timer_list.c
-+++ b/kernel/time/timer_list.c
-@@ -399,6 +399,9 @@ static int __init init_timer_list_procfs
- {
-       struct proc_dir_entry *pe;
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
-       if (!pe)
-               return -ENOMEM;
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -2718,6 +2718,8 @@ static const struct file_operations proc
- static int __init proc_vmalloc_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
-       return 0;
- }
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -1793,10 +1793,12 @@ static int __init setup_vmstat(void)
-       cpu_notifier_register_done();
- #endif
- #ifdef CONFIG_PROC_FS
--      proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
--      proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
-+              proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
-+              proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
-+              proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
-+      }
-       proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
--      proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
- #endif
-       return 0;
- }
---- a/net/8021q/vlanproc.c
-+++ b/net/8021q/vlanproc.c
-@@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net)
- {
-       struct vlan_net *vn = net_generic(net, vlan_net_id);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return;
-+
-       if (vn->proc_vlan_conf)
-               remove_proc_entry(name_conf, vn->proc_vlan_dir);
-@@ -146,6 +149,9 @@ int __net_init vlan_proc_init(struct net
- {
-       struct vlan_net *vn = net_generic(net, vlan_net_id);
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
-       if (!vn->proc_vlan_dir)
-               goto err;
---- a/net/core/net-procfs.c
-+++ b/net/core/net-procfs.c
-@@ -319,10 +319,12 @@ static int __net_init dev_proc_net_init(
-       if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
-               goto out;
--      if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+              !proc_create("softnet_stat", S_IRUGO, net->proc_net,
-                        &softnet_seq_fops))
-               goto out_dev;
--      if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+              !proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
-               goto out_softnet;
-       if (wext_proc_init(net))
-@@ -331,9 +333,11 @@ static int __net_init dev_proc_net_init(
- out:
-       return rc;
- out_ptype:
--      remove_proc_entry("ptype", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("ptype", net->proc_net);
- out_softnet:
--      remove_proc_entry("softnet_stat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("softnet_stat", net->proc_net);
- out_dev:
-       remove_proc_entry("dev", net->proc_net);
-       goto out;
-@@ -343,8 +347,10 @@ static void __net_exit dev_proc_net_exit
- {
-       wext_proc_exit(net);
--      remove_proc_entry("ptype", net->proc_net);
--      remove_proc_entry("softnet_stat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
-+              remove_proc_entry("ptype", net->proc_net);
-+              remove_proc_entry("softnet_stat", net->proc_net);
-+      }
-       remove_proc_entry("dev", net->proc_net);
- }
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -3088,6 +3088,8 @@ static __net_initdata struct pernet_oper
- static int __init proto_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       return register_pernet_subsys(&proto_net_ops);
- }
---- a/net/ipv4/fib_trie.c
-+++ b/net/ipv4/fib_trie.c
-@@ -2677,10 +2677,12 @@ static const struct file_operations fib_
- int __net_init fib_proc_init(struct net *net)
- {
--      if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+              !proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
-               goto out1;
--      if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
-+              !proc_create("fib_triestat", S_IRUGO, net->proc_net,
-                        &fib_triestat_fops))
-               goto out2;
-@@ -2690,17 +2692,21 @@ int __net_init fib_proc_init(struct net
-       return 0;
- out3:
--      remove_proc_entry("fib_triestat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("fib_triestat", net->proc_net);
- out2:
--      remove_proc_entry("fib_trie", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              remove_proc_entry("fib_trie", net->proc_net);
- out1:
-       return -ENOMEM;
- }
- void __net_exit fib_proc_exit(struct net *net)
- {
--      remove_proc_entry("fib_trie", net->proc_net);
--      remove_proc_entry("fib_triestat", net->proc_net);
-+      if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
-+              remove_proc_entry("fib_trie", net->proc_net);
-+              remove_proc_entry("fib_triestat", net->proc_net);
-+      }
-       remove_proc_entry("route", net->proc_net);
- }
---- a/net/ipv4/proc.c
-+++ b/net/ipv4/proc.c
-@@ -565,6 +565,9 @@ static __net_initdata struct pernet_oper
- int __init ip_misc_proc_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       return register_pernet_subsys(&ip_proc_ops);
- }
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -423,6 +423,9 @@ static struct pernet_operations ip_rt_pr
- static int __init ip_rt_proc_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-+
-       return register_pernet_subsys(&ip_rt_proc_ops);
- }
diff --git a/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch b/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch
deleted file mode 100644 (file)
index da69b7e..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:20:43 +0200
-Subject: debloat: dmabuf
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/base/Kconfig      |  2 +-
- drivers/dma-buf/Makefile  | 10 +++++++---
- drivers/dma-buf/dma-buf.c |  4 +++-
- kernel/sched/core.c       |  1 +
- 4 files changed, 12 insertions(+), 5 deletions(-)
-
---- a/drivers/base/Kconfig
-+++ b/drivers/base/Kconfig
-@@ -244,7 +244,7 @@ config SOC_BUS
- source "drivers/base/regmap/Kconfig"
- config DMA_SHARED_BUFFER
--      bool
-+      tristate
-       default n
-       select ANON_INODES
-       help
---- a/drivers/dma-buf/Makefile
-+++ b/drivers/dma-buf/Makefile
-@@ -1,3 +1,7 @@
--obj-y := dma-buf.o fence.o reservation.o seqno-fence.o fence-array.o
--obj-$(CONFIG_SYNC_FILE)               += sync_file.o
--obj-$(CONFIG_SW_SYNC)         += sw_sync.o sync_debug.o
-+obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o
-+
-+dma-buf-objs-y := dma-buf.o fence.o reservation.o seqno-fence.o fence-array.o
-+dma-buf-objs-$(CONFIG_SYNC_FILE)              += sync_file.o
-+dma-buf-objs-$(CONFIG_SW_SYNC)                += sw_sync.o sync_debug.o
-+
-+dma-shared-buffer-objs :=  $(dma-buf-objs-y)
---- a/drivers/dma-buf/dma-buf.c
-+++ b/drivers/dma-buf/dma-buf.c
-@@ -34,6 +34,7 @@
- #include <linux/poll.h>
- #include <linux/reservation.h>
- #include <linux/mm.h>
-+#include <linux/module.h>
- #include <uapi/linux/dma-buf.h>
-@@ -977,4 +978,5 @@ static void __exit dma_buf_deinit(void)
- {
-       dma_buf_uninit_debugfs();
- }
--__exitcall(dma_buf_deinit);
-+module_exit(dma_buf_deinit);
-+MODULE_LICENSE("GPL");
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -2171,6 +2171,7 @@ int wake_up_state(struct task_struct *p,
- {
-       return try_to_wake_up(p, state, 0);
- }
-+EXPORT_SYMBOL_GPL(wake_up_state);
- /*
-  * This function clears the sched_dl_entity static params.
diff --git a/target/linux/generic/hack-4.9/910-kobject_uevent.patch b/target/linux/generic/hack-4.9/910-kobject_uevent.patch
deleted file mode 100644 (file)
index 734401e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 16 Jul 2017 16:56:10 +0200
-Subject: lib: add uevent_next_seqnum()
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/kobject.h |  5 +++++
- lib/kobject_uevent.c    | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 42 insertions(+)
-
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -52,6 +52,18 @@ static const char *kobject_actions[] = {
-       [KOBJ_OFFLINE] =        "offline",
- };
-+u64 uevent_next_seqnum(void)
-+{
-+      u64 seq;
-+
-+      mutex_lock(&uevent_sock_mutex);
-+      seq = ++uevent_seqnum;
-+      mutex_unlock(&uevent_sock_mutex);
-+
-+      return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
diff --git a/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch
deleted file mode 100644 (file)
index d827ace..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 16 Jul 2017 16:56:10 +0200
-Subject: lib: add uevent_next_seqnum()
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/kobject.h |  5 +++++
- lib/kobject_uevent.c    | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 42 insertions(+)
-
---- a/include/linux/kobject.h
-+++ b/include/linux/kobject.h
-@@ -32,6 +32,8 @@
- #define UEVENT_NUM_ENVP                       32      /* number of env pointers */
- #define UEVENT_BUFFER_SIZE            2048    /* buffer for the variables */
-+struct sk_buff;
-+
- #ifdef CONFIG_UEVENT_HELPER
- /* path to the userspace helper executed on an event */
- extern char uevent_helper[];
-@@ -239,4 +241,7 @@ int add_uevent_var(struct kobj_uevent_en
- int kobject_action_type(const char *buf, size_t count,
-                       enum kobject_action *type);
-+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
-+                   gfp_t allocation);
-+
- #endif /* _KOBJECT_H_ */
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -423,6 +423,43 @@ int add_uevent_var(struct kobj_uevent_en
- EXPORT_SYMBOL_GPL(add_uevent_var);
- #if defined(CONFIG_NET)
-+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
-+                   gfp_t allocation)
-+{
-+      struct uevent_sock *ue_sk;
-+      int err = 0;
-+
-+      /* send netlink message */
-+      mutex_lock(&uevent_sock_mutex);
-+      list_for_each_entry(ue_sk, &uevent_sock_list, list) {
-+              struct sock *uevent_sock = ue_sk->sk;
-+              struct sk_buff *skb2;
-+
-+              skb2 = skb_clone(skb, allocation);
-+              if (!skb2)
-+                      break;
-+
-+              err = netlink_broadcast(uevent_sock, skb2, pid, group,
-+                                      allocation);
-+              if (err)
-+                      break;
-+      }
-+      mutex_unlock(&uevent_sock_mutex);
-+
-+      kfree_skb(skb);
-+      return err;
-+}
-+#else
-+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
-+                   gfp_t allocation)
-+{
-+      kfree_skb(skb);
-+      return 0;
-+}
-+#endif
-+EXPORT_SYMBOL_GPL(broadcast_uevent);
-+
-+#if defined(CONFIG_NET)
- static int uevent_net_init(struct net *net)
- {
-       struct uevent_sock *ue_sk;
diff --git a/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch b/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch
deleted file mode 100644 (file)
index 6eeddcc..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5d301596fdc72f6cb672f72eb3c66e7cddefb103 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:26:02 +0200
-Subject: initramfs: always create console node
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- scripts/gen_initramfs_list.sh | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -59,6 +59,18 @@ default_initramfs() {
-       EOF
- }
-+list_openwrt_initramfs() {
-+      :
-+}
-+
-+openwrt_initramfs() {
-+      # make sure that /dev/console exists
-+      cat <<-EOF >> ${output}
-+              dir /dev 0755 0 0
-+              nod /dev/console 0600 0 0 c 5 1
-+      EOF
-+}
-+
- filetype() {
-       local argv1="$1"
-@@ -180,6 +192,8 @@ dir_filelist() {
-       if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
-               ${dep_list}print_mtime "$1"
-+              ${dep_list}openwrt_initramfs
-+
-               echo "${dirlist}" | \
-               while read x; do
-                       ${dep_list}parse ${x}
diff --git a/target/linux/generic/hack-4.9/930-crashlog.patch b/target/linux/generic/hack-4.9/930-crashlog.patch
deleted file mode 100644 (file)
index baa87b1..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-From 6b1ab74a9917012d0c559edc4ed299d9228ac89f Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 8 Jul 2017 08:26:47 +0200
-Subject: kernel: add the new 'crashlog' feature
-
-this tries to store kernel oops/panic logs in a fixed location in RAM to
-recover them available to user space using debugfs
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/crashlog.h |  17 ++++
- init/Kconfig             |   4 +
- kernel/Makefile          |   1 +
- kernel/crashlog.c        | 213 +++++++++++++++++++++++++++++++++++++++++++++++
- kernel/module.c          |   3 +
- mm/bootmem.c             |   2 +
- mm/memblock.c            |   5 ++
- 7 files changed, 245 insertions(+)
- create mode 100644 include/linux/crashlog.h
- create mode 100644 kernel/crashlog.c
-
---- /dev/null
-+++ b/include/linux/crashlog.h
-@@ -0,0 +1,17 @@
-+#ifndef __CRASHLOG_H
-+#define __CRASHLOG_H
-+
-+#ifdef CONFIG_CRASHLOG
-+void crashlog_init_bootmem(struct bootmem_data *bdata);
-+void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
-+#else
-+static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
-+{
-+}
-+
-+static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
-+{
-+}
-+#endif
-+
-+#endif
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1298,6 +1298,10 @@ config RELAY
-         If unsure, say N.
-+config CRASHLOG
-+      bool "Crash logging"
-+      depends on (!NO_BOOTMEM || HAVE_MEMBLOCK)
-+
- config BLK_DEV_INITRD
-       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
-       depends on BROKEN || !FRV
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -113,6 +113,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
- obj-$(CONFIG_MEMBARRIER) += membarrier.o
- obj-$(CONFIG_HAS_IOMEM) += memremap.o
-+obj-$(CONFIG_CRASHLOG) += crashlog.o
- $(obj)/configs.o: $(obj)/config_data.h
---- /dev/null
-+++ b/kernel/crashlog.c
-@@ -0,0 +1,213 @@
-+/*
-+ * Crash information logger
-+ * Copyright (C) 2010 Felix Fietkau <nbd@nbd.name>
-+ *
-+ * Based on ramoops.c
-+ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
-+ *
-+ * 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.
-+ *
-+ * 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 St, Fifth Floor, Boston, MA
-+ * 02110-1301 USA
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/bootmem.h>
-+#include <linux/memblock.h>
-+#include <linux/debugfs.h>
-+#include <linux/crashlog.h>
-+#include <linux/kmsg_dump.h>
-+#include <linux/module.h>
-+#include <linux/pfn.h>
-+#include <linux/vmalloc.h>
-+#include <asm/io.h>
-+
-+#define CRASHLOG_PAGES        4
-+#define CRASHLOG_SIZE (CRASHLOG_PAGES * PAGE_SIZE)
-+#define CRASHLOG_MAGIC        0xa1eedead
-+
-+/*
-+ * Start the log at 1M before the end of RAM, as some boot loaders like
-+ * to use the end of the RAM for stack usage and other things
-+ * If this fails, fall back to using the last part.
-+ */
-+#define CRASHLOG_OFFSET       (1024 * 1024)
-+
-+struct crashlog_data {
-+      u32 magic;
-+      u32 len;
-+      u8 data[];
-+};
-+
-+static struct debugfs_blob_wrapper crashlog_blob;
-+static unsigned long crashlog_addr = 0;
-+static struct crashlog_data *crashlog_buf;
-+static struct kmsg_dumper dump;
-+static bool first = true;
-+
-+extern struct list_head *crashlog_modules;
-+
-+static bool crashlog_set_addr(phys_addr_t addr, phys_addr_t size)
-+{
-+      /* Limit to lower 64 MB to avoid highmem */
-+      phys_addr_t limit = 64 * 1024 * 1024;
-+
-+      if (crashlog_addr)
-+              return false;
-+
-+      if (addr > limit)
-+              return false;
-+
-+      if (addr + size > limit)
-+              size = limit - addr;
-+
-+      crashlog_addr = addr;
-+
-+      if (addr + size > CRASHLOG_OFFSET)
-+              crashlog_addr += size - CRASHLOG_OFFSET;
-+
-+      return true;
-+}
-+
-+#ifndef CONFIG_NO_BOOTMEM
-+void __init crashlog_init_bootmem(bootmem_data_t *bdata)
-+{
-+      phys_addr_t start, end;
-+
-+      start = PFN_PHYS(bdata->node_low_pfn);
-+      end = PFN_PHYS(bdata->node_min_pfn);
-+      if (!crashlog_set_addr(start, end - start))
-+              return;
-+
-+      if (reserve_bootmem(crashlog_addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
-+              printk("Crashlog failed to allocate RAM at address 0x%lx\n",
-+                     crashlog_addr);
-+              crashlog_addr = 0;
-+      }
-+}
-+#endif
-+
-+#ifdef CONFIG_HAVE_MEMBLOCK
-+void __init_memblock crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
-+{
-+      if (!crashlog_set_addr(addr, size))
-+              return;
-+
-+      if (memblock_reserve(crashlog_addr, CRASHLOG_SIZE)) {
-+              printk("Crashlog failed to allocate RAM at address 0x%lx\n",
-+                     crashlog_addr);
-+              crashlog_addr = 0;
-+      }
-+}
-+#endif
-+
-+static void __init crashlog_copy(void)
-+{
-+      if (crashlog_buf->magic != CRASHLOG_MAGIC)
-+              return;
-+
-+      if (!crashlog_buf->len || crashlog_buf->len >
-+          CRASHLOG_SIZE - sizeof(*crashlog_buf))
-+              return;
-+
-+      crashlog_blob.size = crashlog_buf->len;
-+      crashlog_blob.data = kmemdup(crashlog_buf->data,
-+              crashlog_buf->len, GFP_KERNEL);
-+
-+      debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
-+}
-+
-+static int get_maxlen(void)
-+{
-+      return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
-+}
-+
-+static void crashlog_printf(const char *fmt, ...)
-+{
-+      va_list args;
-+      int len = get_maxlen();
-+
-+      if (!len)
-+              return;
-+
-+      va_start(args, fmt);
-+      crashlog_buf->len += vscnprintf(
-+              &crashlog_buf->data[crashlog_buf->len],
-+              len, fmt, args);
-+      va_end(args);
-+}
-+
-+static void crashlog_do_dump(struct kmsg_dumper *dumper,
-+              enum kmsg_dump_reason reason)
-+{
-+      struct timeval tv;
-+      struct module *m;
-+      char *buf;
-+      size_t len;
-+
-+      if (!first)
-+              crashlog_printf("\n===================================\n");
-+
-+      do_gettimeofday(&tv);
-+      crashlog_printf("Time: %lu.%lu\n",
-+              (long)tv.tv_sec, (long)tv.tv_usec);
-+
-+      if (first) {
-+              crashlog_printf("Modules:");
-+              list_for_each_entry(m, crashlog_modules, list) {
-+                      crashlog_printf("\t%s@%p+%x", m->name,
-+                      m->core_layout.base, m->core_layout.size,
-+                      m->init_layout.base, m->init_layout.size);
-+              }
-+              crashlog_printf("\n");
-+              first = false;
-+      }
-+
-+      buf = (char *)&crashlog_buf->data[crashlog_buf->len];
-+
-+      kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
-+
-+      crashlog_buf->len += len;
-+}
-+
-+
-+int __init crashlog_init_fs(void)
-+{
-+      struct page *pages[CRASHLOG_PAGES];
-+      pgprot_t prot;
-+      int i;
-+
-+      if (!crashlog_addr) {
-+              printk("No memory allocated for crashlog\n");
-+              return -ENOMEM;
-+      }
-+
-+      printk("Crashlog allocated RAM at address 0x%lx\n", (unsigned long) crashlog_addr);
-+      for (i = 0; i < CRASHLOG_PAGES; i++)
-+              pages[i] = pfn_to_page((crashlog_addr >> PAGE_SHIFT) + i);
-+
-+      prot = pgprot_writecombine(PAGE_KERNEL);
-+      crashlog_buf = vmap(pages, CRASHLOG_PAGES, VM_MAP, prot);
-+
-+      crashlog_copy();
-+
-+      crashlog_buf->magic = CRASHLOG_MAGIC;
-+      crashlog_buf->len = 0;
-+
-+      dump.max_reason = KMSG_DUMP_OOPS;
-+      dump.dump = crashlog_do_dump;
-+      kmsg_dump_register(&dump);
-+
-+      return 0;
-+}
-+module_init(crashlog_init_fs);
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -253,6 +253,9 @@ static void mod_update_bounds(struct mod
- #ifdef CONFIG_KGDB_KDB
- struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
- #endif /* CONFIG_KGDB_KDB */
-+#ifdef CONFIG_CRASHLOG
-+struct list_head *crashlog_modules = &modules;
-+#endif
- static void module_assert_mutex(void)
- {
---- a/mm/bootmem.c
-+++ b/mm/bootmem.c
-@@ -14,6 +14,7 @@
- #include <linux/export.h>
- #include <linux/kmemleak.h>
- #include <linux/range.h>
-+#include <linux/crashlog.h>
- #include <linux/bug.h>
- #include <linux/io.h>
- #include <linux/bootmem.h>
-@@ -174,6 +175,7 @@ static unsigned long __init free_all_boo
-       if (!bdata->node_bootmem_map)
-               return 0;
-+      crashlog_init_bootmem(bdata);
-       map = bdata->node_bootmem_map;
-       start = bdata->node_min_pfn;
-       end = bdata->node_low_pfn;
---- a/mm/memblock.c
-+++ b/mm/memblock.c
-@@ -19,6 +19,7 @@
- #include <linux/debugfs.h>
- #include <linux/seq_file.h>
- #include <linux/memblock.h>
-+#include <linux/crashlog.h>
- #include <asm/sections.h>
- #include <linux/io.h>
-@@ -495,6 +496,8 @@ static void __init_memblock memblock_ins
-       memblock_set_region_node(rgn, nid);
-       type->cnt++;
-       type->total_size += size;
-+      if (type == &memblock.memory)
-+              crashlog_init_memblock(base, size);
- }
- /**
-@@ -534,6 +537,8 @@ int __init_memblock memblock_add_range(s
-               type->regions[0].flags = flags;
-               memblock_set_region_node(&type->regions[0], nid);
-               type->total_size = size;
-+              if (type == &memblock.memory)
-+                      crashlog_init_memblock(base, size);
-               return 0;
-       }
- repeat:
diff --git a/target/linux/generic/pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch b/target/linux/generic/pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
deleted file mode 100644 (file)
index be9ceeb..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9c8bc8c1408f3e8529db6e4e04017b4c579c342 Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Sun, 18 Feb 2018 17:08:04 +0100
-Subject: [PATCH] w1: gpio: fix problem with platfom data in w1-gpio
-
-In devices, where fdt is used, is impossible to apply platform data
-without proper fdt node.
-
-This patch allow to use platform data in devices with fdt.
-
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- drivers/w1/masters/w1-gpio.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/w1/masters/w1-gpio.c
-+++ b/drivers/w1/masters/w1-gpio.c
-@@ -79,7 +79,7 @@ static int w1_gpio_probe(struct platform
-       enum gpiod_flags gflags = GPIOD_OUT_LOW_OPEN_DRAIN;
-       int err;
--      if (of_have_populated_dt()) {
-+      if (of_have_populated_dt() && !dev_get_platdata(&pdev->dev)) {
-               pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-               if (!pdata)
-                       return -ENOMEM;
diff --git a/target/linux/generic/pending-4.19/102-MIPS-only-process-negative-stack-offsets-on-stack-tr.patch b/target/linux/generic/pending-4.19/102-MIPS-only-process-negative-stack-offsets-on-stack-tr.patch
deleted file mode 100644 (file)
index 0b87f49..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Wed, 18 Apr 2018 10:50:05 +0200
-Subject: [PATCH] MIPS: only process negative stack offsets on stack traces
-
-Fixes endless back traces in cases where the compiler emits a stack
-pointer increase in a branch delay slot (probably for some form of
-function return).
-
-[    3.475442] BUG: MAX_STACK_TRACE_ENTRIES too low!
-[    3.480070] turning off the locking correctness validator.
-[    3.485521] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.14.34 #0
-[    3.491475] Stack : 00000000 00000000 00000000 00000000 80e0fce2 00000034 00000000 00000000
-[    3.499764]         87c3838c 80696377 8061047c 00000000 00000001 00000001 87c2d850 6534689f
-[    3.508059]         00000000 00000000 80e10000 00000000 00000000 000000cf 0000000f 00000000
-[    3.516353]         00000000 806a0000 00076891 00000000 00000000 00000000 ffffffff 00000000
-[    3.524648]         806c0000 00000004 80e10000 806a0000 00000003 80690000 00000000 80700000
-[    3.532942]         ...
-[    3.535362] Call Trace:
-[    3.537818] [<80010a48>] show_stack+0x58/0x100
-[    3.542207] [<804c2f78>] dump_stack+0xe8/0x170
-[    3.546613] [<80079f90>] save_trace+0xf0/0x110
-[    3.551010] [<8007b1ec>] mark_lock+0x33c/0x78c
-[    3.555413] [<8007bf48>] __lock_acquire+0x2ac/0x1a08
-[    3.560337] [<8007de60>] lock_acquire+0x64/0x8c
-[    3.564846] [<804e1570>] _raw_spin_lock_irqsave+0x54/0x78
-[    3.570186] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.574770] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.579257] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.583839] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.588329] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.592911] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.597401] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.601983] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.606473] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.611055] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.615545] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.620125] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.624619] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.629197] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.633691] [<801b618c>] kernfs_notify+0x94/0xac
-[    3.638269] [<801b7b10>] sysfs_notify+0x74/0xa0
-[    3.642763] [<801b618c>] kernfs_notify+0x94/0xac
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/arch/mips/kernel/process.c
-+++ b/arch/mips/kernel/process.c
-@@ -361,6 +361,8 @@ static inline int is_sp_move_ins(union m
-       if (ip->i_format.opcode == addiu_op ||
-           ip->i_format.opcode == daddiu_op) {
-+              if (ip->i_format.simmediate > 0)
-+                      return 0;
-               *frame_size = -ip->i_format.simmediate;
-               return 1;
-       }
diff --git a/target/linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch b/target/linux/generic/pending-4.19/110-ehci_hcd_ignore_oc.patch
deleted file mode 100644 (file)
index cad00b5..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Florian Fainelli <florian@openwrt.org>
-Subject: USB: EHCI: add ignore_oc flag to disable overcurrent checking
-
-This patch adds an ignore_oc flag which can be set by EHCI controller
-not supporting or wanting to disable overcurrent checking. The EHCI
-platform data in include/linux/usb/ehci_pdriver.h is also augmented to
-take advantage of this new flag.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- drivers/usb/host/ehci-hcd.c      |    2 +-
- drivers/usb/host/ehci-hub.c      |    4 ++--
- drivers/usb/host/ehci-platform.c |    1 +
- drivers/usb/host/ehci.h          |    1 +
- include/linux/usb/ehci_pdriver.h |    1 +
- 5 files changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -638,7 +638,7 @@ static int ehci_run (struct usb_hcd *hcd
-               "USB %x.%x started, EHCI %x.%02x%s\n",
-               ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
-               temp >> 8, temp & 0xff,
--              ignore_oc ? ", overcurrent ignored" : "");
-+              (ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
-       ehci_writel(ehci, INTR_MASK,
-                   &ehci->regs->intr_enable); /* Turn On Interrupts */
---- a/drivers/usb/host/ehci-hub.c
-+++ b/drivers/usb/host/ehci-hub.c
-@@ -641,7 +641,7 @@ ehci_hub_status_data (struct usb_hcd *hc
-        * always set, seem to clear PORT_OCC and PORT_CSC when writing to
-        * PORT_POWER; that's surprising, but maybe within-spec.
-        */
--      if (!ignore_oc)
-+      if (!ignore_oc && !ehci->ignore_oc)
-               mask = PORT_CSC | PORT_PEC | PORT_OCC;
-       else
-               mask = PORT_CSC | PORT_PEC;
-@@ -1011,7 +1011,7 @@ int ehci_hub_control(
-               if (temp & PORT_PEC)
-                       status |= USB_PORT_STAT_C_ENABLE << 16;
--              if ((temp & PORT_OCC) && !ignore_oc){
-+              if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
-                       status |= USB_PORT_STAT_C_OVERCURRENT << 16;
-                       /*
---- a/drivers/usb/host/ehci-platform.c
-+++ b/drivers/usb/host/ehci-platform.c
-@@ -208,6 +208,8 @@ static int ehci_platform_probe(struct pl
-               hcd->has_tt = 1;
-       if (pdata->reset_on_resume)
-               priv->reset_on_resume = true;
-+      if (pdata->ignore_oc)
-+              ehci->ignore_oc = 1;
- #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
-       if (ehci->big_endian_mmio) {
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -218,6 +218,7 @@ struct ehci_hcd {                  /* one per controlle
-       unsigned                frame_index_bug:1; /* MosChip (AKA NetMos) */
-       unsigned                need_oc_pp_cycle:1; /* MPC834X port power */
-       unsigned                imx28_write_fix:1; /* For Freescale i.MX28 */
-+      unsigned                ignore_oc:1;
-       /* required for usb32 quirk */
-       #define OHCI_CTRL_HCFS          (3 << 6)
---- a/include/linux/usb/ehci_pdriver.h
-+++ b/include/linux/usb/ehci_pdriver.h
-@@ -50,6 +50,7 @@ struct usb_ehci_pdata {
-       unsigned        no_io_watchdog:1;
-       unsigned        reset_on_resume:1;
-       unsigned        dma_mask_64:1;
-+      unsigned        ignore_oc:1;
-       /* Turn on all power and clocks */
-       int (*power_on)(struct platform_device *pdev);
diff --git a/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
deleted file mode 100644 (file)
index 3aca457..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Tobias Wolf <dev-NTEO@vplace.de>
-Subject: mm: Fix alloc_node_mem_map with ARCH_PFN_OFFSET calculation
-
-An rt288x (ralink) based router (Belkin F5D8235 v1) does not boot with any
-kernel beyond version 4.3 resulting in:
-
-BUG: Bad page state in process swapper  pfn:086ac
-
-bisect resulted in:
-
-a1c34a3bf00af2cede839879502e12dc68491ad5 is the first bad commit
-commit a1c34a3bf00af2cede839879502e12dc68491ad5
-Author: Laura Abbott <laura@labbott.name>
-Date:   Thu Nov 5 18:48:46 2015 -0800
-
-    mm: Don't offset memmap for flatmem
-
-    Srinivas Kandagatla reported bad page messages when trying to remove the
-    bottom 2MB on an ARM based IFC6410 board
-
-      BUG: Bad page state in process swapper  pfn:fffa8
-      page:ef7fb500 count:0 mapcount:0 mapping:  (null) index:0x0
-      flags: 0x96640253(locked|error|dirty|active|arch_1|reclaim|mlocked)
-      page dumped because: PAGE_FLAGS_CHECK_AT_FREE flag(s) set
-      bad because of flags:
-      flags: 0x200041(locked|active|mlocked)
-      Modules linked in:
-      CPU: 0 PID: 0 Comm: swapper Not tainted 3.19.0-rc3-00007-g412f9ba-dirty
-#816
-      Hardware name: Qualcomm (Flattened Device Tree)
-        unwind_backtrace
-        show_stack
-        dump_stack
-        bad_page
-        free_pages_prepare
-        free_hot_cold_page
-        __free_pages
-        free_highmem_page
-        mem_init
-        start_kernel
-      Disabling lock debugging due to kernel taint
-    [...]
-:040000 040000 2de013c372345fd471cd58f0553c9b38b0ef1cc4
-0a8156f848733dfa21e16c196dfb6c0a76290709 M      mm
-
-This fix for ARM does not account ARCH_PFN_OFFSET for mem_map as later used by
-page_to_pfn anymore.
-
-The following output was generated with two hacked in printk statements:
-
-printk("before %p vs. %p or %p\n", mem_map, mem_map - offset, mem_map -
-(pgdat->node_start_pfn - ARCH_PFN_OFFSET));
-               if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
-                       mem_map -= offset + (pgdat->node_start_pfn - ARCH_PFN_OFFSET);
-printk("after %p\n", mem_map);
-
-Output:
-
-[    0.000000] before 8861b280 vs. 8861b280 or 8851b280
-[    0.000000] after 8851b280
-
-As seen in the first line mem_map with subtraction of offset does not equal the
-mem_map after subtraction of ARCH_PFN_OFFSET.
-
-After adding the offset of ARCH_PFN_OFFSET as well to mem_map as the
-previously calculated offset is zero for the named platform it is able to boot
-4.4 and 4.9-rc7 again.
-
-Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
----
-
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -6393,7 +6393,7 @@ static void __ref alloc_node_mem_map(str
-               mem_map = NODE_DATA(0)->node_mem_map;
- #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
-               if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
--                      mem_map -= offset;
-+                      mem_map -= offset + (pgdat->node_start_pfn - ARCH_PFN_OFFSET);
- #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
-       }
- #endif
diff --git a/target/linux/generic/pending-4.19/130-add-linux-spidev-compatible-si3210.patch b/target/linux/generic/pending-4.19/130-add-linux-spidev-compatible-si3210.patch
deleted file mode 100644 (file)
index b00fb8e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Giuseppe Lippolis <giu.lippolis@gmail.com>
-Subject: Add the linux,spidev compatible in spidev Several device in ramips have this binding in the dts
-
-Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
----
- drivers/spi/spidev.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -669,6 +669,7 @@ static const struct of_device_id spidev_
-       { .compatible = "lineartechnology,ltc2488" },
-       { .compatible = "ge,achc" },
-       { .compatible = "semtech,sx1301" },
-+      { .compatible = "siliconlabs,si3210" },
-       {},
- };
- MODULE_DEVICE_TABLE(of, spidev_dt_ids);
diff --git a/target/linux/generic/pending-4.19/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch b/target/linux/generic/pending-4.19/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch
deleted file mode 100644 (file)
index bd5ed6f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: spi: use gpio_set_value_cansleep for setting chipselect GPIO
-
-Sleeping is safe inside spi_transfer_one_message, and some GPIO chips
-need to sleep for setting values
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -733,7 +733,7 @@ static void spi_set_cs(struct spi_device
-               enable = !enable;
-       if (gpio_is_valid(spi->cs_gpio)) {
--              gpio_set_value(spi->cs_gpio, !enable);
-+              gpio_set_value_cansleep(spi->cs_gpio, !enable);
-               /* Some SPI masters need both GPIO CS & slave_select */
-               if ((spi->controller->flags & SPI_MASTER_GPIO_SS) &&
-                   spi->controller->set_cs)
diff --git a/target/linux/generic/pending-4.19/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/pending-4.19/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
deleted file mode 100644 (file)
index c97e932..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: jffs2: use .rename2 and add RENAME_WHITEOUT support
-
-It is required for renames on overlayfs
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/fs/jffs2/dir.c
-+++ b/fs/jffs2/dir.c
-@@ -752,6 +752,24 @@ static int jffs2_mknod (struct inode *di
-       return ret;
- }
-+static int jffs2_whiteout (struct inode *old_dir, struct dentry *old_dentry)
-+{
-+      struct dentry *wh;
-+      int err;
-+
-+      wh = d_alloc(old_dentry->d_parent, &old_dentry->d_name);
-+      if (!wh)
-+              return -ENOMEM;
-+
-+      err = jffs2_mknod(old_dir, wh, S_IFCHR | WHITEOUT_MODE,
-+                        WHITEOUT_DEV);
-+      if (err)
-+              return err;
-+
-+      d_rehash(wh);
-+      return 0;
-+}
-+
- static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
-                        struct inode *new_dir_i, struct dentry *new_dentry,
-                        unsigned int flags)
-@@ -762,7 +780,7 @@ static int jffs2_rename (struct inode *o
-       uint8_t type;
-       uint32_t now;
--      if (flags & ~RENAME_NOREPLACE)
-+      if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT))
-               return -EINVAL;
-       /* The VFS will check for us and prevent trying to rename a
-@@ -828,9 +846,14 @@ static int jffs2_rename (struct inode *o
-       if (d_is_dir(old_dentry) && !victim_f)
-               inc_nlink(new_dir_i);
--      /* Unlink the original */
--      ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
--                            old_dentry->d_name.name, old_dentry->d_name.len, NULL, now);
-+      if (flags & RENAME_WHITEOUT)
-+              /* Replace with whiteout */
-+              ret = jffs2_whiteout(old_dir_i, old_dentry);
-+      else
-+              /* Unlink the original */
-+              ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-+                                    old_dentry->d_name.name,
-+                                    old_dentry->d_name.len, NULL, now);
-       /* We don't touch inode->i_nlink */
diff --git a/target/linux/generic/pending-4.19/141-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/pending-4.19/141-jffs2-add-RENAME_EXCHANGE-support.patch
deleted file mode 100644 (file)
index 093a73a..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: jffs2: add RENAME_EXCHANGE support
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/fs/jffs2/dir.c
-+++ b/fs/jffs2/dir.c
-@@ -777,18 +777,31 @@ static int jffs2_rename (struct inode *o
-       int ret;
-       struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
-       struct jffs2_inode_info *victim_f = NULL;
-+      struct inode *fst_inode = d_inode(old_dentry);
-+      struct inode *snd_inode = d_inode(new_dentry);
-       uint8_t type;
-       uint32_t now;
--      if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT))
-+      if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT|RENAME_EXCHANGE))
-               return -EINVAL;
-+      if ((flags & RENAME_EXCHANGE) && (old_dir_i != new_dir_i)) {
-+              if (S_ISDIR(fst_inode->i_mode) && !S_ISDIR(snd_inode->i_mode)) {
-+                      inc_nlink(new_dir_i);
-+                      drop_nlink(old_dir_i);
-+              }
-+              else if (!S_ISDIR(fst_inode->i_mode) && S_ISDIR(snd_inode->i_mode)) {
-+                      drop_nlink(new_dir_i);
-+                      inc_nlink(old_dir_i);
-+              }
-+      }
-+
-       /* The VFS will check for us and prevent trying to rename a
-        * file over a directory and vice versa, but if it's a directory,
-        * the VFS can't check whether the victim is empty. The filesystem
-        * needs to do that for itself.
-        */
--      if (d_really_is_positive(new_dentry)) {
-+      if (d_really_is_positive(new_dentry) && !(flags & RENAME_EXCHANGE)) {
-               victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
-               if (d_is_dir(new_dentry)) {
-                       struct jffs2_full_dirent *fd;
-@@ -823,7 +836,7 @@ static int jffs2_rename (struct inode *o
-       if (ret)
-               return ret;
--      if (victim_f) {
-+      if (victim_f && !(flags & RENAME_EXCHANGE)) {
-               /* There was a victim. Kill it off nicely */
-               if (d_is_dir(new_dentry))
-                       clear_nlink(d_inode(new_dentry));
-@@ -849,6 +862,12 @@ static int jffs2_rename (struct inode *o
-       if (flags & RENAME_WHITEOUT)
-               /* Replace with whiteout */
-               ret = jffs2_whiteout(old_dir_i, old_dentry);
-+      else if (flags & RENAME_EXCHANGE)
-+              /* Replace the original */
-+              ret = jffs2_do_link(c, JFFS2_INODE_INFO(old_dir_i),
-+                                  d_inode(new_dentry)->i_ino, type,
-+                                  old_dentry->d_name.name, old_dentry->d_name.len,
-+                                  now);
-       else
-               /* Unlink the original */
-               ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-@@ -880,7 +899,7 @@ static int jffs2_rename (struct inode *o
-               return ret;
-       }
--      if (d_is_dir(old_dentry))
-+      if (d_is_dir(old_dentry) && !(flags & RENAME_EXCHANGE))
-               drop_nlink(old_dir_i);
-       new_dir_i->i_mtime = new_dir_i->i_ctime = old_dir_i->i_mtime = old_dir_i->i_ctime = ITIME(now);
diff --git a/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.19/150-bridge_allow_receiption_on_disabled_port.patch
deleted file mode 100644 (file)
index 2afdeef..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Stephen Hemminger <stephen@networkplumber.org>
-Subject: bridge: allow receiption on disabled port
-
-When an ethernet device is enslaved to a bridge, and the bridge STP
-detects loss of carrier (or operational state down), then normally
-packet receiption is blocked.
-
-This breaks control applications like WPA which maybe expecting to
-receive packets to negotiate to bring link up. The bridge needs to
-block forwarding packets from these disabled ports, but there is no
-hard requirement to not allow local packet delivery.
-
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -195,6 +195,9 @@ static void __br_handle_local_finish(str
- /* note: already called with rcu_read_lock */
- static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
- {
-+      struct net_bridge_port *p = br_port_get_rcu(skb->dev);
-+
-+      if (p->state != BR_STATE_DISABLED)
-       __br_handle_local_finish(skb);
-       /* return 1 to signal the okfn() was called so it's ok to use the skb */
-@@ -291,6 +294,17 @@ rx_handler_result_t br_handle_frame(stru
- forward:
-       switch (p->state) {
-+      case BR_STATE_DISABLED:
-+              if (ether_addr_equal(p->br->dev->dev_addr, dest))
-+                      skb->pkt_type = PACKET_HOST;
-+
-+              if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING,
-+                      dev_net(skb->dev), NULL, skb, skb->dev, NULL,
-+                      br_handle_local_finish) == 1) {
-+                      return RX_HANDLER_PASS;
-+              }
-+              break;
-+
-       case BR_STATE_FORWARDING:
-               rhook = rcu_dereference(br_should_route_hook);
-               if (rhook) {
diff --git a/target/linux/generic/pending-4.19/180-net-phy-at803x-add-support-for-AT8032.patch b/target/linux/generic/pending-4.19/180-net-phy-at803x-add-support-for-AT8032.patch
deleted file mode 100644 (file)
index e496301..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: net: phy: at803x: add support for AT8032
-
-Like AT8030, this PHY needs the GPIO reset workaround
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -62,8 +62,10 @@
- #define ATH8030_PHY_ID 0x004dd076
- #define ATH8031_PHY_ID 0x004dd074
-+#define ATH8032_PHY_ID 0x004dd023
- #define ATH8035_PHY_ID 0x004dd072
- #define AT803X_PHY_ID_MASK                    0xffffffef
-+#define AT8032_PHY_ID_MASK                    0xffffffff
- MODULE_DESCRIPTION("Atheros 803x PHY driver");
- MODULE_AUTHOR("Matus Ujhelyi");
-@@ -308,7 +310,7 @@ static void at803x_link_change_notify(st
-       struct at803x_priv *priv = phydev->priv;
-       /*
--       * Conduct a hardware reset for AT8030 every time a link loss is
-+       * Conduct a hardware reset for AT8030/2 every time a link loss is
-        * signalled. This is necessary to circumvent a hardware bug that
-        * occurs when the cable is unplugged while TX packets are pending
-        * in the FIFO. In such cases, the FIFO enters an error mode it
-@@ -414,6 +416,24 @@ static struct phy_driver at803x_driver[]
-       .aneg_done              = at803x_aneg_done,
-       .ack_interrupt          = &at803x_ack_interrupt,
-       .config_intr            = &at803x_config_intr,
-+}, {
-+      /* ATHEROS 8032 */
-+      .phy_id                 = ATH8032_PHY_ID,
-+      .name                   = "Atheros 8032 ethernet",
-+      .phy_id_mask            = AT8032_PHY_ID_MASK,
-+      .probe                  = at803x_probe,
-+      .config_init            = at803x_config_init,
-+      .link_change_notify     = at803x_link_change_notify,
-+      .set_wol                = at803x_set_wol,
-+      .get_wol                = at803x_get_wol,
-+      .suspend                = at803x_suspend,
-+      .resume                 = at803x_resume,
-+      .features               = PHY_BASIC_FEATURES,
-+      .flags                  = PHY_HAS_INTERRUPT,
-+      .config_aneg            = genphy_config_aneg,
-+      .read_status            = genphy_read_status,
-+      .ack_interrupt          = at803x_ack_interrupt,
-+      .config_intr            = at803x_config_intr,
- } };
- module_phy_driver(at803x_driver);
-@@ -421,6 +441,7 @@ module_phy_driver(at803x_driver);
- static struct mdio_device_id __maybe_unused atheros_tbl[] = {
-       { ATH8030_PHY_ID, AT803X_PHY_ID_MASK },
-       { ATH8031_PHY_ID, AT803X_PHY_ID_MASK },
-+      { ATH8032_PHY_ID, AT8032_PHY_ID_MASK },
-       { ATH8035_PHY_ID, AT803X_PHY_ID_MASK },
-       { }
- };
diff --git a/target/linux/generic/pending-4.19/201-extra_optimization.patch b/target/linux/generic/pending-4.19/201-extra_optimization.patch
deleted file mode 100644 (file)
index 5890483..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: Upgrade to Linux 2.6.19
-
-- Includes large parts of the patch from #1021 by dpalffy
-- Includes RB532 NAND driver changes by n0-1
-
-[john@phrozen.org: feix will add this to his upstream queue]
-
-lede-commit: bff468813f78f81e36ebb2a3f4354de7365e640f
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -654,12 +654,12 @@ KBUILD_CFLAGS    += $(call cc-disable-warni
- KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
-+KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
- else
- ifdef CONFIG_PROFILE_ALL_BRANCHES
--KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
-+KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
- else
--KBUILD_CFLAGS   += -O2
-+KBUILD_CFLAGS   += -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
- endif
- endif
diff --git a/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch
deleted file mode 100644 (file)
index 79e9910..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a config option for keeping the kallsyms table uncompressed, saving ~9kb kernel size after lzma on ar71xx
-
-[john@phrozen.org: added to my upstream queue 30.12.2016]
-lede-commit: e0e3509b5ce2ccf93d4d67ea907613f5f7ec2eed
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- init/Kconfig            | 11 +++++++++++
- kernel/kallsyms.c       |  8 ++++++++
- scripts/kallsyms.c      | 12 ++++++++++++
- scripts/link-vmlinux.sh |  4 ++++
- 4 files changed, 35 insertions(+)
-
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1149,6 +1149,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
-         the unaligned access emulation.
-         see arch/parisc/kernel/unaligned.c for reference
-+config KALLSYMS_UNCOMPRESSED
-+      bool "Keep kallsyms uncompressed"
-+      depends on KALLSYMS
-+      help
-+              Normally kallsyms contains compressed symbols (using a token table),
-+              reducing the uncompressed kernel image size. Keeping the symbol table
-+              uncompressed significantly improves the size of this part in compressed
-+              kernel images.
-+
-+              Say N unless you need compressed kernel images to be small.
-+
- config HAVE_PCSPKR_PLATFORM
-       bool
---- a/kernel/kallsyms.c
-+++ b/kernel/kallsyms.c
-@@ -74,6 +74,11 @@ static unsigned int kallsyms_expand_symb
-        * For every byte on the compressed symbol data, copy the table
-        * entry for that byte.
-        */
-+#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
-+      memcpy(result, data + 1, len - 1);
-+      result += len - 1;
-+      len = 0;
-+#endif
-       while (len) {
-               tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
-               data++;
-@@ -106,6 +111,9 @@ tail:
-  */
- static char kallsyms_get_symbol_type(unsigned int off)
- {
-+#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
-+      return kallsyms_names[off + 1];
-+#endif
-       /*
-        * Get just the first code, look it up in the token table,
-        * and return the first char from this token.
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -61,6 +61,7 @@ static struct addr_range percpu_range =
- static struct sym_entry *table;
- static unsigned int table_size, table_cnt;
- static int all_symbols = 0;
-+static int uncompressed = 0;
- static int absolute_percpu = 0;
- static int base_relative = 0;
-@@ -439,6 +440,9 @@ static void write_src(void)
-       free(markers);
-+      if (uncompressed)
-+              return;
-+
-       output_label("kallsyms_token_table");
-       off = 0;
-       for (i = 0; i < 256; i++) {
-@@ -497,6 +501,9 @@ static void *find_token(unsigned char *s
- {
-       int i;
-+      if (uncompressed)
-+              return NULL;
-+
-       for (i = 0; i < len - 1; i++) {
-               if (str[i] == token[0] && str[i+1] == token[1])
-                       return &str[i];
-@@ -569,6 +576,9 @@ static void optimize_result(void)
- {
-       int i, best;
-+      if (uncompressed)
-+              return;
-+
-       /* using the '\0' symbol last allows compress_symbols to use standard
-        * fast string functions */
-       for (i = 255; i >= 0; i--) {
-@@ -751,6 +761,8 @@ int main(int argc, char **argv)
-                               absolute_percpu = 1;
-                       else if (strcmp(argv[i], "--base-relative") == 0)
-                               base_relative = 1;
-+                      else if (strcmp(argv[i], "--uncompressed") == 0)
-+                              uncompressed = 1;
-                       else
-                               usage();
-               }
---- a/scripts/link-vmlinux.sh
-+++ b/scripts/link-vmlinux.sh
-@@ -133,6 +133,10 @@ kallsyms()
-               kallsymopt="${kallsymopt} --base-relative"
-       fi
-+      if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
-+              kallsymopt="${kallsymopt} --uncompressed"
-+      fi
-+
-       local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
-                     ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
diff --git a/target/linux/generic/pending-4.19/205-backtrace_module_info.patch b/target/linux/generic/pending-4.19/205-backtrace_module_info.patch
deleted file mode 100644 (file)
index 5671173..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries
-
-[john@phrozen.org: felix will add this to his upstream queue]
-
-lede-commit 53827cdc824556cda910b23ce5030c363b8f1461
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- lib/vsprintf.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
---- a/lib/vsprintf.c
-+++ b/lib/vsprintf.c
-@@ -681,8 +681,10 @@ char *symbol_string(char *buf, char *end
-                   struct printf_spec spec, const char *fmt)
- {
-       unsigned long value;
--#ifdef CONFIG_KALLSYMS
-       char sym[KSYM_SYMBOL_LEN];
-+#ifndef CONFIG_KALLSYMS
-+      struct module *mod;
-+      int len;
- #endif
-       if (fmt[1] == 'R')
-@@ -696,11 +698,16 @@ char *symbol_string(char *buf, char *end
-               sprint_symbol(sym, value);
-       else
-               sprint_symbol_no_offset(sym, value);
--
--      return string(buf, end, sym, spec);
- #else
--      return special_hex_number(buf, end, value, sizeof(void *));
-+      len = snprintf(sym, sizeof(sym), "0x%lx", value);
-+
-+      mod = __module_address(value);
-+      if (mod)
-+              snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
-+                       mod->name, mod->core_layout.base,
-+                       mod->core_layout.size);
- #endif
-+      return string(buf, end, sym, spec);
- }
- static const struct printf_spec default_str_spec = {
diff --git a/target/linux/generic/pending-4.19/220-optimize_inlining.patch b/target/linux/generic/pending-4.19/220-optimize_inlining.patch
deleted file mode 100644 (file)
index 29ec28a..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/arch/x86/Kconfig.debug
-+++ b/arch/x86/Kconfig.debug
-@@ -276,20 +276,6 @@ config CPA_DEBUG
-       ---help---
-         Do change_page_attr() self-tests every 30 seconds.
--config OPTIMIZE_INLINING
--      bool "Allow gcc to uninline functions marked 'inline'"
--      ---help---
--        This option determines if the kernel forces gcc to inline the functions
--        developers have marked 'inline'. Doing so takes away freedom from gcc to
--        do what it thinks is best, which is desirable for the gcc 3.x series of
--        compilers. The gcc 4.x series have a rewritten inlining algorithm and
--        enabling this option will generate a smaller kernel there. Hopefully
--        this algorithm is so good that allowing gcc 4.x and above to make the
--        decision will become the default in the future. Until then this option
--        is there to test gcc for this.
--
--        If unsure, say N.
--
- config DEBUG_ENTRY
-       bool "Debug low-level entry code"
-       depends on DEBUG_KERNEL
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -150,6 +150,20 @@ endmenu # "printk and dmesg options"
- menu "Compile-time checks and compiler options"
-+config OPTIMIZE_INLINING
-+      bool "Allow gcc to uninline functions marked 'inline'"
-+      ---help---
-+        This option determines if the kernel forces gcc to inline the functions
-+        developers have marked 'inline'. Doing so takes away freedom from gcc to
-+        do what it thinks is best, which is desirable for the gcc 3.x series of
-+        compilers. The gcc 4.x series have a rewritten inlining algorithm and
-+        enabling this option will generate a smaller kernel there. Hopefully
-+        this algorithm is so good that allowing gcc 4.x and above to make the
-+        decision will become the default in the future. Until then this option
-+        is there to test gcc for this.
-+
-+        If unsure, say N.
-+
- config DEBUG_INFO
-       bool "Compile the kernel with debug info"
-       depends on DEBUG_KERNEL && !COMPILE_TEST
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -306,9 +306,6 @@ config ZONE_DMA32
- config AUDIT_ARCH
-       def_bool y if X86_64
--config ARCH_SUPPORTS_OPTIMIZED_INLINING
--      def_bool y
--
- config ARCH_SUPPORTS_DEBUG_PAGEALLOC
-       def_bool y
---- a/include/linux/compiler_types.h
-+++ b/include/linux/compiler_types.h
-@@ -264,8 +264,7 @@ struct ftrace_likely_data {
-  * of extern inline functions at link time.
-  * A lot of inline functions can cause havoc with function tracing.
-  */
--#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
--      !defined(CONFIG_OPTIMIZE_INLINING)
-+#if !defined(CONFIG_OPTIMIZE_INLINING)
- #define inline \
-       inline __attribute__((always_inline, unused)) notrace __gnu_inline
- #else
diff --git a/target/linux/generic/pending-4.19/240-remove-unsane-filenames-from-deps_initramfs-list.patch b/target/linux/generic/pending-4.19/240-remove-unsane-filenames-from-deps_initramfs-list.patch
deleted file mode 100644 (file)
index f440305..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: usr: sanitize deps_initramfs list
-
-If any filename in the intramfs dependency
-list contains a colon, that causes a kernel
-build error like this:
-
-/devel/openwrt/build_dir/linux-ar71xx_generic/linux-3.6.6/usr/Makefile:58: *** multiple target patterns.  Stop.
-make[5]: *** [usr] Error 2
-
-Fix it by removing such filenames from the
-deps_initramfs list.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- usr/Makefile | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -39,20 +39,22 @@ ifneq ($(wildcard $(obj)/$(datafile_d_y)
-       include $(obj)/$(datafile_d_y)
- endif
-+deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
-+
- quiet_cmd_initfs = GEN     $@
-       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
- targets := $(datafile_y)
- # do not try to update files included in initramfs
--$(deps_initramfs): ;
-+$(deps_initramfs_sane): ;
--$(deps_initramfs): klibcdirs
-+$(deps_initramfs_sane): klibcdirs
- # We rebuild initramfs_data.cpio if:
- # 1) Any included file is newer then initramfs_data.cpio
- # 2) There are changes in which files are included (added or deleted)
- # 3) If gen_init_cpio are newer than initramfs_data.cpio
- # 4) arguments to gen_initramfs.sh changes
--$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
-+$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
-       $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/$(datafile_d_y)
-       $(call if_changed,initfs)
diff --git a/target/linux/generic/pending-4.19/261-enable_wilink_platform_without_drivers.patch b/target/linux/generic/pending-4.19/261-enable_wilink_platform_without_drivers.patch
deleted file mode 100644 (file)
index 9955ab3..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Imre Kaloz <kaloz@openwrt.org>
-Subject: [PATCH] hack: net: wireless: make the wl12xx glue code available with
- compat-wireless, too
-
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- drivers/net/wireless/ti/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/ti/Kconfig
-+++ b/drivers/net/wireless/ti/Kconfig
-@@ -19,7 +19,7 @@ source "drivers/net/wireless/ti/wlcore/K
- config WILINK_PLATFORM_DATA
-       bool "TI WiLink platform data"
--      depends on WLCORE_SDIO || WL1251_SDIO
-+      depends on WLCORE_SDIO || WL1251_SDIO || ARCH_OMAP2PLUS
-       default y
-       ---help---
-       Small platform data bit needed to pass data to the sdio modules.
diff --git a/target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch
deleted file mode 100644 (file)
index 5d10cae..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Mark Miller <mark@mirell.org>
-Subject: mips: expose CONFIG_BOOT_RAW
-
-This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
-certain Broadcom chipsets running CFE in order to load the kernel.
-
-Signed-off-by: Mark Miller <mark@mirell.org>
-Acked-by: Rob Landley <rob@landley.net>
----
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1062,9 +1062,6 @@ config FW_ARC
- config ARCH_MAY_HAVE_PC_FDC
-       bool
--config BOOT_RAW
--      bool
--
- config CEVT_BCM1480
-       bool
-@@ -2968,6 +2965,18 @@ choice
-               bool "Extend builtin kernel arguments with bootloader arguments"
- endchoice
-+config BOOT_RAW
-+      bool "Enable the kernel to be executed from the load address"
-+      default n
-+      help
-+       Allow the kernel to be executed from the load address for
-+       bootloaders which cannot read the ELF format. This places
-+       a jump to start_kernel at the load address.
-+
-+       If unsure, say N.
-+
-+
-+
- endmenu
- config LOCKDEP_SUPPORT
diff --git a/target/linux/generic/pending-4.19/302-mips_no_branch_likely.patch b/target/linux/generic/pending-4.19/302-mips_no_branch_likely.patch
deleted file mode 100644 (file)
index 0e46002..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: mips: use -mno-branch-likely for kernel and userspace
-
-saves ~11k kernel size after lzma and ~12k squashfs size in the
-
-lede-commit: 41a039f46450ffae9483d6216422098669da2900
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -90,7 +90,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- # machines may also.  Since BFD is incredibly buggy with respect to
- # crossformat linking we rely on the elf2ecoff tool for format conversion.
- #
--cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe
-+cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
- cflags-y                      += -msoft-float
- LDFLAGS_vmlinux                       += -G 0 -static -n -nostdlib
- KBUILD_AFLAGS_MODULE          += -mlong-calls
diff --git a/target/linux/generic/pending-4.19/304-mips_disable_fpu.patch b/target/linux/generic/pending-4.19/304-mips_disable_fpu.patch
deleted file mode 100644 (file)
index 6e71c68..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-From:   Manuel Lauss <manuel.lauss@gmail.com>
-Subject: [RFC PATCH v4 2/2] MIPS: make FPU emulator optional
-
-This small patch makes the MIPS FPU emulator optional. The kernel
-kills float-users on systems without a hardware FPU by sending a SIGILL.
-
-Disabling the emulator shrinks vmlinux by about 54kBytes (32bit,
-optimizing for size).
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
----
-v4: rediffed because of patch 1/2, should now work with micromips as well
-v3: updated patch description with size savings.
-v2: incorporated changes suggested by Jonas Gorski
-    force the fpu emulator on for micromips: relocating the parts
-    of the mmips code in the emulator to other areas would be a
-    much larger change; I went the cheap route instead with this.
-
- arch/mips/Kbuild                     |  2 +-
- arch/mips/Kconfig                    | 14 ++++++++++++++
- arch/mips/include/asm/fpu.h          |  5 +++--
- arch/mips/include/asm/fpu_emulator.h | 15 +++++++++++++++
- 4 files changed, 33 insertions(+), 3 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -2892,6 +2892,20 @@ config MIPS_O32_FP64_SUPPORT
-         If unsure, say N.
-+config MIPS_FPU_EMULATOR
-+      bool "MIPS FPU Emulator"
-+      default y
-+      help
-+        This option lets you disable the built-in MIPS FPU (Coprocessor 1)
-+        emulator, which handles floating-point instructions on processors
-+        without a hardware FPU.  It is generally a good idea to keep the
-+        emulator built-in, unless you are perfectly sure you have a
-+        complete soft-float environment.  With the emulator disabled, all
-+        users of float operations will be killed with an illegal instr-
-+        uction exception.
-+
-+        Say Y, please.
-+
- config USE_OF
-       bool
-       select OF
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -322,7 +322,7 @@ OBJCOPYFLAGS               += --remove-section=.regin
- head-y := arch/mips/kernel/head.o
- libs-y                        += arch/mips/lib/
--libs-y                        += arch/mips/math-emu/
-+libs-$(CONFIG_MIPS_FPU_EMULATOR)      += arch/mips/math-emu/
- # See arch/mips/Kbuild for content of core part of the kernel
- core-y += arch/mips/
---- a/arch/mips/include/asm/fpu.h
-+++ b/arch/mips/include/asm/fpu.h
-@@ -230,8 +230,10 @@ static inline int init_fpu(void)
-               /* Restore FRE */
-               write_c0_config5(config5);
-               enable_fpu_hazard();
--      } else
-+      } else if (IS_ENABLED(CONFIG_MIPS_FPU_EMULATOR))
-               fpu_emulator_init_fpu();
-+      else
-+              ret = SIGILL;
-       return ret;
- }
---- a/arch/mips/include/asm/fpu_emulator.h
-+++ b/arch/mips/include/asm/fpu_emulator.h
-@@ -30,6 +30,7 @@
- #include <asm/local.h>
- #include <asm/processor.h>
-+#ifdef CONFIG_MIPS_FPU_EMULATOR
- #ifdef CONFIG_DEBUG_FS
- struct mips_fpu_emulator_stats {
-@@ -179,6 +180,16 @@ do {                                                                      \
- extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
-                                   struct mips_fpu_struct *ctx, int has_fpu,
-                                   void __user **fault_addr);
-+#else /* no CONFIG_MIPS_FPU_EMULATOR */
-+static inline int fpu_emulator_cop1Handler(struct pt_regs *xcp,
-+                              struct mips_fpu_struct *ctx, int has_fpu,
-+                              void __user **fault_addr)
-+{
-+      *fault_addr = NULL;
-+      return SIGILL;  /* we don't speak MIPS FPU */
-+}
-+#endif        /* CONFIG_MIPS_FPU_EMULATOR */
-+
- void force_fcr31_sig(unsigned long fcr31, void __user *fault_addr,
-                    struct task_struct *tsk);
- int process_fpemu_return(int sig, void __user *fault_addr,
---- a/arch/mips/include/asm/dsemul.h
-+++ b/arch/mips/include/asm/dsemul.h
-@@ -41,6 +41,7 @@ struct task_struct;
- extern int mips_dsemul(struct pt_regs *regs, mips_instruction ir,
-                      unsigned long branch_pc, unsigned long cont_pc);
-+#ifdef CONFIG_MIPS_FPU_EMULATOR
- /**
-  * do_dsemulret() - Return from a delay slot 'emulation' frame
-  * @xcp:      User thread register context.
-@@ -88,5 +89,27 @@ extern bool dsemul_thread_rollback(struc
-  * before @mm is freed in order to avoid memory leaks.
-  */
- extern void dsemul_mm_cleanup(struct mm_struct *mm);
-+#else
-+static inline bool do_dsemulret(struct pt_regs *xcp)
-+{
-+      return false;
-+}
-+
-+static inline bool dsemul_thread_cleanup(struct task_struct *tsk)
-+{
-+      return false;
-+}
-+
-+static inline bool dsemul_thread_rollback(struct pt_regs *regs)
-+{
-+      return false;
-+}
-+
-+static inline void dsemul_mm_cleanup(struct mm_struct *mm)
-+{
-+
-+}
-+
-+#endif
- #endif /* __MIPS_ASM_DSEMUL_H__ */
diff --git a/target/linux/generic/pending-4.19/305-mips_module_reloc.patch b/target/linux/generic/pending-4.19/305-mips_module_reloc.patch
deleted file mode 100644 (file)
index 609a96d..0000000
+++ /dev/null
@@ -1,371 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: mips: replace -mlong-calls with -mno-long-calls to make function calls faster in kernel modules to achieve this, try to
-
-lede-commit: 3b3d64743ba2a874df9d70cd19e242205b0a788c
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/Makefile             |   5 +
- arch/mips/include/asm/module.h |   5 +
- arch/mips/kernel/module.c      | 279 ++++++++++++++++++++++++++++++++++++++++-
- 3 files changed, 284 insertions(+), 5 deletions(-)
-
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -93,8 +93,18 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
- cflags-y                      += -msoft-float
- LDFLAGS_vmlinux                       += -G 0 -static -n -nostdlib
-+ifdef CONFIG_64BIT
- KBUILD_AFLAGS_MODULE          += -mlong-calls
- KBUILD_CFLAGS_MODULE          += -mlong-calls
-+else
-+  ifdef CONFIG_DYNAMIC_FTRACE
-+    KBUILD_AFLAGS_MODULE      += -mlong-calls
-+    KBUILD_CFLAGS_MODULE      += -mlong-calls
-+  else
-+    KBUILD_AFLAGS_MODULE      += -mno-long-calls
-+    KBUILD_CFLAGS_MODULE      += -mno-long-calls
-+  endif
-+endif
- ifeq ($(CONFIG_RELOCATABLE),y)
- LDFLAGS_vmlinux                       += --emit-relocs
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -12,6 +12,11 @@ struct mod_arch_specific {
-       const struct exception_table_entry *dbe_start;
-       const struct exception_table_entry *dbe_end;
-       struct mips_hi16 *r_mips_hi16_list;
-+
-+      void *phys_plt_tbl;
-+      void *virt_plt_tbl;
-+      unsigned int phys_plt_offset;
-+      unsigned int virt_plt_offset;
- };
- typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -44,14 +44,221 @@ struct mips_hi16 {
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
--#ifdef MODULE_START
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+      unsigned long ret = 0;
-+      unsigned int i, j;
-+      Elf_Sym *syms;
-+
-+      /* Everything marked ALLOC (this includes the exported symbols) */
-+      for (i = 1; i < hdr->e_shnum; ++i) {
-+              unsigned int info = sechdrs[i].sh_info;
-+
-+              if (sechdrs[i].sh_type != SHT_REL
-+                  && sechdrs[i].sh_type != SHT_RELA)
-+                      continue;
-+
-+              /* Not a valid relocation section? */
-+              if (info >= hdr->e_shnum)
-+                      continue;
-+
-+              /* Don't bother with non-allocated sections */
-+              if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+                      continue;
-+
-+              /* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+              if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+                  != is_init)
-+                      continue;
-+
-+              syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+              if (sechdrs[i].sh_type == SHT_REL) {
-+                      Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+                      unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+                      for (j = 0; j < size; ++j) {
-+                              Elf_Sym *sym;
-+
-+                              if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+                                      continue;
-+
-+                              sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+                              if (!is_init && sym->st_shndx != SHN_UNDEF)
-+                                      continue;
-+
-+                              ret += 4 * sizeof(int);
-+                      }
-+              } else {
-+                      Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+                      unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+                      for (j = 0; j < size; ++j) {
-+                              Elf_Sym *sym;
-+
-+                              if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+                                      continue;
-+
-+                              sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+                              if (!is_init && sym->st_shndx != SHN_UNDEF)
-+                                      continue;
-+
-+                              ret += 4 * sizeof(int);
-+                      }
-+              }
-+      }
-+
-+      return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+      unsigned order;
-+      struct page *page;
-+      struct page *p;
-+
-+      size = PAGE_ALIGN(size);
-+      order = get_order(size);
-+
-+      page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+                      __GFP_THISNODE, order);
-+      if (!page)
-+              return NULL;
-+
-+      split_page(page, order);
-+
-+      /* mark all pages except for the last one */
-+      for (p = page; p + 1 < page + (size >> PAGE_SHIFT); ++p)
-+              set_bit(PG_owner_priv_1, &p->flags);
-+
-+      for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+              __free_page(p);
-+
-+      return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr)
-+{
-+      struct page *page;
-+      bool free;
-+
-+      page = virt_to_page(ptr);
-+      do {
-+              free = test_and_clear_bit(PG_owner_priv_1, &page->flags);
-+              __free_page(page);
-+              page++;
-+      } while (free);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
-+#ifdef MODULE_START
-       return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
-                               GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,
-                               __builtin_return_address(0));
-+#else
-+      void *ptr;
-+
-+      if (size == 0)
-+              return NULL;
-+
-+      ptr = alloc_phys(size);
-+
-+      /* If we failed to allocate physically contiguous memory,
-+       * fall back to regular vmalloc. The module loader code will
-+       * create jump tables to handle long jumps */
-+      if (!ptr)
-+              return vmalloc(size);
-+
-+      return ptr;
-+#endif
- }
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+      return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+      return (KSEGX(ptr) == KSEG0);
- #endif
-+}
-+
-+/* Free memory returned from module_alloc */
-+void module_memfree(void *module_region)
-+{
-+      if (is_phys_addr(module_region))
-+              free_phys(module_region);
-+      else
-+              vfree(module_region);
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+      void *ptr;
-+
-+      if (phys)
-+              ptr = kmalloc(size, GFP_KERNEL);
-+      else
-+              ptr = vmalloc(size);
-+      return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+      if (is_phys_addr(ptr))
-+              kfree(ptr);
-+      else
-+              vfree(ptr);
-+}
-+
-+int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
-+                            char *secstrings, struct module *mod)
-+{
-+      unsigned int symindex = 0;
-+      unsigned int core_size, init_size;
-+      int i;
-+
-+      mod->arch.phys_plt_offset = 0;
-+      mod->arch.virt_plt_offset = 0;
-+      mod->arch.phys_plt_tbl = NULL;
-+      mod->arch.virt_plt_tbl = NULL;
-+
-+      if (IS_ENABLED(CONFIG_64BIT))
-+              return 0;
-+
-+      for (i = 1; i < hdr->e_shnum; i++)
-+              if (sechdrs[i].sh_type == SHT_SYMTAB)
-+                      symindex = i;
-+
-+      core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+      init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+      if ((core_size + init_size) == 0)
-+              return 0;
-+
-+      mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+      if (!mod->arch.phys_plt_tbl)
-+              return -ENOMEM;
-+
-+      mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+      if (!mod->arch.virt_plt_tbl) {
-+              __module_free(mod->arch.phys_plt_tbl);
-+              mod->arch.phys_plt_tbl = NULL;
-+              return -ENOMEM;
-+      }
-+
-+      return 0;
-+}
- static int apply_r_mips_none(struct module *me, u32 *location,
-                            u32 base, Elf_Addr v, bool rela)
-@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module
-       return 0;
- }
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+                               void *start, Elf_Addr v)
-+{
-+      unsigned *tramp = start + *plt_offset;
-+      *plt_offset += 4 * sizeof(int);
-+
-+      /* adjust carry for addiu */
-+      if (v & 0x00008000)
-+              v += 0x10000;
-+
-+      tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+      tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+      tramp[2] = 0x03200008;                  /* jr t9 */
-+      tramp[3] = 0x00000000;                  /* nop */
-+
-+      return (Elf_Addr) tramp;
-+}
-+
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+      if (is_phys_addr(location))
-+              return add_plt_entry_to(&me->arch.phys_plt_offset,
-+                              me->arch.phys_plt_tbl, v);
-+      else
-+              return add_plt_entry_to(&me->arch.virt_plt_offset,
-+                              me->arch.virt_plt_tbl, v);
-+
-+}
-+
- static int apply_r_mips_26(struct module *me, u32 *location,
-                          u32 base, Elf_Addr v, bool rela)
- {
-+      u32 ofs = base & 0x03ffffff;
-+
-       if (v % 4) {
-               pr_err("module %s: dangerous R_MIPS_26 relocation\n",
-                      me->name);
-@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module
-       }
-       if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--              pr_err("module %s: relocation overflow\n",
--                     me->name);
--              return -ENOEXEC;
-+              v = add_plt_entry(me, location, v + (ofs << 2));
-+              if (!v) {
-+                      pr_err("module %s: relocation overflow\n",
-+                             me->name);
-+                      return -ENOEXEC;
-+              }
-+              ofs = 0;
-       }
-       *location = (*location & ~0x03ffffff) |
--                  ((base + (v >> 2)) & 0x03ffffff);
-+                  ((ofs + (v >> 2)) & 0x03ffffff);
-       return 0;
- }
-@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr,
-               list_add(&me->arch.dbe_list, &dbe_list);
-               spin_unlock_irq(&dbe_lock);
-       }
-+
-+      /* Get rid of the fixup trampoline if we're running the module
-+       * from physically mapped address space */
-+      if (me->arch.phys_plt_offset == 0) {
-+              __module_free(me->arch.phys_plt_tbl);
-+              me->arch.phys_plt_tbl = NULL;
-+      }
-+      if (me->arch.virt_plt_offset == 0) {
-+              __module_free(me->arch.virt_plt_tbl);
-+              me->arch.virt_plt_tbl = NULL;
-+      }
-+
-       return 0;
- }
-+void module_arch_freeing_init(struct module *mod)
-+{
-+      if (mod->state == MODULE_STATE_LIVE)
-+              return;
-+
-+      if (mod->arch.phys_plt_tbl) {
-+              __module_free(mod->arch.phys_plt_tbl);
-+              mod->arch.phys_plt_tbl = NULL;
-+      }
-+      if (mod->arch.virt_plt_tbl) {
-+              __module_free(mod->arch.virt_plt_tbl);
-+              mod->arch.virt_plt_tbl = NULL;
-+      }
-+}
-+
- void module_arch_cleanup(struct module *mod)
- {
-       spin_lock_irq(&dbe_lock);
diff --git a/target/linux/generic/pending-4.19/306-mips_mem_functions_performance.patch b/target/linux/generic/pending-4.19/306-mips_mem_functions_performance.patch
deleted file mode 100644 (file)
index e73cfd6..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: [PATCH] mips: allow the compiler to optimize memset, memcmp, memcpy  for better performance and (in some instances) smaller code
-
-lede-commit: 07e59c7bc7f375f792ec9734be42fe4fa391a8bb
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/boot/compressed/Makefile |  3 ++-
- arch/mips/include/asm/string.h     | 38 ++++++++++++++++++++++++++++++++++++++
- arch/mips/lib/Makefile             |  2 +-
- arch/mips/lib/memcmp.c             | 22 ++++++++++++++++++++++
- 4 files changed, 63 insertions(+), 2 deletions(-)
- create mode 100644 arch/mips/lib/memcmp.c
-
---- a/arch/mips/boot/compressed/Makefile
-+++ b/arch/mips/boot/compressed/Makefile
-@@ -23,7 +23,8 @@ KBUILD_CFLAGS := $(filter-out -pg, $(KBU
- KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS))
- KBUILD_CFLAGS := $(KBUILD_CFLAGS) -D__KERNEL__ \
--      -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull"
-+      -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" \
-+      -D__ZBOOT__
- KBUILD_AFLAGS := $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
-       -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -140,4 +140,42 @@ extern void *memcpy(void *__to, __const_
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#ifndef __ZBOOT__
-+#define memset(__s, __c, len)                                 \
-+({                                                            \
-+      size_t __len = (len);                                   \
-+      void *__ret;                                            \
-+      if (__builtin_constant_p(len) && __len >= 64)           \
-+              __ret = memset((__s), (__c), __len);            \
-+      else                                                    \
-+              __ret = __builtin_memset((__s), (__c), __len);  \
-+      __ret;                                                  \
-+})
-+
-+#define memcpy(dst, src, len)                                 \
-+({                                                            \
-+      size_t __len = (len);                                   \
-+      void *__ret;                                            \
-+      if (__builtin_constant_p(len) && __len >= 64)           \
-+              __ret = memcpy((dst), (src), __len);            \
-+      else                                                    \
-+              __ret = __builtin_memcpy((dst), (src), __len);  \
-+      __ret;                                                  \
-+})
-+
-+#define memmove(dst, src, len)                                        \
-+({                                                            \
-+      size_t __len = (len);                                   \
-+      void *__ret;                                            \
-+      if (__builtin_constant_p(len) && __len >= 64)           \
-+              __ret = memmove((dst), (src), __len);           \
-+      else                                                    \
-+              __ret = __builtin_memmove((dst), (src), __len); \
-+      __ret;                                                  \
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
-+#endif
-+
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -5,7 +5,7 @@
- lib-y += bitops.o csum_partial.o delay.o memcpy.o memset.o \
-          mips-atomic.o strncpy_user.o \
--         strnlen_user.o uncached.o
-+         strnlen_user.o uncached.o memcmp.o
- obj-y                 += iomap.o iomap_copy.o
- obj-$(CONFIG_PCI)     += iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+      const unsigned char *su1, *su2;
-+      int res = 0;
-+
-+      for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+              if ((res = *su1 - *su2) != 0)
-+                      break;
-+      return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic/pending-4.19/307-mips_highmem_offset.patch b/target/linux/generic/pending-4.19/307-mips_highmem_offset.patch
deleted file mode 100644 (file)
index 9dd2fa9..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: adjust mips highmem offset to avoid the need for -mlong-calls on systems with >256M RAM
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/include/asm/mach-generic/spaces.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/include/asm/mach-generic/spaces.h
-+++ b/arch/mips/include/asm/mach-generic/spaces.h
-@@ -50,7 +50,7 @@
-  * Memory above this physical address will be considered highmem.
-  */
- #ifndef HIGHMEM_START
--#define HIGHMEM_START         _AC(0x20000000, UL)
-+#define HIGHMEM_START         _AC(0x10000000, UL)
- #endif
- #endif /* CONFIG_32BIT */
diff --git a/target/linux/generic/pending-4.19/308-mips32r2_tune.patch b/target/linux/generic/pending-4.19/308-mips32r2_tune.patch
deleted file mode 100644 (file)
index d9a2a92..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add -mtune=34kc to MIPS CFLAGS when building for mips32r2
-
-This provides a good tradeoff across at least 24Kc-74Kc, while also
-producing smaller code.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -176,7 +176,7 @@ cflags-$(CONFIG_CPU_VR41XX)        += -march=r4
- cflags-$(CONFIG_CPU_R4X00)    += -march=r4600 -Wa,--trap
- cflags-$(CONFIG_CPU_TX49XX)   += -march=r4600 -Wa,--trap
- cflags-$(CONFIG_CPU_MIPS32_R1)        += -march=mips32 -Wa,--trap
--cflags-$(CONFIG_CPU_MIPS32_R2)        += -march=mips32r2 -Wa,--trap
-+cflags-$(CONFIG_CPU_MIPS32_R2)        += -march=mips32r2 -mtune=34kc -Wa,--trap
- cflags-$(CONFIG_CPU_MIPS32_R6)        += -march=mips32r6 -Wa,--trap -modd-spreg
- cflags-$(CONFIG_CPU_MIPS64_R1)        += -march=mips64 -Wa,--trap
- cflags-$(CONFIG_CPU_MIPS64_R2)        += -march=mips64r2 -Wa,--trap
diff --git a/target/linux/generic/pending-4.19/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch b/target/linux/generic/pending-4.19/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch
deleted file mode 100644 (file)
index 303654a..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From 87ec87c2ad615c1a177cd08ef5fa29fc739f6e50 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 23 Dec 2018 18:06:53 +0100
-Subject: [PATCH] MIPS: Add CPU option reporting to /proc/cpuinfo
-
-Many MIPS CPUs have optional CPU features which are not activates for
-all CPU cores. Print the CPU options which are implemented in the core
-in /proc/cpuinfo. This makes it possible to see what features are
-supported and which are not supported. This should cover all standard
-MIPS extensions, before it only printed information about the main MIPS
-ASEs.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- arch/mips/kernel/proc.c | 116 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 116 insertions(+)
-
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -130,6 +130,122 @@ static int show_cpuinfo(struct seq_file
-               seq_printf(m, "micromips kernel\t: %s\n",
-                     (read_c0_config3() & MIPS_CONF3_ISA_OE) ?  "yes" : "no");
-       }
-+
-+      seq_printf(m, "Options implemented\t:");
-+      if (cpu_has_tlb)
-+              seq_printf(m, "%s", " tlb");
-+      if (cpu_has_ftlb)
-+              seq_printf(m, "%s", " ftlb");
-+      if (cpu_has_tlbinv)
-+              seq_printf(m, "%s", " tlbinv");
-+      if (cpu_has_segments)
-+              seq_printf(m, "%s", " segments");
-+      if (cpu_has_rixiex)
-+              seq_printf(m, "%s", " rixiex");
-+      if (cpu_has_ldpte)
-+              seq_printf(m, "%s", " ldpte");
-+      if (cpu_has_maar)
-+              seq_printf(m, "%s", " maar");
-+      if (cpu_has_rw_llb)
-+              seq_printf(m, "%s", " rw_llb");
-+      if (cpu_has_4kex)
-+              seq_printf(m, "%s", " 4kex");
-+      if (cpu_has_3k_cache)
-+              seq_printf(m, "%s", " 3k_cache");
-+      if (cpu_has_4k_cache)
-+              seq_printf(m, "%s", " 4k_cache");
-+      if (cpu_has_6k_cache)
-+              seq_printf(m, "%s", " 6k_cache");
-+      if (cpu_has_8k_cache)
-+              seq_printf(m, "%s", " 8k_cache");
-+      if (cpu_has_tx39_cache)
-+              seq_printf(m, "%s", " tx39_cache");
-+      if (cpu_has_octeon_cache)
-+              seq_printf(m, "%s", " octeon_cache");
-+      if (cpu_has_fpu)
-+              seq_printf(m, "%s", " fpu");
-+      if (cpu_has_32fpr)
-+              seq_printf(m, "%s", " 32fpr");
-+      if (cpu_has_cache_cdex_p)
-+              seq_printf(m, "%s", " cache_cdex_p");
-+      if (cpu_has_cache_cdex_s)
-+              seq_printf(m, "%s", " cache_cdex_s");
-+      if (cpu_has_prefetch)
-+              seq_printf(m, "%s", " prefetch");
-+      if (cpu_has_mcheck)
-+              seq_printf(m, "%s", " mcheck");
-+      if (cpu_has_ejtag)
-+              seq_printf(m, "%s", " ejtag");
-+      if (cpu_has_llsc)
-+              seq_printf(m, "%s", " llsc");
-+      if (cpu_has_bp_ghist)
-+              seq_printf(m, "%s", " bp_ghist");
-+      if (cpu_has_guestctl0ext)
-+              seq_printf(m, "%s", " guestctl0ext");
-+      if (cpu_has_guestctl1)
-+              seq_printf(m, "%s", " guestctl1");
-+      if (cpu_has_guestctl2)
-+              seq_printf(m, "%s", " guestctl2");
-+      if (cpu_has_guestid)
-+              seq_printf(m, "%s", " guestid");
-+      if (cpu_has_drg)
-+              seq_printf(m, "%s", " drg");
-+      if (cpu_has_rixi)
-+              seq_printf(m, "%s", " rixi");
-+      if (cpu_has_lpa)
-+              seq_printf(m, "%s", " lpa");
-+      if (cpu_has_mvh)
-+              seq_printf(m, "%s", " mvh");
-+      if (cpu_has_vtag_icache)
-+              seq_printf(m, "%s", " vtag_icache");
-+      if (cpu_has_dc_aliases)
-+              seq_printf(m, "%s", " dc_aliases");
-+      if (cpu_has_ic_fills_f_dc)
-+              seq_printf(m, "%s", " ic_fills_f_dc");
-+      if (cpu_has_pindexed_dcache)
-+              seq_printf(m, "%s", " pindexed_dcache");
-+      if (cpu_has_userlocal)
-+              seq_printf(m, "%s", " userlocal");
-+      if (cpu_has_nofpuex)
-+              seq_printf(m, "%s", " nofpuex");
-+      if (cpu_has_vint)
-+              seq_printf(m, "%s", " vint");
-+      if (cpu_has_veic)
-+              seq_printf(m, "%s", " veic");
-+      if (cpu_has_inclusive_pcaches)
-+              seq_printf(m, "%s", " inclusive_pcaches");
-+      if (cpu_has_perf_cntr_intr_bit)
-+              seq_printf(m, "%s", " perf_cntr_intr_bit");
-+      if (cpu_has_ufr)
-+              seq_printf(m, "%s", " ufr");
-+      if (cpu_has_fre)
-+              seq_printf(m, "%s", " fre");
-+      if (cpu_has_cdmm)
-+              seq_printf(m, "%s", " cdmm");
-+      if (cpu_has_small_pages)
-+              seq_printf(m, "%s", " small_pages");
-+      if (cpu_has_nan_legacy)
-+              seq_printf(m, "%s", " nan_legacy");
-+      if (cpu_has_nan_2008)
-+              seq_printf(m, "%s", " nan_2008");
-+      if (cpu_has_ebase_wg)
-+              seq_printf(m, "%s", " ebase_wg");
-+      if (cpu_has_badinstr)
-+              seq_printf(m, "%s", " badinstr");
-+      if (cpu_has_badinstrp)
-+              seq_printf(m, "%s", " badinstrp");
-+      if (cpu_has_contextconfig)
-+              seq_printf(m, "%s", " contextconfig");
-+      if (cpu_has_perf)
-+              seq_printf(m, "%s", " perf");
-+      if (cpu_has_shared_ftlb_ram)
-+              seq_printf(m, "%s", " shared_ftlb_ram");
-+      if (cpu_has_shared_ftlb_entries)
-+              seq_printf(m, "%s", " shared_ftlb_entries");
-+      if (cpu_has_mipsmt_pertccounters)
-+              seq_printf(m, "%s", " mipsmt_pertccounters");
-+      seq_printf(m, "\n");
-+
-       seq_printf(m, "shadow register sets\t: %d\n",
-                     cpu_data[n].srsets);
-       seq_printf(m, "kscratch registers\t: %d\n",
diff --git a/target/linux/generic/pending-4.19/310-arm_module_unresolved_weak_sym.patch b/target/linux/generic/pending-4.19/310-arm_module_unresolved_weak_sym.patch
deleted file mode 100644 (file)
index bc9f0a4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: fix errors in unresolved weak symbols on arm
-
-lede-commit: 570699d4838a907c3ef9f2819bf19eb72997b32f
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/arm/kernel/module.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -95,6 +95,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
-                       return -ENOEXEC;
-               }
-+              if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+                  ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+                      continue;
-+
-               loc = dstsec->sh_addr + rel->r_offset;
-               switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic/pending-4.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-4.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch
deleted file mode 100644 (file)
index 1187543..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Subject: MIPS: kexec: Accept command line parameters from userspace.
-
-Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
----
- arch/mips/kernel/machine_kexec.c   |  153 +++++++++++++++++++++++++++++++-----
- arch/mips/kernel/machine_kexec.h   |   20 +++++
- arch/mips/kernel/relocate_kernel.S |   21 +++--
- 3 files changed, 167 insertions(+), 27 deletions(-)
- create mode 100644 arch/mips/kernel/machine_kexec.h
-
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -10,14 +10,11 @@
- #include <linux/mm.h>
- #include <linux/delay.h>
-+#include <asm/bootinfo.h>
- #include <asm/cacheflush.h>
- #include <asm/page.h>
--
--extern const unsigned char relocate_new_kernel[];
--extern const size_t relocate_new_kernel_size;
--
--extern unsigned long kexec_start_address;
--extern unsigned long kexec_indirection_page;
-+#include <linux/uaccess.h>
-+#include "machine_kexec.h"
- int (*_machine_kexec_prepare)(struct kimage *) = NULL;
- void (*_machine_kexec_shutdown)(void) = NULL;
-@@ -28,6 +25,99 @@ atomic_t kexec_ready_to_reboot = ATOMIC_
- void (*_crash_smp_send_stop)(void) = NULL;
- #endif
-+static void machine_kexec_print_args(void)
-+{
-+      unsigned long argc = (int)kexec_args[0];
-+      int i;
-+
-+      pr_info("kexec_args[0] (argc): %lu\n", argc);
-+      pr_info("kexec_args[1] (argv): %p\n", (void *)kexec_args[1]);
-+      pr_info("kexec_args[2] (env ): %p\n", (void *)kexec_args[2]);
-+      pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]);
-+
-+      for (i = 0; i < argc; i++) {
-+              pr_info("kexec_argv[%d] = %p, %s\n",
-+                              i, kexec_argv[i], kexec_argv[i]);
-+      }
-+}
-+
-+static void machine_kexec_init_argv(struct kimage *image)
-+{
-+      void __user *buf = NULL;
-+      size_t bufsz;
-+      size_t size;
-+      int i;
-+
-+      bufsz = 0;
-+      for (i = 0; i < image->nr_segments; i++) {
-+              struct kexec_segment *seg;
-+
-+              seg = &image->segment[i];
-+              if (seg->bufsz < 6)
-+                      continue;
-+
-+              if (strncmp((char *) seg->buf, "kexec ", 6))
-+                      continue;
-+
-+              buf = seg->buf;
-+              bufsz = seg->bufsz;
-+              break;
-+      }
-+
-+      if (!buf)
-+              return;
-+
-+      size = KEXEC_COMMAND_LINE_SIZE;
-+      size = min(size, bufsz);
-+      if (size < bufsz)
-+              pr_warn("kexec command line truncated to %zd bytes\n", size);
-+
-+      /* Copy to kernel space */
-+      copy_from_user(kexec_argv_buf, buf, size);
-+      kexec_argv_buf[size - 1] = 0;
-+}
-+
-+static void machine_kexec_parse_argv(struct kimage *image)
-+{
-+      char *reboot_code_buffer;
-+      int reloc_delta;
-+      char *ptr;
-+      int argc;
-+      int i;
-+
-+      ptr = kexec_argv_buf;
-+      argc = 0;
-+
-+      /*
-+       * convert command line string to array of parameters
-+       * (as bootloader does).
-+       */
-+      while (ptr && *ptr && (KEXEC_MAX_ARGC > argc)) {
-+              if (*ptr == ' ') {
-+                      *ptr++ = '\0';
-+                      continue;
-+              }
-+
-+              kexec_argv[argc++] = ptr;
-+              ptr = strchr(ptr, ' ');
-+      }
-+
-+      if (!argc)
-+              return;
-+
-+      kexec_args[0] = argc;
-+      kexec_args[1] = (unsigned long)kexec_argv;
-+      kexec_args[2] = 0;
-+      kexec_args[3] = 0;
-+
-+      reboot_code_buffer = page_address(image->control_code_page);
-+      reloc_delta = reboot_code_buffer - (char *)kexec_relocate_new_kernel;
-+
-+      kexec_args[1] += reloc_delta;
-+      for (i = 0; i < argc; i++)
-+              kexec_argv[i] += reloc_delta;
-+}
-+
- static void kexec_image_info(const struct kimage *kimage)
- {
-       unsigned long i;
-@@ -52,6 +142,18 @@ int
- machine_kexec_prepare(struct kimage *kimage)
- {
-       kexec_image_info(kimage);
-+      /*
-+       * Whenever arguments passed from kexec-tools, Init the arguments as
-+       * the original ones to try avoiding booting failure.
-+       */
-+
-+      kexec_args[0] = fw_arg0;
-+      kexec_args[1] = fw_arg1;
-+      kexec_args[2] = fw_arg2;
-+      kexec_args[3] = fw_arg3;
-+
-+      machine_kexec_init_argv(kimage);
-+      machine_kexec_parse_argv(kimage);
-       if (_machine_kexec_prepare)
-               return _machine_kexec_prepare(kimage);
-@@ -89,10 +191,12 @@ machine_kexec(struct kimage *image)
-       unsigned long *ptr;
-       reboot_code_buffer =
--        (unsigned long)page_address(image->control_code_page);
-+              (unsigned long)page_address(image->control_code_page);
-+      pr_info("reboot_code_buffer = %p\n", (void *)reboot_code_buffer);
-       kexec_start_address =
-               (unsigned long) phys_to_virt(image->start);
-+      pr_info("kexec_start_address = %p\n", (void *)kexec_start_address);
-       if (image->type == KEXEC_TYPE_DEFAULT) {
-               kexec_indirection_page =
-@@ -100,9 +204,19 @@ machine_kexec(struct kimage *image)
-       } else {
-               kexec_indirection_page = (unsigned long)&image->head;
-       }
-+      pr_info("kexec_indirection_page = %p\n", (void *)kexec_indirection_page);
--      memcpy((void*)reboot_code_buffer, relocate_new_kernel,
--             relocate_new_kernel_size);
-+      pr_info("Where is memcpy: %p\n", memcpy);
-+      pr_info("kexec_relocate_new_kernel = %p, kexec_relocate_new_kernel_end = %p\n",
-+              (void *)kexec_relocate_new_kernel, &kexec_relocate_new_kernel_end);
-+      pr_info("Copy %lu bytes from %p to %p\n", KEXEC_RELOCATE_NEW_KERNEL_SIZE,
-+              (void *)kexec_relocate_new_kernel, (void *)reboot_code_buffer);
-+      memcpy((void*)reboot_code_buffer, kexec_relocate_new_kernel,
-+             KEXEC_RELOCATE_NEW_KERNEL_SIZE);
-+
-+      pr_info("Before _print_args().\n");
-+      machine_kexec_print_args();
-+      pr_info("Before eval loop.\n");
-       /*
-        * The generic kexec code builds a page list with physical
-@@ -124,15 +238,16 @@ machine_kexec(struct kimage *image)
-       /*
-        * we do not want to be bothered.
-        */
-+      pr_info("Before irq_disable.\n");
-       local_irq_disable();
--      printk("Will call new kernel at %08lx\n", image->start);
--      printk("Bye ...\n");
-+      pr_info("Will call new kernel at %08lx\n", image->start);
-+      pr_info("Bye ...\n");
-       __flush_cache_all();
- #ifdef CONFIG_SMP
-       /* All secondary cpus now may jump to kexec_wait cycle */
-       relocated_kexec_smp_wait = reboot_code_buffer +
--              (void *)(kexec_smp_wait - relocate_new_kernel);
-+              (void *)(kexec_smp_wait - kexec_relocate_new_kernel);
-       smp_wmb();
-       atomic_set(&kexec_ready_to_reboot, 1);
- #endif
---- /dev/null
-+++ b/arch/mips/kernel/machine_kexec.h
-@@ -0,0 +1,20 @@
-+#ifndef _MACHINE_KEXEC_H
-+#define _MACHINE_KEXEC_H
-+
-+#ifndef __ASSEMBLY__
-+extern const unsigned char kexec_relocate_new_kernel[];
-+extern unsigned long kexec_relocate_new_kernel_end;
-+extern unsigned long kexec_start_address;
-+extern unsigned long kexec_indirection_page;
-+
-+extern char kexec_argv_buf[];
-+extern char *kexec_argv[];
-+
-+#define KEXEC_RELOCATE_NEW_KERNEL_SIZE        ((unsigned long)&kexec_relocate_new_kernel_end - (unsigned long)kexec_relocate_new_kernel)
-+#endif /* !__ASSEMBLY__ */
-+
-+#define KEXEC_COMMAND_LINE_SIZE               256
-+#define KEXEC_ARGV_SIZE                       (KEXEC_COMMAND_LINE_SIZE / 16)
-+#define KEXEC_MAX_ARGC                        (KEXEC_ARGV_SIZE / sizeof(long))
-+
-+#endif
---- a/arch/mips/kernel/relocate_kernel.S
-+++ b/arch/mips/kernel/relocate_kernel.S
-@@ -12,8 +12,9 @@
- #include <asm/mipsregs.h>
- #include <asm/stackframe.h>
- #include <asm/addrspace.h>
-+#include "machine_kexec.h"
--LEAF(relocate_new_kernel)
-+LEAF(kexec_relocate_new_kernel)
-       PTR_L a0,       arg0
-       PTR_L a1,       arg1
-       PTR_L a2,       arg2
-@@ -98,7 +99,7 @@ done:
- #endif
-       /* jump to kexec_start_address */
-       j               s1
--      END(relocate_new_kernel)
-+      END(kexec_relocate_new_kernel)
- #ifdef CONFIG_SMP
- /*
-@@ -184,9 +185,15 @@ kexec_indirection_page:
-       PTR             0
-       .size           kexec_indirection_page, PTRSIZE
--relocate_new_kernel_end:
-+kexec_argv_buf:
-+      EXPORT(kexec_argv_buf)
-+      .skip           KEXEC_COMMAND_LINE_SIZE
-+      .size           kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE
-+
-+kexec_argv:
-+      EXPORT(kexec_argv)
-+      .skip           KEXEC_ARGV_SIZE
-+      .size           kexec_argv, KEXEC_ARGV_SIZE
--relocate_new_kernel_size:
--      EXPORT(relocate_new_kernel_size)
--      PTR             relocate_new_kernel_end - relocate_new_kernel
--      .size           relocate_new_kernel_size, PTRSIZE
-+kexec_relocate_new_kernel_end:
-+      EXPORT(kexec_relocate_new_kernel_end)
diff --git a/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch
deleted file mode 100644 (file)
index 6fea6f0..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 34ef04f3845ed2b47d57dd9d3b795b16e1f8185a Mon Sep 17 00:00:00 2001
-From: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
-Date: Fri, 15 Mar 2019 18:53:38 +0300
-Subject: [PATCH] arc add OWRTDTB section
-
-This change allows OpenWRT to patch resulting kernel binary with
-external .dtb.
-
-That allows us to re-use exactky the same vmlinux on different boards
-given its ARC core configurations match (at least cache line sizes etc).
-
-""patch-dtb" searches for ASCII "OWRTDTB:" strign and copies external
-.dtb right after it, keeping the string in place.
-
-Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
-Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
----
- arch/arc/kernel/head.S        | 10 ++++++++++
- arch/arc/kernel/setup.c       |  4 +++-
- arch/arc/kernel/vmlinux.lds.S | 13 +++++++++++++
- 3 files changed, 26 insertions(+), 1 deletion(-)
-
---- a/arch/arc/kernel/head.S
-+++ b/arch/arc/kernel/head.S
-@@ -59,6 +59,16 @@
- #endif
- .endm
-+      ; Here "patch-dtb" will embed external .dtb
-+      ; Note "patch-dtb" searches for ASCII "OWRTDTB:" string
-+      ; and pastes .dtb right after it, hense the string precedes
-+      ; __image_dtb symbol.
-+      .section .owrt, "aw",@progbits
-+      .ascii  "OWRTDTB:"
-+ENTRY(__image_dtb)
-+      .fill   0x4000
-+END(__image_dtb)
-+
-       .section .init.text, "ax",@progbits
- ;----------------------------------------------------------------
---- a/arch/arc/kernel/setup.c
-+++ b/arch/arc/kernel/setup.c
-@@ -528,7 +528,7 @@ ignore_uboot_args:
- #endif
-       if (use_embedded_dtb) {
--              machine_desc = setup_machine_fdt(__dtb_start);
-+              machine_desc = setup_machine_fdt(&__image_dtb);
-               if (!machine_desc)
-                       panic("Embedded DT invalid\n");
-       }
-@@ -544,6 +544,8 @@ ignore_uboot_args:
-       }
- }
-+extern struct boot_param_header __image_dtb;
-+
- void __init setup_arch(char **cmdline_p)
- {
-       handle_uboot_args();
---- a/arch/arc/kernel/vmlinux.lds.S
-+++ b/arch/arc/kernel/vmlinux.lds.S
-@@ -30,6 +30,19 @@ SECTIONS
-       . = CONFIG_LINUX_LINK_BASE;
-+      /*
-+      * In OpenWRT we want to patch built binary embedding .dtb of choice.
-+      * This is implemented with "patch-dtb" utility which searches for
-+      * "OWRTDTB:" string in first 16k of image and if it is found
-+      * copies .dtb right after mentioned string.
-+      *
-+      * Note: "OWRTDTB:" won't be overwritten with .dtb, .dtb will follow it.
-+      */
-+      .owrt : {
-+              *(.owrt)
-+      . = ALIGN(PAGE_SIZE);
-+      }
-+
-       _int_vec_base_lds = .;
-       .vector : {
-               *(.vector)
diff --git a/target/linux/generic/pending-4.19/333-arc-enable-unaligned-access-in-kernel-mode.patch b/target/linux/generic/pending-4.19/333-arc-enable-unaligned-access-in-kernel-mode.patch
deleted file mode 100644 (file)
index 4e0265a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Subject: arc: enable unaligned access in kernel mode
-
-This enables misaligned access handling even in kernel mode.
-Some wireless drivers (ath9k-htc and mt7601u) use misaligned accesses
-here and there and to cope with that without fixing stuff in the drivers
-we're just gracefully handling it on ARC.
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- arch/arc/kernel/unaligned.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arc/kernel/unaligned.c
-+++ b/arch/arc/kernel/unaligned.c
-@@ -206,7 +206,7 @@ int misaligned_fixup(unsigned long addre
-       char buf[TASK_COMM_LEN];
-       /* handle user mode only and only if enabled by sysadmin */
--      if (!user_mode(regs) || !unaligned_enabled)
-+      if (!unaligned_enabled)
-               return 1;
-       if (no_unaligned_warning) {
diff --git a/target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch b/target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
deleted file mode 100644 (file)
index d28bc7b..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 203f17906ff45705fbdaa0430dbbc71142c2640f Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sat, 8 Dec 2018 21:45:53 +0100
-Subject: [PATCH 1/3] MIPS: Compile post DMA flush only when needed
-
-dma_sync_phys() is only called for some CPUs when a mapping is removed.
-Add ARCH_HAS_SYNC_DMA_FOR_CPU only for the CPUs listed in
-cpu_needs_post_dma_flush() which need this extra call and do not compile
-this code in for other CPUs. We need this for R10000, R12000, BMIPS5000
-CPUs and CPUs supporting MAAR which was introduced in MIPS32r5.
-
-This will hopefully improve the performance of the not affected devices.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- arch/mips/Kconfig              | 6 +++++-
- arch/mips/mm/dma-noncoherent.c | 2 ++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1116,7 +1116,6 @@ config DMA_PERDEV_COHERENT
- config DMA_NONCOHERENT
-       bool
-       select ARCH_HAS_SYNC_DMA_FOR_DEVICE
--      select ARCH_HAS_SYNC_DMA_FOR_CPU
-       select NEED_DMA_MAP_STATE
-       select DMA_NONCOHERENT_MMAP
-       select DMA_NONCOHERENT_CACHE_SYNC
-@@ -1897,9 +1896,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
- config SYS_HAS_CPU_MIPS32_R5
-       bool
-+      select ARCH_HAS_SYNC_DMA_FOR_CPU
- config SYS_HAS_CPU_MIPS32_R6
-       bool
-+      select ARCH_HAS_SYNC_DMA_FOR_CPU
- config SYS_HAS_CPU_MIPS64_R1
-       bool
-@@ -1909,6 +1910,7 @@ config SYS_HAS_CPU_MIPS64_R2
- config SYS_HAS_CPU_MIPS64_R6
-       bool
-+      select ARCH_HAS_SYNC_DMA_FOR_CPU
- config SYS_HAS_CPU_R3000
-       bool
-@@ -1945,6 +1947,7 @@ config SYS_HAS_CPU_R8000
- config SYS_HAS_CPU_R10000
-       bool
-+      select ARCH_HAS_SYNC_DMA_FOR_CPU
- config SYS_HAS_CPU_RM7000
-       bool
-@@ -1973,6 +1976,7 @@ config SYS_HAS_CPU_BMIPS4380
- config SYS_HAS_CPU_BMIPS5000
-       bool
-       select SYS_HAS_CPU_BMIPS
-+      select ARCH_HAS_SYNC_DMA_FOR_CPU
- config SYS_HAS_CPU_XLR
-       bool
---- a/arch/mips/mm/dma-noncoherent.c
-+++ b/arch/mips/mm/dma-noncoherent.c
-@@ -191,12 +191,14 @@ void arch_sync_dma_for_device(struct dev
-               dma_sync_phys(paddr, size, dir);
- }
-+#ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU
- void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
-               size_t size, enum dma_data_direction dir)
- {
-       if (cpu_needs_post_dma_flush(dev))
-               dma_sync_phys(paddr, size, dir);
- }
-+#endif
- void arch_dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-               enum dma_data_direction direction)
diff --git a/target/linux/generic/pending-4.19/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch b/target/linux/generic/pending-4.19/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch
deleted file mode 100644 (file)
index b353e20..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 66770a004afe10df11d3902e16eaa0c2c39436bb Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Fri, 24 May 2019 17:56:19 +0200
-Subject: [PATCH] powerpc: Enable kernel XZ compression option on PPC_85xx
-
-Enable kernel XZ compression option on PPC_85xx. Tested with
-simpleImage on TP-Link TL-WDR4900 (Freescale P1014 processor).
-
-Suggested-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- arch/powerpc/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index a80669209155..f1e9f31ee3b0 100644
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -197,7 +197,7 @@ config PPC
-       select HAVE_IOREMAP_PROT
-       select HAVE_IRQ_EXIT_ON_IRQ_STACK
-       select HAVE_KERNEL_GZIP
--      select HAVE_KERNEL_XZ                   if PPC_BOOK3S
-+      select HAVE_KERNEL_XZ                   if PPC_BOOK3S || PPC_85xx
-       select HAVE_KPROBES
-       select HAVE_KPROBES_ON_FTRACE
-       select HAVE_KRETPROBES
--- 
-2.20.1
-
diff --git a/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch
deleted file mode 100644 (file)
index e646224..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: make rootfs split/detection more generic - patch can be moved to generic-2.6 after testing on other platforms
-
-lede-commit: 328e660b31f0937d52c5ae3d6e7029409918a9df
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/Kconfig            | 17 +++++++++++++++++
- drivers/mtd/mtdpart.c          | 35 +++++++++++++++++++++++++++++++++++
- include/linux/mtd/partitions.h |  2 ++
- 3 files changed, 54 insertions(+)
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -11,6 +11,23 @@ menuconfig MTD
- if MTD
-+menu "OpenWrt specific MTD options"
-+
-+config MTD_ROOTFS_ROOT_DEV
-+      bool "Automatically set 'rootfs' partition to be root filesystem"
-+      default y
-+
-+config MTD_SPLIT_FIRMWARE
-+      bool "Automatically split firmware partition for kernel+rootfs"
-+      default y
-+
-+config MTD_SPLIT_FIRMWARE_NAME
-+      string "Firmware partition name"
-+      depends on MTD_SPLIT_FIRMWARE
-+      default "firmware"
-+
-+endmenu
-+
- config MTD_TESTS
-       tristate "MTD tests support (DANGEROUS)"
-       depends on m
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -29,10 +29,12 @@
- #include <linux/kmod.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-+#include <linux/magic.h>
- #include <linux/err.h>
- #include <linux/of.h>
- #include "mtdcore.h"
-+#include "mtdsplit/mtdsplit.h"
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -52,6 +54,8 @@ struct mtd_part {
-       struct list_head list;
- };
-+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
-+
- /*
-  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
-  * the pointer to that structure.
-@@ -623,6 +627,7 @@ int mtd_add_partition(struct mtd_info *p
-       mutex_unlock(&mtd_partitions_mutex);
-       add_mtd_device(&new->mtd);
-+      mtd_partition_split(parent, new);
-       mtd_add_partition_attrs(new);
-@@ -701,6 +706,29 @@ int mtd_del_partition(struct mtd_info *m
- }
- EXPORT_SYMBOL_GPL(mtd_del_partition);
-+#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
-+#define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
-+#else
-+#define SPLIT_FIRMWARE_NAME   "unused"
-+#endif
-+
-+static void split_firmware(struct mtd_info *master, struct mtd_part *part)
-+{
-+}
-+
-+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
-+{
-+      static int rootfs_found = 0;
-+
-+      if (rootfs_found)
-+              return;
-+
-+      if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
-+          !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
-+          !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
-+              split_firmware(master, part);
-+}
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -732,6 +760,7 @@ int add_mtd_partitions(struct mtd_info *
-               mutex_unlock(&mtd_partitions_mutex);
-               add_mtd_device(&slave->mtd);
-+              mtd_partition_split(master, slave);
-               mtd_add_partition_attrs(slave);
-               /* Look for subpartitions */
-               parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
diff --git a/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch
deleted file mode 100644 (file)
index 4026a20..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: mtd: add support for different partition parser types
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdpart.c          |   56 ++++++++++++++++++++++++++++++++++++++++
- include/linux/mtd/partitions.h |   11 ++++++++
- 2 files changed, 67 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -55,6 +55,10 @@ struct mtd_part {
- };
- static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
-+static int parse_mtd_partitions_by_type(struct mtd_info *master,
-+                                      enum mtd_parser_type type,
-+                                      const struct mtd_partition **pparts,
-+                                      struct mtd_part_parser_data *data);
- /*
-  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
-@@ -706,6 +710,36 @@ int mtd_del_partition(struct mtd_info *m
- }
- EXPORT_SYMBOL_GPL(mtd_del_partition);
-+static int
-+run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
-+{
-+      struct mtd_partition *parts;
-+      int nr_parts;
-+      int i;
-+
-+      nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, (const struct mtd_partition **)&parts,
-+                                              NULL);
-+      if (nr_parts <= 0)
-+              return nr_parts;
-+
-+      if (WARN_ON(!parts))
-+              return 0;
-+
-+      for (i = 0; i < nr_parts; i++) {
-+              /* adjust partition offsets */
-+              parts[i].offset += slave->offset;
-+
-+              mtd_add_partition(slave->parent,
-+                                parts[i].name,
-+                                parts[i].offset,
-+                                parts[i].size);
-+      }
-+
-+      kfree(parts);
-+
-+      return nr_parts;
-+}
-+
- #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #else
-@@ -1041,6 +1075,61 @@ void mtd_part_parser_cleanup(struct mtd_
-       }
- }
-+static struct mtd_part_parser *
-+get_partition_parser_by_type(enum mtd_parser_type type,
-+                           struct mtd_part_parser *start)
-+{
-+      struct mtd_part_parser *p, *ret = NULL;
-+
-+      spin_lock(&part_parser_lock);
-+
-+      p = list_prepare_entry(start, &part_parsers, list);
-+      if (start)
-+              mtd_part_parser_put(start);
-+
-+      list_for_each_entry_continue(p, &part_parsers, list) {
-+              if (p->type == type && try_module_get(p->owner)) {
-+                      ret = p;
-+                      break;
-+              }
-+      }
-+
-+      spin_unlock(&part_parser_lock);
-+
-+      return ret;
-+}
-+
-+static int parse_mtd_partitions_by_type(struct mtd_info *master,
-+                                      enum mtd_parser_type type,
-+                                      const struct mtd_partition **pparts,
-+                                      struct mtd_part_parser_data *data)
-+{
-+      struct mtd_part_parser *prev = NULL;
-+      int ret = 0;
-+
-+      while (1) {
-+              struct mtd_part_parser *parser;
-+
-+              parser = get_partition_parser_by_type(type, prev);
-+              if (!parser)
-+                      break;
-+
-+              ret = (*parser->parse_fn)(master, pparts, data);
-+
-+              if (ret > 0) {
-+                      mtd_part_parser_put(parser);
-+                      printk(KERN_NOTICE
-+                             "%d %s partitions found on MTD device %s\n",
-+                             ret, parser->name, master->name);
-+                      break;
-+              }
-+
-+              prev = parser;
-+      }
-+
-+      return ret;
-+}
-+
- int mtd_is_partition(const struct mtd_info *mtd)
- {
-       struct mtd_part *part;
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -73,6 +73,10 @@ struct mtd_part_parser_data {
-  * Functions dealing with the various ways of partitioning the space
-  */
-+enum mtd_parser_type {
-+      MTD_PARSER_TYPE_DEVICE = 0,
-+};
-+
- struct mtd_part_parser {
-       struct list_head list;
-       struct module *owner;
-@@ -81,6 +85,7 @@ struct mtd_part_parser {
-       int (*parse_fn)(struct mtd_info *, const struct mtd_partition **,
-                       struct mtd_part_parser_data *);
-       void (*cleanup)(const struct mtd_partition *pparts, int nr_parts);
-+      enum mtd_parser_type type;
- };
- /* Container for passing around a set of parsed partitions */
diff --git a/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
deleted file mode 100644 (file)
index 8a90ce6..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: kernel/3.10: allow to use partition parsers for rootfs and firmware split
-
-lede-commit: 3b71cd94bc9517bc25267dccb393b07d4b54564e
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdpart.c          | 37 +++++++++++++++++++++++++++++++++++++
- include/linux/mtd/partitions.h |  2 ++
- 2 files changed, 39 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -748,6 +748,7 @@ run_parsers_by_type(struct mtd_part *sla
- static void split_firmware(struct mtd_info *master, struct mtd_part *part)
- {
-+      run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
- }
- static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
-@@ -757,6 +758,12 @@ static void mtd_partition_split(struct m
-       if (rootfs_found)
-               return;
-+      if (!strcmp(part->mtd.name, "rootfs")) {
-+              run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
-+
-+              rootfs_found = 1;
-+      }
-+
-       if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
-           !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
-           !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -75,6 +75,8 @@ struct mtd_part_parser_data {
- enum mtd_parser_type {
-       MTD_PARSER_TYPE_DEVICE = 0,
-+      MTD_PARSER_TYPE_ROOTFS,
-+      MTD_PARSER_TYPE_FIRMWARE,
- };
- struct mtd_part_parser {
diff --git a/target/linux/generic/pending-4.19/403-mtd-hook-mtdsplit-to-Kbuild.patch b/target/linux/generic/pending-4.19/403-mtd-hook-mtdsplit-to-Kbuild.patch
deleted file mode 100644 (file)
index 60cf043..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: [PATCH] kernel/3.10: move squashfs check from rootfs split code into a separate file
-
-lede-commit: d89bea92b31b4e157a0fa438e75370f089f73427
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/Kconfig  | 2 ++
- drivers/mtd/Makefile | 2 ++
- 2 files changed, 4 insertions(+)
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -26,6 +26,8 @@ config MTD_SPLIT_FIRMWARE_NAME
-       depends on MTD_SPLIT_FIRMWARE
-       default "firmware"
-+source "drivers/mtd/mtdsplit/Kconfig"
-+
- endmenu
- config MTD_TESTS
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -7,6 +7,8 @@
- obj-$(CONFIG_MTD)             += mtd.o
- mtd-y                         := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
-+obj-$(CONFIG_MTD_SPLIT)               += mtdsplit/
-+
- obj-$(CONFIG_MTD_OF_PARTS)    += ofpart.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
diff --git a/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch
deleted file mode 100644 (file)
index 2e95e99..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: kernel/3.10: add separate rootfs partition parser
-
-lede-commit: daec7ad7688415156e2730e401503d09bd3acf91
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdpart.c          | 29 +++++++++++++++++++++++++++++
- include/linux/mtd/mtd.h        | 18 ++++++++++++++++++
- include/linux/mtd/partitions.h |  2 ++
- 3 files changed, 49 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -1154,6 +1154,24 @@ int mtd_is_partition(const struct mtd_in
- }
- EXPORT_SYMBOL_GPL(mtd_is_partition);
-+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd)
-+{
-+      if (!mtd_is_partition(mtd))
-+              return (struct mtd_info *)mtd;
-+
-+      return mtd_to_part(mtd)->parent;
-+}
-+EXPORT_SYMBOL_GPL(mtdpart_get_master);
-+
-+uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
-+{
-+      if (!mtd_is_partition(mtd))
-+              return 0;
-+
-+      return mtd_to_part(mtd)->offset;
-+}
-+EXPORT_SYMBOL_GPL(mtdpart_get_offset);
-+
- /* Returns the size of the entire flash chip */
- uint64_t mtd_get_device_size(const struct mtd_info *mtd)
- {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -507,6 +507,24 @@ static inline void mtd_align_erase_req(s
-               req->len += mtd->erasesize - mod;
- }
-+static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd)
-+{
-+      if (mtd_mod_by_eb(sz, mtd) == 0)
-+              return sz;
-+
-+      /* Round up to next erase block */
-+      return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize;
-+}
-+
-+static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd)
-+{
-+      if (mtd_mod_by_eb(sz, mtd) == 0)
-+              return sz;
-+
-+      /* Round down to the start of the current erase block */
-+      return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize;
-+}
-+
- static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
- {
-       if (mtd->writesize_shift)
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -116,6 +116,8 @@ int mtd_is_partition(const struct mtd_in
- int mtd_add_partition(struct mtd_info *master, const char *name,
-                     long long offset, long long length);
- int mtd_del_partition(struct mtd_info *master, int partno);
-+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
-+uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
- uint64_t mtd_get_device_size(const struct mtd_info *mtd);
- #endif
diff --git a/target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch
deleted file mode 100644 (file)
index bf9822f..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: mtd: implement write support for partitions covering only a part of an eraseblock (buffer data that would otherwise be erased)
-
-lede-commit: 87a8e8ac1067f58ba831c4aae443f3655c31cd80
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/mtdpart.c   | 90 ++++++++++++++++++++++++++++++++++++++++++++-----
- include/linux/mtd/mtd.h |  4 +++
- 2 files changed, 85 insertions(+), 9 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -36,6 +36,8 @@
- #include "mtdcore.h"
- #include "mtdsplit/mtdsplit.h"
-+#define MTD_ERASE_PARTIAL     0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- static DEFINE_MUTEX(mtd_partitions_mutex);
-@@ -220,6 +222,53 @@ static int part_erase(struct mtd_info *m
- {
-       struct mtd_part *part = mtd_to_part(mtd);
-       int ret;
-+      size_t wrlen = 0;
-+      u8 *erase_buf = NULL;
-+      u32 erase_buf_ofs = 0;
-+      bool partial_start = false;
-+
-+      if (mtd->flags & MTD_ERASE_PARTIAL) {
-+              size_t readlen = 0;
-+              u64 mtd_ofs;
-+
-+              erase_buf = kmalloc(part->parent->erasesize, GFP_ATOMIC);
-+              if (!erase_buf)
-+                      return -ENOMEM;
-+
-+              mtd_ofs = part->offset + instr->addr;
-+              erase_buf_ofs = do_div(mtd_ofs, part->parent->erasesize);
-+
-+              if (erase_buf_ofs > 0) {
-+                      instr->addr -= erase_buf_ofs;
-+                      ret = mtd_read(part->parent,
-+                              instr->addr + part->offset,
-+                              part->parent->erasesize,
-+                              &readlen, erase_buf);
-+
-+                      instr->len += erase_buf_ofs;
-+                      partial_start = true;
-+              } else {
-+                      mtd_ofs = part->offset + part->mtd.size;
-+                      erase_buf_ofs = part->parent->erasesize -
-+                              do_div(mtd_ofs, part->parent->erasesize);
-+
-+                      if (erase_buf_ofs > 0) {
-+                              instr->len += erase_buf_ofs;
-+                              ret = mtd_read(part->parent,
-+                                      part->offset + instr->addr +
-+                                      instr->len - part->parent->erasesize,
-+                                      part->parent->erasesize, &readlen,
-+                                      erase_buf);
-+                      } else {
-+                              ret = 0;
-+                      }
-+              }
-+              if (ret < 0) {
-+                      kfree(erase_buf);
-+                      return ret;
-+              }
-+
-+      }
-       instr->addr += part->offset;
-       ret = part->parent->_erase(part->parent, instr);
-@@ -227,6 +276,24 @@ static int part_erase(struct mtd_info *m
-               instr->fail_addr -= part->offset;
-       instr->addr -= part->offset;
-+      if (mtd->flags & MTD_ERASE_PARTIAL) {
-+              if (partial_start) {
-+                      part->parent->_write(part->parent,
-+                              instr->addr, erase_buf_ofs,
-+                              &wrlen, erase_buf);
-+                      instr->addr += erase_buf_ofs;
-+              } else {
-+                      instr->len -= erase_buf_ofs;
-+                      part->parent->_write(part->parent,
-+                              instr->addr + instr->len,
-+                              erase_buf_ofs, &wrlen,
-+                              erase_buf +
-+                              part->parent->erasesize -
-+                              erase_buf_ofs);
-+              }
-+              kfree(erase_buf);
-+      }
-+
-       return ret;
- }
-@@ -539,19 +606,22 @@ static struct mtd_part *allocate_partiti
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               /* Doesn't start on a boundary of major erase size */
--              /* FIXME: Let it be writable if it is on a boundary of
--               * _minor_ erase size though */
--              slave->mtd.flags &= ~MTD_WRITEABLE;
--              printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n",
--                      part->name);
-+              slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+              if (((u32)slave->mtd.size) > parent->erasesize)
-+                      slave->mtd.flags &= ~MTD_WRITEABLE;
-+              else
-+                      slave->mtd.erasesize = slave->mtd.size;
-       }
--      tmp = part_absolute_offset(parent) + slave->mtd.size;
-+      tmp = part_absolute_offset(parent) + slave->offset + slave->mtd.size;
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
--              slave->mtd.flags &= ~MTD_WRITEABLE;
--              printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n",
--                      part->name);
-+              slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+              if ((u32)slave->mtd.size > parent->erasesize)
-+                      slave->mtd.flags &= ~MTD_WRITEABLE;
-+              else
-+                      slave->mtd.erasesize = slave->mtd.size;
-       }
-       mtd_set_ooblayout(&slave->mtd, &part_ooblayout_ops);
diff --git a/target/linux/generic/pending-4.19/412-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/pending-4.19/412-mtd-partial_eraseblock_unlock.patch
deleted file mode 100644 (file)
index a54603a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Tim Harvey <tharvey@gateworks.com>
-Subject: mtd: allow partial block unlock
-
-This allows sysupgrade for devices such as the Gateworks Avila/Cambria
-product families based on the ixp4xx using the redboot bootloader with
-combined FIS directory and RedBoot config partitions on larger FLASH
-devices with larger eraseblocks.
-
-This second iteration of this patch addresses previous issues:
-- whitespace breakage fixed
-- unlock in all scenarios
-- simplification and fix logic bug
-
-[john@phrozen.org: this should be moved to the ixp4xx folder]
-
-Signed-off-by: Tim Harvey <tharvey@gateworks.com>
----
- drivers/mtd/mtdpart.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -306,7 +306,16 @@ static int part_lock(struct mtd_info *mt
- static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->parent->_unlock(part->parent, ofs + part->offset, len);
-+
-+      ofs += part->offset;
-+
-+      if (mtd->flags & MTD_ERASE_PARTIAL) {
-+              /* round up len to next erasesize and round down offset to prev block */
-+              len = (mtd_div_by_eb(len, part->parent) + 1) * part->parent->erasesize;
-+              ofs &= ~(part->parent->erasesize - 1);
-+      }
-+
-+      return part->parent->_unlock(part->parent, ofs, len);
- }
- static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/target/linux/generic/pending-4.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-4.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch
deleted file mode 100644 (file)
index fbf9a05..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Subject: [PATCH] mtd: redboot: add of_match_table with DT binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows parsing RedBoot compatible partitions for properly described
-flash device in DT.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
-
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -289,9 +289,16 @@ static int parse_redboot_partitions(stru
-       return ret;
- }
-+static const struct of_device_id redboot_parser_of_match_table[] = {
-+      { .compatible = "ecoscentric,redboot-fis-partitions" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, redboot_parser_of_match_table);
-+
- static struct mtd_part_parser redboot_parser = {
-       .parse_fn = parse_redboot_partitions,
-       .name = "RedBoot",
-+      .of_match_table = redboot_parser_of_match_table,
- };
- module_mtd_part_parser(redboot_parser);
diff --git a/target/linux/generic/pending-4.19/420-mtd-redboot_space.patch b/target/linux/generic/pending-4.19/420-mtd-redboot_space.patch
deleted file mode 100644 (file)
index 85fbe05..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: add patch for including unpartitioned space in the rootfs partition for redboot devices (if applicable)
-
-[john@phrozen.org: used by ixp and others]
-
-lede-commit: 394918851f84e4d00fa16eb900e7700e95091f00
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/redboot.c | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru
- #endif
-               names += strlen(names)+1;
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-               if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--                      i++;
--                      parts[i].offset = parts[i-1].size + parts[i-1].offset;
--                      parts[i].size = fl->next->img->flash_base - parts[i].offset;
--                      parts[i].name = nullname;
--              }
-+                      if (!strcmp(parts[i].name, "rootfs")) {
-+                              parts[i].size = fl->next->img->flash_base;
-+                              parts[i].size &= ~(master->erasesize - 1);
-+                              parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+                              nrparts--;
-+                      } else {
-+                              i++;
-+                              parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+                              parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+                              parts[i].name = nullname;
- #endif
-+                      }
-+              }
-               tmp_fl = fl;
-               fl = fl->next;
-               kfree(tmp_fl);
diff --git a/target/linux/generic/pending-4.19/430-mtd-add-myloader-partition-parser.patch b/target/linux/generic/pending-4.19/430-mtd-add-myloader-partition-parser.patch
deleted file mode 100644 (file)
index bd49893..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Florian Fainelli <f.fainelli@gmail.com>
-Subject: Add myloader partition table parser
-
-[john@phozen.org: shoud be upstreamable]
-
-lede-commit: d8bf22859b51faa09d22c056fe221a45d2f7a3b8
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- drivers/mtd/Kconfig  | 16 ++++++++++++++++
- drivers/mtd/Makefile |  1 +
- 2 files changed, 17 insertions(+)
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -177,6 +177,22 @@ menu "Partition parsers"
- source "drivers/mtd/parsers/Kconfig"
- endmenu
-+config MTD_MYLOADER_PARTS
-+      tristate "MyLoader partition parsing"
-+      depends on ADM5120 || ATH25 || ATH79
-+      ---help---
-+        MyLoader is a bootloader which allows the user to define partitions
-+        in flash devices, by putting a table in the second erase block
-+        on the device, similar to a partition table. This table gives the 
-+        offsets and lengths of the user defined partitions.
-+
-+        If you need code which can detect and parse these tables, and
-+        register MTD 'partitions' corresponding to each image detected,
-+        enable this option.
-+
-+        You will still need the parsing functions to be called by the driver
-+        for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- #
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)  += afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
- obj-$(CONFIG_MTD_BCM63XX_PARTS)       += bcm63xxpart.o
- obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- obj-y                         += parsers/
- # 'Users' - code which presents functionality to userspace.
diff --git a/target/linux/generic/pending-4.19/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/pending-4.19/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
deleted file mode 100644 (file)
index d54c284..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Subject: [PATCH] mtd: bcm47xxpart: check for bad blocks when calculating offsets
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
-
---- a/drivers/mtd/parsers/parser_trx.c
-+++ b/drivers/mtd/parsers/parser_trx.c
-@@ -29,6 +29,33 @@ struct trx_header {
-       uint32_t offset[3];
- } __packed;
-+/*
-+ * Calculate real end offset (address) for a given amount of data. It checks
-+ * all blocks skipping bad ones.
-+ */
-+static size_t parser_trx_real_offset(struct mtd_info *mtd, size_t bytes)
-+{
-+      size_t real_offset = 0;
-+
-+      if (mtd_block_isbad(mtd, real_offset))
-+              pr_warn("Base offset shouldn't be at bad block");
-+
-+      while (bytes >= mtd->erasesize) {
-+              bytes -= mtd->erasesize;
-+              real_offset += mtd->erasesize;
-+              while (mtd_block_isbad(mtd, real_offset)) {
-+                      real_offset += mtd->erasesize;
-+
-+                      if (real_offset >= mtd->size)
-+                              return real_offset - mtd->erasesize;
-+              }
-+      }
-+
-+      real_offset += bytes;
-+
-+      return real_offset;
-+}
-+
- static const char *parser_trx_data_part_name(struct mtd_info *master,
-                                            size_t offset)
- {
-@@ -83,21 +110,21 @@ static int parser_trx_parse(struct mtd_i
-       if (trx.offset[2]) {
-               part = &parts[curr_part++];
-               part->name = "loader";
--              part->offset = trx.offset[i];
-+              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
-               i++;
-       }
-       if (trx.offset[i]) {
-               part = &parts[curr_part++];
-               part->name = "linux";
--              part->offset = trx.offset[i];
-+              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
-               i++;
-       }
-       if (trx.offset[i]) {
-               part = &parts[curr_part++];
--              part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
--              part->offset = trx.offset[i];
-+              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
-+              part->name = parser_trx_data_part_name(mtd, part->offset);
-               i++;
-       }
diff --git a/target/linux/generic/pending-4.19/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch b/target/linux/generic/pending-4.19/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
deleted file mode 100644 (file)
index a6d0828..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Subject: mtd: bcm47xxpart: detect T_Meter partition
-
-It can be found on many Netgear devices. It consists of many 0x30 blocks
-starting with 4D 54.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
- drivers/mtd/bcm47xxpart.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -39,6 +39,7 @@
- #define NVRAM_HEADER                  0x48534C46      /* FLSH */
- #define POT_MAGIC1                    0x54544f50      /* POTT */
- #define POT_MAGIC2                    0x504f          /* OP */
-+#define T_METER_MAGIC                 0x4D540000      /* MT */
- #define ML_MAGIC1                     0x39685a42
- #define ML_MAGIC2                     0x26594131
- #define TRX_MAGIC                     0x30524448
-@@ -182,6 +183,15 @@ static int bcm47xxpart_parse(struct mtd_
-                                            MTD_WRITEABLE);
-                       continue;
-               }
-+
-+              /* T_Meter */
-+              if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
-+                  (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
-+                  (le32_to_cpu(buf[0x060 / 4]) & 0xFFFF0000) == T_METER_MAGIC) {
-+                      bcm47xxpart_add_part(&parts[curr_part++], "T_Meter", offset,
-+                                           MTD_WRITEABLE);
-+                      continue;
-+              }
-               /* TRX */
-               if (buf[0x000 / 4] == TRX_MAGIC) {
diff --git a/target/linux/generic/pending-4.19/440-block2mtd_init.patch b/target/linux/generic/pending-4.19/440-block2mtd_init.patch
deleted file mode 100644 (file)
index b8ec11f..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: block2mtd
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/devices/block2mtd.c | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -26,6 +26,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
- #include <linux/slab.h>
-@@ -214,7 +215,7 @@ static void block2mtd_free_device(struct
- static struct block2mtd_dev *add_device(char *devname, int erase_size,
--              int timeout)
-+              const char *mtdname, int timeout)
- {
- #ifndef MODULE
-       int i;
-@@ -222,6 +223,7 @@ static struct block2mtd_dev *add_device(
-       const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
-       struct block_device *bdev;
-       struct block2mtd_dev *dev;
-+      struct mtd_partition *part;
-       char *name;
-       if (!devname)
-@@ -278,13 +280,16 @@ static struct block2mtd_dev *add_device(
-       /* Setup the MTD structure */
-       /* make the name contain the block device in */
--      name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
-+      if (!mtdname)
-+              mtdname = devname;
-+      name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
-       if (!name)
-               goto err_destroy_mutex;
-+      strcpy(name, mtdname);
-       dev->mtd.name = name;
--      dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+      dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
-       dev->mtd.erasesize = erase_size;
-       dev->mtd.writesize = 1;
-       dev->mtd.writebufsize = PAGE_SIZE;
-@@ -297,7 +302,11 @@ static struct block2mtd_dev *add_device(
-       dev->mtd.priv = dev;
-       dev->mtd.owner = THIS_MODULE;
--      if (mtd_device_register(&dev->mtd, NULL, 0)) {
-+      part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+      part->name = name;
-+      part->offset = 0;
-+      part->size = dev->mtd.size;
-+      if (mtd_device_register(&dev->mtd, part, 1)) {
-               /* Device didn't get added, so free the entry */
-               goto err_destroy_mutex;
-       }
-@@ -305,8 +314,7 @@ static struct block2mtd_dev *add_device(
-       list_add(&dev->list, &blkmtd_device_list);
-       pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n",
-               dev->mtd.index,
--              dev->mtd.name + strlen("block2mtd: "),
--              dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+              mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-       return dev;
- err_destroy_mutex:
-@@ -379,7 +387,7 @@ static int block2mtd_setup2(const char *
-       /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
-       char buf[80 + 12 + 80 + 8];
-       char *str = buf;
--      char *token[2];
-+      char *token[3];
-       char *name;
-       size_t erase_size = PAGE_SIZE;
-       unsigned long timeout = MTD_DEFAULT_TIMEOUT;
-@@ -393,7 +401,7 @@ static int block2mtd_setup2(const char *
-       strcpy(str, val);
-       kill_final_newline(str);
--      for (i = 0; i < 2; i++)
-+      for (i = 0; i < 3; i++)
-               token[i] = strsep(&str, ",");
-       if (str) {
-@@ -419,8 +427,10 @@ static int block2mtd_setup2(const char *
-                       return 0;
-               }
-       }
-+      if (token[2] && (strlen(token[2]) + 1 > 80))
-+              pr_err("mtd device name too long\n");
--      add_device(name, erase_size, timeout);
-+      add_device(name, erase_size, token[2], timeout);
-       return 0;
- }
-@@ -454,7 +464,7 @@ static int block2mtd_setup(const char *v
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic/pending-4.19/441-block2mtd_probe.patch b/target/linux/generic/pending-4.19/441-block2mtd_probe.patch
deleted file mode 100644 (file)
index 7e974e0..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: block2mtd
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/devices/block2mtd.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -387,7 +387,7 @@ static int block2mtd_setup2(const char *
-       /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
-       char buf[80 + 12 + 80 + 8];
-       char *str = buf;
--      char *token[3];
-+      char *token[4];
-       char *name;
-       size_t erase_size = PAGE_SIZE;
-       unsigned long timeout = MTD_DEFAULT_TIMEOUT;
-@@ -401,7 +401,7 @@ static int block2mtd_setup2(const char *
-       strcpy(str, val);
-       kill_final_newline(str);
--      for (i = 0; i < 3; i++)
-+      for (i = 0; i < 4; i++)
-               token[i] = strsep(&str, ",");
-       if (str) {
-@@ -430,6 +430,9 @@ static int block2mtd_setup2(const char *
-       if (token[2] && (strlen(token[2]) + 1 > 80))
-               pr_err("mtd device name too long\n");
-+      if (token[3] && kstrtoul(token[3], 0, &timeout))
-+              pr_err("invalid timeout\n");
-+
-       add_device(name, erase_size, token[2], timeout);
-       return 0;
-@@ -464,7 +467,7 @@ static int block2mtd_setup(const char *v
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic/pending-4.19/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch b/target/linux/generic/pending-4.19/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch
deleted file mode 100644 (file)
index ecc3ea1..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 22 Feb 2018 11:11:57 +0100
-Subject: [PATCH] mtd: spi-nor: allow NOR driver to write fewer bytes than
- requested
-
-The write size can be constrained by the maximum message/transfer size
-of the SPI controller. Only check for ret = 0 to avoid an infinite loop.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1455,7 +1455,7 @@ static int spi_nor_write(struct mtd_info
-               write_enable(nor);
-               ret = nor->write(nor, addr, page_remain, buf + i);
--              if (ret < 0)
-+              if (ret <= 0)
-                       goto write_err;
-               written = ret;
-@@ -1464,13 +1464,6 @@ static int spi_nor_write(struct mtd_info
-                       goto write_err;
-               *retlen += written;
-               i += written;
--              if (written != page_remain) {
--                      dev_err(nor->dev,
--                              "While writing %zu bytes written %zd bytes\n",
--                              page_remain, written);
--                      ret = -EIO;
--                      goto write_err;
--              }
-       }
- write_err:
diff --git a/target/linux/generic/pending-4.19/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/target/linux/generic/pending-4.19/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
deleted file mode 100644 (file)
index 88d3863..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: disable cfi cmdset 0002 erase suspend
-
-on some platforms, erase suspend leads to data corruption and lockups when write
-ops collide with erase ops. this has been observed on the buffalo wzr-hp-g300nh.
-rather than play whack-a-mole with a hard to reproduce issue on a variety of devices,
-simply disable erase suspend, as it will usually not produce any useful gain on
-the small filesystems used on embedded hardware.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/chips/cfi_cmdset_0002.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -812,7 +812,7 @@ static int get_chip(struct map_info *map
-               return 0;
-       case FL_ERASING:
--              if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
-+              if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
-                   !(mode == FL_READY || mode == FL_POINT ||
-                   (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
-                       goto sleep;
diff --git a/target/linux/generic/pending-4.19/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/target/linux/generic/pending-4.19/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
deleted file mode 100644 (file)
index f4ba5b7..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-From: George Kashperko <george@znau.edu.ua>
-Subject: Issue map read after Write Buffer Load command to ensure chip is ready to receive data.
-
-Signed-off-by: George Kashperko <george@znau.edu.ua>
----
- drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
- 1 file changed, 1 insertion(+)
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1832,6 +1832,7 @@ static int __xipram do_write_buffer(stru
-       /* Write Buffer Load */
-       map_write(map, CMD(0x25), cmd_adr);
-+      (void) map_read(map, cmd_adr);
-       chip->state = FL_WRITING_TO_BUFFER;
diff --git a/target/linux/generic/pending-4.19/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/pending-4.19/465-m25p80-mx-disable-software-protection.patch
deleted file mode 100644 (file)
index fa25c65..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: Disable software protection bits for Macronix flashes.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2733,6 +2733,7 @@ static int spi_nor_init(struct spi_nor *
-        */
-       if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL ||
-           JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
-+          JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
-           JEDEC_MFR(nor->info) == SNOR_MFR_SST ||
-           nor->info->flags & SPI_NOR_HAS_LOCK) {
-               write_enable(nor);
diff --git a/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
deleted file mode 100644 (file)
index dcb86f6..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 9 Jan 2018 20:41:48 +0100
-Subject: [PATCH] Revert "mtd: spi-nor: fix Spansion regressions (aliased with
- Winbond)"
-
-This reverts commit 67b9bcd36906e12a15ffec19463afbbd6a41660e.
-
-The underlying issue breaking Spansion flash has been fixed with "mtd: spi-nor:
-wait until lock/unlock operations are ready" and "mtd: spi-nor: wait for SR_WIP
-to clear on initial unlock", so we can support unlocking for Winbond flash
-again.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
----
- drivers/mtd/spi-nor/spi-nor.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2735,6 +2735,7 @@ static int spi_nor_init(struct spi_nor *
-           JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
-           JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
-           JEDEC_MFR(nor->info) == SNOR_MFR_SST ||
-+          JEDEC_MFR(nor->info) == SNOR_MFR_WINBOND ||
-           nor->info->flags & SPI_NOR_HAS_LOCK) {
-               write_enable(nor);
-               write_sr(nor, 0);
-@@ -2871,7 +2872,8 @@ int spi_nor_scan(struct spi_nor *nor, co
-       /* NOR protection support for STmicro/Micron chips and similar */
-       if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
--                      info->flags & SPI_NOR_HAS_LOCK) {
-+          JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-+          info->flags & SPI_NOR_HAS_LOCK) {
-               nor->flash_lock = stm_lock;
-               nor->flash_unlock = stm_unlock;
-               nor->flash_is_locked = stm_is_locked;
diff --git a/target/linux/generic/pending-4.19/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch b/target/linux/generic/pending-4.19/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
deleted file mode 100644 (file)
index a2ab6f3..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 4 Nov 2017 07:40:23 +0100
-Subject: [PATCH] mtd: spi-nor: support limiting 4K sectors support based on
- flash size
-
-Some devices need 4K sectors to be able to deal with small flash chips.
-For instance, w25x05 is 64 KiB in size, and without 4K sectors, the
-entire chip is just one erase block.
-On bigger flash chip sizes, using 4K sectors can significantly slow down
-many operations, including using a writable filesystem. There are several
-platforms where it makes sense to use a single kernel on both kinds of
-devices.
-
-To support this properly, allow configuring an upper flash chip size
-limit for 4K sectors support.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/mtd/spi-nor/Kconfig
-+++ b/drivers/mtd/spi-nor/Kconfig
-@@ -39,6 +39,17 @@ config SPI_ASPEED_SMC
-         and support for the SPI flash memory controller (SPI) for
-         the host firmware. The implementation only supports SPI NOR.
-+config MTD_SPI_NOR_USE_4K_SECTORS_LIMIT
-+      int "Maximum flash chip size to use 4K sectors on (in KiB)"
-+      depends on MTD_SPI_NOR_USE_4K_SECTORS
-+      default "4096"
-+      help
-+        There are many flash chips that support 4K sectors, but are so large
-+        that using them significantly slows down writing large amounts of
-+        data or using a writable filesystem.
-+        Any flash chip larger than the size specified in this option will
-+        not use 4K sectors.
-+
- config SPI_ATMEL_QUADSPI
-       tristate "Atmel Quad SPI Controller"
-       depends on ARCH_AT91 || (ARM && COMPILE_TEST && !ARCH_EBSA110)
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2647,10 +2647,12 @@ static int spi_nor_select_erase(struct s
- #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
-       /* prefer "small sector" erase if possible */
--      if (info->flags & SECT_4K) {
-+      if ((info->flags & SECT_4K) && (mtd->size <=
-+          CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT * 1024)) {
-               nor->erase_opcode = SPINOR_OP_BE_4K;
-               mtd->erasesize = 4096;
--      } else if (info->flags & SECT_4K_PMC) {
-+      } else if ((info->flags & SECT_4K_PMC) && (mtd->size <=
-+                 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT * 1024)) {
-               nor->erase_opcode = SPINOR_OP_BE_4K_PMC;
-               mtd->erasesize = 4096;
-       } else
diff --git a/target/linux/generic/pending-4.19/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch b/target/linux/generic/pending-4.19/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
deleted file mode 100644 (file)
index 8b5dc4e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Robert Marko <robimarko@gmail.com>
-To: linux-mtd@lists.infradead.org
-Subject: mtd: spi-nor: Add Winbond w25q128jv support
-Date: Mon, 25 Jun 2018 13:17:48 +0200
-
-Datasheet:
-http://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
-
-Testing done on Mikrotik Routerboard  wAP R board.
-It does not support Dual or Quad modes.
-
-Signed-off-by: Robert Marko <robimarko@gmail.com>
----
-
-Changes in v2:
-       - Correct the title
----
- drivers/mtd/spi-nor/spi-nor.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1239,6 +1239,11 @@ static const struct flash_info spi_nor_i
-                       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-                       SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-       },
-+      {
-+              "w25q128jv", INFO(0xef7018, 0, 64 * 1024, 256,
-+                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-+                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-+      },
-       { "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
-       { "w25q80bl", INFO(0xef4014, 0, 64 * 1024,  16, SECT_4K) },
-       { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
diff --git a/target/linux/generic/pending-4.19/476-mtd-spi-nor-add-eon-en25q128.patch b/target/linux/generic/pending-4.19/476-mtd-spi-nor-add-eon-en25q128.patch
deleted file mode 100644 (file)
index 69ac17c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Piotr Dymacz <pepe2k@gmail.com>
-Subject: kernel/mtd: add support for EON EN25Q128
-
-Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -994,6 +994,7 @@ static const struct flash_info spi_nor_i
-       { "en25q32b",   INFO(0x1c3016, 0, 64 * 1024,   64, 0) },
-       { "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128, 0) },
-       { "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
-+      { "en25q128",   INFO(0x1c3018, 0, 64 * 1024,  256, SECT_4K) },
-       { "en25qh32",   INFO(0x1c7016, 0, 64 * 1024,   64, 0) },
-       { "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },
-       { "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },
diff --git a/target/linux/generic/pending-4.19/477-mtd-add-spi-nor-add-mx25u3235f.patch b/target/linux/generic/pending-4.19/477-mtd-add-spi-nor-add-mx25u3235f.patch
deleted file mode 100644 (file)
index 0648b12..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: André Valentin <avalentin@marcant.net>
-Subject: linux/mtd: add id for mx25u3235f needed by ZyXEL NBG6817
-
-Signed-off-by: André Valentin <avalentin@marcant.net>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1083,6 +1083,7 @@ static const struct flash_info spi_nor_i
-       { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, SECT_4K) },
-       { "mx25l3255e",  INFO(0xc29e16, 0, 64 * 1024,  64, SECT_4K) },
-       { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
-+      { "mx25u3235f",  INFO(0xc22536, 0, 64 * 1024, 64, 0) },
-       { "mx25u2033e",  INFO(0xc22532, 0, 64 * 1024,   4, SECT_4K) },
-       { "mx25u4035",   INFO(0xc22533, 0, 64 * 1024,   8, SECT_4K) },
-       { "mx25u8035",   INFO(0xc22534, 0, 64 * 1024,  16, SECT_4K) },
diff --git a/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-eon-en25qh64.patch b/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-eon-en25qh64.patch
deleted file mode 100644 (file)
index 6bb7754..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -996,6 +996,7 @@ static const struct flash_info spi_nor_i
-       { "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
-       { "en25q128",   INFO(0x1c3018, 0, 64 * 1024,  256, SECT_4K) },
-       { "en25qh32",   INFO(0x1c7016, 0, 64 * 1024,   64, 0) },
-+      { "en25qh64",   INFO(0x1c7017, 0, 64 * 1024,   128, 0) },
-       { "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },
-       { "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },
-       { "en25s64",    INFO(0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
diff --git a/target/linux/generic/pending-4.19/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/pending-4.19/480-mtd-set-rootfs-to-be-root-dev.patch
deleted file mode 100644 (file)
index dce0432..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: kernel/3.1[02]: move MTD root device setup code to mtdcore
-
-The current code only allows to automatically set
-root device on MTD partitions. Move the code to MTD
-core to allow to use it with all MTD devices.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdcore.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -41,6 +41,7 @@
- #include <linux/reboot.h>
- #include <linux/leds.h>
- #include <linux/debugfs.h>
-+#include <linux/root_dev.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-@@ -593,6 +594,15 @@ int add_mtd_device(struct mtd_info *mtd)
-          of this try_ nonsense, and no bitching about it
-          either. :) */
-       __module_get(THIS_MODULE);
-+
-+      if (!strcmp(mtd->name, "rootfs") &&
-+          IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
-+          ROOT_DEV == 0) {
-+              pr_notice("mtd: device %d (%s) set to be root filesystem\n",
-+                        mtd->index, mtd->name);
-+              ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
-+      }
-+
-       return 0;
- fail_added:
diff --git a/target/linux/generic/pending-4.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
deleted file mode 100644 (file)
index 79d18d0..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: ubi: auto-attach mtd device named "ubi" or "data" on boot
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
---- a/drivers/mtd/ubi/build.c
-+++ b/drivers/mtd/ubi/build.c
-@@ -1181,6 +1181,73 @@ static struct mtd_info * __init open_mtd
-       return mtd;
- }
-+/*
-+ * This function tries attaching mtd partitions named either "ubi" or "data"
-+ * during boot.
-+ */
-+static void __init ubi_auto_attach(void)
-+{
-+      int err;
-+      struct mtd_info *mtd;
-+      loff_t offset = 0;
-+      size_t len;
-+      char magic[4];
-+
-+      /* try attaching mtd device named "ubi" or "data" */
-+      mtd = open_mtd_device("ubi");
-+      if (IS_ERR(mtd))
-+              mtd = open_mtd_device("data");
-+
-+      if (IS_ERR(mtd))
-+              return;
-+
-+      /* get the first not bad block */
-+      if (mtd_can_have_bb(mtd))
-+              while (mtd_block_isbad(mtd, offset)) {
-+                      offset += mtd->erasesize;
-+
-+                      if (offset > mtd->size) {
-+                              pr_err("UBI error: Failed to find a non-bad "
-+                                     "block on mtd%d\n", mtd->index);
-+                              goto cleanup;
-+                      }
-+              }
-+
-+      /* check if the read from flash was successful */
-+      err = mtd_read(mtd, offset, 4, &len, (void *) magic);
-+      if ((err && !mtd_is_bitflip(err)) || len != 4) {
-+              pr_err("UBI error: unable to read from mtd%d\n", mtd->index);
-+              goto cleanup;
-+      }
-+
-+      /* check for a valid ubi magic */
-+      if (strncmp(magic, "UBI#", 4)) {
-+              pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index);
-+              goto cleanup;
-+      }
-+
-+      /* don't auto-add media types where UBI doesn't makes sense */
-+      if (mtd->type != MTD_NANDFLASH &&
-+          mtd->type != MTD_NORFLASH &&
-+          mtd->type != MTD_DATAFLASH &&
-+          mtd->type != MTD_MLCNANDFLASH)
-+              goto cleanup;
-+
-+      mutex_lock(&ubi_devices_mutex);
-+      pr_notice("UBI: auto-attach mtd%d\n", mtd->index);
-+      err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
-+      mutex_unlock(&ubi_devices_mutex);
-+      if (err < 0) {
-+              pr_err("UBI error: cannot attach mtd%d\n", mtd->index);
-+              goto cleanup;
-+      }
-+
-+      return;
-+
-+cleanup:
-+      put_mtd_device(mtd);
-+}
-+
- static int __init ubi_init(void)
- {
-       int err, i, k;
-@@ -1264,6 +1331,12 @@ static int __init ubi_init(void)
-               }
-       }
-+      /* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd
-+       * parameter was given */
-+      if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
-+          !ubi_is_module() && !mtd_devs)
-+              ubi_auto_attach();
-+
-       err = ubiblock_init();
-       if (err) {
-               pr_err("UBI error: block: cannot initialize, error %d\n", err);
diff --git a/target/linux/generic/pending-4.19/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/pending-4.19/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
deleted file mode 100644 (file)
index cb2d525..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: ubi: auto-create ubiblock device for rootfs
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
---- a/drivers/mtd/ubi/block.c
-+++ b/drivers/mtd/ubi/block.c
-@@ -633,6 +633,44 @@ static void __init ubiblock_create_from_
-       }
- }
-+#define UBIFS_NODE_MAGIC  0x06101831
-+static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc)
-+{
-+      int ret;
-+      uint32_t magic_of, magic;
-+      ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4);
-+      if (ret)
-+              return 0;
-+      magic = le32_to_cpu(magic_of);
-+      return magic == UBIFS_NODE_MAGIC;
-+}
-+
-+static void __init ubiblock_create_auto_rootfs(void)
-+{
-+      int ubi_num, ret, is_ubifs;
-+      struct ubi_volume_desc *desc;
-+      struct ubi_volume_info vi;
-+
-+      for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++) {
-+              desc = ubi_open_volume_nm(ubi_num, "rootfs", UBI_READONLY);
-+              if (IS_ERR(desc))
-+                      continue;
-+
-+              ubi_get_volume_info(desc, &vi);
-+              is_ubifs = ubi_vol_is_ubifs(desc);
-+              ubi_close_volume(desc);
-+              if (is_ubifs)
-+                      break;
-+
-+              ret = ubiblock_create(&vi);
-+              if (ret)
-+                      pr_err("UBI error: block: can't add '%s' volume, err=%d\n",
-+                              vi.name, ret);
-+              /* always break if we get here */
-+              break;
-+      }
-+}
-+
- static void ubiblock_remove_all(void)
- {
-       struct ubiblock *next;
-@@ -665,6 +703,10 @@ int __init ubiblock_init(void)
-        */
-       ubiblock_create_from_param();
-+      /* auto-attach "rootfs" volume if existing and non-ubifs */
-+      if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV))
-+              ubiblock_create_auto_rootfs();
-+
-       /*
-        * Block devices are only created upon user requests, so we ignore
-        * existing volumes.
diff --git a/target/linux/generic/pending-4.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/pending-4.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
deleted file mode 100644 (file)
index b76e83e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: try auto-mounting ubi0:rootfs in init/do_mounts.c
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- init/do_mounts.c | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -427,7 +427,28 @@ retry:
- out:
-       put_page(page);
- }
-- 
-+
-+static int __init mount_ubi_rootfs(void)
-+{
-+      int flags = MS_SILENT;
-+      int err, tried = 0;
-+
-+      while (tried < 2) {
-+              err = do_mount_root("ubi0:rootfs", "ubifs", flags, \
-+                                      root_mount_data);
-+              switch (err) {
-+                      case -EACCES:
-+                              flags |= MS_RDONLY;
-+                              tried++;
-+                              break;
-+                      default:
-+                              return err;
-+              }
-+      }
-+
-+      return -EINVAL;
-+}
-+
- #ifdef CONFIG_ROOT_NFS
- #define NFSROOT_TIMEOUT_MIN   5
-@@ -521,6 +542,10 @@ void __init mount_root(void)
-                       change_floppy("root floppy");
-       }
- #endif
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+      if (!mount_ubi_rootfs())
-+              return;
-+#endif
- #ifdef CONFIG_BLOCK
-       {
-               int err = create_dev("/dev/root", ROOT_DEV);
diff --git a/target/linux/generic/pending-4.19/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/pending-4.19/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
deleted file mode 100644 (file)
index 1bb53ad..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: ubi: set ROOT_DEV to ubiblock "rootfs" if unset
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/mtd/ubi/block.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/mtd/ubi/block.c
-+++ b/drivers/mtd/ubi/block.c
-@@ -50,6 +50,7 @@
- #include <linux/scatterlist.h>
- #include <linux/idr.h>
- #include <asm/div64.h>
-+#include <linux/root_dev.h>
- #include "ubi-media.h"
- #include "ubi.h"
-@@ -445,6 +446,15 @@ int ubiblock_create(struct ubi_volume_in
-       dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
-                dev->ubi_num, dev->vol_id, vi->name);
-       mutex_unlock(&devices_mutex);
-+
-+      if (!strcmp(vi->name, "rootfs") &&
-+          IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
-+          ROOT_DEV == 0) {
-+              pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n",
-+                        dev->ubi_num, dev->vol_id, vi->name);
-+              ROOT_DEV = MKDEV(gd->major, gd->first_minor);
-+      }
-+
-       return 0;
- out_free_queue:
diff --git a/target/linux/generic/pending-4.19/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-4.19/494-mtd-ubi-add-EOF-marker-support.patch
deleted file mode 100644 (file)
index e38f11e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: mtd: add EOF marker support to the UBI layer
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/ubi/attach.c | 25 ++++++++++++++++++++++---
- drivers/mtd/ubi/ubi.h    |  1 +
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/ubi/attach.c
-+++ b/drivers/mtd/ubi/attach.c
-@@ -939,6 +939,13 @@ static bool vol_ignored(int vol_id)
- #endif
- }
-+static bool ec_hdr_has_eof(struct ubi_ec_hdr *ech)
-+{
-+      return ech->padding1[0] == 'E' &&
-+             ech->padding1[1] == 'O' &&
-+             ech->padding1[2] == 'F';
-+}
-+
- /**
-  * scan_peb - scan and process UBI headers of a PEB.
-  * @ubi: UBI device description object
-@@ -971,9 +978,21 @@ static int scan_peb(struct ubi_device *u
-               return 0;
-       }
--      err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
--      if (err < 0)
--              return err;
-+      if (!ai->eof_found) {
-+              err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
-+              if (err < 0)
-+                      return err;
-+
-+              if (ec_hdr_has_eof(ech)) {
-+                      pr_notice("UBI: EOF marker found, PEBs from %d will be erased\n",
-+                              pnum);
-+                      ai->eof_found = true;
-+              }
-+      }
-+
-+      if (ai->eof_found)
-+              err = UBI_IO_FF_BITFLIPS;
-+
-       switch (err) {
-       case 0:
-               break;
---- a/drivers/mtd/ubi/ubi.h
-+++ b/drivers/mtd/ubi/ubi.h
-@@ -789,6 +789,7 @@ struct ubi_attach_info {
-       int mean_ec;
-       uint64_t ec_sum;
-       int ec_count;
-+      bool eof_found;
-       struct kmem_cache *aeb_slab_cache;
-       struct ubi_ec_hdr *ech;
-       struct ubi_vid_io_buf *vidb;
diff --git a/target/linux/generic/pending-4.19/495-mtd-core-add-get_mtd_device_by_node.patch b/target/linux/generic/pending-4.19/495-mtd-core-add-get_mtd_device_by_node.patch
deleted file mode 100644 (file)
index 1446ca2..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1bd1b740f208d1cf4071932cc51860d37266c402 Mon Sep 17 00:00:00 2001
-From: Bernhard Frauendienst <kernel@nospam.obeliks.de>
-Date: Sat, 1 Sep 2018 00:30:11 +0200
-Subject: [PATCH 495/497] mtd: core: add get_mtd_device_by_node
-
-Add function to retrieve a mtd device by its OF node. Since drivers can
-assign arbitrary names to mtd devices in the absence of a label
-property, there is no other reliable way to retrieve a mtd device for a
-given OF node.
-
-Signed-off-by: Bernhard Frauendienst <kernel@nospam.obeliks.de>
-Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
----
- drivers/mtd/mtdcore.c   | 38 ++++++++++++++++++++++++++++++++++++++
- include/linux/mtd/mtd.h |  2 ++
- 2 files changed, 40 insertions(+)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -938,6 +938,44 @@ out_unlock:
- }
- EXPORT_SYMBOL_GPL(get_mtd_device_nm);
-+/**
-+ *    get_mtd_device_by_node - obtain a validated handle for an MTD device
-+ *    by of_node
-+ *    @of_node: OF node of MTD device to open
-+ *
-+ *    This function returns MTD device description structure in case of
-+ *    success and an error code in case of failure.
-+ */
-+struct mtd_info *get_mtd_device_by_node(const struct device_node *of_node)
-+{
-+      int err = -ENODEV;
-+      struct mtd_info *mtd = NULL, *other;
-+
-+      mutex_lock(&mtd_table_mutex);
-+
-+      mtd_for_each_device(other) {
-+              if (of_node == other->dev.of_node) {
-+                      mtd = other;
-+                      break;
-+              }
-+      }
-+
-+      if (!mtd)
-+              goto out_unlock;
-+
-+      err = __get_mtd_device(mtd);
-+      if (err)
-+              goto out_unlock;
-+
-+      mutex_unlock(&mtd_table_mutex);
-+      return mtd;
-+
-+out_unlock:
-+      mutex_unlock(&mtd_table_mutex);
-+      return ERR_PTR(err);
-+}
-+EXPORT_SYMBOL_GPL(get_mtd_device_by_node);
-+
- void put_mtd_device(struct mtd_info *mtd)
- {
-       mutex_lock(&mtd_table_mutex);
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -589,6 +589,8 @@ extern struct mtd_info *get_mtd_device(s
- extern int __get_mtd_device(struct mtd_info *mtd);
- extern void __put_mtd_device(struct mtd_info *mtd);
- extern struct mtd_info *get_mtd_device_nm(const char *name);
-+extern struct mtd_info *get_mtd_device_by_node(
-+              const struct device_node *of_node);
- extern void put_mtd_device(struct mtd_info *mtd);
diff --git a/target/linux/generic/pending-4.19/496-dt-bindings-add-bindings-for-mtd-concat-devices.patch b/target/linux/generic/pending-4.19/496-dt-bindings-add-bindings-for-mtd-concat-devices.patch
deleted file mode 100644 (file)
index 01f3b9e..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5734c6669fba7ddb5ef491ccff7159d15dba0b59 Mon Sep 17 00:00:00 2001
-From: Bernhard Frauendienst <kernel@nospam.obeliks.de>
-Date: Wed, 5 Sep 2018 01:32:51 +0200
-Subject: [PATCH 496/497] dt-bindings: add bindings for mtd-concat devices
-
-Document virtual mtd-concat device bindings.
-
-Signed-off-by: Bernhard Frauendienst <kernel@nospam.obeliks.de>
----
- .../devicetree/bindings/mtd/mtd-concat.txt    | 36 +++++++++++++++++++
- 1 file changed, 36 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/mtd/mtd-concat.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/mtd/mtd-concat.txt
-@@ -0,0 +1,36 @@
-+Virtual MTD concat device
-+
-+Requires properties:
-+- devices: list of phandles to mtd nodes that should be concatenated
-+
-+Example:
-+
-+&spi {
-+      flash0: flash@0 {
-+              ...
-+      };
-+      flash1: flash@1 {
-+              ...
-+      };
-+};
-+
-+flash {
-+      compatible = "mtd-concat";
-+
-+      devices = <&flash0 &flash1>;
-+
-+      partitions {
-+              compatible = "fixed-partitions";
-+
-+              partition@0 {
-+                      label = "boot";
-+                      reg = <0x0000000 0x0040000>;
-+                      read-only;
-+              };
-+
-+              partition@40000 {
-+                      label = "firmware";
-+                      reg = <0x0040000 0x1fc0000>;
-+              };
-+      }
-+}
diff --git a/target/linux/generic/pending-4.19/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch b/target/linux/generic/pending-4.19/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch
deleted file mode 100644 (file)
index 6584e22..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-From e53f712d8eac71f54399b61038ccf87d2cee99d7 Mon Sep 17 00:00:00 2001
-From: Bernhard Frauendienst <kernel@nospam.obeliks.de>
-Date: Sat, 25 Aug 2018 12:35:22 +0200
-Subject: [PATCH 497/497] mtd: mtdconcat: add dt driver for concat devices
-
-Some mtd drivers like physmap variants have support for concatenating
-multiple mtd devices, but there is no generic way to define such a
-concat device from within the device tree.
-
-This is useful for some SoC boards that use multiple flash chips as
-memory banks of a single mtd device, with partitions spanning chip
-borders.
-
-This commit adds a driver for creating virtual mtd-concat devices. They
-must have a compatible = "mtd-concat" line, and define a list of devices
-to concat in the 'devices' property, for example:
-
-flash {
-  compatible = "mtd-concat";
-
-  devices = <&flash0 &flash1>;
-
-  partitions {
-    ...
-  };
-};
-
-The driver is added to the very end of the mtd Makefile to increase the
-likelyhood of all child devices already being loaded at the time of
-probing, preventing unnecessary deferred probes.
-
-Signed-off-by: Bernhard Frauendienst <kernel@nospam.obeliks.de>
----
- drivers/mtd/Kconfig                 |   2 +
- drivers/mtd/Makefile                |   3 +
- drivers/mtd/composite/Kconfig       |  12 +++
- drivers/mtd/composite/Makefile      |   6 ++
- drivers/mtd/composite/virt_concat.c | 128 ++++++++++++++++++++++++++++
- 5 files changed, 151 insertions(+)
- create mode 100644 drivers/mtd/composite/Kconfig
- create mode 100644 drivers/mtd/composite/Makefile
- create mode 100644 drivers/mtd/composite/virt_concat.c
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -374,4 +374,6 @@ source "drivers/mtd/spi-nor/Kconfig"
- source "drivers/mtd/ubi/Kconfig"
-+source "drivers/mtd/composite/Kconfig"
-+
- endif # MTD
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -39,3 +39,6 @@ obj-y                += chips/ lpddr/ maps/ devices/ n
- obj-$(CONFIG_MTD_SPI_NOR)     += spi-nor/
- obj-$(CONFIG_MTD_UBI)         += ubi/
-+
-+# Composite drivers must be loaded last
-+obj-y         += composite/
---- /dev/null
-+++ b/drivers/mtd/composite/Kconfig
-@@ -0,0 +1,12 @@
-+menu "Composite MTD device drivers"
-+      depends on MTD!=n
-+
-+config MTD_VIRT_CONCAT
-+      tristate "Virtual concat MTD device"
-+      help
-+        This driver allows creation of a virtual MTD concat device, which
-+        concatenates multiple underlying MTD devices to a single device.
-+        This is required by some SoC boards where multiple memory banks are
-+        used as one device with partitions spanning across device boundaries.
-+
-+endmenu
---- /dev/null
-+++ b/drivers/mtd/composite/Makefile
-@@ -0,0 +1,6 @@
-+# SPDX-License-Identifier: GPL-2.0
-+#
-+# linux/drivers/mtd/composite/Makefile
-+#
-+
-+obj-$(CONFIG_MTD_VIRT_CONCAT)   += virt_concat.o
---- /dev/null
-+++ b/drivers/mtd/composite/virt_concat.c
-@@ -0,0 +1,128 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Virtual concat MTD device driver
-+ *
-+ * Copyright (C) 2018 Bernhard Frauendienst
-+ * Author: Bernhard Frauendienst, kernel@nospam.obeliks.de
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/mtd/concat.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/of.h>
-+#include <linux/of_platform.h>
-+#include <linux/slab.h>
-+
-+/*
-+ * struct of_virt_concat - platform device driver data.
-+ * @cmtd the final mtd_concat device
-+ * @num_devices the number of devices in @devices
-+ * @devices points to an array of devices already loaded
-+ */
-+struct of_virt_concat {
-+      struct mtd_info *cmtd;
-+      int num_devices;
-+      struct mtd_info **devices;
-+};
-+
-+static int virt_concat_remove(struct platform_device *pdev)
-+{
-+      struct of_virt_concat *info;
-+      int i;
-+
-+      info = platform_get_drvdata(pdev);
-+      if (!info)
-+              return 0;
-+
-+      // unset data for when this is called after a probe error
-+      platform_set_drvdata(pdev, NULL);
-+
-+      if (info->cmtd) {
-+              mtd_device_unregister(info->cmtd);
-+              mtd_concat_destroy(info->cmtd);
-+      }
-+
-+      if (info->devices) {
-+              for (i = 0; i < info->num_devices; i++)
-+                      put_mtd_device(info->devices[i]);
-+      }
-+
-+      return 0;
-+}
-+
-+static int virt_concat_probe(struct platform_device *pdev)
-+{
-+      struct device_node *node = pdev->dev.of_node;
-+      struct of_phandle_iterator it;
-+      struct of_virt_concat *info;
-+      struct mtd_info *mtd;
-+      int err = 0, count;
-+
-+      count = of_count_phandle_with_args(node, "devices", NULL);
-+      if (count <= 0)
-+              return -EINVAL;
-+
-+      info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
-+      if (!info)
-+              return -ENOMEM;
-+      info->devices = devm_kcalloc(&pdev->dev, count,
-+                                   sizeof(*(info->devices)), GFP_KERNEL);
-+      if (!info->devices) {
-+              err = -ENOMEM;
-+              goto err_remove;
-+      }
-+
-+      platform_set_drvdata(pdev, info);
-+
-+      of_for_each_phandle(&it, err, node, "devices", NULL, 0) {
-+              mtd = get_mtd_device_by_node(it.node);
-+              if (IS_ERR(mtd)) {
-+                      of_node_put(it.node);
-+                      err = -EPROBE_DEFER;
-+                      goto err_remove;
-+              }
-+
-+              info->devices[info->num_devices++] = mtd;
-+      }
-+
-+      info->cmtd = mtd_concat_create(info->devices, info->num_devices,
-+                                     dev_name(&pdev->dev));
-+      if (!info->cmtd) {
-+              err = -ENXIO;
-+              goto err_remove;
-+      }
-+
-+      info->cmtd->dev.parent = &pdev->dev;
-+      mtd_set_of_node(info->cmtd, node);
-+      mtd_device_register(info->cmtd, NULL, 0);
-+
-+      return 0;
-+
-+err_remove:
-+      virt_concat_remove(pdev);
-+
-+      return err;
-+}
-+
-+static const struct of_device_id virt_concat_of_match[] = {
-+      { .compatible = "mtd-concat", },
-+      { /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, virt_concat_of_match);
-+
-+static struct platform_driver virt_concat_driver = {
-+      .probe = virt_concat_probe,
-+      .remove = virt_concat_remove,
-+      .driver  = {
-+              .name   = "virt-mtdconcat",
-+              .of_match_table = virt_concat_of_match,
-+      },
-+};
-+
-+module_platform_driver(virt_concat_driver);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_AUTHOR("Bernhard Frauendienst <kernel@nospam.obeliks.de>");
-+MODULE_DESCRIPTION("Virtual concat MTD device driver");
diff --git a/target/linux/generic/pending-4.19/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-4.19/530-jffs2_make_lzma_available.patch
deleted file mode 100644 (file)
index f28186a..0000000
+++ /dev/null
@@ -1,5180 +0,0 @@
-From: Alexandros C. Couloumbis <alex@ozo.com>
-Subject: fs: add jffs2/lzma support (not activated by default yet)
-
-lede-commit: c2c88d315fa0e881f8b19da07b62859b915b11b2
-Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
----
- fs/jffs2/Kconfig             |    9 +
- fs/jffs2/Makefile            |    3 +
- fs/jffs2/compr.c             |    6 +
- fs/jffs2/compr.h             |   10 +-
- fs/jffs2/compr_lzma.c        |  128 +++
- fs/jffs2/super.c             |   33 +-
- include/linux/lzma.h         |   62 ++
- include/linux/lzma/LzFind.h  |  115 +++
- include/linux/lzma/LzHash.h  |   54 +
- include/linux/lzma/LzmaDec.h |  231 +++++
- include/linux/lzma/LzmaEnc.h |   80 ++
- include/linux/lzma/Types.h   |  226 +++++
- include/uapi/linux/jffs2.h   |    1 +
- lib/Kconfig                  |    6 +
- lib/Makefile                 |   12 +
- lib/lzma/LzFind.c            |  761 ++++++++++++++
- lib/lzma/LzmaDec.c           |  999 +++++++++++++++++++
- lib/lzma/LzmaEnc.c           | 2271 ++++++++++++++++++++++++++++++++++++++++++
- lib/lzma/Makefile            |    7 +
- 19 files changed, 5008 insertions(+), 6 deletions(-)
- create mode 100644 fs/jffs2/compr_lzma.c
- create mode 100644 include/linux/lzma.h
- create mode 100644 include/linux/lzma/LzFind.h
- create mode 100644 include/linux/lzma/LzHash.h
- create mode 100644 include/linux/lzma/LzmaDec.h
- create mode 100644 include/linux/lzma/LzmaEnc.h
- create mode 100644 include/linux/lzma/Types.h
- create mode 100644 lib/lzma/LzFind.c
- create mode 100644 lib/lzma/LzmaDec.c
- create mode 100644 lib/lzma/LzmaEnc.c
- create mode 100644 lib/lzma/Makefile
-
---- a/fs/jffs2/Kconfig
-+++ b/fs/jffs2/Kconfig
-@@ -135,6 +135,15 @@ config JFFS2_LZO
-         This feature was added in July, 2007. Say 'N' if you need
-         compatibility with older bootloaders or kernels.
-+config JFFS2_LZMA
-+      bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
-+      select LZMA_COMPRESS
-+      select LZMA_DECOMPRESS
-+      depends on JFFS2_FS
-+      default n
-+      help
-+        JFFS2 wrapper to the LZMA C SDK
-+
- config JFFS2_RTIME
-       bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
-       depends on JFFS2_FS
---- a/fs/jffs2/Makefile
-+++ b/fs/jffs2/Makefile
-@@ -19,4 +19,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)  += compr_rub
- jffs2-$(CONFIG_JFFS2_RTIME)   += compr_rtime.o
- jffs2-$(CONFIG_JFFS2_ZLIB)    += compr_zlib.o
- jffs2-$(CONFIG_JFFS2_LZO)     += compr_lzo.o
-+jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
- jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
-+
-+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
---- a/fs/jffs2/compr.c
-+++ b/fs/jffs2/compr.c
-@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
- #ifdef CONFIG_JFFS2_LZO
-       jffs2_lzo_init();
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_init();
-+#endif
- /* Setting default compression mode */
- #ifdef CONFIG_JFFS2_CMODE_NONE
-       jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
- int jffs2_compressors_exit(void)
- {
- /* Unregistering compressors */
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_exit();
-+#endif
- #ifdef CONFIG_JFFS2_LZO
-       jffs2_lzo_exit();
- #endif
---- a/fs/jffs2/compr.h
-+++ b/fs/jffs2/compr.h
-@@ -29,9 +29,9 @@
- #define JFFS2_DYNRUBIN_PRIORITY  20
- #define JFFS2_LZARI_PRIORITY     30
- #define JFFS2_RTIME_PRIORITY     50
--#define JFFS2_ZLIB_PRIORITY      60
--#define JFFS2_LZO_PRIORITY       80
--
-+#define JFFS2_LZMA_PRIORITY      70
-+#define JFFS2_ZLIB_PRIORITY      80
-+#define JFFS2_LZO_PRIORITY       90
- #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
- #define JFFS2_DYNRUBIN_DISABLED  /*      for decompression */
-@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
- int jffs2_lzo_init(void);
- void jffs2_lzo_exit(void);
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+int jffs2_lzma_init(void);
-+void jffs2_lzma_exit(void);
-+#endif
- #endif /* __JFFS2_COMPR_H__ */
---- /dev/null
-+++ b/fs/jffs2/compr_lzma.c
-@@ -0,0 +1,128 @@
-+/*
-+ * JFFS2 -- Journalling Flash File System, Version 2.
-+ *
-+ * For licensing information, see the file 'LICENCE' in this directory.
-+ *
-+ * JFFS2 wrapper to the LZMA C SDK
-+ *
-+ */
-+
-+#include <linux/lzma.h>
-+#include "compr.h"
-+
-+#ifdef __KERNEL__
-+      static DEFINE_MUTEX(deflate_mutex);
-+#endif
-+
-+CLzmaEncHandle *p;
-+Byte propsEncoded[LZMA_PROPS_SIZE];
-+SizeT propsSize = sizeof(propsEncoded);
-+
-+STATIC void lzma_free_workspace(void)
-+{
-+      LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
-+}
-+
-+STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
-+{
-+      if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
-+      {
-+              PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
-+              return -ENOMEM;
-+      }
-+
-+      if (LzmaEnc_SetProps(p, props) != SZ_OK)
-+      {
-+              lzma_free_workspace();
-+              return -1;
-+      }
-+      
-+      if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
-+      {
-+              lzma_free_workspace();
-+              return -1;
-+      }
-+
-+        return 0;
-+}
-+
-+STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
-+                            uint32_t *sourcelen, uint32_t *dstlen)
-+{
-+      SizeT compress_size = (SizeT)(*dstlen);
-+      int ret;
-+
-+      #ifdef __KERNEL__
-+              mutex_lock(&deflate_mutex);
-+      #endif
-+
-+      ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
-+              0, NULL, &lzma_alloc, &lzma_alloc);
-+
-+      #ifdef __KERNEL__
-+              mutex_unlock(&deflate_mutex);
-+      #endif
-+
-+      if (ret != SZ_OK)
-+              return -1;
-+
-+      *dstlen = (uint32_t)compress_size;
-+
-+      return 0;
-+}
-+
-+STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
-+                               uint32_t srclen, uint32_t destlen)
-+{
-+      int ret;
-+      SizeT dl = (SizeT)destlen;
-+      SizeT sl = (SizeT)srclen;
-+      ELzmaStatus status;
-+      
-+      ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
-+              propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
-+
-+      if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
-+              return -1;
-+
-+      return 0;
-+}
-+
-+static struct jffs2_compressor jffs2_lzma_comp = {
-+      .priority = JFFS2_LZMA_PRIORITY,
-+      .name = "lzma",
-+      .compr = JFFS2_COMPR_LZMA,
-+      .compress = &jffs2_lzma_compress,
-+      .decompress = &jffs2_lzma_decompress,
-+      .disabled = 0,
-+};
-+
-+int INIT jffs2_lzma_init(void)
-+{
-+        int ret;
-+      CLzmaEncProps props;
-+      LzmaEncProps_Init(&props);
-+
-+        props.dictSize = LZMA_BEST_DICT(0x2000);
-+        props.level = LZMA_BEST_LEVEL;
-+        props.lc = LZMA_BEST_LC;
-+        props.lp = LZMA_BEST_LP;
-+        props.pb = LZMA_BEST_PB;
-+        props.fb = LZMA_BEST_FB;
-+
-+      ret = lzma_alloc_workspace(&props);
-+        if (ret < 0)
-+                return ret;
-+
-+      ret = jffs2_register_compressor(&jffs2_lzma_comp);
-+      if (ret)
-+              lzma_free_workspace();
-+      
-+        return ret;
-+}
-+
-+void jffs2_lzma_exit(void)
-+{
-+      jffs2_unregister_compressor(&jffs2_lzma_comp);
-+      lzma_free_workspace();
-+}
---- a/fs/jffs2/super.c
-+++ b/fs/jffs2/super.c
-@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
-       BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
-       BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
--      pr_info("version 2.2."
-+      pr_info("version 2.2"
- #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
-              " (NAND)"
- #endif
- #ifdef CONFIG_JFFS2_SUMMARY
--             " (SUMMARY) "
-+             " (SUMMARY)"
- #endif
--             " Â© 2001-2006 Red Hat, Inc.\n");
-+#ifdef CONFIG_JFFS2_ZLIB
-+             " (ZLIB)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZO
-+             " (LZO)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZMA
-+             " (LZMA)"
-+#endif
-+#ifdef CONFIG_JFFS2_RTIME
-+             " (RTIME)"
-+#endif
-+#ifdef CONFIG_JFFS2_RUBIN
-+             " (RUBIN)"
-+#endif
-+#ifdef  CONFIG_JFFS2_CMODE_NONE
-+             " (CMODE_NONE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_PRIORITY
-+             " (CMODE_PRIORITY)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_SIZE
-+             " (CMODE_SIZE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
-+             " (CMODE_FAVOURLZO)"
-+#endif
-+             " (c) 2001-2006 Red Hat, Inc.\n");
-       jffs2_inode_cachep = kmem_cache_create("jffs2_i",
-                                            sizeof(struct jffs2_inode_info),
---- /dev/null
-+++ b/include/linux/lzma.h
-@@ -0,0 +1,62 @@
-+#ifndef __LZMA_H__
-+#define __LZMA_H__
-+
-+#ifdef __KERNEL__
-+      #include <linux/kernel.h>
-+      #include <linux/sched.h>
-+      #include <linux/slab.h>
-+      #include <linux/vmalloc.h>
-+      #include <linux/init.h>
-+      #define LZMA_MALLOC vmalloc
-+      #define LZMA_FREE vfree
-+      #define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
-+      #define INIT __init
-+      #define STATIC static
-+#else
-+      #include <stdint.h>
-+      #include <stdlib.h>
-+      #include <stdio.h>
-+      #include <unistd.h>
-+      #include <string.h>
-+      #include <asm/types.h>
-+      #include <errno.h>
-+      #include <linux/jffs2.h>
-+      #ifndef PAGE_SIZE
-+              extern int page_size;
-+              #define PAGE_SIZE page_size
-+      #endif
-+      #define LZMA_MALLOC malloc
-+      #define LZMA_FREE free
-+      #define PRINT_ERROR(msg) fprintf(stderr, msg)
-+      #define INIT
-+      #define STATIC
-+#endif
-+
-+#include "lzma/LzmaDec.h"
-+#include "lzma/LzmaEnc.h"
-+
-+#define LZMA_BEST_LEVEL (9)
-+#define LZMA_BEST_LC    (0)
-+#define LZMA_BEST_LP    (0)
-+#define LZMA_BEST_PB    (0)
-+#define LZMA_BEST_FB  (273)
-+
-+#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
-+
-+static void *p_lzma_malloc(void *p, size_t size)
-+{
-+        if (size == 0)
-+                return NULL;
-+
-+        return LZMA_MALLOC(size);
-+}
-+
-+static void p_lzma_free(void *p, void *address)
-+{
-+        if (address != NULL)
-+                LZMA_FREE(address);
-+}
-+
-+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzFind.h
-@@ -0,0 +1,115 @@
-+/* LzFind.h -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_FIND_H
-+#define __LZ_FIND_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef UInt32 CLzRef;
-+
-+typedef struct _CMatchFinder
-+{
-+  Byte *buffer;
-+  UInt32 pos;
-+  UInt32 posLimit;
-+  UInt32 streamPos;
-+  UInt32 lenLimit;
-+
-+  UInt32 cyclicBufferPos;
-+  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
-+
-+  UInt32 matchMaxLen;
-+  CLzRef *hash;
-+  CLzRef *son;
-+  UInt32 hashMask;
-+  UInt32 cutValue;
-+
-+  Byte *bufferBase;
-+  ISeqInStream *stream;
-+  int streamEndWasReached;
-+
-+  UInt32 blockSize;
-+  UInt32 keepSizeBefore;
-+  UInt32 keepSizeAfter;
-+
-+  UInt32 numHashBytes;
-+  int directInput;
-+  size_t directInputRem;
-+  int btMode;
-+  int bigHash;
-+  UInt32 historySize;
-+  UInt32 fixedHashSize;
-+  UInt32 hashSizeSum;
-+  UInt32 numSons;
-+  SRes result;
-+  UInt32 crc[256];
-+} CMatchFinder;
-+
-+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
-+#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
-+
-+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
-+
-+int MatchFinder_NeedMove(CMatchFinder *p);
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
-+void MatchFinder_MoveBlock(CMatchFinder *p);
-+void MatchFinder_ReadIfRequired(CMatchFinder *p);
-+
-+void MatchFinder_Construct(CMatchFinder *p);
-+
-+/* Conditions:
-+     historySize <= 3 GB
-+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
-+*/
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc);
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-+    UInt32 *distances, UInt32 maxLen);
-+
-+/*
-+Conditions:
-+  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
-+  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
-+*/
-+
-+typedef void (*Mf_Init_Func)(void *object);
-+typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
-+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
-+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
-+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
-+typedef void (*Mf_Skip_Func)(void *object, UInt32);
-+
-+typedef struct _IMatchFinder
-+{
-+  Mf_Init_Func Init;
-+  Mf_GetIndexByte_Func GetIndexByte;
-+  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
-+  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
-+  Mf_GetMatches_Func GetMatches;
-+  Mf_Skip_Func Skip;
-+} IMatchFinder;
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
-+
-+void MatchFinder_Init(CMatchFinder *p);
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzHash.h
-@@ -0,0 +1,54 @@
-+/* LzHash.h -- HASH functions for LZ algorithms
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_HASH_H
-+#define __LZ_HASH_H
-+
-+#define kHash2Size (1 << 10)
-+#define kHash3Size (1 << 16)
-+#define kHash4Size (1 << 20)
-+
-+#define kFix3HashSize (kHash2Size)
-+#define kFix4HashSize (kHash2Size + kHash3Size)
-+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
-+
-+#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
-+
-+#define HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
-+
-+#define HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
-+
-+#define HASH5_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
-+  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
-+  hash4Value &= (kHash4Size - 1); }
-+
-+/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
-+#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
-+
-+
-+#define MT_HASH2_CALC \
-+  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
-+
-+#define MT_HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
-+
-+#define MT_HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaDec.h
-@@ -0,0 +1,231 @@
-+/* LzmaDec.h -- LZMA Decoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_DEC_H
-+#define __LZMA_DEC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* #define _LZMA_PROB32 */
-+/* _LZMA_PROB32 can increase the speed on some CPUs,
-+   but memory usage for CLzmaDec::probs will be doubled in that case */
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+
-+/* ---------- LZMA Properties ---------- */
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaProps
-+{
-+  unsigned lc, lp, pb;
-+  UInt32 dicSize;
-+} CLzmaProps;
-+
-+/* LzmaProps_Decode - decodes properties
-+Returns:
-+  SZ_OK
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
-+
-+
-+/* ---------- LZMA Decoder state ---------- */
-+
-+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
-+   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
-+
-+#define LZMA_REQUIRED_INPUT_MAX 20
-+
-+typedef struct
-+{
-+  CLzmaProps prop;
-+  CLzmaProb *probs;
-+  Byte *dic;
-+  const Byte *buf;
-+  UInt32 range, code;
-+  SizeT dicPos;
-+  SizeT dicBufSize;
-+  UInt32 processedPos;
-+  UInt32 checkDicSize;
-+  unsigned state;
-+  UInt32 reps[4];
-+  unsigned remainLen;
-+  int needFlush;
-+  int needInitState;
-+  UInt32 numProbs;
-+  unsigned tempBufSize;
-+  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
-+} CLzmaDec;
-+
-+#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
-+
-+void LzmaDec_Init(CLzmaDec *p);
-+
-+/* There are two types of LZMA streams:
-+     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-+     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-+
-+typedef enum
-+{
-+  LZMA_FINISH_ANY,   /* finish at any point */
-+  LZMA_FINISH_END    /* block must be finished at the end */
-+} ELzmaFinishMode;
-+
-+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
-+
-+   You must use LZMA_FINISH_END, when you know that current output buffer
-+   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
-+
-+   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
-+   and output value of destLen will be less than output buffer size limit.
-+   You can check status result also.
-+
-+   You can use multiple checks to test data integrity after full decompression:
-+     1) Check Result and "status" variable.
-+     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
-+     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
-+        You must use correct finish mode in that case. */
-+
-+typedef enum
-+{
-+  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
-+  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
-+  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
-+  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
-+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
-+} ELzmaStatus;
-+
-+/* ELzmaStatus is used only as output value for function call */
-+
-+
-+/* ---------- Interfaces ---------- */
-+
-+/* There are 3 levels of interfaces:
-+     1) Dictionary Interface
-+     2) Buffer Interface
-+     3) One Call Interface
-+   You can select any of these interfaces, but don't mix functions from different
-+   groups for same object. */
-+
-+
-+/* There are two variants to allocate state for Dictionary Interface:
-+     1) LzmaDec_Allocate / LzmaDec_Free
-+     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
-+   You can use variant 2, if you set dictionary buffer manually.
-+   For Buffer Interface you must always use variant 1.
-+
-+LzmaDec_Allocate* can return:
-+  SZ_OK
-+  SZ_ERROR_MEM         - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+   
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
-+
-+SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
-+
-+/* ---------- Dictionary Interface ---------- */
-+
-+/* You can use it, if you want to eliminate the overhead for data copying from
-+   dictionary to some other external buffer.
-+   You must work with CLzmaDec variables directly in this interface.
-+
-+   STEPS:
-+     LzmaDec_Constr()
-+     LzmaDec_Allocate()
-+     for (each new stream)
-+     {
-+       LzmaDec_Init()
-+       while (it needs more decompression)
-+       {
-+         LzmaDec_DecodeToDic()
-+         use data from CLzmaDec::dic and update CLzmaDec::dicPos
-+       }
-+     }
-+     LzmaDec_Free()
-+*/
-+
-+/* LzmaDec_DecodeToDic
-+   
-+   The decoding to internal dictionary buffer (CLzmaDec::dic).
-+   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (dicLimit).
-+  LZMA_FINISH_ANY - Decode just dicLimit bytes.
-+  LZMA_FINISH_END - Stream must be finished after dicLimit.
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_NEEDS_MORE_INPUT
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+*/
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- Buffer Interface ---------- */
-+
-+/* It's zlib-like interface.
-+   See LzmaDec_DecodeToDic description for information about STEPS and return results,
-+   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
-+   to work with CLzmaDec variables manually.
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+*/
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaDecode
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+  SZ_ERROR_MEM  - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-+*/
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaEnc.h
-@@ -0,0 +1,80 @@
-+/*  LzmaEnc.h -- LZMA Encoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_ENC_H
-+#define __LZMA_ENC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaEncProps
-+{
-+  int level;       /*  0 <= level <= 9 */
-+  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
-+                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
-+                       default = (1 << 24) */
-+  int lc;          /* 0 <= lc <= 8, default = 3 */
-+  int lp;          /* 0 <= lp <= 4, default = 0 */
-+  int pb;          /* 0 <= pb <= 4, default = 2 */
-+  int algo;        /* 0 - fast, 1 - normal, default = 1 */
-+  int fb;          /* 5 <= fb <= 273, default = 32 */
-+  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
-+  int numHashBytes; /* 2, 3 or 4, default = 4 */
-+  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
-+  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
-+  int numThreads;  /* 1 or 2, default = 2 */
-+} CLzmaEncProps;
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p);
-+void LzmaEncProps_Normalize(CLzmaEncProps *p);
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
-+
-+
-+/* ---------- CLzmaEncHandle Interface ---------- */
-+
-+/* LzmaEnc_* functions can return the following exit codes:
-+Returns:
-+  SZ_OK           - OK
-+  SZ_ERROR_MEM    - Memory allocation error
-+  SZ_ERROR_PARAM  - Incorrect paramater in props
-+  SZ_ERROR_WRITE  - Write callback error.
-+  SZ_ERROR_PROGRESS - some break from progress callback
-+  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
-+*/
-+
-+typedef void * CLzmaEncHandle;
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
-+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaEncode
-+Return code:
-+  SZ_OK               - OK
-+  SZ_ERROR_MEM        - Memory allocation error
-+  SZ_ERROR_PARAM      - Incorrect paramater
-+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
-+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
-+*/
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/Types.h
-@@ -0,0 +1,226 @@
-+/* Types.h -- Basic types
-+2009-11-23 : Igor Pavlov : Public domain */
-+
-+#ifndef __7Z_TYPES_H
-+#define __7Z_TYPES_H
-+
-+#include <stddef.h>
-+
-+#ifdef _WIN32
-+#include <windows.h>
-+#endif
-+
-+#ifndef EXTERN_C_BEGIN
-+#ifdef __cplusplus
-+#define EXTERN_C_BEGIN extern "C" {
-+#define EXTERN_C_END }
-+#else
-+#define EXTERN_C_BEGIN
-+#define EXTERN_C_END
-+#endif
-+#endif
-+
-+EXTERN_C_BEGIN
-+
-+#define SZ_OK 0
-+
-+#define SZ_ERROR_DATA 1
-+#define SZ_ERROR_MEM 2
-+#define SZ_ERROR_CRC 3
-+#define SZ_ERROR_UNSUPPORTED 4
-+#define SZ_ERROR_PARAM 5
-+#define SZ_ERROR_INPUT_EOF 6
-+#define SZ_ERROR_OUTPUT_EOF 7
-+#define SZ_ERROR_READ 8
-+#define SZ_ERROR_WRITE 9
-+#define SZ_ERROR_PROGRESS 10
-+#define SZ_ERROR_FAIL 11
-+#define SZ_ERROR_THREAD 12
-+
-+#define SZ_ERROR_ARCHIVE 16
-+#define SZ_ERROR_NO_ARCHIVE 17
-+
-+typedef int SRes;
-+
-+#ifdef _WIN32
-+typedef DWORD WRes;
-+#else
-+typedef int WRes;
-+#endif
-+
-+#ifndef RINOK
-+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
-+#endif
-+
-+typedef unsigned char Byte;
-+typedef short Int16;
-+typedef unsigned short UInt16;
-+
-+#ifdef _LZMA_UINT32_IS_ULONG
-+typedef long Int32;
-+typedef unsigned long UInt32;
-+#else
-+typedef int Int32;
-+typedef unsigned int UInt32;
-+#endif
-+
-+#ifdef _SZ_NO_INT_64
-+
-+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
-+   NOTES: Some code will work incorrectly in that case! */
-+
-+typedef long Int64;
-+typedef unsigned long UInt64;
-+
-+#else
-+
-+#if defined(_MSC_VER) || defined(__BORLANDC__)
-+typedef __int64 Int64;
-+typedef unsigned __int64 UInt64;
-+#else
-+typedef long long int Int64;
-+typedef unsigned long long int UInt64;
-+#endif
-+
-+#endif
-+
-+#ifdef _LZMA_NO_SYSTEM_SIZE_T
-+typedef UInt32 SizeT;
-+#else
-+typedef size_t SizeT;
-+#endif
-+
-+typedef int Bool;
-+#define True 1
-+#define False 0
-+
-+
-+#ifdef _WIN32
-+#define MY_STD_CALL __stdcall
-+#else
-+#define MY_STD_CALL
-+#endif
-+
-+#ifdef _MSC_VER
-+
-+#if _MSC_VER >= 1300
-+#define MY_NO_INLINE __declspec(noinline)
-+#else
-+#define MY_NO_INLINE
-+#endif
-+
-+#define MY_CDECL __cdecl
-+#define MY_FAST_CALL __fastcall
-+
-+#else
-+
-+#define MY_CDECL
-+#define MY_FAST_CALL
-+
-+#endif
-+
-+
-+/* The following interfaces use first parameter as pointer to structure */
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) < input(*size)) is allowed */
-+} ISeqInStream;
-+
-+/* it can return SZ_ERROR_INPUT_EOF */
-+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
-+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
-+
-+typedef struct
-+{
-+  size_t (*Write)(void *p, const void *buf, size_t size);
-+    /* Returns: result - the number of actually written bytes.
-+       (result < size) means error */
-+} ISeqOutStream;
-+
-+typedef enum
-+{
-+  SZ_SEEK_SET = 0,
-+  SZ_SEEK_CUR = 1,
-+  SZ_SEEK_END = 2
-+} ESzSeek;
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ISeekInStream;
-+
-+typedef struct
-+{
-+  SRes (*Look)(void *p, void **buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) > input(*size)) is not allowed
-+       (output(*size) < input(*size)) is allowed */
-+  SRes (*Skip)(void *p, size_t offset);
-+    /* offset must be <= output(*size) of Look */
-+
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* reads directly (without buffer). It's same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ILookInStream;
-+
-+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
-+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
-+
-+/* reads via ILookInStream::Read */
-+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
-+
-+#define LookToRead_BUF_SIZE (1 << 14)
-+
-+typedef struct
-+{
-+  ILookInStream s;
-+  ISeekInStream *realStream;
-+  size_t pos;
-+  size_t size;
-+  Byte buf[LookToRead_BUF_SIZE];
-+} CLookToRead;
-+
-+void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
-+void LookToRead_Init(CLookToRead *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToLook;
-+
-+void SecToLook_CreateVTable(CSecToLook *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToRead;
-+
-+void SecToRead_CreateVTable(CSecToRead *p);
-+
-+typedef struct
-+{
-+  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
-+    /* Returns: result. (result != SZ_OK) means break.
-+       Value (UInt64)(Int64)-1 for size means unknown value. */
-+} ICompressProgress;
-+
-+typedef struct
-+{
-+  void *(*Alloc)(void *p, size_t size);
-+  void (*Free)(void *p, void *address); /* address can be 0 */
-+} ISzAlloc;
-+
-+#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
-+#define IAlloc_Free(p, a) (p)->Free((p), a)
-+
-+EXTERN_C_END
-+
-+#endif
---- a/include/uapi/linux/jffs2.h
-+++ b/include/uapi/linux/jffs2.h
-@@ -46,6 +46,7 @@
- #define JFFS2_COMPR_DYNRUBIN  0x05
- #define JFFS2_COMPR_ZLIB      0x06
- #define JFFS2_COMPR_LZO               0x07
-+#define JFFS2_COMPR_LZMA      0x08
- /* Compatibility flags. */
- #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
- #define JFFS2_NODE_ACCURATE 0x2000
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -278,6 +278,12 @@ config ZSTD_DECOMPRESS
- source "lib/xz/Kconfig"
-+config LZMA_COMPRESS
-+    tristate
-+
-+config LZMA_DECOMPRESS
-+    tristate
-+
- #
- # These all provide a common interface (hence the apparent duplication with
- # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -3,6 +3,16 @@
- # Makefile for some libs needed in the kernel.
- #
-+ifdef CONFIG_JFFS2_ZLIB
-+      CONFIG_ZLIB_INFLATE:=y
-+      CONFIG_ZLIB_DEFLATE:=y
-+endif
-+
-+ifdef CONFIG_JFFS2_LZMA
-+      CONFIG_LZMA_DECOMPRESS:=y
-+      CONFIG_LZMA_COMPRESS:=y
-+endif
-+
- ifdef CONFIG_FUNCTION_TRACER
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
- KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
-@@ -139,6 +149,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
- obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
- obj-$(CONFIG_XZ_DEC) += xz/
- obj-$(CONFIG_RAID6_PQ) += raid6/
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma/
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
---- /dev/null
-+++ b/lib/lzma/LzFind.c
-@@ -0,0 +1,761 @@
-+/* LzFind.c -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+#include "LzFind.h"
-+#include "LzHash.h"
-+
-+#define kEmptyHashValue 0
-+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
-+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
-+#define kNormalizeMask (~(kNormalizeStepMin - 1))
-+#define kMaxHistorySize ((UInt32)3 << 30)
-+
-+#define kStartMaxLen 3
-+
-+static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  if (!p->directInput)
-+  {
-+    alloc->Free(alloc, p->bufferBase);
-+    p->bufferBase = 0;
-+  }
-+}
-+
-+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
-+
-+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
-+{
-+  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
-+  if (p->directInput)
-+  {
-+    p->blockSize = blockSize;
-+    return 1;
-+  }
-+  if (p->bufferBase == 0 || p->blockSize != blockSize)
-+  {
-+    LzInWindow_Free(p, alloc);
-+    p->blockSize = blockSize;
-+    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
-+  }
-+  return (p->bufferBase != 0);
-+}
-+
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-+
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-+
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-+{
-+  p->posLimit -= subValue;
-+  p->pos -= subValue;
-+  p->streamPos -= subValue;
-+}
-+
-+static void MatchFinder_ReadBlock(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached || p->result != SZ_OK)
-+    return;
-+  if (p->directInput)
-+  {
-+    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-+    if (curSize > p->directInputRem)
-+      curSize = (UInt32)p->directInputRem;
-+    p->directInputRem -= curSize;
-+    p->streamPos += curSize;
-+    if (p->directInputRem == 0)
-+      p->streamEndWasReached = 1;
-+    return;
-+  }
-+  for (;;)
-+  {
-+    Byte *dest = p->buffer + (p->streamPos - p->pos);
-+    size_t size = (p->bufferBase + p->blockSize - dest);
-+    if (size == 0)
-+      return;
-+    p->result = p->stream->Read(p->stream, dest, &size);
-+    if (p->result != SZ_OK)
-+      return;
-+    if (size == 0)
-+    {
-+      p->streamEndWasReached = 1;
-+      return;
-+    }
-+    p->streamPos += (UInt32)size;
-+    if (p->streamPos - p->pos > p->keepSizeAfter)
-+      return;
-+  }
-+}
-+
-+void MatchFinder_MoveBlock(CMatchFinder *p)
-+{
-+  memmove(p->bufferBase,
-+    p->buffer - p->keepSizeBefore,
-+    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
-+  p->buffer = p->bufferBase + p->keepSizeBefore;
-+}
-+
-+int MatchFinder_NeedMove(CMatchFinder *p)
-+{
-+  if (p->directInput)
-+    return 0;
-+  /* if (p->streamEndWasReached) return 0; */
-+  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
-+}
-+
-+void MatchFinder_ReadIfRequired(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached)
-+    return;
-+  if (p->keepSizeAfter >= p->streamPos - p->pos)
-+    MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
-+{
-+  if (MatchFinder_NeedMove(p))
-+    MatchFinder_MoveBlock(p);
-+  MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
-+{
-+  p->cutValue = 32;
-+  p->btMode = 1;
-+  p->numHashBytes = 4;
-+  p->bigHash = 0;
-+}
-+
-+#define kCrcPoly 0xEDB88320
-+
-+void MatchFinder_Construct(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  p->bufferBase = 0;
-+  p->directInput = 0;
-+  p->hash = 0;
-+  MatchFinder_SetDefaultSettings(p);
-+
-+  for (i = 0; i < 256; i++)
-+  {
-+    UInt32 r = i;
-+    int j;
-+    for (j = 0; j < 8; j++)
-+      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-+    p->crc[i] = r;
-+  }
-+}
-+
-+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->hash);
-+  p->hash = 0;
-+}
-+
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  MatchFinder_FreeThisClassMemory(p, alloc);
-+  LzInWindow_Free(p, alloc);
-+}
-+
-+static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
-+{
-+  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
-+  if (sizeInBytes / sizeof(CLzRef) != num)
-+    return 0;
-+  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
-+}
-+
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc)
-+{
-+  UInt32 sizeReserv;
-+  if (historySize > kMaxHistorySize)
-+  {
-+    MatchFinder_Free(p, alloc);
-+    return 0;
-+  }
-+  sizeReserv = historySize >> 1;
-+  if (historySize > ((UInt32)2 << 30))
-+    sizeReserv = historySize >> 2;
-+  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
-+
-+  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
-+  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
-+  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
-+  if (LzInWindow_Create(p, sizeReserv, alloc))
-+  {
-+    UInt32 newCyclicBufferSize = historySize + 1;
-+    UInt32 hs;
-+    p->matchMaxLen = matchMaxLen;
-+    {
-+      p->fixedHashSize = 0;
-+      if (p->numHashBytes == 2)
-+        hs = (1 << 16) - 1;
-+      else
-+      {
-+        hs = historySize - 1;
-+        hs |= (hs >> 1);
-+        hs |= (hs >> 2);
-+        hs |= (hs >> 4);
-+        hs |= (hs >> 8);
-+        hs >>= 1;
-+        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
-+        if (hs > (1 << 24))
-+        {
-+          if (p->numHashBytes == 3)
-+            hs = (1 << 24) - 1;
-+          else
-+            hs >>= 1;
-+        }
-+      }
-+      p->hashMask = hs;
-+      hs++;
-+      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
-+      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
-+      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
-+      hs += p->fixedHashSize;
-+    }
-+
-+    {
-+      UInt32 prevSize = p->hashSizeSum + p->numSons;
-+      UInt32 newSize;
-+      p->historySize = historySize;
-+      p->hashSizeSum = hs;
-+      p->cyclicBufferSize = newCyclicBufferSize;
-+      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
-+      newSize = p->hashSizeSum + p->numSons;
-+      if (p->hash != 0 && prevSize == newSize)
-+        return 1;
-+      MatchFinder_FreeThisClassMemory(p, alloc);
-+      p->hash = AllocRefs(newSize, alloc);
-+      if (p->hash != 0)
-+      {
-+        p->son = p->hash + p->hashSizeSum;
-+        return 1;
-+      }
-+    }
-+  }
-+  MatchFinder_Free(p, alloc);
-+  return 0;
-+}
-+
-+static void MatchFinder_SetLimits(CMatchFinder *p)
-+{
-+  UInt32 limit = kMaxValForNormalize - p->pos;
-+  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  limit2 = p->streamPos - p->pos;
-+  if (limit2 <= p->keepSizeAfter)
-+  {
-+    if (limit2 > 0)
-+      limit2 = 1;
-+  }
-+  else
-+    limit2 -= p->keepSizeAfter;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  {
-+    UInt32 lenLimit = p->streamPos - p->pos;
-+    if (lenLimit > p->matchMaxLen)
-+      lenLimit = p->matchMaxLen;
-+    p->lenLimit = lenLimit;
-+  }
-+  p->posLimit = p->pos + limit;
-+}
-+
-+void MatchFinder_Init(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < p->hashSizeSum; i++)
-+    p->hash[i] = kEmptyHashValue;
-+  p->cyclicBufferPos = 0;
-+  p->buffer = p->bufferBase;
-+  p->pos = p->streamPos = p->cyclicBufferSize;
-+  p->result = SZ_OK;
-+  p->streamEndWasReached = 0;
-+  MatchFinder_ReadBlock(p);
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
-+{
-+  return (p->pos - p->historySize - 1) & kNormalizeMask;
-+}
-+
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-+{
-+  UInt32 i;
-+  for (i = 0; i < numItems; i++)
-+  {
-+    UInt32 value = items[i];
-+    if (value <= subValue)
-+      value = kEmptyHashValue;
-+    else
-+      value -= subValue;
-+    items[i] = value;
-+  }
-+}
-+
-+static void MatchFinder_Normalize(CMatchFinder *p)
-+{
-+  UInt32 subValue = MatchFinder_GetSubValue(p);
-+  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
-+  MatchFinder_ReduceOffsets(p, subValue);
-+}
-+
-+static void MatchFinder_CheckLimits(CMatchFinder *p)
-+{
-+  if (p->pos == kMaxValForNormalize)
-+    MatchFinder_Normalize(p);
-+  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
-+    MatchFinder_CheckAndMoveAndRead(p);
-+  if (p->cyclicBufferPos == p->cyclicBufferSize)
-+    p->cyclicBufferPos = 0;
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  son[_cyclicBufferPos] = curMatch;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+      return distances;
-+    {
-+      const Byte *pb = cur - delta;
-+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
-+      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
-+      {
-+        UInt32 len = 0;
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+            return distances;
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return distances;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        if (++len != lenLimit && pb[len] == cur[len])
-+          while (++len != lenLimit)
-+            if (pb[len] != cur[len])
-+              break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return distances;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        {
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+#define MOVE_POS \
-+  ++p->cyclicBufferPos; \
-+  p->buffer++; \
-+  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
-+
-+#define MOVE_POS_RET MOVE_POS return offset;
-+
-+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-+
-+#define GET_MATCHES_HEADER2(minLen, ret_op) \
-+  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-+  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-+  cur = p->buffer;
-+
-+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
-+#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
-+
-+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
-+
-+#define GET_MATCHES_FOOTER(offset, maxLen) \
-+  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
-+  distances + offset, maxLen) - distances); MOVE_POS_RET;
-+
-+#define SKIP_FOOTER \
-+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
-+
-+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(2)
-+  HASH2_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 1)
-+}
-+
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 2)
-+}
-+
-+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, delta2, maxLen, offset;
-+  GET_MATCHES_HEADER(3)
-+
-+  HASH3_CALC;
-+
-+  delta2 = p->pos - p->hash[hash2Value];
-+  curMatch = p->hash[kFix3HashSize + hashValue];
-+  
-+  p->hash[hash2Value] =
-+  p->hash[kFix3HashSize + hashValue] = p->pos;
-+
-+
-+  maxLen = 2;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[0] = maxLen;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+  
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      p->son[p->cyclicBufferPos] = curMatch;
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances + offset, maxLen) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances, 2) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(2)
-+    HASH2_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value;
-+    SKIP_HEADER(3)
-+    HASH3_CALC;
-+    curMatch = p->hash[kFix3HashSize + hashValue];
-+    p->hash[hash2Value] =
-+    p->hash[kFix3HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] = p->pos;
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] =
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
-+{
-+  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-+  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
-+  if (!p->btMode)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 2)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 3)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
-+  }
-+  else
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
-+  }
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaDec.c
-@@ -0,0 +1,999 @@
-+/* LzmaDec.c -- LZMA Decoder
-+2009-09-20 : Igor Pavlov : Public domain */
-+
-+#include "LzmaDec.h"
-+
-+#include <string.h>
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+#define RC_INIT_SIZE 5
-+
-+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
-+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
-+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
-+  { UPDATE_0(p); i = (i + i); A0; } else \
-+  { UPDATE_1(p); i = (i + i) + 1; A1; }
-+#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
-+
-+#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
-+#define TREE_DECODE(probs, limit, i) \
-+  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
-+
-+/* #define _LZMA_SIZE_OPT */
-+
-+#ifdef _LZMA_SIZE_OPT
-+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-+#else
-+#define TREE_6_DECODE(probs, i) \
-+  { i = 1; \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  i -= 0x40; }
-+#endif
-+
-+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0_CHECK range = bound;
-+#define UPDATE_1_CHECK range -= bound; code -= bound;
-+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
-+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
-+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
-+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
-+#define TREE_DECODE_CHECK(probs, limit, i) \
-+  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
-+
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-+
-+
-+#define kNumStates 12
-+#define kNumLitStates 7
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+#define LZMA_DIC_MIN (1 << 12)
-+
-+/* First LZMA-symbol is always decoded.
-+And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
-+Out:
-+  Result:
-+    SZ_OK - OK
-+    SZ_ERROR_DATA - Error
-+  p->remainLen:
-+    < kMatchSpecLenStart : normal remain
-+    = kMatchSpecLenStart : finished
-+    = kMatchSpecLenStart + 1 : Flush marker
-+    = kMatchSpecLenStart + 2 : State Init Marker
-+*/
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  CLzmaProb *probs = p->probs;
-+
-+  unsigned state = p->state;
-+  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
-+  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
-+  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
-+  unsigned lc = p->prop.lc;
-+
-+  Byte *dic = p->dic;
-+  SizeT dicBufSize = p->dicBufSize;
-+  SizeT dicPos = p->dicPos;
-+  
-+  UInt32 processedPos = p->processedPos;
-+  UInt32 checkDicSize = p->checkDicSize;
-+  unsigned len = 0;
-+
-+  const Byte *buf = p->buf;
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+
-+  do
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = processedPos & pbMask;
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0(prob)
-+    {
-+      unsigned symbol;
-+      UPDATE_0(prob);
-+      prob = probs + Literal;
-+      if (checkDicSize != 0 || processedPos != 0)
-+        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
-+        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        state -= (state < 4) ? state : 3;
-+        symbol = 1;
-+        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        state -= (state < 10) ? 3 : 6;
-+        symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      dic[dicPos++] = (Byte)symbol;
-+      processedPos++;
-+      continue;
-+    }
-+    else
-+    {
-+      UPDATE_1(prob);
-+      prob = probs + IsRep + state;
-+      IF_BIT_0(prob)
-+      {
-+        UPDATE_0(prob);
-+        state += kNumStates;
-+        prob = probs + LenCoder;
-+      }
-+      else
-+      {
-+        UPDATE_1(prob);
-+        if (checkDicSize == 0 && processedPos == 0)
-+          return SZ_ERROR_DATA;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0(prob)
-+        {
-+          UPDATE_0(prob);
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+            dicPos++;
-+            processedPos++;
-+            state = state < kNumLitStates ? 9 : 11;
-+            continue;
-+          }
-+          UPDATE_1(prob);
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          UPDATE_1(prob);
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            distance = rep1;
-+          }
-+          else
-+          {
-+            UPDATE_1(prob);
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0(prob)
-+            {
-+              UPDATE_0(prob);
-+              distance = rep2;
-+            }
-+            else
-+            {
-+              UPDATE_1(prob);
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        state = state < kNumLitStates ? 8 : 11;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0(probLen)
-+        {
-+          UPDATE_0(probLen);
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = (1 << kLenNumLowBits);
-+        }
-+        else
-+        {
-+          UPDATE_1(probLen);
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0(probLen)
-+          {
-+            UPDATE_0(probLen);
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = (1 << kLenNumMidBits);
-+          }
-+          else
-+          {
-+            UPDATE_1(probLen);
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = (1 << kLenNumHighBits);
-+          }
-+        }
-+        TREE_DECODE(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state >= kNumStates)
-+      {
-+        UInt32 distance;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-+        TREE_6_DECODE(prob, distance);
-+        if (distance >= kStartPosModelIndex)
-+        {
-+          unsigned posSlot = (unsigned)distance;
-+          int numDirectBits = (int)(((distance >> 1) - 1));
-+          distance = (2 | (distance & 1));
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            distance <<= numDirectBits;
-+            prob = probs + SpecPos + distance - posSlot - 1;
-+            {
-+              UInt32 mask = 1;
-+              unsigned i = 1;
-+              do
-+              {
-+                GET_BIT2(prob + i, i, ; , distance |= mask);
-+                mask <<= 1;
-+              }
-+              while (--numDirectBits != 0);
-+            }
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE
-+              range >>= 1;
-+              
-+              {
-+                UInt32 t;
-+                code -= range;
-+                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
-+                distance = (distance << 1) + (t + 1);
-+                code += range & t;
-+              }
-+              /*
-+              distance <<= 1;
-+              if (code >= range)
-+              {
-+                code -= range;
-+                distance |= 1;
-+              }
-+              */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            distance <<= kNumAlignBits;
-+            {
-+              unsigned i = 1;
-+              GET_BIT2(prob + i, i, ; , distance |= 1);
-+              GET_BIT2(prob + i, i, ; , distance |= 2);
-+              GET_BIT2(prob + i, i, ; , distance |= 4);
-+              GET_BIT2(prob + i, i, ; , distance |= 8);
-+            }
-+            if (distance == (UInt32)0xFFFFFFFF)
-+            {
-+              len += kMatchSpecLenStart;
-+              state -= kNumStates;
-+              break;
-+            }
-+          }
-+        }
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        rep0 = distance + 1;
-+        if (checkDicSize == 0)
-+        {
-+          if (distance >= processedPos)
-+            return SZ_ERROR_DATA;
-+        }
-+        else if (distance >= checkDicSize)
-+          return SZ_ERROR_DATA;
-+        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
-+      }
-+
-+      len += kMatchMinLen;
-+
-+      if (limit == dicPos)
-+        return SZ_ERROR_DATA;
-+      {
-+        SizeT rem = limit - dicPos;
-+        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
-+        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
-+
-+        processedPos += curLen;
-+
-+        len -= curLen;
-+        if (pos + curLen <= dicBufSize)
-+        {
-+          Byte *dest = dic + dicPos;
-+          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
-+          const Byte *lim = dest + curLen;
-+          dicPos += curLen;
-+          do
-+            *(dest) = (Byte)*(dest + src);
-+          while (++dest != lim);
-+        }
-+        else
-+        {
-+          do
-+          {
-+            dic[dicPos++] = dic[pos];
-+            if (++pos == dicBufSize)
-+              pos = 0;
-+          }
-+          while (--curLen != 0);
-+        }
-+      }
-+    }
-+  }
-+  while (dicPos < limit && buf < bufLimit);
-+  NORMALIZE;
-+  p->buf = buf;
-+  p->range = range;
-+  p->code = code;
-+  p->remainLen = len;
-+  p->dicPos = dicPos;
-+  p->processedPos = processedPos;
-+  p->reps[0] = rep0;
-+  p->reps[1] = rep1;
-+  p->reps[2] = rep2;
-+  p->reps[3] = rep3;
-+  p->state = state;
-+
-+  return SZ_OK;
-+}
-+
-+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
-+{
-+  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
-+  {
-+    Byte *dic = p->dic;
-+    SizeT dicPos = p->dicPos;
-+    SizeT dicBufSize = p->dicBufSize;
-+    unsigned len = p->remainLen;
-+    UInt32 rep0 = p->reps[0];
-+    if (limit - dicPos < len)
-+      len = (unsigned)(limit - dicPos);
-+
-+    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
-+      p->checkDicSize = p->prop.dicSize;
-+
-+    p->processedPos += len;
-+    p->remainLen -= len;
-+    while (len-- != 0)
-+    {
-+      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+      dicPos++;
-+    }
-+    p->dicPos = dicPos;
-+  }
-+}
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  do
-+  {
-+    SizeT limit2 = limit;
-+    if (p->checkDicSize == 0)
-+    {
-+      UInt32 rem = p->prop.dicSize - p->processedPos;
-+      if (limit - p->dicPos > rem)
-+        limit2 = p->dicPos + rem;
-+    }
-+    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
-+    if (p->processedPos >= p->prop.dicSize)
-+      p->checkDicSize = p->prop.dicSize;
-+    LzmaDec_WriteRem(p, limit);
-+  }
-+  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
-+
-+  if (p->remainLen > kMatchSpecLenStart)
-+  {
-+    p->remainLen = kMatchSpecLenStart;
-+  }
-+  return 0;
-+}
-+
-+typedef enum
-+{
-+  DUMMY_ERROR, /* unexpected end of input stream */
-+  DUMMY_LIT,
-+  DUMMY_MATCH,
-+  DUMMY_REP
-+} ELzmaDummy;
-+
-+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
-+{
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+  const Byte *bufLimit = buf + inSize;
-+  CLzmaProb *probs = p->probs;
-+  unsigned state = p->state;
-+  ELzmaDummy res;
-+
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0_CHECK(prob)
-+    {
-+      UPDATE_0_CHECK
-+
-+      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
-+
-+      prob = probs + Literal;
-+      if (p->checkDicSize != 0 || p->processedPos != 0)
-+        prob += (LZMA_LIT_SIZE *
-+          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
-+          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        unsigned symbol = 1;
-+        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
-+            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        unsigned symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      res = DUMMY_LIT;
-+    }
-+    else
-+    {
-+      unsigned len;
-+      UPDATE_1_CHECK;
-+
-+      prob = probs + IsRep + state;
-+      IF_BIT_0_CHECK(prob)
-+      {
-+        UPDATE_0_CHECK;
-+        state = 0;
-+        prob = probs + LenCoder;
-+        res = DUMMY_MATCH;
-+      }
-+      else
-+      {
-+        UPDATE_1_CHECK;
-+        res = DUMMY_REP;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0_CHECK(prob)
-+        {
-+          UPDATE_0_CHECK;
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+            NORMALIZE_CHECK;
-+            return DUMMY_REP;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+          }
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0_CHECK(prob)
-+            {
-+              UPDATE_0_CHECK;
-+            }
-+            else
-+            {
-+              UPDATE_1_CHECK;
-+            }
-+          }
-+        }
-+        state = kNumStates;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0_CHECK(probLen)
-+        {
-+          UPDATE_0_CHECK;
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = 1 << kLenNumLowBits;
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0_CHECK(probLen)
-+          {
-+            UPDATE_0_CHECK;
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = 1 << kLenNumMidBits;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = 1 << kLenNumHighBits;
-+          }
-+        }
-+        TREE_DECODE_CHECK(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state < 4)
-+      {
-+        unsigned posSlot;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-+            kNumPosSlotBits);
-+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+
-+          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
-+
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE_CHECK
-+              range >>= 1;
-+              code -= range & (((code - range) >> 31) - 1);
-+              /* if (code >= range) code -= range; */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            numDirectBits = kNumAlignBits;
-+          }
-+          {
-+            unsigned i = 1;
-+            do
-+            {
-+              GET_BIT_CHECK(prob + i, i);
-+            }
-+            while (--numDirectBits != 0);
-+          }
-+        }
-+      }
-+    }
-+  }
-+  NORMALIZE_CHECK;
-+  return res;
-+}
-+
-+
-+static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
-+{
-+  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
-+  p->range = 0xFFFFFFFF;
-+  p->needFlush = 0;
-+}
-+
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-+{
-+  p->needFlush = 1;
-+  p->remainLen = 0;
-+  p->tempBufSize = 0;
-+
-+  if (initDic)
-+  {
-+    p->processedPos = 0;
-+    p->checkDicSize = 0;
-+    p->needInitState = 1;
-+  }
-+  if (initState)
-+    p->needInitState = 1;
-+}
-+
-+void LzmaDec_Init(CLzmaDec *p)
-+{
-+  p->dicPos = 0;
-+  LzmaDec_InitDicAndState(p, True, True);
-+}
-+
-+static void LzmaDec_InitStateReal(CLzmaDec *p)
-+{
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
-+  UInt32 i;
-+  CLzmaProb *probs = p->probs;
-+  for (i = 0; i < numProbs; i++)
-+    probs[i] = kBitModelTotal >> 1;
-+  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
-+  p->state = 0;
-+  p->needInitState = 0;
-+}
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-+    ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT inSize = *srcLen;
-+  (*srcLen) = 0;
-+  LzmaDec_WriteRem(p, dicLimit);
-+  
-+  *status = LZMA_STATUS_NOT_SPECIFIED;
-+
-+  while (p->remainLen != kMatchSpecLenStart)
-+  {
-+      int checkEndMarkNow;
-+
-+      if (p->needFlush != 0)
-+      {
-+        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
-+          p->tempBuf[p->tempBufSize++] = *src++;
-+        if (p->tempBufSize < RC_INIT_SIZE)
-+        {
-+          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+          return SZ_OK;
-+        }
-+        if (p->tempBuf[0] != 0)
-+          return SZ_ERROR_DATA;
-+
-+        LzmaDec_InitRc(p, p->tempBuf);
-+        p->tempBufSize = 0;
-+      }
-+
-+      checkEndMarkNow = 0;
-+      if (p->dicPos >= dicLimit)
-+      {
-+        if (p->remainLen == 0 && p->code == 0)
-+        {
-+          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
-+          return SZ_OK;
-+        }
-+        if (finishMode == LZMA_FINISH_ANY)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_OK;
-+        }
-+        if (p->remainLen != 0)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_ERROR_DATA;
-+        }
-+        checkEndMarkNow = 1;
-+      }
-+
-+      if (p->needInitState)
-+        LzmaDec_InitStateReal(p);
-+  
-+      if (p->tempBufSize == 0)
-+      {
-+        SizeT processed;
-+        const Byte *bufLimit;
-+        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            memcpy(p->tempBuf, src, inSize);
-+            p->tempBufSize = (unsigned)inSize;
-+            (*srcLen) += inSize;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+          bufLimit = src;
-+        }
-+        else
-+          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
-+        p->buf = src;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
-+          return SZ_ERROR_DATA;
-+        processed = (SizeT)(p->buf - src);
-+        (*srcLen) += processed;
-+        src += processed;
-+        inSize -= processed;
-+      }
-+      else
-+      {
-+        unsigned rem = p->tempBufSize, lookAhead = 0;
-+        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
-+          p->tempBuf[rem++] = src[lookAhead++];
-+        p->tempBufSize = rem;
-+        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            (*srcLen) += lookAhead;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+        }
-+        p->buf = p->tempBuf;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
-+          return SZ_ERROR_DATA;
-+        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
-+        (*srcLen) += lookAhead;
-+        src += lookAhead;
-+        inSize -= lookAhead;
-+        p->tempBufSize = 0;
-+      }
-+  }
-+  if (p->code == 0)
-+    *status = LZMA_STATUS_FINISHED_WITH_MARK;
-+  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
-+}
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT outSize = *destLen;
-+  SizeT inSize = *srcLen;
-+  *srcLen = *destLen = 0;
-+  for (;;)
-+  {
-+    SizeT inSizeCur = inSize, outSizeCur, dicPos;
-+    ELzmaFinishMode curFinishMode;
-+    SRes res;
-+    if (p->dicPos == p->dicBufSize)
-+      p->dicPos = 0;
-+    dicPos = p->dicPos;
-+    if (outSize > p->dicBufSize - dicPos)
-+    {
-+      outSizeCur = p->dicBufSize;
-+      curFinishMode = LZMA_FINISH_ANY;
-+    }
-+    else
-+    {
-+      outSizeCur = dicPos + outSize;
-+      curFinishMode = finishMode;
-+    }
-+
-+    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
-+    src += inSizeCur;
-+    inSize -= inSizeCur;
-+    *srcLen += inSizeCur;
-+    outSizeCur = p->dicPos - dicPos;
-+    memcpy(dest, p->dic + dicPos, outSizeCur);
-+    dest += outSizeCur;
-+    outSize -= outSizeCur;
-+    *destLen += outSizeCur;
-+    if (res != 0)
-+      return res;
-+    if (outSizeCur == 0 || outSize == 0)
-+      return SZ_OK;
-+  }
-+}
-+
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->probs);
-+  p->probs = 0;
-+}
-+
-+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->dic);
-+  p->dic = 0;
-+}
-+
-+void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  LzmaDec_FreeProbs(p, alloc);
-+  LzmaDec_FreeDict(p, alloc);
-+}
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-+{
-+  UInt32 dicSize;
-+  Byte d;
-+  
-+  if (size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_UNSUPPORTED;
-+  else
-+    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
-+ 
-+  if (dicSize < LZMA_DIC_MIN)
-+    dicSize = LZMA_DIC_MIN;
-+  p->dicSize = dicSize;
-+
-+  d = data[0];
-+  if (d >= (9 * 5 * 5))
-+    return SZ_ERROR_UNSUPPORTED;
-+
-+  p->lc = d % 9;
-+  d /= 9;
-+  p->pb = d / 5;
-+  p->lp = d % 5;
-+
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
-+{
-+  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
-+  if (p->probs == 0 || numProbs != p->numProbs)
-+  {
-+    LzmaDec_FreeProbs(p, alloc);
-+    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
-+    p->numProbs = numProbs;
-+    if (p->probs == 0)
-+      return SZ_ERROR_MEM;
-+  }
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  SizeT dicBufSize;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  dicBufSize = propNew.dicSize;
-+  if (p->dic == 0 || dicBufSize != p->dicBufSize)
-+  {
-+    LzmaDec_FreeDict(p, alloc);
-+    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
-+    if (p->dic == 0)
-+    {
-+      LzmaDec_FreeProbs(p, alloc);
-+      return SZ_ERROR_MEM;
-+    }
-+  }
-+  p->dicBufSize = dicBufSize;
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc)
-+{
-+  CLzmaDec p;
-+  SRes res;
-+  SizeT inSize = *srcLen;
-+  SizeT outSize = *destLen;
-+  *srcLen = *destLen = 0;
-+  if (inSize < RC_INIT_SIZE)
-+    return SZ_ERROR_INPUT_EOF;
-+
-+  LzmaDec_Construct(&p);
-+  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
-+  if (res != 0)
-+    return res;
-+  p.dic = dest;
-+  p.dicBufSize = outSize;
-+
-+  LzmaDec_Init(&p);
-+  
-+  *srcLen = inSize;
-+  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-+
-+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-+    res = SZ_ERROR_INPUT_EOF;
-+
-+  (*destLen) = p.dicPos;
-+  LzmaDec_FreeProbs(&p, alloc);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaEnc.c
-@@ -0,0 +1,2271 @@
-+/* LzmaEnc.c -- LZMA Encoder
-+2009-11-24 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+/* #define SHOW_STAT */
-+/* #define SHOW_STAT2 */
-+
-+#if defined(SHOW_STAT) || defined(SHOW_STAT2)
-+#include <stdio.h>
-+#endif
-+
-+#include "LzmaEnc.h"
-+
-+/* disable MT */
-+#define _7ZIP_ST
-+
-+#include "LzFind.h"
-+#ifndef _7ZIP_ST
-+#include "LzFindMt.h"
-+#endif
-+
-+#ifdef SHOW_STAT
-+static int ttt = 0;
-+#endif
-+
-+#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
-+
-+#define kBlockSize (9 << 10)
-+#define kUnpackBlockSize (1 << 18)
-+#define kMatchArraySize (1 << 21)
-+#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
-+
-+#define kNumMaxDirectBits (31)
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+#define kProbInitValue (kBitModelTotal >> 1)
-+
-+#define kNumMoveReducingBits 4
-+#define kNumBitPriceShiftBits 4
-+#define kBitPrice (1 << kNumBitPriceShiftBits)
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p)
-+{
-+  p->level = 5;
-+  p->dictSize = p->mc = 0;
-+  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
-+  p->writeEndMark = 0;
-+}
-+
-+void LzmaEncProps_Normalize(CLzmaEncProps *p)
-+{
-+  int level = p->level;
-+  if (level < 0) level = 5;
-+  p->level = level;
-+  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
-+  if (p->lc < 0) p->lc = 3;
-+  if (p->lp < 0) p->lp = 0;
-+  if (p->pb < 0) p->pb = 2;
-+  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
-+  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
-+  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
-+  if (p->numHashBytes < 0) p->numHashBytes = 4;
-+  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
-+  if (p->numThreads < 0)
-+    p->numThreads =
-+      #ifndef _7ZIP_ST
-+      ((p->btMode && p->algo) ? 2 : 1);
-+      #else
-+      1;
-+      #endif
-+}
-+
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-+{
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+  return props.dictSize;
-+}
-+
-+/* #define LZMA_LOG_BSR */
-+/* Define it for Intel's CPU */
-+
-+
-+#ifdef LZMA_LOG_BSR
-+
-+#define kDicLogSizeMaxCompress 30
-+
-+#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
-+
-+UInt32 GetPosSlot1(UInt32 pos)
-+{
-+  UInt32 res;
-+  BSR2_RET(pos, res);
-+  return res;
-+}
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
-+
-+#else
-+
-+#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
-+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
-+
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
-+{
-+  int c = 2, slotFast;
-+  g_FastPos[0] = 0;
-+  g_FastPos[1] = 1;
-+  
-+  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
-+  {
-+    UInt32 k = (1 << ((slotFast >> 1) - 1));
-+    UInt32 j;
-+    for (j = 0; j < k; j++, c++)
-+      g_FastPos[c] = (Byte)slotFast;
-+  }
-+}
-+
-+#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
-+  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
-+  res = p->g_FastPos[pos >> i] + (i * 2); }
-+/*
-+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
-+  p->g_FastPos[pos >> 6] + 12 : \
-+  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
-+*/
-+
-+#define GetPosSlot1(pos) p->g_FastPos[pos]
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
-+
-+#endif
-+
-+
-+#define LZMA_NUM_REPS 4
-+
-+typedef unsigned CState;
-+
-+typedef struct
-+{
-+  UInt32 price;
-+
-+  CState state;
-+  int prev1IsChar;
-+  int prev2;
-+
-+  UInt32 posPrev2;
-+  UInt32 backPrev2;
-+
-+  UInt32 posPrev;
-+  UInt32 backPrev;
-+  UInt32 backs[LZMA_NUM_REPS];
-+} COptimal;
-+
-+#define kNumOpts (1 << 12)
-+
-+#define kNumLenToPosStates 4
-+#define kNumPosSlotBits 6
-+#define kDicLogSizeMin 0
-+#define kDicLogSizeMax 32
-+#define kDistTableSizeMax (kDicLogSizeMax * 2)
-+
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+#define kAlignMask (kAlignTableSize - 1)
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
-+
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+#define LZMA_PB_MAX 4
-+#define LZMA_LC_MAX 8
-+#define LZMA_LP_MAX 4
-+
-+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
-+
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define LZMA_MATCH_LEN_MIN 2
-+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
-+
-+#define kNumStates 12
-+
-+typedef struct
-+{
-+  CLzmaProb choice;
-+  CLzmaProb choice2;
-+  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
-+  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
-+  CLzmaProb high[kLenNumHighSymbols];
-+} CLenEnc;
-+
-+typedef struct
-+{
-+  CLenEnc p;
-+  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
-+  UInt32 tableSize;
-+  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
-+} CLenPriceEnc;
-+
-+typedef struct
-+{
-+  UInt32 range;
-+  Byte cache;
-+  UInt64 low;
-+  UInt64 cacheSize;
-+  Byte *buf;
-+  Byte *bufLim;
-+  Byte *bufBase;
-+  ISeqOutStream *outStream;
-+  UInt64 processed;
-+  SRes res;
-+} CRangeEnc;
-+
-+typedef struct
-+{
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+} CSaveState;
-+
-+typedef struct
-+{
-+  IMatchFinder matchFinder;
-+  void *matchFinderObj;
-+
-+  #ifndef _7ZIP_ST
-+  Bool mtMode;
-+  CMatchFinderMt matchFinderMt;
-+  #endif
-+
-+  CMatchFinder matchFinderBase;
-+
-+  #ifndef _7ZIP_ST
-+  Byte pad[128];
-+  #endif
-+  
-+  UInt32 optimumEndIndex;
-+  UInt32 optimumCurrentIndex;
-+
-+  UInt32 longestMatchLength;
-+  UInt32 numPairs;
-+  UInt32 numAvail;
-+  COptimal opt[kNumOpts];
-+  
-+  #ifndef LZMA_LOG_BSR
-+  Byte g_FastPos[1 << kNumLogBits];
-+  #endif
-+
-+  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
-+  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
-+  UInt32 numFastBytes;
-+  UInt32 additionalOffset;
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+
-+  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
-+  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
-+  UInt32 alignPrices[kAlignTableSize];
-+  UInt32 alignPriceCount;
-+
-+  UInt32 distTableSize;
-+
-+  unsigned lc, lp, pb;
-+  unsigned lpMask, pbMask;
-+
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  unsigned lclp;
-+
-+  Bool fastMode;
-+  
-+  CRangeEnc rc;
-+
-+  Bool writeEndMark;
-+  UInt64 nowPos64;
-+  UInt32 matchPriceCount;
-+  Bool finished;
-+  Bool multiThread;
-+
-+  SRes result;
-+  UInt32 dictSize;
-+  UInt32 matchFinderCycles;
-+
-+  int needInit;
-+
-+  CSaveState saveState;
-+} CLzmaEnc;
-+
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CSaveState *dest = &p->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
-+}
-+
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *dest = (CLzmaEnc *)pp;
-+  const CSaveState *p = &dest->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
-+}
-+
-+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+
-+  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
-+      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
-+    return SZ_ERROR_PARAM;
-+  p->dictSize = props.dictSize;
-+  p->matchFinderCycles = props.mc;
-+  {
-+    unsigned fb = props.fb;
-+    if (fb < 5)
-+      fb = 5;
-+    if (fb > LZMA_MATCH_LEN_MAX)
-+      fb = LZMA_MATCH_LEN_MAX;
-+    p->numFastBytes = fb;
-+  }
-+  p->lc = props.lc;
-+  p->lp = props.lp;
-+  p->pb = props.pb;
-+  p->fastMode = (props.algo == 0);
-+  p->matchFinderBase.btMode = props.btMode;
-+  {
-+    UInt32 numHashBytes = 4;
-+    if (props.btMode)
-+    {
-+      if (props.numHashBytes < 2)
-+        numHashBytes = 2;
-+      else if (props.numHashBytes < 4)
-+        numHashBytes = props.numHashBytes;
-+    }
-+    p->matchFinderBase.numHashBytes = numHashBytes;
-+  }
-+
-+  p->matchFinderBase.cutValue = props.mc;
-+
-+  p->writeEndMark = props.writeEndMark;
-+
-+  #ifndef _7ZIP_ST
-+  /*
-+  if (newMultiThread != _multiThread)
-+  {
-+    ReleaseMatchFinder();
-+    _multiThread = newMultiThread;
-+  }
-+  */
-+  p->multiThread = (props.numThreads > 1);
-+  #endif
-+
-+  return SZ_OK;
-+}
-+
-+static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
-+static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
-+static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
-+static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
-+
-+#define IsCharState(s) ((s) < 7)
-+
-+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
-+
-+#define kInfinityPrice (1 << 30)
-+
-+static void RangeEnc_Construct(CRangeEnc *p)
-+{
-+  p->outStream = 0;
-+  p->bufBase = 0;
-+}
-+
-+#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
-+
-+#define RC_BUF_SIZE (1 << 16)
-+static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  if (p->bufBase == 0)
-+  {
-+    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
-+    if (p->bufBase == 0)
-+      return 0;
-+    p->bufLim = p->bufBase + RC_BUF_SIZE;
-+  }
-+  return 1;
-+}
-+
-+static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->bufBase);
-+  p->bufBase = 0;
-+}
-+
-+static void RangeEnc_Init(CRangeEnc *p)
-+{
-+  /* Stream.Init(); */
-+  p->low = 0;
-+  p->range = 0xFFFFFFFF;
-+  p->cacheSize = 1;
-+  p->cache = 0;
-+
-+  p->buf = p->bufBase;
-+
-+  p->processed = 0;
-+  p->res = SZ_OK;
-+}
-+
-+static void RangeEnc_FlushStream(CRangeEnc *p)
-+{
-+  size_t num;
-+  if (p->res != SZ_OK)
-+    return;
-+  num = p->buf - p->bufBase;
-+  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
-+    p->res = SZ_ERROR_WRITE;
-+  p->processed += num;
-+  p->buf = p->bufBase;
-+}
-+
-+static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
-+{
-+  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
-+  {
-+    Byte temp = p->cache;
-+    do
-+    {
-+      Byte *buf = p->buf;
-+      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
-+      p->buf = buf;
-+      if (buf == p->bufLim)
-+        RangeEnc_FlushStream(p);
-+      temp = 0xFF;
-+    }
-+    while (--p->cacheSize != 0);
-+    p->cache = (Byte)((UInt32)p->low >> 24);
-+  }
-+  p->cacheSize++;
-+  p->low = (UInt32)p->low << 8;
-+}
-+
-+static void RangeEnc_FlushData(CRangeEnc *p)
-+{
-+  int i;
-+  for (i = 0; i < 5; i++)
-+    RangeEnc_ShiftLow(p);
-+}
-+
-+static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
-+{
-+  do
-+  {
-+    p->range >>= 1;
-+    p->low += p->range & (0 - ((value >> --numBits) & 1));
-+    if (p->range < kTopValue)
-+    {
-+      p->range <<= 8;
-+      RangeEnc_ShiftLow(p);
-+    }
-+  }
-+  while (numBits != 0);
-+}
-+
-+static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
-+{
-+  UInt32 ttt = *prob;
-+  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
-+  if (symbol == 0)
-+  {
-+    p->range = newBound;
-+    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
-+  }
-+  else
-+  {
-+    p->low += newBound;
-+    p->range -= newBound;
-+    ttt -= ttt >> kNumMoveBits;
-+  }
-+  *prob = (CLzmaProb)ttt;
-+  if (p->range < kTopValue)
-+  {
-+    p->range <<= 8;
-+    RangeEnc_ShiftLow(p);
-+  }
-+}
-+
-+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
-+{
-+  symbol |= 0x100;
-+  do
-+  {
-+    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
-+{
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-+{
-+  UInt32 i;
-+  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-+  {
-+    const int kCyclesBits = kNumBitPriceShiftBits;
-+    UInt32 w = i;
-+    UInt32 bitCount = 0;
-+    int j;
-+    for (j = 0; j < kCyclesBits; j++)
-+    {
-+      w = w * w;
-+      bitCount <<= 1;
-+      while (w >= ((UInt32)1 << 16))
-+      {
-+        w >>= 1;
-+        bitCount++;
-+      }
-+    }
-+    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
-+  }
-+}
-+
-+
-+#define GET_PRICE(prob, symbol) \
-+  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICEa(prob, symbol) \
-+  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= 0x100;
-+  do
-+  {
-+    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+
-+static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0;)
-+  {
-+    UInt32 bit;
-+    i--;
-+    bit = (symbol >> i) & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+  }
-+}
-+
-+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = 0; i < numBitLevels; i++)
-+  {
-+    UInt32 bit = symbol & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+    symbol >>= 1;
-+  }
-+}
-+
-+static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= (1 << numBitLevels);
-+  while (symbol != 1)
-+  {
-+    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
-+    symbol >>= 1;
-+  }
-+  return price;
-+}
-+
-+static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0; i--)
-+  {
-+    UInt32 bit = symbol & 1;
-+    symbol >>= 1;
-+    price += GET_PRICEa(probs[m], bit);
-+    m = (m << 1) | bit;
-+  }
-+  return price;
-+}
-+
-+
-+static void LenEnc_Init(CLenEnc *p)
-+{
-+  unsigned i;
-+  p->choice = p->choice2 = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
-+    p->low[i] = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
-+    p->mid[i] = kProbInitValue;
-+  for (i = 0; i < kLenNumHighSymbols; i++)
-+    p->high[i] = kProbInitValue;
-+}
-+
-+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
-+{
-+  if (symbol < kLenNumLowSymbols)
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 0);
-+    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
-+  }
-+  else
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 1);
-+    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 0);
-+      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 1);
-+      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
-+    }
-+  }
-+}
-+
-+static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
-+{
-+  UInt32 a0 = GET_PRICE_0a(p->choice);
-+  UInt32 a1 = GET_PRICE_1a(p->choice);
-+  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
-+  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
-+  UInt32 i = 0;
-+  for (i = 0; i < kLenNumLowSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
-+  }
-+  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
-+  }
-+  for (; i < numSymbols; i++)
-+    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
-+}
-+
-+static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
-+{
-+  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
-+  p->counters[posState] = p->tableSize;
-+}
-+
-+static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
-+{
-+  UInt32 posState;
-+  for (posState = 0; posState < numPosStates; posState++)
-+    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
-+{
-+  LenEnc_Encode(&p->p, rc, symbol, posState);
-+  if (updatePrice)
-+    if (--p->counters[posState] == 0)
-+      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+
-+
-+
-+static void MovePos(CLzmaEnc *p, UInt32 num)
-+{
-+  #ifdef SHOW_STAT
-+  ttt += num;
-+  printf("\n MovePos %d", num);
-+  #endif
-+  if (num != 0)
-+  {
-+    p->additionalOffset += num;
-+    p->matchFinder.Skip(p->matchFinderObj, num);
-+  }
-+}
-+
-+static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
-+{
-+  UInt32 lenRes = 0, numPairs;
-+  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
-+  #ifdef SHOW_STAT
-+  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
-+  ttt++;
-+  {
-+    UInt32 i;
-+    for (i = 0; i < numPairs; i += 2)
-+      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
-+  }
-+  #endif
-+  if (numPairs > 0)
-+  {
-+    lenRes = p->matches[numPairs - 2];
-+    if (lenRes == p->numFastBytes)
-+    {
-+      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+      UInt32 distance = p->matches[numPairs - 1] + 1;
-+      UInt32 numAvail = p->numAvail;
-+      if (numAvail > LZMA_MATCH_LEN_MAX)
-+        numAvail = LZMA_MATCH_LEN_MAX;
-+      {
-+        const Byte *pby2 = pby - distance;
-+        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
-+      }
-+    }
-+  }
-+  p->additionalOffset++;
-+  *numDistancePairsRes = numPairs;
-+  return lenRes;
-+}
-+
-+
-+#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
-+#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
-+#define IsShortRep(p) ((p)->backPrev == 0)
-+
-+static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
-+{
-+  return
-+    GET_PRICE_0(p->isRepG0[state]) +
-+    GET_PRICE_0(p->isRep0Long[state][posState]);
-+}
-+
-+static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
-+{
-+  UInt32 price;
-+  if (repIndex == 0)
-+  {
-+    price = GET_PRICE_0(p->isRepG0[state]);
-+    price += GET_PRICE_1(p->isRep0Long[state][posState]);
-+  }
-+  else
-+  {
-+    price = GET_PRICE_1(p->isRepG0[state]);
-+    if (repIndex == 1)
-+      price += GET_PRICE_0(p->isRepG1[state]);
-+    else
-+    {
-+      price += GET_PRICE_1(p->isRepG1[state]);
-+      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
-+    }
-+  }
-+  return price;
-+}
-+
-+static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
-+{
-+  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
-+    GetPureRepPrice(p, repIndex, state, posState);
-+}
-+
-+static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
-+{
-+  UInt32 posMem = p->opt[cur].posPrev;
-+  UInt32 backMem = p->opt[cur].backPrev;
-+  p->optimumEndIndex = cur;
-+  do
-+  {
-+    if (p->opt[cur].prev1IsChar)
-+    {
-+      MakeAsChar(&p->opt[posMem])
-+      p->opt[posMem].posPrev = posMem - 1;
-+      if (p->opt[cur].prev2)
-+      {
-+        p->opt[posMem - 1].prev1IsChar = False;
-+        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
-+        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
-+      }
-+    }
-+    {
-+      UInt32 posPrev = posMem;
-+      UInt32 backCur = backMem;
-+      
-+      backMem = p->opt[posPrev].backPrev;
-+      posMem = p->opt[posPrev].posPrev;
-+      
-+      p->opt[posPrev].backPrev = backCur;
-+      p->opt[posPrev].posPrev = cur;
-+      cur = posPrev;
-+    }
-+  }
-+  while (cur != 0);
-+  *backRes = p->opt[0].backPrev;
-+  p->optimumCurrentIndex  = p->opt[0].posPrev;
-+  return p->optimumCurrentIndex;
-+}
-+
-+#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
-+
-+static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
-+  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
-+  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
-+  UInt32 *matches;
-+  const Byte *data;
-+  Byte curByte, matchByte;
-+  if (p->optimumEndIndex != p->optimumCurrentIndex)
-+  {
-+    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
-+    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
-+    *backRes = opt->backPrev;
-+    p->optimumCurrentIndex = opt->posPrev;
-+    return lenRes;
-+  }
-+  p->optimumCurrentIndex = p->optimumEndIndex = 0;
-+  
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  if (numAvail < 2)
-+  {
-+    *backRes = (UInt32)(-1);
-+    return 1;
-+  }
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  repMaxIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 lenTest;
-+    const Byte *data2;
-+    reps[i] = p->reps[i];
-+    data2 = data - (reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+    {
-+      repLens[i] = 0;
-+      continue;
-+    }
-+    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+    repLens[i] = lenTest;
-+    if (lenTest > repLens[repMaxIndex])
-+      repMaxIndex = i;
-+  }
-+  if (repLens[repMaxIndex] >= p->numFastBytes)
-+  {
-+    UInt32 lenRes;
-+    *backRes = repMaxIndex;
-+    lenRes = repLens[repMaxIndex];
-+    MovePos(p, lenRes - 1);
-+    return lenRes;
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+  curByte = *data;
-+  matchByte = *(data - (reps[0] + 1));
-+
-+  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
-+  {
-+    *backRes = (UInt32)-1;
-+    return 1;
-+  }
-+
-+  p->opt[0].state = (CState)p->state;
-+
-+  posState = (position & p->pbMask);
-+
-+  {
-+    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
-+        (!IsCharState(p->state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+  }
-+
-+  MakeAsChar(&p->opt[1]);
-+
-+  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
-+  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
-+
-+  if (matchByte == curByte)
-+  {
-+    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
-+    if (shortRepPrice < p->opt[1].price)
-+    {
-+      p->opt[1].price = shortRepPrice;
-+      MakeAsShortRep(&p->opt[1]);
-+    }
-+  }
-+  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
-+
-+  if (lenEnd < 2)
-+  {
-+    *backRes = p->opt[1].backPrev;
-+    return 1;
-+  }
-+
-+  p->opt[1].posPrev = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+    p->opt[0].backs[i] = reps[i];
-+
-+  len = lenEnd;
-+  do
-+    p->opt[len--].price = kInfinityPrice;
-+  while (len >= 2);
-+
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 repLen = repLens[i];
-+    UInt32 price;
-+    if (repLen < 2)
-+      continue;
-+    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
-+    do
-+    {
-+      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
-+      COptimal *opt = &p->opt[repLen];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = i;
-+        opt->prev1IsChar = False;
-+      }
-+    }
-+    while (--repLen >= 2);
-+  }
-+
-+  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
-+
-+  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
-+  if (len <= mainLen)
-+  {
-+    UInt32 offs = 0;
-+    while (len > matches[offs])
-+      offs += 2;
-+    for (; ; len++)
-+    {
-+      COptimal *opt;
-+      UInt32 distance = matches[offs + 1];
-+
-+      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
-+      UInt32 lenToPosState = GetLenToPosState(len);
-+      if (distance < kNumFullDistances)
-+        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
-+      else
-+      {
-+        UInt32 slot;
-+        GetPosSlot2(distance, slot);
-+        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
-+      }
-+      opt = &p->opt[len];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = distance + LZMA_NUM_REPS;
-+        opt->prev1IsChar = False;
-+      }
-+      if (len == matches[offs])
-+      {
-+        offs += 2;
-+        if (offs == numPairs)
-+          break;
-+      }
-+    }
-+  }
-+
-+  cur = 0;
-+
-+    #ifdef SHOW_STAT2
-+    if (position >= 0)
-+    {
-+      unsigned i;
-+      printf("\n pos = %4X", position);
-+      for (i = cur; i <= lenEnd; i++)
-+      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
-+    }
-+    #endif
-+
-+  for (;;)
-+  {
-+    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
-+    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
-+    Bool nextIsChar;
-+    Byte curByte, matchByte;
-+    const Byte *data;
-+    COptimal *curOpt;
-+    COptimal *nextOpt;
-+
-+    cur++;
-+    if (cur == lenEnd)
-+      return Backward(p, backRes, cur);
-+
-+    newLen = ReadMatchDistances(p, &numPairs);
-+    if (newLen >= p->numFastBytes)
-+    {
-+      p->numPairs = numPairs;
-+      p->longestMatchLength = newLen;
-+      return Backward(p, backRes, cur);
-+    }
-+    position++;
-+    curOpt = &p->opt[cur];
-+    posPrev = curOpt->posPrev;
-+    if (curOpt->prev1IsChar)
-+    {
-+      posPrev--;
-+      if (curOpt->prev2)
-+      {
-+        state = p->opt[curOpt->posPrev2].state;
-+        if (curOpt->backPrev2 < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      else
-+        state = p->opt[posPrev].state;
-+      state = kLiteralNextStates[state];
-+    }
-+    else
-+      state = p->opt[posPrev].state;
-+    if (posPrev == cur - 1)
-+    {
-+      if (IsShortRep(curOpt))
-+        state = kShortRepNextStates[state];
-+      else
-+        state = kLiteralNextStates[state];
-+    }
-+    else
-+    {
-+      UInt32 pos;
-+      const COptimal *prevOpt;
-+      if (curOpt->prev1IsChar && curOpt->prev2)
-+      {
-+        posPrev = curOpt->posPrev2;
-+        pos = curOpt->backPrev2;
-+        state = kRepNextStates[state];
-+      }
-+      else
-+      {
-+        pos = curOpt->backPrev;
-+        if (pos < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      prevOpt = &p->opt[posPrev];
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        UInt32 i;
-+        reps[0] = prevOpt->backs[pos];
-+        for (i = 1; i <= pos; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+        for (; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i];
-+      }
-+      else
-+      {
-+        UInt32 i;
-+        reps[0] = (pos - LZMA_NUM_REPS);
-+        for (i = 1; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+      }
-+    }
-+    curOpt->state = (CState)state;
-+
-+    curOpt->backs[0] = reps[0];
-+    curOpt->backs[1] = reps[1];
-+    curOpt->backs[2] = reps[2];
-+    curOpt->backs[3] = reps[3];
-+
-+    curPrice = curOpt->price;
-+    nextIsChar = False;
-+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+    curByte = *data;
-+    matchByte = *(data - (reps[0] + 1));
-+
-+    posState = (position & p->pbMask);
-+
-+    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
-+    {
-+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+      curAnd1Price +=
-+        (!IsCharState(state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+    }
-+
-+    nextOpt = &p->opt[cur + 1];
-+
-+    if (curAnd1Price < nextOpt->price)
-+    {
-+      nextOpt->price = curAnd1Price;
-+      nextOpt->posPrev = cur;
-+      MakeAsChar(nextOpt);
-+      nextIsChar = True;
-+    }
-+
-+    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
-+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-+    
-+    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
-+    {
-+      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
-+      if (shortRepPrice <= nextOpt->price)
-+      {
-+        nextOpt->price = shortRepPrice;
-+        nextOpt->posPrev = cur;
-+        MakeAsShortRep(nextOpt);
-+        nextIsChar = True;
-+      }
-+    }
-+    numAvailFull = p->numAvail;
-+    {
-+      UInt32 temp = kNumOpts - 1 - cur;
-+      if (temp < numAvailFull)
-+        numAvailFull = temp;
-+    }
-+
-+    if (numAvailFull < 2)
-+      continue;
-+    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
-+
-+    if (!nextIsChar && matchByte != curByte) /* speed optimization */
-+    {
-+      /* try Literal + rep0 */
-+      UInt32 temp;
-+      UInt32 lenTest2;
-+      const Byte *data2 = data - (reps[0] + 1);
-+      UInt32 limit = p->numFastBytes + 1;
-+      if (limit > numAvailFull)
-+        limit = numAvailFull;
-+
-+      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
-+      lenTest2 = temp - 1;
-+      if (lenTest2 >= 2)
-+      {
-+        UInt32 state2 = kLiteralNextStates[state];
-+        UInt32 posStateNext = (position + 1) & p->pbMask;
-+        UInt32 nextRepMatchPrice = curAnd1Price +
-+            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+            GET_PRICE_1(p->isRep[state2]);
-+        /* for (; lenTest2 >= 2; lenTest2--) */
-+        {
-+          UInt32 curAndLenPrice;
-+          COptimal *opt;
-+          UInt32 offset = cur + 1 + lenTest2;
-+          while (lenEnd < offset)
-+            p->opt[++lenEnd].price = kInfinityPrice;
-+          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+          opt = &p->opt[offset];
-+          if (curAndLenPrice < opt->price)
-+          {
-+            opt->price = curAndLenPrice;
-+            opt->posPrev = cur + 1;
-+            opt->backPrev = 0;
-+            opt->prev1IsChar = True;
-+            opt->prev2 = False;
-+          }
-+        }
-+      }
-+    }
-+    
-+    startLen = 2; /* speed optimization */
-+    {
-+    UInt32 repIndex;
-+    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
-+    {
-+      UInt32 lenTest;
-+      UInt32 lenTestTemp;
-+      UInt32 price;
-+      const Byte *data2 = data - (reps[repIndex] + 1);
-+      if (data[0] != data2[0] || data[1] != data2[1])
-+        continue;
-+      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+      while (lenEnd < cur + lenTest)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+      lenTestTemp = lenTest;
-+      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
-+      do
-+      {
-+        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
-+        COptimal *opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = repIndex;
-+          opt->prev1IsChar = False;
-+        }
-+      }
-+      while (--lenTest >= 2);
-+      lenTest = lenTestTemp;
-+      
-+      if (repIndex == 0)
-+        startLen = lenTest + 1;
-+        
-+      /* if (_maxMode) */
-+        {
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kRepNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice =
-+                price + p->repLenEnc.prices[posState][lenTest - 2] +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (position + lenTest + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = repIndex;
-+              }
-+            }
-+          }
-+        }
-+    }
-+    }
-+    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
-+    if (newLen > numAvail)
-+    {
-+      newLen = numAvail;
-+      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
-+      matches[numPairs] = newLen;
-+      numPairs += 2;
-+    }
-+    if (newLen >= startLen)
-+    {
-+      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
-+      UInt32 offs, curBack, posSlot;
-+      UInt32 lenTest;
-+      while (lenEnd < cur + newLen)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+
-+      offs = 0;
-+      while (startLen > matches[offs])
-+        offs += 2;
-+      curBack = matches[offs + 1];
-+      GetPosSlot2(curBack, posSlot);
-+      for (lenTest = /*2*/ startLen; ; lenTest++)
-+      {
-+        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
-+        UInt32 lenToPosState = GetLenToPosState(lenTest);
-+        COptimal *opt;
-+        if (curBack < kNumFullDistances)
-+          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
-+        else
-+          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-+        
-+        opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = curBack + LZMA_NUM_REPS;
-+          opt->prev1IsChar = False;
-+        }
-+
-+        if (/*_maxMode && */lenTest == matches[offs])
-+        {
-+          /* Try Match + Literal + Rep0 */
-+          const Byte *data2 = data - (curBack + 1);
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kMatchNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice = curAndLenPrice +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (posStateNext + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = curBack + LZMA_NUM_REPS;
-+              }
-+            }
-+          }
-+          offs += 2;
-+          if (offs == numPairs)
-+            break;
-+          curBack = matches[offs + 1];
-+          if (curBack >= kNumFullDistances)
-+            GetPosSlot2(curBack, posSlot);
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
-+
-+static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
-+  const Byte *data;
-+  const UInt32 *matches;
-+
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  *backRes = (UInt32)-1;
-+  if (numAvail < 2)
-+    return 1;
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+
-+  repLen = repIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
-+    if (len >= p->numFastBytes)
-+    {
-+      *backRes = i;
-+      MovePos(p, len - 1);
-+      return len;
-+    }
-+    if (len > repLen)
-+    {
-+      repIndex = i;
-+      repLen = len;
-+    }
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+
-+  mainDist = 0; /* for GCC */
-+  if (mainLen >= 2)
-+  {
-+    mainDist = matches[numPairs - 1];
-+    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
-+    {
-+      if (!ChangePair(matches[numPairs - 3], mainDist))
-+        break;
-+      numPairs -= 2;
-+      mainLen = matches[numPairs - 2];
-+      mainDist = matches[numPairs - 1];
-+    }
-+    if (mainLen == 2 && mainDist >= 0x80)
-+      mainLen = 1;
-+  }
-+
-+  if (repLen >= 2 && (
-+        (repLen + 1 >= mainLen) ||
-+        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
-+        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
-+  {
-+    *backRes = repIndex;
-+    MovePos(p, repLen - 1);
-+    return repLen;
-+  }
-+  
-+  if (mainLen < 2 || numAvail <= 2)
-+    return 1;
-+
-+  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
-+  if (p->longestMatchLength >= 2)
-+  {
-+    UInt32 newDistance = matches[p->numPairs - 1];
-+    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
-+        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
-+        (p->longestMatchLength > mainLen + 1) ||
-+        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
-+      return 1;
-+  }
-+  
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len, limit;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    limit = mainLen - 1;
-+    for (len = 2; len < limit && data[len] == data2[len]; len++);
-+    if (len >= limit)
-+      return 1;
-+  }
-+  *backRes = mainDist + LZMA_NUM_REPS;
-+  MovePos(p, mainLen - 2);
-+  return mainLen;
-+}
-+
-+static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
-+{
-+  UInt32 len;
-+  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+  p->state = kMatchNextStates[p->state];
-+  len = LZMA_MATCH_LEN_MIN;
-+  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
-+  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
-+  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
-+}
-+
-+static SRes CheckErrors(CLzmaEnc *p)
-+{
-+  if (p->result != SZ_OK)
-+    return p->result;
-+  if (p->rc.res != SZ_OK)
-+    p->result = SZ_ERROR_WRITE;
-+  if (p->matchFinderBase.result != SZ_OK)
-+    p->result = SZ_ERROR_READ;
-+  if (p->result != SZ_OK)
-+    p->finished = True;
-+  return p->result;
-+}
-+
-+static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
-+{
-+  /* ReleaseMFStream(); */
-+  p->finished = True;
-+  if (p->writeEndMark)
-+    WriteEndMarker(p, nowPos & p->pbMask);
-+  RangeEnc_FlushData(&p->rc);
-+  RangeEnc_FlushStream(&p->rc);
-+  return CheckErrors(p);
-+}
-+
-+static void FillAlignPrices(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < kAlignTableSize; i++)
-+    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
-+  p->alignPriceCount = 0;
-+}
-+
-+static void FillDistancesPrices(CLzmaEnc *p)
-+{
-+  UInt32 tempPrices[kNumFullDistances];
-+  UInt32 i, lenToPosState;
-+  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
-+  {
-+    UInt32 posSlot = GetPosSlot1(i);
-+    UInt32 footerBits = ((posSlot >> 1) - 1);
-+    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
-+  }
-+
-+  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
-+  {
-+    UInt32 posSlot;
-+    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
-+    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
-+    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
-+    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
-+
-+    {
-+      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
-+      UInt32 i;
-+      for (i = 0; i < kStartPosModelIndex; i++)
-+        distancesPrices[i] = posSlotPrices[i];
-+      for (; i < kNumFullDistances; i++)
-+        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
-+    }
-+  }
-+  p->matchPriceCount = 0;
-+}
-+
-+void LzmaEnc_Construct(CLzmaEnc *p)
-+{
-+  RangeEnc_Construct(&p->rc);
-+  MatchFinder_Construct(&p->matchFinderBase);
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Construct(&p->matchFinderMt);
-+  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
-+  #endif
-+
-+  {
-+    CLzmaEncProps props;
-+    LzmaEncProps_Init(&props);
-+    LzmaEnc_SetProps(p, &props);
-+  }
-+
-+  #ifndef LZMA_LOG_BSR
-+  LzmaEnc_FastPosInit(p->g_FastPos);
-+  #endif
-+
-+  LzmaEnc_InitPriceTables(p->ProbPrices);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
-+{
-+  void *p;
-+  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
-+  if (p != 0)
-+    LzmaEnc_Construct((CLzmaEnc *)p);
-+  return p;
-+}
-+
-+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->litProbs);
-+  alloc->Free(alloc, p->saveState.litProbs);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-+  #endif
-+  MatchFinder_Free(&p->matchFinderBase, allocBig);
-+  LzmaEnc_FreeLits(p, alloc);
-+  RangeEnc_Free(&p->rc, alloc);
-+}
-+
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
-+  alloc->Free(alloc, p);
-+}
-+
-+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
-+{
-+  UInt32 nowPos32, startPos32;
-+  if (p->needInit)
-+  {
-+    p->matchFinder.Init(p->matchFinderObj);
-+    p->needInit = 0;
-+  }
-+
-+  if (p->finished)
-+    return p->result;
-+  RINOK(CheckErrors(p));
-+
-+  nowPos32 = (UInt32)p->nowPos64;
-+  startPos32 = nowPos32;
-+
-+  if (p->nowPos64 == 0)
-+  {
-+    UInt32 numPairs;
-+    Byte curByte;
-+    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+      return Flush(p, nowPos32);
-+    ReadMatchDistances(p, &numPairs);
-+    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
-+    p->state = kLiteralNextStates[p->state];
-+    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
-+    LitEnc_Encode(&p->rc, p->litProbs, curByte);
-+    p->additionalOffset--;
-+    nowPos32++;
-+  }
-+
-+  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
-+  for (;;)
-+  {
-+    UInt32 pos, len, posState;
-+
-+    if (p->fastMode)
-+      len = GetOptimumFast(p, &pos);
-+    else
-+      len = GetOptimum(p, nowPos32, &pos);
-+
-+    #ifdef SHOW_STAT2
-+    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
-+    #endif
-+
-+    posState = nowPos32 & p->pbMask;
-+    if (len == 1 && pos == (UInt32)-1)
-+    {
-+      Byte curByte;
-+      CLzmaProb *probs;
-+      const Byte *data;
-+
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
-+      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+      curByte = *data;
-+      probs = LIT_PROBS(nowPos32, *(data - 1));
-+      if (IsCharState(p->state))
-+        LitEnc_Encode(&p->rc, probs, curByte);
-+      else
-+        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
-+      p->state = kLiteralNextStates[p->state];
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
-+        if (pos == 0)
-+        {
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
-+          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
-+        }
-+        else
-+        {
-+          UInt32 distance = p->reps[pos];
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
-+          if (pos == 1)
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
-+          else
-+          {
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
-+            if (pos == 3)
-+              p->reps[3] = p->reps[2];
-+            p->reps[2] = p->reps[1];
-+          }
-+          p->reps[1] = p->reps[0];
-+          p->reps[0] = distance;
-+        }
-+        if (len == 1)
-+          p->state = kShortRepNextStates[p->state];
-+        else
-+        {
-+          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+          p->state = kRepNextStates[p->state];
-+        }
-+      }
-+      else
-+      {
-+        UInt32 posSlot;
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+        p->state = kMatchNextStates[p->state];
-+        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+        pos -= LZMA_NUM_REPS;
-+        GetPosSlot(pos, posSlot);
-+        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-+        
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          UInt32 footerBits = ((posSlot >> 1) - 1);
-+          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+          UInt32 posReduced = pos - base;
-+
-+          if (posSlot < kEndPosModelIndex)
-+            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
-+          else
-+          {
-+            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
-+            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
-+            p->alignPriceCount++;
-+          }
-+        }
-+        p->reps[3] = p->reps[2];
-+        p->reps[2] = p->reps[1];
-+        p->reps[1] = p->reps[0];
-+        p->reps[0] = pos;
-+        p->matchPriceCount++;
-+      }
-+    }
-+    p->additionalOffset -= len;
-+    nowPos32 += len;
-+    if (p->additionalOffset == 0)
-+    {
-+      UInt32 processed;
-+      if (!p->fastMode)
-+      {
-+        if (p->matchPriceCount >= (1 << 7))
-+          FillDistancesPrices(p);
-+        if (p->alignPriceCount >= kAlignTableSize)
-+          FillAlignPrices(p);
-+      }
-+      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+        break;
-+      processed = nowPos32 - startPos32;
-+      if (useLimits)
-+      {
-+        if (processed + kNumOpts + 300 >= maxUnpackSize ||
-+            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
-+          break;
-+      }
-+      else if (processed >= (1 << 15))
-+      {
-+        p->nowPos64 += nowPos32 - startPos32;
-+        return CheckErrors(p);
-+      }
-+    }
-+  }
-+  p->nowPos64 += nowPos32 - startPos32;
-+  return Flush(p, nowPos32);
-+}
-+
-+#define kBigHashDicLimit ((UInt32)1 << 24)
-+
-+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 beforeSize = kNumOpts;
-+  Bool btMode;
-+  if (!RangeEnc_Alloc(&p->rc, alloc))
-+    return SZ_ERROR_MEM;
-+  btMode = (p->matchFinderBase.btMode != 0);
-+  #ifndef _7ZIP_ST
-+  p->mtMode = (p->multiThread && !p->fastMode && btMode);
-+  #endif
-+
-+  {
-+    unsigned lclp = p->lc + p->lp;
-+    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
-+    {
-+      LzmaEnc_FreeLits(p, alloc);
-+      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      if (p->litProbs == 0 || p->saveState.litProbs == 0)
-+      {
-+        LzmaEnc_FreeLits(p, alloc);
-+        return SZ_ERROR_MEM;
-+      }
-+      p->lclp = lclp;
-+    }
-+  }
-+
-+  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
-+
-+  if (beforeSize + p->dictSize < keepWindowSize)
-+    beforeSize = keepWindowSize - p->dictSize;
-+
-+  #ifndef _7ZIP_ST
-+  if (p->mtMode)
-+  {
-+    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
-+    p->matchFinderObj = &p->matchFinderMt;
-+    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
-+  }
-+  else
-+  #endif
-+  {
-+    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
-+      return SZ_ERROR_MEM;
-+    p->matchFinderObj = &p->matchFinderBase;
-+    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
-+  }
-+  return SZ_OK;
-+}
-+
-+void LzmaEnc_Init(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  p->state = 0;
-+  for (i = 0 ; i < LZMA_NUM_REPS; i++)
-+    p->reps[i] = 0;
-+
-+  RangeEnc_Init(&p->rc);
-+
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    UInt32 j;
-+    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
-+    {
-+      p->isMatch[i][j] = kProbInitValue;
-+      p->isRep0Long[i][j] = kProbInitValue;
-+    }
-+    p->isRep[i] = kProbInitValue;
-+    p->isRepG0[i] = kProbInitValue;
-+    p->isRepG1[i] = kProbInitValue;
-+    p->isRepG2[i] = kProbInitValue;
-+  }
-+
-+  {
-+    UInt32 num = 0x300 << (p->lp + p->lc);
-+    for (i = 0; i < num; i++)
-+      p->litProbs[i] = kProbInitValue;
-+  }
-+
-+  {
-+    for (i = 0; i < kNumLenToPosStates; i++)
-+    {
-+      CLzmaProb *probs = p->posSlotEncoder[i];
-+      UInt32 j;
-+      for (j = 0; j < (1 << kNumPosSlotBits); j++)
-+        probs[j] = kProbInitValue;
-+    }
-+  }
-+  {
-+    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
-+      p->posEncoders[i] = kProbInitValue;
-+  }
-+
-+  LenEnc_Init(&p->lenEnc.p);
-+  LenEnc_Init(&p->repLenEnc.p);
-+
-+  for (i = 0; i < (1 << kNumAlignBits); i++)
-+    p->posAlignEncoder[i] = kProbInitValue;
-+
-+  p->optimumEndIndex = 0;
-+  p->optimumCurrentIndex = 0;
-+  p->additionalOffset = 0;
-+
-+  p->pbMask = (1 << p->pb) - 1;
-+  p->lpMask = (1 << p->lp) - 1;
-+}
-+
-+void LzmaEnc_InitPrices(CLzmaEnc *p)
-+{
-+  if (!p->fastMode)
-+  {
-+    FillDistancesPrices(p);
-+    FillAlignPrices(p);
-+  }
-+
-+  p->lenEnc.tableSize =
-+  p->repLenEnc.tableSize =
-+      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
-+  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
-+  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
-+}
-+
-+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 i;
-+  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
-+    if (p->dictSize <= ((UInt32)1 << i))
-+      break;
-+  p->distTableSize = i * 2;
-+
-+  p->finished = False;
-+  p->result = SZ_OK;
-+  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
-+  LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  p->nowPos64 = 0;
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  p->rc.outStream = outStream;
-+  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
-+}
-+
-+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
-+    ISeqInStream *inStream, UInt32 keepWindowSize,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
-+{
-+  p->matchFinderBase.directInput = 1;
-+  p->matchFinderBase.bufferBase = (Byte *)src;
-+  p->matchFinderBase.directInputRem = srcLen;
-+}
-+
-+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-+    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+  p->needInit = 1;
-+
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+void LzmaEnc_Finish(CLzmaEncHandle pp)
-+{
-+  #ifndef _7ZIP_ST
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  if (p->mtMode)
-+    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
-+  #else
-+  pp = pp;
-+  #endif
-+}
-+
-+typedef struct
-+{
-+  ISeqOutStream funcTable;
-+  Byte *data;
-+  SizeT rem;
-+  Bool overflow;
-+} CSeqOutStreamBuf;
-+
-+static size_t MyWrite(void *pp, const void *data, size_t size)
-+{
-+  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
-+  if (p->rem < size)
-+  {
-+    size = p->rem;
-+    p->overflow = True;
-+  }
-+  memcpy(p->data, data, size);
-+  p->rem -= size;
-+  p->data += size;
-+  return size;
-+}
-+
-+
-+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+}
-+
-+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+}
-+
-+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
-+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  UInt64 nowPos64;
-+  SRes res;
-+  CSeqOutStreamBuf outStream;
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = False;
-+  p->finished = False;
-+  p->result = SZ_OK;
-+
-+  if (reInit)
-+    LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  nowPos64 = p->nowPos64;
-+  RangeEnc_Init(&p->rc);
-+  p->rc.outStream = &outStream.funcTable;
-+
-+  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-+  
-+  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+
-+  return res;
-+}
-+
-+static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
-+{
-+  SRes res = SZ_OK;
-+
-+  #ifndef _7ZIP_ST
-+  Byte allocaDummy[0x300];
-+  int i = 0;
-+  for (i = 0; i < 16; i++)
-+    allocaDummy[i] = (Byte)i;
-+  #endif
-+
-+  for (;;)
-+  {
-+    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
-+    if (res != SZ_OK || p->finished != 0)
-+      break;
-+    if (progress != 0)
-+    {
-+      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
-+      if (res != SZ_OK)
-+      {
-+        res = SZ_ERROR_PROGRESS;
-+        break;
-+      }
-+    }
-+  }
-+  LzmaEnc_Finish(p);
-+  return res;
-+}
-+
-+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
-+  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
-+}
-+
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  int i;
-+  UInt32 dictSize = p->dictSize;
-+  if (*size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_PARAM;
-+  *size = LZMA_PROPS_SIZE;
-+  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
-+
-+  for (i = 11; i <= 30; i++)
-+  {
-+    if (dictSize <= ((UInt32)2 << i))
-+    {
-+      dictSize = (2 << i);
-+      break;
-+    }
-+    if (dictSize <= ((UInt32)3 << i))
-+    {
-+      dictSize = (3 << i);
-+      break;
-+    }
-+  }
-+
-+  for (i = 0; i < 4; i++)
-+    props[1 + i] = (Byte)(dictSize >> (8 * i));
-+  return SZ_OK;
-+}
-+
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  SRes res;
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+
-+  CSeqOutStreamBuf outStream;
-+
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = writeEndMark;
-+
-+  p->rc.outStream = &outStream.funcTable;
-+  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
-+  if (res == SZ_OK)
-+    res = LzmaEnc_Encode2(p, progress);
-+
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+  return res;
-+}
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
-+  SRes res;
-+  if (p == 0)
-+    return SZ_ERROR_MEM;
-+
-+  res = LzmaEnc_SetProps(p, props);
-+  if (res == SZ_OK)
-+  {
-+    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
-+    if (res == SZ_OK)
-+      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
-+          writeEndMark, progress, alloc, allocBig);
-+  }
-+
-+  LzmaEnc_Destroy(p, alloc, allocBig);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/Makefile
-@@ -0,0 +1,7 @@
-+lzma_compress-objs := LzFind.o LzmaEnc.o
-+lzma_decompress-objs := LzmaDec.o
-+
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
-+
-+EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/target/linux/generic/pending-4.19/532-jffs2_eofdetect.patch b/target/linux/generic/pending-4.19/532-jffs2_eofdetect.patch
deleted file mode 100644 (file)
index e9952c6..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: fs: jffs2: EOF marker
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- fs/jffs2/build.c | 10 ++++++++++
- fs/jffs2/scan.c  | 21 +++++++++++++++++++--
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -117,6 +117,16 @@ static int jffs2_build_filesystem(struct
-       dbg_fsbuild("scanned flash completely\n");
-       jffs2_dbg_dump_block_lists_nolock(c);
-+      if (c->flags & (1 << 7)) {
-+              printk("%s(): unlocking the mtd device... ", __func__);
-+              mtd_unlock(c->mtd, 0, c->mtd->size);
-+              printk("done.\n");
-+
-+              printk("%s(): erasing all blocks after the end marker... ", __func__);
-+              jffs2_erase_pending_blocks(c, -1);
-+              printk("done.\n");
-+      }
-+
-       dbg_fsbuild("pass 1 starting\n");
-       c->flags |= JFFS2_SB_FLAG_BUILDING;
-       /* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in
-               /* reset summary info for next eraseblock scan */
-               jffs2_sum_reset_collected(s);
--              ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--                                              buf_size, s);
-+              if (c->flags & (1 << 7)) {
-+                      if (mtd_block_isbad(c->mtd, jeb->offset))
-+                              ret = BLK_STATE_BADBLOCK;
-+                      else
-+                              ret = BLK_STATE_ALLFF;
-+              } else
-+                      ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+                                                      buf_size, s);
-               if (ret < 0)
-                       goto out;
-@@ -561,6 +567,17 @@ full_scan:
-                       return err;
-       }
-+      if ((buf[0] == 0xde) &&
-+              (buf[1] == 0xad) &&
-+              (buf[2] == 0xc0) &&
-+              (buf[3] == 0xde)) {
-+              /* end of filesystem. erase everything after this point */
-+              printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+              c->flags |= (1 << 7);
-+
-+              return BLK_STATE_ALLFF;
-+      }
-+
-       /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
-       ofs = 0;
-       max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
diff --git a/target/linux/generic/pending-4.19/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch b/target/linux/generic/pending-4.19/553-ubifs-Add-option-to-create-UBI-FS-version-4-on-empty.patch
deleted file mode 100644 (file)
index 02c9b4c..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From 93c33e6a7f3b0aef99d02252e6232a3d8b80f2d5 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 21 Jan 2018 15:47:50 +0100
-Subject: ubifs: Add option to create UBI FS version 4 on empty UBI volume
-
-Instead of creating an ubifs file system with format version 5 by
-default on empty UBI volumes add a compile option to create an older ubi
-with file system format version 4 instated. This allows it to be mount
-as a volume on kernel versions < 4.10, which does not support format
-version 5.
-We saw that some people can not access their older data when they
-downgraded from kernel 4.14 to kernel 4.9 to prevent this this option
-would help.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- fs/ubifs/Kconfig | 13 +++++++++++++
- fs/ubifs/sb.c    |  6 ++++++
- 2 files changed, 19 insertions(+)
-
---- a/fs/ubifs/Kconfig
-+++ b/fs/ubifs/Kconfig
-@@ -85,3 +85,16 @@ config UBIFS_FS_SECURITY
-         the extended attribute support in advance.
-         If you are not using a security module, say N.
-+
-+config UBIFS_FS_FORMAT4
-+      bool "Use file system format version 4 for new file systems"
-+      depends on UBIFS_FS
-+      help
-+        Instead of creating new file systems with the new ubifs file
-+        system version 5, use the old format version 4 for implicitly
-+        by the driver created file systems on an empty UBI volume. This
-+        makes it possible to  mount these file systems also with kernel
-+        versions before 4.10. The driver will still support file system
-+        format version 5 for ubifs file systems created with version 5.
-+
-+        If you are unsure, say N.
---- a/fs/ubifs/sb.c
-+++ b/fs/ubifs/sb.c
-@@ -176,7 +176,9 @@ static int create_default_filesystem(str
-       tmp64 = (long long)max_buds * c->leb_size;
-       if (big_lpt)
-               sup_flags |= UBIFS_FLG_BIGLPT;
-+#ifndef CONFIG_UBIFS_FS_FORMAT4
-       sup_flags |= UBIFS_FLG_DOUBLE_HASH;
-+#endif
-       sup->ch.node_type  = UBIFS_SB_NODE;
-       sup->key_hash      = UBIFS_KEY_HASH_R5;
-@@ -192,7 +194,11 @@ static int create_default_filesystem(str
-       sup->jhead_cnt     = cpu_to_le32(DEFAULT_JHEADS_CNT);
-       sup->fanout        = cpu_to_le32(DEFAULT_FANOUT);
-       sup->lsave_cnt     = cpu_to_le32(c->lsave_cnt);
-+#ifdef CONFIG_UBIFS_FS_FORMAT4
-+      sup->fmt_version   = cpu_to_le32(4);
-+#else
-       sup->fmt_version   = cpu_to_le32(UBIFS_FORMAT_VERSION);
-+#endif
-       sup->time_gran     = cpu_to_le32(DEFAULT_TIME_GRAN);
-       if (c->mount_opts.override_compr)
-               sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
diff --git a/target/linux/generic/pending-4.19/600-netfilter_conntrack_flush.patch b/target/linux/generic/pending-4.19/600-netfilter_conntrack_flush.patch
deleted file mode 100644 (file)
index fa32f88..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: add support for flushing conntrack via /proc
-
-lede-commit 8193bbe59a74d34d6a26d4a8cb857b1952905314
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/nf_conntrack_standalone.c | 59 ++++++++++++++++++++++++++++++++-
- 1 file changed, 58 insertions(+), 1 deletion(-)
-
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -9,6 +9,7 @@
- #include <linux/percpu.h>
- #include <linux/netdevice.h>
- #include <linux/security.h>
-+#include <linux/inet.h>
- #include <net/net_namespace.h>
- #ifdef CONFIG_SYSCTL
- #include <linux/sysctl.h>
-@@ -433,6 +434,56 @@ static int ct_cpu_seq_show(struct seq_fi
-       return 0;
- }
-+struct kill_request {
-+      u16 family;
-+      union nf_inet_addr addr;
-+};
-+
-+static int kill_matching(struct nf_conn *i, void *data)
-+{
-+      struct kill_request *kr = data;
-+      struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
-+      struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
-+
-+      if (!kr->family)
-+              return 1;
-+
-+      if (t1->src.l3num != kr->family)
-+              return 0;
-+
-+      return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
-+              nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
-+              nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
-+              nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
-+}
-+
-+static int ct_file_write(struct file *file, char *buf, size_t count)
-+{
-+      struct seq_file *seq = file->private_data;
-+      struct net *net = seq_file_net(seq);
-+      struct kill_request kr = { };
-+
-+      if (count == 0)
-+              return 0;
-+
-+      if (count >= INET6_ADDRSTRLEN)
-+              count = INET6_ADDRSTRLEN - 1;
-+
-+      if (strnchr(buf, count, ':')) {
-+              kr.family = AF_INET6;
-+              if (!in6_pton(buf, count, (void *)&kr.addr, '\n', NULL))
-+                      return -EINVAL;
-+      } else if (strnchr(buf, count, '.')) {
-+              kr.family = AF_INET;
-+              if (!in4_pton(buf, count, (void *)&kr.addr, '\n', NULL))
-+                      return -EINVAL;
-+      }
-+
-+      nf_ct_iterate_cleanup_net(net, kill_matching, &kr, 0, 0);
-+
-+      return 0;
-+}
-+
- static const struct seq_operations ct_cpu_seq_ops = {
-       .start  = ct_cpu_seq_start,
-       .next   = ct_cpu_seq_next,
-@@ -446,8 +497,9 @@ static int nf_conntrack_standalone_init_
-       kuid_t root_uid;
-       kgid_t root_gid;
--      pde = proc_create_net("nf_conntrack", 0440, net->proc_net, &ct_seq_ops,
--                      sizeof(struct ct_iter_state));
-+      pde = proc_create_net_data_write("nf_conntrack", 0440, net->proc_net,
-+                                       &ct_seq_ops, &ct_file_write,
-+                                       sizeof(struct ct_iter_state), NULL);
-       if (!pde)
-               goto out_nf_conntrack;
diff --git a/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch
deleted file mode 100644 (file)
index 1691146..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a new version of my netfilter speedup patches for linux 2.6.39 and 3.0
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/uapi/linux/netfilter_ipv4/ip_tables.h |  1 +
- net/ipv4/netfilter/ip_tables.c                | 37 +++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
-
---- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
-@@ -89,6 +89,7 @@ struct ipt_ip {
- #define IPT_F_FRAG            0x01    /* Set if rule is a fragment rule */
- #define IPT_F_GOTO            0x02    /* Set if jump is a goto */
- #define IPT_F_MASK            0x03    /* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH    0x80    /* Internal: no default match rules present */
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN                0x01    /* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -53,6 +53,9 @@ ip_packet_match(const struct iphdr *ip,
- {
-       unsigned long ret;
-+      if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+              return true;
-+
-       if (NF_INVF(ipinfo, IPT_INV_SRCIP,
-                   (ip->saddr & ipinfo->smsk.s_addr) != ipinfo->src.s_addr) ||
-           NF_INVF(ipinfo, IPT_INV_DSTIP,
-@@ -83,6 +86,29 @@ ip_packet_match(const struct iphdr *ip,
-       return true;
- }
-+static void
-+ip_checkdefault(struct ipt_ip *ip)
-+{
-+      static const char iface_mask[IFNAMSIZ] = {};
-+
-+      if (ip->invflags || ip->flags & IPT_F_FRAG)
-+              return;
-+
-+      if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
-+              return;
-+
-+      if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
-+              return;
-+
-+      if (ip->smsk.s_addr || ip->dmsk.s_addr)
-+              return;
-+
-+      if (ip->proto)
-+              return;
-+
-+      ip->flags |= IPT_F_NO_DEF_MATCH;
-+}
-+
- static bool
- ip_checkentry(const struct ipt_ip *ip)
- {
-@@ -527,6 +553,8 @@ find_check_entry(struct ipt_entry *e, st
-       struct xt_mtchk_param mtpar;
-       struct xt_entry_match *ematch;
-+      ip_checkdefault(&e->ip);
-+
-       if (!xt_percpu_counter_alloc(alloc_state, &e->counters))
-               return -ENOMEM;
-@@ -821,6 +849,7 @@ copy_entries_to_user(unsigned int total_
-       const struct xt_table_info *private = table->private;
-       int ret = 0;
-       const void *loc_cpu_entry;
-+      u8 flags;
-       counters = alloc_counters(table);
-       if (IS_ERR(counters))
-@@ -848,6 +877,14 @@ copy_entries_to_user(unsigned int total_
-                       goto free_counters;
-               }
-+              flags = e->ip.flags & IPT_F_MASK;
-+              if (copy_to_user(userptr + off
-+                               + offsetof(struct ipt_entry, ip.flags),
-+                               &flags, sizeof(flags)) != 0) {
-+                      ret = -EFAULT;
-+                      goto free_counters;
-+              }
-+
-               for (i = sizeof(struct ipt_entry);
-                    i < e->target_offset;
-                    i += m->u.match_size) {
-@@ -1228,12 +1265,15 @@ compat_copy_entry_to_user(struct ipt_ent
-       compat_uint_t origsize;
-       const struct xt_entry_match *ematch;
-       int ret = 0;
-+      u8 flags = e->ip.flags & IPT_F_MASK;
-       origsize = *size;
-       ce = *dstptr;
-       if (copy_to_user(ce, e, sizeof(struct ipt_entry)) != 0 ||
-           copy_to_user(&ce->counters, &counters[i],
--          sizeof(counters[i])) != 0)
-+          sizeof(counters[i])) != 0 ||
-+          copy_to_user(&ce->ip.flags, &flags,
-+          sizeof(flags)) != 0)
-               return -EFAULT;
-       *dstptr += sizeof(struct compat_ipt_entry);
diff --git a/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch b/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch
deleted file mode 100644 (file)
index ba976b0..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: match bypass default table
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/ipv4/netfilter/ip_tables.c | 79 +++++++++++++++++++++++++++++++-----------
- 1 file changed, 58 insertions(+), 21 deletions(-)
-
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -249,6 +249,33 @@ struct ipt_entry *ipt_next_entry(const s
-       return (void *)entry + entry->next_offset;
- }
-+static bool
-+ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
-+{
-+      struct xt_entry_target *t;
-+      struct xt_standard_target *st;
-+
-+      if (e->target_offset != sizeof(struct ipt_entry))
-+              return false;
-+
-+      if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
-+              return false;
-+
-+      t = ipt_get_target(e);
-+      if (t->u.kernel.target->target)
-+              return false;
-+
-+      st = (struct xt_standard_target *) t;
-+      if (st->verdict == XT_RETURN)
-+              return false;
-+
-+      if (st->verdict >= 0)
-+              return false;
-+
-+      *verdict = (unsigned)(-st->verdict) - 1;
-+      return true;
-+}
-+
- /* Returns one of the generic firewall policies, like NF_ACCEPT. */
- unsigned int
- ipt_do_table(struct sk_buff *skb,
-@@ -269,27 +296,28 @@ ipt_do_table(struct sk_buff *skb,
-       unsigned int addend;
-       /* Initialization */
-+      WARN_ON(!(table->valid_hooks & (1 << hook)));
-+      local_bh_disable();
-+      private = READ_ONCE(table->private); /* Address dependency. */
-+      cpu        = smp_processor_id();
-+      table_base = private->entries;
-+
-+      e = get_entry(table_base, private->hook_entry[hook]);
-+      if (ipt_handle_default_rule(e, &verdict)) {
-+              struct xt_counters *counter;
-+
-+              counter = xt_get_this_cpu_counter(&e->counters);
-+              ADD_COUNTER(*counter, skb->len, 1);
-+              local_bh_enable();
-+              return verdict;
-+      }
-+
-       stackidx = 0;
-       ip = ip_hdr(skb);
-       indev = state->in ? state->in->name : nulldevname;
-       outdev = state->out ? state->out->name : nulldevname;
--      /* We handle fragments by dealing with the first fragment as
--       * if it was a normal packet.  All other fragments are treated
--       * normally, except that they will NEVER match rules that ask
--       * things we don't know, ie. tcp syn flag or ports).  If the
--       * rule is also a fragment-specific rule, non-fragments won't
--       * match it. */
--      acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
--      acpar.thoff   = ip_hdrlen(skb);
--      acpar.hotdrop = false;
--      acpar.state   = state;
--      WARN_ON(!(table->valid_hooks & (1 << hook)));
--      local_bh_disable();
-       addend = xt_write_recseq_begin();
--      private = READ_ONCE(table->private); /* Address dependency. */
--      cpu        = smp_processor_id();
--      table_base = private->entries;
-       jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
-       /* Switch to alternate jumpstack if we're being invoked via TEE.
-@@ -302,7 +330,16 @@ ipt_do_table(struct sk_buff *skb,
-       if (static_key_false(&xt_tee_enabled))
-               jumpstack += private->stacksize * __this_cpu_read(nf_skb_duplicated);
--      e = get_entry(table_base, private->hook_entry[hook]);
-+      /* We handle fragments by dealing with the first fragment as
-+       * if it was a normal packet.  All other fragments are treated
-+       * normally, except that they will NEVER match rules that ask
-+       * things we don't know, ie. tcp syn flag or ports).  If the
-+       * rule is also a fragment-specific rule, non-fragments won't
-+       * match it. */
-+      acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
-+      acpar.thoff   = ip_hdrlen(skb);
-+      acpar.hotdrop = false;
-+      acpar.state   = state;
-       do {
-               const struct xt_entry_target *t;
diff --git a/target/linux/generic/pending-4.19/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/pending-4.19/612-netfilter_match_reduce_memory_access.patch
deleted file mode 100644 (file)
index cd6fcf8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: reduce match memory access
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/ipv4/netfilter/ip_tables.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -56,9 +56,9 @@ ip_packet_match(const struct iphdr *ip,
-       if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-               return true;
--      if (NF_INVF(ipinfo, IPT_INV_SRCIP,
-+      if (NF_INVF(ipinfo, IPT_INV_SRCIP, ipinfo->smsk.s_addr &&
-                   (ip->saddr & ipinfo->smsk.s_addr) != ipinfo->src.s_addr) ||
--          NF_INVF(ipinfo, IPT_INV_DSTIP,
-+          NF_INVF(ipinfo, IPT_INV_DSTIP, ipinfo->dmsk.s_addr &&
-                   (ip->daddr & ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr))
-               return false;
diff --git a/target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch
deleted file mode 100644 (file)
index 2bc48f8..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: optional tcp window check
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/nf_conntrack_proto_tcp.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/net/netfilter/nf_conntrack_proto_tcp.c
-+++ b/net/netfilter/nf_conntrack_proto_tcp.c
-@@ -34,6 +34,9 @@
- #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
- #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
-+/* Do not check the TCP window for incoming packets  */
-+static int nf_ct_tcp_no_window_check __read_mostly = 1;
-+
- /* "Be conservative in what you do,
-     be liberal in what you accept from others."
-     If it's non-zero, we mark only out of window RST segments as INVALID. */
-@@ -483,6 +486,9 @@ static bool tcp_in_window(const struct n
-       s32 receiver_offset;
-       bool res, in_recv_win;
-+      if (nf_ct_tcp_no_window_check)
-+              return true;
-+
-       /*
-        * Get the required data from the packet.
-        */
-@@ -1057,7 +1063,7 @@ static int tcp_packet(struct nf_conn *ct
-                IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
-                timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
-               timeout = timeouts[TCP_CONNTRACK_UNACK];
--      else if (ct->proto.tcp.last_win == 0 &&
-+      else if (!nf_ct_tcp_no_window_check && ct->proto.tcp.last_win == 0 &&
-                timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
-               timeout = timeouts[TCP_CONNTRACK_RETRANS];
-       else
-@@ -1506,6 +1512,13 @@ static struct ctl_table tcp_sysctl_table
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec,
-       },
-+      {
-+              .procname       = "nf_conntrack_tcp_no_window_check",
-+              .data           = &nf_ct_tcp_no_window_check,
-+              .maxlen         = sizeof(unsigned int),
-+              .mode           = 0644,
-+              .proc_handler   = proc_dointvec,
-+      },
-       { }
- };
- #endif /* CONFIG_SYSCTL */
diff --git a/target/linux/generic/pending-4.19/616-net_optimize_xfrm_calls.patch b/target/linux/generic/pending-4.19/616-net_optimize_xfrm_calls.patch
deleted file mode 100644 (file)
index 6a58010..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a small xfrm related performance optimization
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/nf_nat_core.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/net/netfilter/nf_nat_core.c
-+++ b/net/netfilter/nf_nat_core.c
-@@ -110,6 +110,9 @@ int nf_xfrm_me_harder(struct net *net, s
-       struct sock *sk = skb->sk;
-       int err;
-+      if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
-+              return 0;
-+
-       err = xfrm_decode_session(skb, &fl, family);
-       if (err < 0)
-               return err;
diff --git a/target/linux/generic/pending-4.19/620-net_sched-codel-do-not-defer-queue-length-update.patch b/target/linux/generic/pending-4.19/620-net_sched-codel-do-not-defer-queue-length-update.patch
deleted file mode 100644 (file)
index 457c812..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Date: Mon, 21 Aug 2017 11:14:14 +0300
-Subject: [PATCH] net_sched/codel: do not defer queue length update
-
-When codel wants to drop last packet in ->dequeue() it cannot call
-qdisc_tree_reduce_backlog() right away - it will notify parent qdisc
-about zero qlen and HTB/HFSC will deactivate class. The same class will
-be deactivated second time by caller of ->dequeue(). Currently codel and
-fq_codel defer update. This triggers warning in HFSC when it's qlen != 0
-but there is no active classes.
-
-This patch update parent queue length immediately: just temporary increase
-qlen around qdisc_tree_reduce_backlog() to prevent first class deactivation
-if we have skb to return.
-
-This might open another problem in HFSC - now operation peek could fail and
-deactivate parent class.
-
-Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=109581
----
-
---- a/net/sched/sch_codel.c
-+++ b/net/sched/sch_codel.c
-@@ -95,11 +95,17 @@ static struct sk_buff *codel_qdisc_deque
-                           &q->stats, qdisc_pkt_len, codel_get_enqueue_time,
-                           drop_func, dequeue_func);
--      /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0,
--       * or HTB crashes. Defer it for next round.
-+      /* If our qlen is 0 qdisc_tree_reduce_backlog() will deactivate
-+       * parent class, dequeue in parent qdisc will do the same if we
-+       * return skb. Temporary increment qlen if we have skb.
-        */
--      if (q->stats.drop_count && sch->q.qlen) {
--              qdisc_tree_reduce_backlog(sch, q->stats.drop_count, q->stats.drop_len);
-+      if (q->stats.drop_count) {
-+              if (skb)
-+                      sch->q.qlen++;
-+              qdisc_tree_reduce_backlog(sch, q->stats.drop_count,
-+                                        q->stats.drop_len);
-+              if (skb)
-+                      sch->q.qlen--;
-               q->stats.drop_count = 0;
-               q->stats.drop_len = 0;
-       }
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -317,6 +317,21 @@ begin:
-       flow->dropped += q->cstats.drop_count - prev_drop_count;
-       flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
-+      /* If our qlen is 0 qdisc_tree_reduce_backlog() will deactivate
-+       * parent class, dequeue in parent qdisc will do the same if we
-+       * return skb. Temporary increment qlen if we have skb.
-+       */
-+      if (q->cstats.drop_count) {
-+              if (skb)
-+                      sch->q.qlen++;
-+              qdisc_tree_reduce_backlog(sch, q->cstats.drop_count,
-+                                        q->cstats.drop_len);
-+              if (skb)
-+                      sch->q.qlen--;
-+              q->cstats.drop_count = 0;
-+              q->cstats.drop_len = 0;
-+      }
-+
-       if (!skb) {
-               /* force a pass through old_flows to prevent starvation */
-               if ((head == &q->new_flows) && !list_empty(&q->old_flows))
-@@ -327,15 +342,6 @@ begin:
-       }
-       qdisc_bstats_update(sch, skb);
-       flow->deficit -= qdisc_pkt_len(skb);
--      /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0,
--       * or HTB crashes. Defer it for next round.
--       */
--      if (q->cstats.drop_count && sch->q.qlen) {
--              qdisc_tree_reduce_backlog(sch, q->cstats.drop_count,
--                                        q->cstats.drop_len);
--              q->cstats.drop_count = 0;
--              q->cstats.drop_len = 0;
--      }
-       return skb;
- }
diff --git a/target/linux/generic/pending-4.19/630-packet_socket_type.patch b/target/linux/generic/pending-4.19/630-packet_socket_type.patch
deleted file mode 100644 (file)
index 333d4f5..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: net: add an optimization for dealing with raw sockets
-
-lede-commit: 4898039703d7315f0f3431c860123338ec3be0f6
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/uapi/linux/if_packet.h |  3 +++
- net/packet/af_packet.c         | 34 +++++++++++++++++++++++++++-------
- net/packet/internal.h          |  1 +
- 3 files changed, 31 insertions(+), 7 deletions(-)
-
---- a/include/uapi/linux/if_packet.h
-+++ b/include/uapi/linux/if_packet.h
-@@ -32,6 +32,8 @@ struct sockaddr_ll {
- #define PACKET_KERNEL         7               /* To kernel space      */
- /* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */
- #define PACKET_FASTROUTE      6               /* Fastrouted frame     */
-+#define PACKET_MASK_ANY               0xffffffff      /* mask for packet type bits */
-+
- /* Packet socket options */
-@@ -57,6 +59,7 @@ struct sockaddr_ll {
- #define PACKET_QDISC_BYPASS           20
- #define PACKET_ROLLOVER_STATS         21
- #define PACKET_FANOUT_DATA            22
-+#define PACKET_RECV_TYPE              23
- #define PACKET_FANOUT_HASH            0
- #define PACKET_FANOUT_LB              1
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -1789,6 +1789,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
-       struct sock *sk;
-       struct sockaddr_pkt *spkt;
-+      struct packet_sock *po;
-       /*
-        *      When we registered the protocol we saved the socket in the data
-@@ -1796,6 +1797,7 @@ static int packet_rcv_spkt(struct sk_buf
-        */
-       sk = pt->af_packet_priv;
-+      po = pkt_sk(sk);
-       /*
-        *      Yank back the headers [hope the device set this
-@@ -1808,7 +1810,7 @@ static int packet_rcv_spkt(struct sk_buf
-        *      so that this procedure is noop.
-        */
--      if (skb->pkt_type == PACKET_LOOPBACK)
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-               goto out;
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -2036,12 +2038,12 @@ static int packet_rcv(struct sk_buff *sk
-       unsigned int snaplen, res;
-       bool is_drop_n_account = false;
--      if (skb->pkt_type == PACKET_LOOPBACK)
--              goto drop;
--
-       sk = pt->af_packet_priv;
-       po = pkt_sk(sk);
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-+              goto drop;
-+
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-               goto drop;
-@@ -2167,12 +2169,12 @@ static int tpacket_rcv(struct sk_buff *s
-       BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
-       BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
--      if (skb->pkt_type == PACKET_LOOPBACK)
--              goto drop;
--
-       sk = pt->af_packet_priv;
-       po = pkt_sk(sk);
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-+              goto drop;
-+
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-               goto drop;
-@@ -3237,6 +3239,7 @@ static int packet_create(struct net *net
-       mutex_init(&po->pg_vec_lock);
-       po->rollover = NULL;
-       po->prot_hook.func = packet_rcv;
-+      po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
-       if (sock->type == SOCK_PACKET)
-               po->prot_hook.func = packet_rcv_spkt;
-@@ -3848,6 +3851,16 @@ packet_setsockopt(struct socket *sock, i
-               po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
-               return 0;
-       }
-+        case PACKET_RECV_TYPE:
-+        {
-+                unsigned int val;
-+                if (optlen != sizeof(val))
-+                        return -EINVAL;
-+                if (copy_from_user(&val, optval, sizeof(val)))
-+                        return -EFAULT;
-+                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
-+                return 0;
-+        }
-       default:
-               return -ENOPROTOOPT;
-       }
-@@ -3900,6 +3913,13 @@ static int packet_getsockopt(struct sock
-       case PACKET_VNET_HDR:
-               val = po->has_vnet_hdr;
-               break;
-+      case PACKET_RECV_TYPE:
-+              if (len > sizeof(unsigned int))
-+                      len = sizeof(unsigned int);
-+              val = po->pkt_type;
-+
-+              data = &val;
-+              break;
-       case PACKET_VERSION:
-               val = po->tp_version;
-               break;
---- a/net/packet/internal.h
-+++ b/net/packet/internal.h
-@@ -131,6 +131,7 @@ struct packet_sock {
-       struct net_device __rcu *cached_dev;
-       int                     (*xmit)(struct sk_buff *skb);
-       struct packet_type      prot_hook ____cacheline_aligned_in_smp;
-+      unsigned int            pkt_type;
- };
- static struct packet_sock *pkt_sk(struct sock *sk)
diff --git a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
deleted file mode 100644 (file)
index 288a603..0000000
+++ /dev/null
@@ -1,564 +0,0 @@
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Thu, 11 Jan 2018 16:32:00 +0100
-Subject: [PATCH] netfilter: nf_flow_table: add hardware offload support
-
-This patch adds the infrastructure to offload flows to hardware, in case
-the nic/switch comes with built-in flow tables capabilities.
-
-If the hardware comes with no hardware flow tables or they have
-limitations in terms of features, the existing infrastructure falls back
-to the software flow table implementation.
-
-The software flow table garbage collector skips entries that resides in
-the hardware, so the hardware will be responsible for releasing this
-flow table entry too via flow_offload_dead().
-
-Hardware configuration, either to add or to delete entries, is done from
-the hardware offload workqueue, to ensure this is done from user context
-given that we may sleep when grabbing the mdio mutex.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- create mode 100644 net/netfilter/nf_flow_table_hw.c
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -918,6 +918,13 @@ struct dev_ifalias {
-       char ifalias[];
- };
-+struct flow_offload;
-+
-+enum flow_offload_type {
-+      FLOW_OFFLOAD_ADD        = 0,
-+      FLOW_OFFLOAD_DEL,
-+};
-+
- /*
-  * This structure defines the management hooks for network devices.
-  * The following hooks can be defined; unless noted otherwise, they are
-@@ -1150,6 +1157,10 @@ struct dev_ifalias {
-  * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh,
-  *                         u16 flags);
-  *
-+ * int (*ndo_flow_offload)(enum flow_offload_type type,
-+ *                       struct flow_offload *flow);
-+ *    Adds/deletes flow entry to/from net device flowtable.
-+ *
-  * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
-  *    Called to change device carrier. Soft-devices (like dummy, team, etc)
-  *    which do not represent real hardware may define this to allow their
-@@ -1377,6 +1388,8 @@ struct net_device_ops {
-       int                     (*ndo_bridge_dellink)(struct net_device *dev,
-                                                     struct nlmsghdr *nlh,
-                                                     u16 flags);
-+      int                     (*ndo_flow_offload)(enum flow_offload_type type,
-+                                                  struct flow_offload *flow);
-       int                     (*ndo_change_carrier)(struct net_device *dev,
-                                                     bool new_carrier);
-       int                     (*ndo_get_phys_port_id)(struct net_device *dev,
---- a/include/net/netfilter/nf_flow_table.h
-+++ b/include/net/netfilter/nf_flow_table.h
-@@ -20,11 +20,17 @@ struct nf_flowtable_type {
-       struct module                   *owner;
- };
-+enum nf_flowtable_flags {
-+      NF_FLOWTABLE_F_HW               = 0x1,
-+};
-+
- struct nf_flowtable {
-       struct list_head                list;
-       struct rhashtable               rhashtable;
-       const struct nf_flowtable_type  *type;
-+      u32                             flags;
-       struct delayed_work             gc_work;
-+      possible_net_t                  ft_net;
- };
- enum flow_offload_tuple_dir {
-@@ -69,6 +75,7 @@ struct flow_offload_tuple_rhash {
- #define FLOW_OFFLOAD_DNAT     0x2
- #define FLOW_OFFLOAD_DYING    0x4
- #define FLOW_OFFLOAD_TEARDOWN 0x8
-+#define FLOW_OFFLOAD_HW               0x10
- struct flow_offload {
-       struct flow_offload_tuple_rhash         tuplehash[FLOW_OFFLOAD_DIR_MAX];
-@@ -125,6 +132,22 @@ unsigned int nf_flow_offload_ip_hook(voi
- unsigned int nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,
-                                      const struct nf_hook_state *state);
-+void nf_flow_offload_hw_add(struct net *net, struct flow_offload *flow,
-+                          struct nf_conn *ct);
-+void nf_flow_offload_hw_del(struct net *net, struct flow_offload *flow);
-+
-+struct nf_flow_table_hw {
-+      struct module   *owner;
-+      void            (*add)(struct net *net, struct flow_offload *flow,
-+                             struct nf_conn *ct);
-+      void            (*del)(struct net *net, struct flow_offload *flow);
-+};
-+
-+int nf_flow_table_hw_register(const struct nf_flow_table_hw *offload);
-+void nf_flow_table_hw_unregister(const struct nf_flow_table_hw *offload);
-+
-+extern struct work_struct nf_flow_offload_hw_work;
-+
- #define MODULE_ALIAS_NF_FLOWTABLE(family)     \
-       MODULE_ALIAS("nf-flowtable-" __stringify(family))
---- a/include/uapi/linux/netfilter/nf_tables.h
-+++ b/include/uapi/linux/netfilter/nf_tables.h
-@@ -1464,6 +1464,7 @@ enum nft_object_attributes {
-  * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
-  * @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
-  * @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
-+ * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)
-  */
- enum nft_flowtable_attributes {
-       NFTA_FLOWTABLE_UNSPEC,
-@@ -1473,6 +1474,7 @@ enum nft_flowtable_attributes {
-       NFTA_FLOWTABLE_USE,
-       NFTA_FLOWTABLE_HANDLE,
-       NFTA_FLOWTABLE_PAD,
-+      NFTA_FLOWTABLE_FLAGS,
-       __NFTA_FLOWTABLE_MAX
- };
- #define NFTA_FLOWTABLE_MAX    (__NFTA_FLOWTABLE_MAX - 1)
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -714,6 +714,15 @@ config NF_FLOW_TABLE
-         To compile it as a module, choose M here.
-+config NF_FLOW_TABLE_HW
-+      tristate "Netfilter flow table hardware offload module"
-+      depends on NF_FLOW_TABLE
-+      help
-+        This option adds hardware offload support for the flow table core
-+        infrastructure.
-+
-+        To compile it as a module, choose M here.
-+
- config NETFILTER_XTABLES
-       tristate "Netfilter Xtables support (required for ip_tables)"
-       default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -126,6 +126,7 @@ obj-$(CONFIG_NF_FLOW_TABLE)        += nf_flow_t
- nf_flow_table-objs := nf_flow_table_core.o nf_flow_table_ip.o
- obj-$(CONFIG_NF_FLOW_TABLE_INET) += nf_flow_table_inet.o
-+obj-$(CONFIG_NF_FLOW_TABLE_HW)        += nf_flow_table_hw.o
- # generic X tables 
- obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
---- a/net/netfilter/nf_flow_table_core.c
-+++ b/net/netfilter/nf_flow_table_core.c
-@@ -216,10 +216,16 @@ int flow_offload_add(struct nf_flowtable
- }
- EXPORT_SYMBOL_GPL(flow_offload_add);
-+static inline bool nf_flow_in_hw(const struct flow_offload *flow)
-+{
-+      return flow->flags & FLOW_OFFLOAD_HW;
-+}
-+
- static void flow_offload_del(struct nf_flowtable *flow_table,
-                            struct flow_offload *flow)
- {
-       struct flow_offload_entry *e;
-+      struct net *net = read_pnet(&flow_table->ft_net);
-       rhashtable_remove_fast(&flow_table->rhashtable,
-                              &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].node,
-@@ -234,6 +240,9 @@ static void flow_offload_del(struct nf_f
-       if (!(flow->flags & FLOW_OFFLOAD_TEARDOWN))
-               flow_offload_fixup_ct_state(e->ct);
-+      if (nf_flow_in_hw(flow))
-+              nf_flow_offload_hw_del(net, flow);
-+
-       flow_offload_free(flow);
- }
-@@ -347,6 +356,9 @@ static int nf_flow_offload_gc_step(struc
-               if (!teardown)
-                       nf_ct_offload_timeout(flow);
-+              if (nf_flow_in_hw(flow) && !teardown)
-+                      continue;
-+
-               if (nf_flow_has_expired(flow) || teardown)
-                       flow_offload_del(flow_table, flow);
-       }
-@@ -482,10 +494,43 @@ int nf_flow_dnat_port(const struct flow_
- }
- EXPORT_SYMBOL_GPL(nf_flow_dnat_port);
-+static const struct nf_flow_table_hw __rcu *nf_flow_table_hw_hook __read_mostly;
-+
-+static int nf_flow_offload_hw_init(struct nf_flowtable *flow_table)
-+{
-+      const struct nf_flow_table_hw *offload;
-+
-+      if (!rcu_access_pointer(nf_flow_table_hw_hook))
-+              request_module("nf-flow-table-hw");
-+
-+      rcu_read_lock();
-+      offload = rcu_dereference(nf_flow_table_hw_hook);
-+      if (!offload)
-+              goto err_no_hw_offload;
-+
-+      if (!try_module_get(offload->owner))
-+              goto err_no_hw_offload;
-+
-+      rcu_read_unlock();
-+
-+      return 0;
-+
-+err_no_hw_offload:
-+      rcu_read_unlock();
-+
-+      return -EOPNOTSUPP;
-+}
-+
- int nf_flow_table_init(struct nf_flowtable *flowtable)
- {
-       int err;
-+      if (flowtable->flags & NF_FLOWTABLE_F_HW) {
-+              err = nf_flow_offload_hw_init(flowtable);
-+              if (err)
-+                      return err;
-+      }
-+
-       INIT_DEFERRABLE_WORK(&flowtable->gc_work, nf_flow_offload_work_gc);
-       err = rhashtable_init(&flowtable->rhashtable,
-@@ -523,6 +568,8 @@ static void nf_flow_table_iterate_cleanu
- {
-       nf_flow_table_iterate(flowtable, nf_flow_table_do_cleanup, dev);
-       flush_delayed_work(&flowtable->gc_work);
-+      if (flowtable->flags & NF_FLOWTABLE_F_HW)
-+              flush_work(&nf_flow_offload_hw_work);
- }
- void nf_flow_table_cleanup(struct net *net, struct net_device *dev)
-@@ -536,6 +583,26 @@ void nf_flow_table_cleanup(struct net *n
- }
- EXPORT_SYMBOL_GPL(nf_flow_table_cleanup);
-+struct work_struct nf_flow_offload_hw_work;
-+EXPORT_SYMBOL_GPL(nf_flow_offload_hw_work);
-+
-+/* Give the hardware workqueue the chance to remove entries from hardware.*/
-+static void nf_flow_offload_hw_free(struct nf_flowtable *flowtable)
-+{
-+      const struct nf_flow_table_hw *offload;
-+
-+      flush_work(&nf_flow_offload_hw_work);
-+
-+      rcu_read_lock();
-+      offload = rcu_dereference(nf_flow_table_hw_hook);
-+      if (!offload) {
-+              rcu_read_unlock();
-+              return;
-+      }
-+      module_put(offload->owner);
-+      rcu_read_unlock();
-+}
-+
- void nf_flow_table_free(struct nf_flowtable *flow_table)
- {
-       mutex_lock(&flowtable_lock);
-@@ -545,9 +612,58 @@ void nf_flow_table_free(struct nf_flowta
-       nf_flow_table_iterate(flow_table, nf_flow_table_do_cleanup, NULL);
-       WARN_ON(!nf_flow_offload_gc_step(flow_table));
-       rhashtable_destroy(&flow_table->rhashtable);
-+      if (flow_table->flags & NF_FLOWTABLE_F_HW)
-+              nf_flow_offload_hw_free(flow_table);
- }
- EXPORT_SYMBOL_GPL(nf_flow_table_free);
-+/* Must be called from user context. */
-+void nf_flow_offload_hw_add(struct net *net, struct flow_offload *flow,
-+                          struct nf_conn *ct)
-+{
-+      const struct nf_flow_table_hw *offload;
-+
-+      rcu_read_lock();
-+      offload = rcu_dereference(nf_flow_table_hw_hook);
-+      if (offload)
-+              offload->add(net, flow, ct);
-+      rcu_read_unlock();
-+}
-+EXPORT_SYMBOL_GPL(nf_flow_offload_hw_add);
-+
-+/* Must be called from user context. */
-+void nf_flow_offload_hw_del(struct net *net, struct flow_offload *flow)
-+{
-+      const struct nf_flow_table_hw *offload;
-+
-+      rcu_read_lock();
-+      offload = rcu_dereference(nf_flow_table_hw_hook);
-+      if (offload)
-+              offload->del(net, flow);
-+      rcu_read_unlock();
-+}
-+EXPORT_SYMBOL_GPL(nf_flow_offload_hw_del);
-+
-+int nf_flow_table_hw_register(const struct nf_flow_table_hw *offload)
-+{
-+      if (rcu_access_pointer(nf_flow_table_hw_hook))
-+              return -EBUSY;
-+
-+      rcu_assign_pointer(nf_flow_table_hw_hook, offload);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(nf_flow_table_hw_register);
-+
-+void nf_flow_table_hw_unregister(const struct nf_flow_table_hw *offload)
-+{
-+      WARN_ON(rcu_access_pointer(nf_flow_table_hw_hook) != offload);
-+      rcu_assign_pointer(nf_flow_table_hw_hook, NULL);
-+
-+      synchronize_rcu();
-+}
-+EXPORT_SYMBOL_GPL(nf_flow_table_hw_unregister);
-+
- static int nf_flow_table_netdev_event(struct notifier_block *this,
-                                     unsigned long event, void *ptr)
- {
---- /dev/null
-+++ b/net/netfilter/nf_flow_table_hw.c
-@@ -0,0 +1,169 @@
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/rhashtable.h>
-+#include <linux/netdevice.h>
-+#include <net/netfilter/nf_flow_table.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#include <net/netfilter/nf_conntrack_tuple.h>
-+
-+static DEFINE_SPINLOCK(flow_offload_hw_pending_list_lock);
-+static LIST_HEAD(flow_offload_hw_pending_list);
-+
-+static DEFINE_MUTEX(nf_flow_offload_hw_mutex);
-+
-+struct flow_offload_hw {
-+      struct list_head        list;
-+      enum flow_offload_type  type;
-+      struct flow_offload     *flow;
-+      struct nf_conn          *ct;
-+      possible_net_t          flow_hw_net;
-+};
-+
-+static int do_flow_offload_hw(struct net *net, struct flow_offload *flow,
-+                            int type)
-+{
-+      struct net_device *indev;
-+      int ret, ifindex;
-+
-+      ifindex = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.iifidx;
-+      indev = dev_get_by_index(net, ifindex);
-+      if (WARN_ON(!indev))
-+              return 0;
-+
-+      mutex_lock(&nf_flow_offload_hw_mutex);
-+      ret = indev->netdev_ops->ndo_flow_offload(type, flow);
-+      mutex_unlock(&nf_flow_offload_hw_mutex);
-+
-+      dev_put(indev);
-+
-+      return ret;
-+}
-+
-+static void flow_offload_hw_work_add(struct flow_offload_hw *offload)
-+{
-+      struct net *net;
-+      int ret;
-+
-+      if (nf_ct_is_dying(offload->ct))
-+              return;
-+
-+      net = read_pnet(&offload->flow_hw_net);
-+      ret = do_flow_offload_hw(net, offload->flow, FLOW_OFFLOAD_ADD);
-+      if (ret >= 0)
-+              offload->flow->flags |= FLOW_OFFLOAD_HW;
-+}
-+
-+static void flow_offload_hw_work_del(struct flow_offload_hw *offload)
-+{
-+      struct net *net = read_pnet(&offload->flow_hw_net);
-+
-+      do_flow_offload_hw(net, offload->flow, FLOW_OFFLOAD_DEL);
-+}
-+
-+static void flow_offload_hw_work(struct work_struct *work)
-+{
-+      struct flow_offload_hw *offload, *next;
-+      LIST_HEAD(hw_offload_pending);
-+
-+      spin_lock_bh(&flow_offload_hw_pending_list_lock);
-+      list_replace_init(&flow_offload_hw_pending_list, &hw_offload_pending);
-+      spin_unlock_bh(&flow_offload_hw_pending_list_lock);
-+
-+      list_for_each_entry_safe(offload, next, &hw_offload_pending, list) {
-+              switch (offload->type) {
-+              case FLOW_OFFLOAD_ADD:
-+                      flow_offload_hw_work_add(offload);
-+                      break;
-+              case FLOW_OFFLOAD_DEL:
-+                      flow_offload_hw_work_del(offload);
-+                      break;
-+              }
-+              if (offload->ct)
-+                      nf_conntrack_put(&offload->ct->ct_general);
-+              list_del(&offload->list);
-+              kfree(offload);
-+      }
-+}
-+
-+static void flow_offload_queue_work(struct flow_offload_hw *offload)
-+{
-+      spin_lock_bh(&flow_offload_hw_pending_list_lock);
-+      list_add_tail(&offload->list, &flow_offload_hw_pending_list);
-+      spin_unlock_bh(&flow_offload_hw_pending_list_lock);
-+
-+      schedule_work(&nf_flow_offload_hw_work);
-+}
-+
-+static void flow_offload_hw_add(struct net *net, struct flow_offload *flow,
-+                              struct nf_conn *ct)
-+{
-+      struct flow_offload_hw *offload;
-+
-+      offload = kmalloc(sizeof(struct flow_offload_hw), GFP_ATOMIC);
-+      if (!offload)
-+              return;
-+
-+      nf_conntrack_get(&ct->ct_general);
-+      offload->type = FLOW_OFFLOAD_ADD;
-+      offload->ct = ct;
-+      offload->flow = flow;
-+      write_pnet(&offload->flow_hw_net, net);
-+
-+      flow_offload_queue_work(offload);
-+}
-+
-+static void flow_offload_hw_del(struct net *net, struct flow_offload *flow)
-+{
-+      struct flow_offload_hw *offload;
-+
-+      offload = kmalloc(sizeof(struct flow_offload_hw), GFP_ATOMIC);
-+      if (!offload)
-+              return;
-+
-+      offload->type = FLOW_OFFLOAD_DEL;
-+      offload->ct = NULL;
-+      offload->flow = flow;
-+      write_pnet(&offload->flow_hw_net, net);
-+
-+      flow_offload_queue_work(offload);
-+}
-+
-+static const struct nf_flow_table_hw flow_offload_hw = {
-+      .add    = flow_offload_hw_add,
-+      .del    = flow_offload_hw_del,
-+      .owner  = THIS_MODULE,
-+};
-+
-+static int __init nf_flow_table_hw_module_init(void)
-+{
-+      INIT_WORK(&nf_flow_offload_hw_work, flow_offload_hw_work);
-+      nf_flow_table_hw_register(&flow_offload_hw);
-+
-+      return 0;
-+}
-+
-+static void __exit nf_flow_table_hw_module_exit(void)
-+{
-+      struct flow_offload_hw *offload, *next;
-+      LIST_HEAD(hw_offload_pending);
-+
-+      nf_flow_table_hw_unregister(&flow_offload_hw);
-+      cancel_work_sync(&nf_flow_offload_hw_work);
-+
-+      list_for_each_entry_safe(offload, next, &hw_offload_pending, list) {
-+              if (offload->ct)
-+                      nf_conntrack_put(&offload->ct->ct_general);
-+              list_del(&offload->list);
-+              kfree(offload);
-+      }
-+}
-+
-+module_init(nf_flow_table_hw_module_init);
-+module_exit(nf_flow_table_hw_module_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
-+MODULE_ALIAS("nf-flow-table-hw");
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -5458,6 +5458,13 @@ static int nf_tables_flowtable_parse_hoo
-       if (err < 0)
-               return err;
-+      for (i = 0; i < n; i++) {
-+              if (flowtable->data.flags & NF_FLOWTABLE_F_HW &&
-+                  !dev_array[i]->netdev_ops->ndo_flow_offload) {
-+                      return -EOPNOTSUPP;
-+              }
-+      }
-+
-       ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
-       if (!ops)
-               return -ENOMEM;
-@@ -5589,10 +5596,19 @@ static int nf_tables_newflowtable(struct
-       }
-       flowtable->data.type = type;
-+      write_pnet(&flowtable->data.ft_net, net);
-+
-       err = type->init(&flowtable->data);
-       if (err < 0)
-               goto err3;
-+      if (nla[NFTA_FLOWTABLE_FLAGS]) {
-+              flowtable->data.flags =
-+                      ntohl(nla_get_be32(nla[NFTA_FLOWTABLE_FLAGS]));
-+              if (flowtable->data.flags & ~NF_FLOWTABLE_F_HW)
-+                      goto err4;
-+      }
-+
-       err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
-                                            flowtable);
-       if (err < 0)
-@@ -5718,7 +5734,8 @@ static int nf_tables_fill_flowtable_info
-           nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
-           nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
-           nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
--                       NFTA_FLOWTABLE_PAD))
-+                       NFTA_FLOWTABLE_PAD) ||
-+          nla_put_be32(skb, NFTA_FLOWTABLE_FLAGS, htonl(flowtable->data.flags)))
-               goto nla_put_failure;
-       nest = nla_nest_start(skb, NFTA_FLOWTABLE_HOOK);
---- a/net/netfilter/nft_flow_offload.c
-+++ b/net/netfilter/nft_flow_offload.c
-@@ -124,6 +124,9 @@ static void nft_flow_offload_eval(const
-       if (ret < 0)
-               goto err_flow_add;
-+      if (flowtable->flags & NF_FLOWTABLE_F_HW)
-+              nf_flow_offload_hw_add(nft_net(pkt), flow, ct);
-+
-       return;
- err_flow_add:
diff --git a/target/linux/generic/pending-4.19/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch b/target/linux/generic/pending-4.19/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch
deleted file mode 100644 (file)
index 87ff634..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 15 Mar 2018 20:46:31 +0100
-Subject: [PATCH] netfilter: nf_flow_table: support hw offload through
- virtual interfaces
-
-There are hardware offload devices that support offloading VLANs and
-PPPoE devices. Additionally, it is useful to be able to offload packets
-routed through bridge interfaces as well.
-Add support for finding the path to the offload device through these
-virtual interfaces, while collecting useful parameters for the offload
-device, like VLAN ID/protocol, PPPoE session and Ethernet MAC address.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -919,6 +919,7 @@ struct dev_ifalias {
- };
- struct flow_offload;
-+struct flow_offload_hw_path;
- enum flow_offload_type {
-       FLOW_OFFLOAD_ADD        = 0,
-@@ -1157,8 +1158,15 @@ enum flow_offload_type {
-  * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh,
-  *                         u16 flags);
-  *
-+ * int (*ndo_flow_offload_check)(struct flow_offload_hw_path *path);
-+ *    For virtual devices like bridges, vlan, and pppoe, fill in the
-+ *    underlying network device that can be used for offloading connections.
-+ *    Return an error if offloading is not supported.
-+ *
-  * int (*ndo_flow_offload)(enum flow_offload_type type,
-- *                       struct flow_offload *flow);
-+ *                       struct flow_offload *flow,
-+ *                       struct flow_offload_hw_path *src,
-+ *                       struct flow_offload_hw_path *dest);
-  *    Adds/deletes flow entry to/from net device flowtable.
-  *
-  * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
-@@ -1388,8 +1396,11 @@ struct net_device_ops {
-       int                     (*ndo_bridge_dellink)(struct net_device *dev,
-                                                     struct nlmsghdr *nlh,
-                                                     u16 flags);
-+      int                     (*ndo_flow_offload_check)(struct flow_offload_hw_path *path);
-       int                     (*ndo_flow_offload)(enum flow_offload_type type,
--                                                  struct flow_offload *flow);
-+                                                  struct flow_offload *flow,
-+                                                  struct flow_offload_hw_path *src,
-+                                                  struct flow_offload_hw_path *dest);
-       int                     (*ndo_change_carrier)(struct net_device *dev,
-                                                     bool new_carrier);
-       int                     (*ndo_get_phys_port_id)(struct net_device *dev,
---- a/include/net/netfilter/nf_flow_table.h
-+++ b/include/net/netfilter/nf_flow_table.h
-@@ -86,6 +86,21 @@ struct flow_offload {
-       };
- };
-+#define FLOW_OFFLOAD_PATH_ETHERNET    BIT(0)
-+#define FLOW_OFFLOAD_PATH_VLAN                BIT(1)
-+#define FLOW_OFFLOAD_PATH_PPPOE               BIT(2)
-+
-+struct flow_offload_hw_path {
-+      struct net_device *dev;
-+      u32 flags;
-+
-+      u8 eth_src[ETH_ALEN];
-+      u8 eth_dest[ETH_ALEN];
-+      u16 vlan_proto;
-+      u16 vlan_id;
-+      u16 pppoe_sid;
-+};
-+
- #define NF_FLOW_TIMEOUT (30 * HZ)
- struct nf_flow_route {
---- a/net/netfilter/nf_flow_table_hw.c
-+++ b/net/netfilter/nf_flow_table_hw.c
-@@ -19,48 +19,75 @@ struct flow_offload_hw {
-       enum flow_offload_type  type;
-       struct flow_offload     *flow;
-       struct nf_conn          *ct;
--      possible_net_t          flow_hw_net;
-+
-+      struct flow_offload_hw_path src;
-+      struct flow_offload_hw_path dest;
- };
--static int do_flow_offload_hw(struct net *net, struct flow_offload *flow,
--                            int type)
-+static void flow_offload_check_ethernet(struct flow_offload_tuple *tuple,
-+                                      struct flow_offload_hw_path *path)
- {
--      struct net_device *indev;
--      int ret, ifindex;
-+      struct net_device *dev = path->dev;
-+      struct neighbour *n;
--      ifindex = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.iifidx;
--      indev = dev_get_by_index(net, ifindex);
--      if (WARN_ON(!indev))
--              return 0;
--
--      mutex_lock(&nf_flow_offload_hw_mutex);
--      ret = indev->netdev_ops->ndo_flow_offload(type, flow);
--      mutex_unlock(&nf_flow_offload_hw_mutex);
-+      if (dev->type != ARPHRD_ETHER)
-+              return;
--      dev_put(indev);
-+      memcpy(path->eth_src, path->dev->dev_addr, ETH_ALEN);
-+      n = dst_neigh_lookup(tuple->dst_cache, &tuple->src_v4);
-+      if (!n)
-+              return;
--      return ret;
-+      memcpy(path->eth_dest, n->ha, ETH_ALEN);
-+      path->flags |= FLOW_OFFLOAD_PATH_ETHERNET;
-+      neigh_release(n);
- }
--static void flow_offload_hw_work_add(struct flow_offload_hw *offload)
-+static int flow_offload_check_path(struct net *net,
-+                                 struct flow_offload_tuple *tuple,
-+                                 struct flow_offload_hw_path *path)
- {
--      struct net *net;
--      int ret;
-+      struct net_device *dev;
--      if (nf_ct_is_dying(offload->ct))
--              return;
-+      dev = dev_get_by_index_rcu(net, tuple->iifidx);
-+      if (!dev)
-+              return -ENOENT;
-+
-+      path->dev = dev;
-+      flow_offload_check_ethernet(tuple, path);
--      net = read_pnet(&offload->flow_hw_net);
--      ret = do_flow_offload_hw(net, offload->flow, FLOW_OFFLOAD_ADD);
--      if (ret >= 0)
--              offload->flow->flags |= FLOW_OFFLOAD_HW;
-+      if (dev->netdev_ops->ndo_flow_offload_check)
-+              return dev->netdev_ops->ndo_flow_offload_check(path);
-+
-+      return 0;
- }
--static void flow_offload_hw_work_del(struct flow_offload_hw *offload)
-+static int do_flow_offload_hw(struct flow_offload_hw *offload)
- {
--      struct net *net = read_pnet(&offload->flow_hw_net);
-+      struct net_device *src_dev = offload->src.dev;
-+      struct net_device *dest_dev = offload->dest.dev;
-+      int ret;
-+
-+      ret = src_dev->netdev_ops->ndo_flow_offload(offload->type,
-+                                                  offload->flow,
-+                                                  &offload->src,
-+                                                  &offload->dest);
-+
-+      /* restore devices in case the driver mangled them */
-+      offload->src.dev = src_dev;
-+      offload->dest.dev = dest_dev;
-+
-+      return ret;
-+}
--      do_flow_offload_hw(net, offload->flow, FLOW_OFFLOAD_DEL);
-+static void flow_offload_hw_free(struct flow_offload_hw *offload)
-+{
-+      dev_put(offload->src.dev);
-+      dev_put(offload->dest.dev);
-+      if (offload->ct)
-+              nf_conntrack_put(&offload->ct->ct_general);
-+      list_del(&offload->list);
-+      kfree(offload);
- }
- static void flow_offload_hw_work(struct work_struct *work)
-@@ -73,18 +100,22 @@ static void flow_offload_hw_work(struct
-       spin_unlock_bh(&flow_offload_hw_pending_list_lock);
-       list_for_each_entry_safe(offload, next, &hw_offload_pending, list) {
-+              mutex_lock(&nf_flow_offload_hw_mutex);
-               switch (offload->type) {
-               case FLOW_OFFLOAD_ADD:
--                      flow_offload_hw_work_add(offload);
-+                      if (nf_ct_is_dying(offload->ct))
-+                              break;
-+
-+                      if (do_flow_offload_hw(offload) >= 0)
-+                              offload->flow->flags |= FLOW_OFFLOAD_HW;
-                       break;
-               case FLOW_OFFLOAD_DEL:
--                      flow_offload_hw_work_del(offload);
-+                      do_flow_offload_hw(offload);
-                       break;
-               }
--              if (offload->ct)
--                      nf_conntrack_put(&offload->ct->ct_general);
--              list_del(&offload->list);
--              kfree(offload);
-+              mutex_unlock(&nf_flow_offload_hw_mutex);
-+
-+              flow_offload_hw_free(offload);
-       }
- }
-@@ -97,20 +128,55 @@ static void flow_offload_queue_work(stru
-       schedule_work(&nf_flow_offload_hw_work);
- }
-+static struct flow_offload_hw *
-+flow_offload_hw_prepare(struct net *net, struct flow_offload *flow)
-+{
-+      struct flow_offload_hw_path src = {};
-+      struct flow_offload_hw_path dest = {};
-+      struct flow_offload_tuple *tuple;
-+      struct flow_offload_hw *offload = NULL;
-+
-+      rcu_read_lock_bh();
-+
-+      tuple = &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple;
-+      if (flow_offload_check_path(net, tuple, &src))
-+              goto out;
-+
-+      tuple = &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple;
-+      if (flow_offload_check_path(net, tuple, &dest))
-+              goto out;
-+
-+      if (!src.dev->netdev_ops->ndo_flow_offload)
-+              goto out;
-+
-+      offload = kzalloc(sizeof(struct flow_offload_hw), GFP_ATOMIC);
-+      if (!offload)
-+              goto out;
-+
-+      dev_hold(src.dev);
-+      dev_hold(dest.dev);
-+      offload->src = src;
-+      offload->dest = dest;
-+      offload->flow = flow;
-+
-+out:
-+      rcu_read_unlock_bh();
-+
-+      return offload;
-+}
-+
- static void flow_offload_hw_add(struct net *net, struct flow_offload *flow,
-                               struct nf_conn *ct)
- {
-       struct flow_offload_hw *offload;
--      offload = kmalloc(sizeof(struct flow_offload_hw), GFP_ATOMIC);
-+      offload = flow_offload_hw_prepare(net, flow);
-       if (!offload)
-               return;
-       nf_conntrack_get(&ct->ct_general);
-       offload->type = FLOW_OFFLOAD_ADD;
-       offload->ct = ct;
--      offload->flow = flow;
--      write_pnet(&offload->flow_hw_net, net);
-       flow_offload_queue_work(offload);
- }
-@@ -119,14 +185,11 @@ static void flow_offload_hw_del(struct n
- {
-       struct flow_offload_hw *offload;
--      offload = kmalloc(sizeof(struct flow_offload_hw), GFP_ATOMIC);
-+      offload = flow_offload_hw_prepare(net, flow);
-       if (!offload)
-               return;
-       offload->type = FLOW_OFFLOAD_DEL;
--      offload->ct = NULL;
--      offload->flow = flow;
--      write_pnet(&offload->flow_hw_net, net);
-       flow_offload_queue_work(offload);
- }
-@@ -153,12 +216,8 @@ static void __exit nf_flow_table_hw_modu
-       nf_flow_table_hw_unregister(&flow_offload_hw);
-       cancel_work_sync(&nf_flow_offload_hw_work);
--      list_for_each_entry_safe(offload, next, &hw_offload_pending, list) {
--              if (offload->ct)
--                      nf_conntrack_put(&offload->ct->ct_general);
--              list_del(&offload->list);
--              kfree(offload);
--      }
-+      list_for_each_entry_safe(offload, next, &hw_offload_pending, list)
-+              flow_offload_hw_free(offload);
- }
- module_init(nf_flow_table_hw_module_init);
diff --git a/target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch
deleted file mode 100644 (file)
index 724f1c4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 15 Mar 2018 20:49:58 +0100
-Subject: [PATCH] net: 8021q: support hardware flow table offload
-
-Add the VLAN ID and protocol information
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/net/8021q/vlan_dev.c
-+++ b/net/8021q/vlan_dev.c
-@@ -32,6 +32,10 @@
- #include <linux/phy.h>
- #include <net/arp.h>
- #include <net/switchdev.h>
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_flow_table.h>
-+#endif
- #include "vlan.h"
- #include "vlanproc.h"
-@@ -770,6 +774,27 @@ static int vlan_dev_get_iflink(const str
-       return real_dev->ifindex;
- }
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+static int vlan_dev_flow_offload_check(struct flow_offload_hw_path *path)
-+{
-+      struct net_device *dev = path->dev;
-+      struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
-+
-+      if (path->flags & FLOW_OFFLOAD_PATH_VLAN)
-+              return -EEXIST;
-+
-+      path->flags |= FLOW_OFFLOAD_PATH_VLAN;
-+      path->vlan_proto = vlan->vlan_proto;
-+      path->vlan_id = vlan->vlan_id;
-+      path->dev = vlan->real_dev;
-+
-+      if (vlan->real_dev->netdev_ops->ndo_flow_offload_check)
-+              return vlan->real_dev->netdev_ops->ndo_flow_offload_check(path);
-+
-+      return 0;
-+}
-+#endif /* CONFIG_NF_FLOW_TABLE */
-+
- static const struct ethtool_ops vlan_ethtool_ops = {
-       .get_link_ksettings     = vlan_ethtool_get_link_ksettings,
-       .get_drvinfo            = vlan_ethtool_get_drvinfo,
-@@ -807,6 +832,9 @@ static const struct net_device_ops vlan_
-       .ndo_fix_features       = vlan_dev_fix_features,
-       .ndo_get_lock_subclass  = vlan_dev_get_lock_subclass,
-       .ndo_get_iflink         = vlan_dev_get_iflink,
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+      .ndo_flow_offload_check = vlan_dev_flow_offload_check,
-+#endif
- };
- static void vlan_dev_free(struct net_device *dev)
diff --git a/target/linux/generic/pending-4.19/643-net-bridge-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.19/643-net-bridge-support-hardware-flow-table-offload.patch
deleted file mode 100644 (file)
index 7d9c8ab..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 15 Mar 2018 20:50:37 +0100
-Subject: [PATCH] net: bridge: support hardware flow table offload
-
-Look up the real device and pass it on
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/net/bridge/br_device.c
-+++ b/net/bridge/br_device.c
-@@ -18,6 +18,10 @@
- #include <linux/ethtool.h>
- #include <linux/list.h>
- #include <linux/netfilter_bridge.h>
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_flow_table.h>
-+#endif
- #include <linux/uaccess.h>
- #include "br_private.h"
-@@ -370,6 +374,28 @@ static const struct ethtool_ops br_ethto
-       .get_link       = ethtool_op_get_link,
- };
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+static int br_flow_offload_check(struct flow_offload_hw_path *path)
-+{
-+      struct net_device *dev = path->dev;
-+      struct net_bridge *br = netdev_priv(dev);
-+      struct net_bridge_fdb_entry *dst;
-+
-+      if (!(path->flags & FLOW_OFFLOAD_PATH_ETHERNET))
-+              return -EINVAL;
-+
-+      dst = br_fdb_find_rcu(br, path->eth_dest, path->vlan_id);
-+      if (!dst || !dst->dst)
-+              return -ENOENT;
-+
-+      path->dev = dst->dst->dev;
-+      if (path->dev->netdev_ops->ndo_flow_offload_check)
-+              return path->dev->netdev_ops->ndo_flow_offload_check(path);
-+
-+      return 0;
-+}
-+#endif /* CONFIG_NF_FLOW_TABLE */
-+
- static const struct net_device_ops br_netdev_ops = {
-       .ndo_open                = br_dev_open,
-       .ndo_stop                = br_dev_stop,
-@@ -397,6 +423,9 @@ static const struct net_device_ops br_ne
-       .ndo_bridge_setlink      = br_setlink,
-       .ndo_bridge_dellink      = br_dellink,
-       .ndo_features_check      = passthru_features_check,
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+      .ndo_flow_offload_check  = br_flow_offload_check,
-+#endif
- };
- static struct device_type br_type = {
diff --git a/target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch
deleted file mode 100644 (file)
index 26d46ec..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 15 Mar 2018 21:15:00 +0100
-Subject: [PATCH] net: pppoe: support hardware flow table offload
-
-Pass on the PPPoE session ID and the remote MAC address
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/net/ppp/ppp_generic.c
-+++ b/drivers/net/ppp/ppp_generic.c
-@@ -57,6 +57,11 @@
- #include <net/net_namespace.h>
- #include <net/netns/generic.h>
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_flow_table.h>
-+#endif
-+
- #define PPP_VERSION   "2.4.2"
- /*
-@@ -1368,12 +1373,37 @@ static void ppp_dev_priv_destructor(stru
-               ppp_destroy_interface(ppp);
- }
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+static int ppp_flow_offload_check(struct flow_offload_hw_path *path)
-+{
-+      struct ppp *ppp = netdev_priv(path->dev);
-+      struct ppp_channel *chan;
-+      struct channel *pch;
-+
-+      if (ppp->flags & SC_MULTILINK)
-+              return -EOPNOTSUPP;
-+
-+      if (list_empty(&ppp->channels))
-+              return -ENODEV;
-+
-+      pch = list_first_entry(&ppp->channels, struct channel, clist);
-+      chan = pch->chan;
-+      if (!chan->ops->flow_offload_check)
-+              return -EOPNOTSUPP;
-+
-+      return chan->ops->flow_offload_check(chan, path);
-+}
-+#endif /* CONFIG_NF_FLOW_TABLE */
-+
- static const struct net_device_ops ppp_netdev_ops = {
-       .ndo_init        = ppp_dev_init,
-       .ndo_uninit      = ppp_dev_uninit,
-       .ndo_start_xmit  = ppp_start_xmit,
-       .ndo_do_ioctl    = ppp_net_ioctl,
-       .ndo_get_stats64 = ppp_get_stats64,
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+      .ndo_flow_offload_check = ppp_flow_offload_check,
-+#endif
- };
- static struct device_type ppp_type = {
---- a/drivers/net/ppp/pppoe.c
-+++ b/drivers/net/ppp/pppoe.c
-@@ -78,6 +78,11 @@
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_flow_table.h>
-+#endif
-+
- #include <linux/nsproxy.h>
- #include <net/net_namespace.h>
- #include <net/netns/generic.h>
-@@ -976,8 +981,36 @@ static int pppoe_xmit(struct ppp_channel
-       return __pppoe_xmit(sk, skb);
- }
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+static int pppoe_flow_offload_check(struct ppp_channel *chan,
-+                                  struct flow_offload_hw_path *path)
-+{
-+      struct sock *sk = (struct sock *)chan->private;
-+      struct pppox_sock *po = pppox_sk(sk);
-+      struct net_device *dev = po->pppoe_dev;
-+
-+      if (sock_flag(sk, SOCK_DEAD) ||
-+          !(sk->sk_state & PPPOX_CONNECTED) || !dev)
-+              return -ENODEV;
-+
-+      path->dev = po->pppoe_dev;
-+      path->flags |= FLOW_OFFLOAD_PATH_PPPOE;
-+      memcpy(path->eth_src, po->pppoe_dev->dev_addr, ETH_ALEN);
-+      memcpy(path->eth_dest, po->pppoe_pa.remote, ETH_ALEN);
-+      path->pppoe_sid = be16_to_cpu(po->num);
-+
-+      if (path->dev->netdev_ops->ndo_flow_offload_check)
-+              return path->dev->netdev_ops->ndo_flow_offload_check(path);
-+
-+      return 0;
-+}
-+#endif /* CONFIG_NF_FLOW_TABLE */
-+
- static const struct ppp_channel_ops pppoe_chan_ops = {
-       .start_xmit = pppoe_xmit,
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+      .flow_offload_check = pppoe_flow_offload_check,
-+#endif
- };
- static int pppoe_recvmsg(struct socket *sock, struct msghdr *m,
---- a/include/linux/ppp_channel.h
-+++ b/include/linux/ppp_channel.h
-@@ -32,6 +32,10 @@ struct ppp_channel_ops {
-       int     (*start_xmit)(struct ppp_channel *, struct sk_buff *);
-       /* Handle an ioctl call that has come in via /dev/ppp. */
-       int     (*ioctl)(struct ppp_channel *, unsigned int, unsigned long);
-+
-+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-+      int     (*flow_offload_check)(struct ppp_channel *, struct flow_offload_hw_path *);
-+#endif
- };
- struct ppp_channel {
diff --git a/target/linux/generic/pending-4.19/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch b/target/linux/generic/pending-4.19/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch
deleted file mode 100644 (file)
index 292f5f8..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 25 Mar 2018 21:10:55 +0200
-Subject: [PATCH] netfilter: nf_flow_table: rework hardware offload timeout
- handling
-
-Some offload implementations send keepalive packets + explicit
-notifications of TCP FIN/RST packets. In this case it is more convenient
-to simply let the driver update flow->timeout handling and use the
-regular flow offload gc step.
-
-For drivers that manage their own lifetime, a separate flag can be set
-to avoid gc timeouts.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/include/net/netfilter/nf_flow_table.h
-+++ b/include/net/netfilter/nf_flow_table.h
-@@ -76,6 +76,7 @@ struct flow_offload_tuple_rhash {
- #define FLOW_OFFLOAD_DYING    0x4
- #define FLOW_OFFLOAD_TEARDOWN 0x8
- #define FLOW_OFFLOAD_HW               0x10
-+#define FLOW_OFFLOAD_KEEP     0x20
- struct flow_offload {
-       struct flow_offload_tuple_rhash         tuplehash[FLOW_OFFLOAD_DIR_MAX];
---- a/net/netfilter/nf_flow_table_core.c
-+++ b/net/netfilter/nf_flow_table_core.c
-@@ -356,7 +356,7 @@ static int nf_flow_offload_gc_step(struc
-               if (!teardown)
-                       nf_ct_offload_timeout(flow);
--              if (nf_flow_in_hw(flow) && !teardown)
-+              if ((flow->flags & FLOW_OFFLOAD_KEEP) && !teardown)
-                       continue;
-               if (nf_flow_has_expired(flow) || teardown)
diff --git a/target/linux/generic/pending-4.19/646-netfilter-nf_flow_table-rework-private-driver-data.patch b/target/linux/generic/pending-4.19/646-netfilter-nf_flow_table-rework-private-driver-data.patch
deleted file mode 100644 (file)
index f94d7ad..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 27 Apr 2018 14:42:14 +0200
-Subject: [PATCH] netfilter: nf_flow_table: rework private driver data
-
-Move the timeout out of the union, since it can be shared between the
-driver and the stack. Add a private pointer that the driver can use to
-point to its own data structures
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/include/net/netfilter/nf_flow_table.h
-+++ b/include/net/netfilter/nf_flow_table.h
-@@ -81,9 +81,10 @@ struct flow_offload_tuple_rhash {
- struct flow_offload {
-       struct flow_offload_tuple_rhash         tuplehash[FLOW_OFFLOAD_DIR_MAX];
-       u32                                     flags;
-+      u32                                     timeout;
-       union {
-               /* Your private driver data here. */
--              u32             timeout;
-+              void *priv;
-       };
- };
diff --git a/target/linux/generic/pending-4.19/655-increase_skb_pad.patch b/target/linux/generic/pending-4.19/655-increase_skb_pad.patch
deleted file mode 100644 (file)
index db79a6d..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a few patches for avoiding unnecessary skb reallocations - significantly improves ethernet<->wireless performance
-
-lede-commit: 6f89cffc9add6939d44a6b54cf9a5e77849aa7fd
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/skbuff.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -2493,7 +2493,7 @@ static inline int pskb_network_may_pull(
-  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
-  */
- #ifndef NET_SKB_PAD
--#define NET_SKB_PAD   max(32, L1_CACHE_BYTES)
-+#define NET_SKB_PAD   max(64, L1_CACHE_BYTES)
- #endif
- int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/target/linux/generic/pending-4.19/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-4.19/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
deleted file mode 100644 (file)
index e21f510..0000000
+++ /dev/null
@@ -1,500 +0,0 @@
-From: Steven Barth <steven@midlink.org>
-Subject: Add support for MAP-E FMRs (mesh mode)
-
-MAP-E FMRs (draft-ietf-softwire-map-10) are rules for IPv4-communication
-between MAP CEs (mesh mode) without the need to forward such data to a
-border relay. This is similar to how 6rd works but for IPv4 over IPv6.
-
-Signed-off-by: Steven Barth <cyrus@openwrt.org>
----
- include/net/ip6_tunnel.h       |  13 ++
- include/uapi/linux/if_tunnel.h |  13 ++
- net/ipv6/ip6_tunnel.c          | 276 +++++++++++++++++++++++++++++++++++++++--
- 3 files changed, 291 insertions(+), 11 deletions(-)
-
---- a/include/net/ip6_tunnel.h
-+++ b/include/net/ip6_tunnel.h
-@@ -18,6 +18,18 @@
- /* determine capability on a per-packet basis */
- #define IP6_TNL_F_CAP_PER_PACKET 0x40000
-+/* IPv6 tunnel FMR */
-+struct __ip6_tnl_fmr {
-+      struct __ip6_tnl_fmr *next; /* next fmr in list */
-+      struct in6_addr ip6_prefix;
-+      struct in_addr ip4_prefix;
-+
-+      __u8 ip6_prefix_len;
-+      __u8 ip4_prefix_len;
-+      __u8 ea_len;
-+      __u8 offset;
-+};
-+
- struct __ip6_tnl_parm {
-       char name[IFNAMSIZ];    /* name of tunnel device */
-       int link;               /* ifindex of underlying L2 interface */
-@@ -29,6 +41,7 @@ struct __ip6_tnl_parm {
-       __u32 flags;            /* tunnel flags */
-       struct in6_addr laddr;  /* local tunnel end-point address */
-       struct in6_addr raddr;  /* remote tunnel end-point address */
-+      struct __ip6_tnl_fmr *fmrs;     /* FMRs */
-       __be16                  i_flags;
-       __be16                  o_flags;
---- a/include/uapi/linux/if_tunnel.h
-+++ b/include/uapi/linux/if_tunnel.h
-@@ -77,10 +77,23 @@ enum {
-       IFLA_IPTUN_ENCAP_DPORT,
-       IFLA_IPTUN_COLLECT_METADATA,
-       IFLA_IPTUN_FWMARK,
-+      IFLA_IPTUN_FMRS,
-       __IFLA_IPTUN_MAX,
- };
- #define IFLA_IPTUN_MAX        (__IFLA_IPTUN_MAX - 1)
-+enum {
-+      IFLA_IPTUN_FMR_UNSPEC,
-+      IFLA_IPTUN_FMR_IP6_PREFIX,
-+      IFLA_IPTUN_FMR_IP4_PREFIX,
-+      IFLA_IPTUN_FMR_IP6_PREFIX_LEN,
-+      IFLA_IPTUN_FMR_IP4_PREFIX_LEN,
-+      IFLA_IPTUN_FMR_EA_LEN,
-+      IFLA_IPTUN_FMR_OFFSET,
-+      __IFLA_IPTUN_FMR_MAX,
-+};
-+#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1)
-+
- enum tunnel_encap_types {
-       TUNNEL_ENCAP_NONE,
-       TUNNEL_ENCAP_FOU,
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -16,6 +16,8 @@
-  *      as published by the Free Software Foundation; either version
-  *      2 of the License, or (at your option) any later version.
-  *
-+ *    Changes:
-+ * Steven Barth <cyrus@openwrt.org>:          MAP-E FMR support
-  */
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-@@ -72,9 +74,9 @@ static bool log_ecn_error = true;
- module_param(log_ecn_error, bool, 0644);
- MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
--static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
-+static u32 HASH(const struct in6_addr *addr)
- {
--      u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2);
-+      u32 hash = ipv6_addr_hash(addr);
-       return hash_32(hash, IP6_TUNNEL_HASH_SIZE_SHIFT);
- }
-@@ -141,20 +143,29 @@ static struct net_device_stats *ip6_get_
- static struct ip6_tnl *
- ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
- {
--      unsigned int hash = HASH(remote, local);
-+      unsigned int hash = HASH(local);
-       struct ip6_tnl *t;
-       struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
-       struct in6_addr any;
-+      struct __ip6_tnl_fmr *fmr;
-       for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
--              if (ipv6_addr_equal(local, &t->parms.laddr) &&
--                  ipv6_addr_equal(remote, &t->parms.raddr) &&
--                  (t->dev->flags & IFF_UP))
-+              if (!ipv6_addr_equal(local, &t->parms.laddr) ||
-+                              !(t->dev->flags & IFF_UP))
-+                      continue;
-+
-+              if (ipv6_addr_equal(remote, &t->parms.raddr))
-                       return t;
-+
-+              for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
-+                      if (ipv6_prefix_equal(remote, &fmr->ip6_prefix,
-+                                      fmr->ip6_prefix_len))
-+                              return t;
-+              }
-       }
-       memset(&any, 0, sizeof(any));
--      hash = HASH(&any, local);
-+      hash = HASH(local);
-       for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
-               if (ipv6_addr_equal(local, &t->parms.laddr) &&
-                   ipv6_addr_any(&t->parms.raddr) &&
-@@ -162,7 +173,7 @@ ip6_tnl_lookup(struct net *net, const st
-                       return t;
-       }
--      hash = HASH(remote, &any);
-+      hash = HASH(&any);
-       for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
-               if (ipv6_addr_equal(remote, &t->parms.raddr) &&
-                   ipv6_addr_any(&t->parms.laddr) &&
-@@ -202,7 +213,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
-       if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
-               prio = 1;
--              h = HASH(remote, local);
-+              h = HASH(local);
-       }
-       return &ip6n->tnls[prio][h];
- }
-@@ -383,6 +394,12 @@ ip6_tnl_dev_uninit(struct net_device *de
-       struct net *net = t->net;
-       struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
-+      while (t->parms.fmrs) {
-+              struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
-+              kfree(t->parms.fmrs);
-+              t->parms.fmrs = next;
-+      }
-+
-       if (dev == ip6n->fb_tnl_dev)
-               RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
-       else
-@@ -772,6 +789,107 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
- }
- EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
-+/**
-+ * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR
-+ *   @dest: destination IPv6 address buffer
-+ *   @skb: received socket buffer
-+ *   @fmr: MAP FMR
-+ *   @xmit: Calculate for xmit or rcv
-+ **/
-+static void ip4ip6_fmr_calc(struct in6_addr *dest,
-+              const struct iphdr *iph, const uint8_t *end,
-+              const struct __ip6_tnl_fmr *fmr, bool xmit)
-+{
-+      int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len);
-+      u8 *portp = NULL;
-+      bool use_dest_addr;
-+      const struct iphdr *dsth = iph;
-+
-+      if ((u8*)dsth >= end)
-+              return;
-+
-+      /* find significant IP header */
-+      if (iph->protocol == IPPROTO_ICMP) {
-+              struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
-+              if (ih && ((u8*)&ih[1]) <= end && (
-+                      ih->type == ICMP_DEST_UNREACH ||
-+                      ih->type == ICMP_SOURCE_QUENCH ||
-+                      ih->type == ICMP_TIME_EXCEEDED ||
-+                      ih->type == ICMP_PARAMETERPROB ||
-+                      ih->type == ICMP_REDIRECT))
-+                              dsth = (const struct iphdr*)&ih[1];
-+      }
-+
-+      /* in xmit-path use dest port by default and source port only if
-+              this is an ICMP reply to something else; vice versa in rcv-path */
-+      use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph);
-+
-+      /* get dst port */
-+      if (((u8*)&dsth[1]) <= end && (
-+              dsth->protocol == IPPROTO_UDP ||
-+              dsth->protocol == IPPROTO_TCP ||
-+              dsth->protocol == IPPROTO_SCTP ||
-+              dsth->protocol == IPPROTO_DCCP)) {
-+                      /* for UDP, TCP, SCTP and DCCP source and dest port
-+                      follow IPv4 header directly */
-+                      portp = ((u8*)dsth) + dsth->ihl * 4;
-+
-+                      if (use_dest_addr)
-+                              portp += sizeof(u16);
-+      } else if (iph->protocol == IPPROTO_ICMP) {
-+              struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
-+
-+              /* use icmp identifier as port */
-+              if (((u8*)&ih) <= end && (
-+                  (use_dest_addr && (
-+                  ih->type == ICMP_ECHOREPLY ||
-+                      ih->type == ICMP_TIMESTAMPREPLY ||
-+                      ih->type == ICMP_INFO_REPLY ||
-+                      ih->type == ICMP_ADDRESSREPLY)) ||
-+                      (!use_dest_addr && (
-+                      ih->type == ICMP_ECHO ||
-+                      ih->type == ICMP_TIMESTAMP ||
-+                      ih->type == ICMP_INFO_REQUEST ||
-+                      ih->type == ICMP_ADDRESS)
-+                      )))
-+                              portp = (u8*)&ih->un.echo.id;
-+      }
-+
-+      if ((portp && &portp[2] <= end) || psidlen == 0) {
-+              int frombyte = fmr->ip6_prefix_len / 8;
-+              int fromrem = fmr->ip6_prefix_len % 8;
-+              int bytes = sizeof(struct in6_addr) - frombyte;
-+              const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr;
-+              u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len);
-+              u64 t = 0;
-+
-+              /* extract PSID from port and add it to eabits */
-+              u16 psidbits = 0;
-+              if (psidlen > 0) {
-+                      psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]);
-+                      psidbits >>= 16 - psidlen - fmr->offset;
-+                      psidbits = (u16)(psidbits << (16 - psidlen));
-+                      eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen));
-+              }
-+
-+              /* rewrite destination address */
-+              *dest = fmr->ip6_prefix;
-+              memcpy(&dest->s6_addr[10], addr, sizeof(*addr));
-+              dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen));
-+
-+              if (bytes > sizeof(u64))
-+                      bytes = sizeof(u64);
-+
-+              /* insert eabits */
-+              memcpy(&t, &dest->s6_addr[frombyte], bytes);
-+              t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1)
-+                      << (64 - fmr->ea_len - fromrem));
-+              t = cpu_to_be64(t | (eabits >> fromrem));
-+              memcpy(&dest->s6_addr[frombyte], &t, bytes);
-+      }
-+}
-+
-+
- static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
-                        const struct tnl_ptk_info *tpi,
-                        struct metadata_dst *tun_dst,
-@@ -824,6 +942,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
-       skb_reset_network_header(skb);
-       memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
-+      if (tpi->proto == htons(ETH_P_IP) && tunnel->parms.fmrs &&
-+              !ipv6_addr_equal(&ipv6h->saddr, &tunnel->parms.raddr)) {
-+                      /* Packet didn't come from BR, so lookup FMR */
-+                      struct __ip6_tnl_fmr *fmr;
-+                      struct in6_addr expected = tunnel->parms.raddr;
-+                      for (fmr = tunnel->parms.fmrs; fmr; fmr = fmr->next)
-+                              if (ipv6_prefix_equal(&ipv6h->saddr,
-+                                      &fmr->ip6_prefix, fmr->ip6_prefix_len))
-+                                              break;
-+
-+                      /* Check that IPv6 matches IPv4 source to prevent spoofing */
-+                      if (fmr)
-+                              ip4ip6_fmr_calc(&expected, ip_hdr(skb),
-+                                              skb_tail_pointer(skb), fmr, false);
-+
-+                      if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) {
-+                              rcu_read_unlock();
-+                              goto drop;
-+                      }
-+      }
-+
-       __skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
-       err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);
-@@ -956,6 +1095,7 @@ static void init_tel_txopt(struct ipv6_t
-       opt->ops.opt_nflen = 8;
- }
-+
- /**
-  * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
-  *   @t: the outgoing tunnel device
-@@ -1309,6 +1449,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
- {
-       struct ip6_tnl *t = netdev_priv(dev);
-       struct ipv6hdr *ipv6h;
-+      struct __ip6_tnl_fmr *fmr;
-       int encap_limit = -1;
-       __u16 offset;
-       struct flowi6 fl6;
-@@ -1373,6 +1514,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
-       fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
-+      /* try to find matching FMR */
-+      for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
-+              unsigned mshift = 32 - fmr->ip4_prefix_len;
-+              if (ntohl(fmr->ip4_prefix.s_addr) >> mshift ==
-+                              ntohl(ip_hdr(skb)->daddr) >> mshift)
-+                      break;
-+      }
-+
-+      /* change dstaddr according to FMR */
-+      if (fmr)
-+              ip4ip6_fmr_calc(&fl6.daddr, ip_hdr(skb), skb_tail_pointer(skb), fmr, true);
-+
-       if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
-               return -1;
-@@ -1504,6 +1657,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
-       t->parms.link = p->link;
-       t->parms.proto = p->proto;
-       t->parms.fwmark = p->fwmark;
-+
-+      while (t->parms.fmrs) {
-+              struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
-+              kfree(t->parms.fmrs);
-+              t->parms.fmrs = next;
-+      }
-+      t->parms.fmrs = p->fmrs;
-+
-       dst_cache_reset(&t->dst_cache);
-       ip6_tnl_link_config(t);
-       return 0;
-@@ -1542,6 +1703,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
-       p->flowinfo = u->flowinfo;
-       p->link = u->link;
-       p->proto = u->proto;
-+      p->fmrs = NULL;
-       memcpy(p->name, u->name, sizeof(u->name));
- }
-@@ -1928,6 +2090,15 @@ static int ip6_tnl_validate(struct nlatt
-       return 0;
- }
-+static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = {
-+      [IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) },
-+      [IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) },
-+      [IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 },
-+      [IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 },
-+      [IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 },
-+      [IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 }
-+};
-+
- static void ip6_tnl_netlink_parms(struct nlattr *data[],
-                                 struct __ip6_tnl_parm *parms)
- {
-@@ -1965,6 +2136,46 @@ static void ip6_tnl_netlink_parms(struct
-       if (data[IFLA_IPTUN_FWMARK])
-               parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
-+
-+      if (data[IFLA_IPTUN_FMRS]) {
-+              unsigned rem;
-+              struct nlattr *fmr;
-+              nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) {
-+                      struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c;
-+                      struct __ip6_tnl_fmr *nfmr;
-+
-+                      nla_parse_nested(fmrd, IFLA_IPTUN_FMR_MAX,
-+                              fmr, ip6_tnl_fmr_policy, NULL);
-+
-+                      if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL)))
-+                              continue;
-+
-+                      nfmr->offset = 6;
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX]))
-+                              nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX],
-+                                      sizeof(nfmr->ip6_prefix));
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX]))
-+                              nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX],
-+                                      sizeof(nfmr->ip4_prefix));
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN]))
-+                              nfmr->ip6_prefix_len = nla_get_u8(c);
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN]))
-+                              nfmr->ip4_prefix_len = nla_get_u8(c);
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN]))
-+                              nfmr->ea_len = nla_get_u8(c);
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET]))
-+                              nfmr->offset = nla_get_u8(c);
-+
-+                      nfmr->next = parms->fmrs;
-+                      parms->fmrs = nfmr;
-+              }
-+      }
- }
- static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
-@@ -2080,6 +2291,12 @@ static void ip6_tnl_dellink(struct net_d
- static size_t ip6_tnl_get_size(const struct net_device *dev)
- {
-+      const struct ip6_tnl *t = netdev_priv(dev);
-+      struct __ip6_tnl_fmr *c;
-+      int fmrs = 0;
-+      for (c = t->parms.fmrs; c; c = c->next)
-+              ++fmrs;
-+
-       return
-               /* IFLA_IPTUN_LINK */
-               nla_total_size(4) +
-@@ -2109,6 +2326,24 @@ static size_t ip6_tnl_get_size(const str
-               nla_total_size(0) +
-               /* IFLA_IPTUN_FWMARK */
-               nla_total_size(4) +
-+              /* IFLA_IPTUN_FMRS */
-+              nla_total_size(0) +
-+              (
-+                      /* nest */
-+                      nla_total_size(0) +
-+                      /* IFLA_IPTUN_FMR_IP6_PREFIX */
-+                      nla_total_size(sizeof(struct in6_addr)) +
-+                      /* IFLA_IPTUN_FMR_IP4_PREFIX */
-+                      nla_total_size(sizeof(struct in_addr)) +
-+                      /* IFLA_IPTUN_FMR_EA_LEN */
-+                      nla_total_size(1) +
-+                      /* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */
-+                      nla_total_size(1) +
-+                      /* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */
-+                      nla_total_size(1) +
-+                      /* IFLA_IPTUN_FMR_OFFSET */
-+                      nla_total_size(1)
-+              ) * fmrs +
-               0;
- }
-@@ -2116,6 +2351,9 @@ static int ip6_tnl_fill_info(struct sk_b
- {
-       struct ip6_tnl *tunnel = netdev_priv(dev);
-       struct __ip6_tnl_parm *parm = &tunnel->parms;
-+      struct __ip6_tnl_fmr *c;
-+      int fmrcnt = 0;
-+      struct nlattr *fmrs;
-       if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
-           nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -2125,9 +2363,27 @@ static int ip6_tnl_fill_info(struct sk_b
-           nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
-           nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
-           nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
--          nla_put_u32(skb, IFLA_IPTUN_FWMARK, parm->fwmark))
-+          nla_put_u32(skb, IFLA_IPTUN_FWMARK, parm->fwmark) ||
-+          !(fmrs = nla_nest_start(skb, IFLA_IPTUN_FMRS)))
-               goto nla_put_failure;
-+      for (c = parm->fmrs; c; c = c->next) {
-+              struct nlattr *fmr = nla_nest_start(skb, ++fmrcnt);
-+              if (!fmr ||
-+                      nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX,
-+                              sizeof(c->ip6_prefix), &c->ip6_prefix) ||
-+                      nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX,
-+                              sizeof(c->ip4_prefix), &c->ip4_prefix) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset))
-+                              goto nla_put_failure;
-+
-+              nla_nest_end(skb, fmr);
-+      }
-+      nla_nest_end(skb, fmrs);
-+
-       if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
-           nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
-           nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
-@@ -2167,6 +2423,7 @@ static const struct nla_policy ip6_tnl_p
-       [IFLA_IPTUN_ENCAP_DPORT]        = { .type = NLA_U16 },
-       [IFLA_IPTUN_COLLECT_METADATA]   = { .type = NLA_FLAG },
-       [IFLA_IPTUN_FWMARK]             = { .type = NLA_U32 },
-+      [IFLA_IPTUN_FMRS]               = { .type = NLA_NESTED },
- };
- static struct rtnl_link_ops ip6_link_ops __read_mostly = {
diff --git a/target/linux/generic/pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
deleted file mode 100644 (file)
index 9e8bc10..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-From: Jonas Gorski <jogo@openwrt.org>
-Subject: ipv6: allow rejecting with "source address failed policy"
-
-RFC6204 L-14 requires rejecting traffic from invalid addresses with
-ICMPv6 Destination Unreachable, Code 5 (Source address failed ingress/
-egress policy) on the LAN side, so add an appropriate rule for that.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- include/net/netns/ipv6.h       |  1 +
- include/uapi/linux/fib_rules.h |  4 +++
- include/uapi/linux/rtnetlink.h |  1 +
- net/ipv4/fib_semantics.c       |  4 +++
- net/ipv4/fib_trie.c            |  1 +
- net/ipv4/ipmr.c                |  1 +
- net/ipv6/fib6_rules.c          |  4 +++
- net/ipv6/ip6mr.c               |  2 ++
- net/ipv6/route.c               | 58 +++++++++++++++++++++++++++++++++++++++++-
- 9 files changed, 75 insertions(+), 1 deletion(-)
-
---- a/include/net/netns/ipv6.h
-+++ b/include/net/netns/ipv6.h
-@@ -78,6 +78,7 @@ struct netns_ipv6 {
-       unsigned int            fib6_rules_require_fldissect;
-       bool                    fib6_has_custom_rules;
-       struct rt6_info         *ip6_prohibit_entry;
-+      struct rt6_info         *ip6_policy_failed_entry;
-       struct rt6_info         *ip6_blk_hole_entry;
-       struct fib6_table       *fib6_local_tbl;
-       struct fib_rules_ops    *fib6_rules_ops;
---- a/include/uapi/linux/fib_rules.h
-+++ b/include/uapi/linux/fib_rules.h
-@@ -82,6 +82,10 @@ enum {
-       FR_ACT_BLACKHOLE,       /* Drop without notification */
-       FR_ACT_UNREACHABLE,     /* Drop with ENETUNREACH */
-       FR_ACT_PROHIBIT,        /* Drop with EACCES */
-+      FR_ACT_RES9,
-+      FR_ACT_RES10,
-+      FR_ACT_RES11,
-+      FR_ACT_POLICY_FAILED,   /* Drop with EACCES */
-       __FR_ACT_MAX,
- };
---- a/include/uapi/linux/rtnetlink.h
-+++ b/include/uapi/linux/rtnetlink.h
-@@ -228,6 +228,7 @@ enum {
-       RTN_THROW,              /* Not in this table            */
-       RTN_NAT,                /* Translate this address       */
-       RTN_XRESOLVE,           /* Use external resolver        */
-+      RTN_POLICY_FAILED,      /* Failed ingress/egress policy */
-       __RTN_MAX
- };
---- a/net/ipv4/fib_semantics.c
-+++ b/net/ipv4/fib_semantics.c
-@@ -139,6 +139,10 @@ const struct fib_prop fib_props[RTN_MAX
-               .error  = -EINVAL,
-               .scope  = RT_SCOPE_NOWHERE,
-       },
-+      [RTN_POLICY_FAILED] = {
-+              .error  = -EACCES,
-+              .scope  = RT_SCOPE_UNIVERSE,
-+      },
- };
- static void rt_fibinfo_free(struct rtable __rcu **rtp)
---- a/net/ipv4/fib_trie.c
-+++ b/net/ipv4/fib_trie.c
-@@ -2474,6 +2474,7 @@ static const char *const rtn_type_names[
-       [RTN_THROW] = "THROW",
-       [RTN_NAT] = "NAT",
-       [RTN_XRESOLVE] = "XRESOLVE",
-+      [RTN_POLICY_FAILED] = "POLICY_FAILED",
- };
- static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
---- a/net/ipv4/ipmr.c
-+++ b/net/ipv4/ipmr.c
-@@ -179,6 +179,7 @@ static int ipmr_rule_action(struct fib_r
-       case FR_ACT_UNREACHABLE:
-               return -ENETUNREACH;
-       case FR_ACT_PROHIBIT:
-+      case FR_ACT_POLICY_FAILED:
-               return -EACCES;
-       case FR_ACT_BLACKHOLE:
-       default:
---- a/net/ipv6/fib6_rules.c
-+++ b/net/ipv6/fib6_rules.c
-@@ -221,6 +221,10 @@ static int __fib6_rule_action(struct fib
-               err = -EACCES;
-               rt = net->ipv6.ip6_prohibit_entry;
-               goto discard_pkt;
-+      case FR_ACT_POLICY_FAILED:
-+              err = -EACCES;
-+              rt = net->ipv6.ip6_policy_failed_entry;
-+              goto discard_pkt;
-       }
-       tb_id = fib_rule_get_table(rule, arg);
---- a/net/ipv6/ip6mr.c
-+++ b/net/ipv6/ip6mr.c
-@@ -162,6 +162,8 @@ static int ip6mr_rule_action(struct fib_
-               return -ENETUNREACH;
-       case FR_ACT_PROHIBIT:
-               return -EACCES;
-+      case FR_ACT_POLICY_FAILED:
-+              return -EACCES;
-       case FR_ACT_BLACKHOLE:
-       default:
-               return -EINVAL;
---- a/net/ipv6/route.c
-+++ b/net/ipv6/route.c
-@@ -97,6 +97,8 @@ static int           ip6_pkt_discard(struct sk_bu
- static int            ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
- static int            ip6_pkt_prohibit(struct sk_buff *skb);
- static int            ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);
-+static int            ip6_pkt_policy_failed(struct sk_buff *skb);
-+static int            ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb);
- static void           ip6_link_failure(struct sk_buff *skb);
- static void           ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
-                                          struct sk_buff *skb, u32 mtu);
-@@ -326,6 +328,18 @@ static const struct rt6_info ip6_prohibi
-       .rt6i_flags     = (RTF_REJECT | RTF_NONEXTHOP),
- };
-+static const struct rt6_info ip6_policy_failed_entry_template = {
-+      .dst = {
-+              .__refcnt       = ATOMIC_INIT(1),
-+              .__use          = 1,
-+              .obsolete       = DST_OBSOLETE_FORCE_CHK,
-+              .error          = -EACCES,
-+              .input          = ip6_pkt_policy_failed,
-+              .output         = ip6_pkt_policy_failed_out,
-+      },
-+      .rt6i_flags     = (RTF_REJECT | RTF_NONEXTHOP),
-+};
-+
- static const struct rt6_info ip6_blk_hole_entry_template = {
-       .dst = {
-               .__refcnt       = ATOMIC_INIT(1),
-@@ -900,6 +914,7 @@ static const int fib6_prop[RTN_MAX + 1]
-       [RTN_BLACKHOLE] = -EINVAL,
-       [RTN_UNREACHABLE] = -EHOSTUNREACH,
-       [RTN_PROHIBIT]  = -EACCES,
-+      [RTN_POLICY_FAILED] = -EACCES,
-       [RTN_THROW]     = -EAGAIN,
-       [RTN_NAT]       = -EINVAL,
-       [RTN_XRESOLVE]  = -EINVAL,
-@@ -937,6 +952,10 @@ static void ip6_rt_init_dst_reject(struc
-               rt->dst.output = ip6_pkt_prohibit_out;
-               rt->dst.input = ip6_pkt_prohibit;
-               break;
-+      case RTN_POLICY_FAILED:
-+              rt->dst.output = ip6_pkt_policy_failed_out;
-+              rt->dst.input = ip6_pkt_policy_failed;
-+              break;
-       case RTN_THROW:
-       case RTN_UNREACHABLE:
-       default:
-@@ -3774,6 +3793,17 @@ static int ip6_pkt_prohibit_out(struct n
-       return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
- }
-+static int ip6_pkt_policy_failed(struct sk_buff *skb)
-+{
-+      return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES);
-+}
-+
-+static int ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb)
-+{
-+      skb->dev = skb_dst(skb)->dev;
-+      return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES);
-+}
-+
- /*
-  *    Allocate a dst for local (unicast / anycast) address.
-  */
-@@ -4221,7 +4251,8 @@ static int rtm_to_fib6_config(struct sk_
-       if (rtm->rtm_type == RTN_UNREACHABLE ||
-           rtm->rtm_type == RTN_BLACKHOLE ||
-           rtm->rtm_type == RTN_PROHIBIT ||
--          rtm->rtm_type == RTN_THROW)
-+          rtm->rtm_type == RTN_THROW ||
-+          rtm->rtm_type == RTN_POLICY_FAILED)
-               cfg->fc_flags |= RTF_REJECT;
-       if (rtm->rtm_type == RTN_LOCAL)
-@@ -5069,6 +5100,8 @@ static int ip6_route_dev_notify(struct n
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-               net->ipv6.ip6_prohibit_entry->dst.dev = dev;
-               net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
-+              net->ipv6.ip6_policy_failed_entry->dst.dev = dev;
-+              net->ipv6.ip6_policy_failed_entry->rt6i_idev = in6_dev_get(dev);
-               net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
-               net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
- #endif
-@@ -5080,6 +5113,7 @@ static int ip6_route_dev_notify(struct n
-               in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-               in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
-+              in6_dev_put_clear(&net->ipv6.ip6_policy_failed_entry->rt6i_idev);
-               in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
- #endif
-       }
-@@ -5274,6 +5308,15 @@ static int __net_init ip6_route_net_init
-       net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
-       dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
-                        ip6_template_metrics, true);
-+
-+      net->ipv6.ip6_policy_failed_entry =
-+              kmemdup(&ip6_policy_failed_entry_template,
-+                      sizeof(*net->ipv6.ip6_policy_failed_entry), GFP_KERNEL);
-+      if (!net->ipv6.ip6_policy_failed_entry)
-+              goto out_ip6_blk_hole_entry;
-+      net->ipv6.ip6_policy_failed_entry->dst.ops = &net->ipv6.ip6_dst_ops;
-+      dst_init_metrics(&net->ipv6.ip6_policy_failed_entry->dst,
-+                       ip6_template_metrics, true);
- #endif
-       net->ipv6.sysctl.flush_delay = 0;
-@@ -5292,6 +5335,8 @@ out:
-       return ret;
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-+out_ip6_blk_hole_entry:
-+      kfree(net->ipv6.ip6_blk_hole_entry);
- out_ip6_prohibit_entry:
-       kfree(net->ipv6.ip6_prohibit_entry);
- out_ip6_null_entry:
-@@ -5312,6 +5357,7 @@ static void __net_exit ip6_route_net_exi
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-       kfree(net->ipv6.ip6_prohibit_entry);
-       kfree(net->ipv6.ip6_blk_hole_entry);
-+      kfree(net->ipv6.ip6_policy_failed_entry);
- #endif
-       dst_entries_destroy(&net->ipv6.ip6_dst_ops);
- }
-@@ -5388,6 +5434,9 @@ void __init ip6_route_init_special_entri
-       init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
-       init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
-       init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
-+      init_net.ipv6.ip6_policy_failed_entry->dst.dev = init_net.loopback_dev;
-+      init_net.ipv6.ip6_policy_failed_entry->rt6i_idev =
-+              in6_dev_get(init_net.loopback_dev);
-   #endif
- }
diff --git a/target/linux/generic/pending-4.19/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch b/target/linux/generic/pending-4.19/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
deleted file mode 100644 (file)
index 85adfed..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Jonas Gorski <jogo@openwrt.org>
-Subject: net: provide defines for _POLICY_FAILED until all code is updated
-
-Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
-unreachable, conflicting with our name.
-
-Add appropriate defines to allow our code to build with the new
-name until we have updated our local patches for older kernels
-and userspace packages.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- include/uapi/linux/fib_rules.h | 2 ++
- include/uapi/linux/icmpv6.h    | 2 ++
- include/uapi/linux/rtnetlink.h | 2 ++
- 3 files changed, 6 insertions(+)
-
---- a/include/uapi/linux/fib_rules.h
-+++ b/include/uapi/linux/fib_rules.h
-@@ -89,6 +89,8 @@ enum {
-       __FR_ACT_MAX,
- };
-+#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
-+
- #define FR_ACT_MAX (__FR_ACT_MAX - 1)
- #endif
---- a/include/uapi/linux/icmpv6.h
-+++ b/include/uapi/linux/icmpv6.h
-@@ -119,6 +119,8 @@ struct icmp6hdr {
- #define ICMPV6_POLICY_FAIL            5
- #define ICMPV6_REJECT_ROUTE           6
-+#define ICMPV6_FAILED_POLICY          ICMPV6_POLICY_FAIL
-+
- /*
-  *    Codes for Time Exceeded
-  */
---- a/include/uapi/linux/rtnetlink.h
-+++ b/include/uapi/linux/rtnetlink.h
-@@ -232,6 +232,8 @@ enum {
-       __RTN_MAX
- };
-+#define RTN_FAILED_POLICY RTN_POLICY_FAILED
-+
- #define RTN_MAX (__RTN_MAX - 1)
diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
deleted file mode 100644 (file)
index f7803f0..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: net: replace GRO optimization patch with a new one that supports VLANs/bridges with different MAC addresses
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/netdevice.h |  2 ++
- include/linux/skbuff.h    |  3 ++-
- net/core/dev.c            | 48 +++++++++++++++++++++++++++++++++++++++++++++++
- net/ethernet/eth.c        | 18 +++++++++++++++++-
- 4 files changed, 69 insertions(+), 2 deletions(-)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1882,6 +1882,8 @@ struct net_device {
-       struct netdev_hw_addr_list      mc;
-       struct netdev_hw_addr_list      dev_addrs;
-+      unsigned char           local_addr_mask[MAX_ADDR_LEN];
-+
- #ifdef CONFIG_SYSFS
-       struct kset             *queues_kset;
- #endif
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -799,6 +799,7 @@ struct sk_buff {
- #ifdef CONFIG_TLS_DEVICE
-       __u8                    decrypted:1;
- #endif
-+      __u8                    gro_skip:1;
- #ifdef CONFIG_NET_SCHED
-       __u16                   tc_index;       /* traffic control index */
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -5468,6 +5468,9 @@ static enum gro_result dev_gro_receive(s
-       int same_flow;
-       int grow;
-+      if (skb->gro_skip)
-+              goto normal;
-+
-       if (netif_elide_gro(skb->dev))
-               goto normal;
-@@ -6962,6 +6965,48 @@ static void __netdev_adjacent_dev_unlink
-                                          &upper_dev->adj_list.lower);
- }
-+static void __netdev_addr_mask(unsigned char *mask, const unsigned char *addr,
-+                             struct net_device *dev)
-+{
-+      int i;
-+
-+      for (i = 0; i < dev->addr_len; i++)
-+              mask[i] |= addr[i] ^ dev->dev_addr[i];
-+}
-+
-+static void __netdev_upper_mask(unsigned char *mask, struct net_device *dev,
-+                              struct net_device *lower)
-+{
-+      struct net_device *cur;
-+      struct list_head *iter;
-+
-+      netdev_for_each_upper_dev_rcu(dev, cur, iter) {
-+              __netdev_addr_mask(mask, cur->dev_addr, lower);
-+              __netdev_upper_mask(mask, cur, lower);
-+      }
-+}
-+
-+static void __netdev_update_addr_mask(struct net_device *dev)
-+{
-+      unsigned char mask[MAX_ADDR_LEN];
-+      struct net_device *cur;
-+      struct list_head *iter;
-+
-+      memset(mask, 0, sizeof(mask));
-+      __netdev_upper_mask(mask, dev, dev);
-+      memcpy(dev->local_addr_mask, mask, dev->addr_len);
-+
-+      netdev_for_each_lower_dev(dev, cur, iter)
-+              __netdev_update_addr_mask(cur);
-+}
-+
-+static void netdev_update_addr_mask(struct net_device *dev)
-+{
-+      rcu_read_lock();
-+      __netdev_update_addr_mask(dev);
-+      rcu_read_unlock();
-+}
-+
- static int __netdev_upper_dev_link(struct net_device *dev,
-                                  struct net_device *upper_dev, bool master,
-                                  void *upper_priv, void *upper_info,
-@@ -7009,6 +7054,7 @@ static int __netdev_upper_dev_link(struc
-       if (ret)
-               return ret;
-+      netdev_update_addr_mask(dev);
-       ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
-                                           &changeupper_info.info);
-       ret = notifier_to_errno(ret);
-@@ -7095,6 +7141,7 @@ void netdev_upper_dev_unlink(struct net_
-       __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
-+      netdev_update_addr_mask(dev);
-       call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
-                                     &changeupper_info.info);
- }
-@@ -7718,6 +7765,7 @@ int dev_set_mac_address(struct net_devic
-       if (err)
-               return err;
-       dev->addr_assign_type = NET_ADDR_SET;
-+      netdev_update_addr_mask(dev);
-       call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
-       add_device_randomness(dev->dev_addr, dev->addr_len);
-       return 0;
---- a/net/ethernet/eth.c
-+++ b/net/ethernet/eth.c
-@@ -144,6 +144,18 @@ u32 eth_get_headlen(void *data, unsigned
- }
- EXPORT_SYMBOL(eth_get_headlen);
-+static inline bool
-+eth_check_local_mask(const void *addr1, const void *addr2, const void *mask)
-+{
-+      const u16 *a1 = addr1;
-+      const u16 *a2 = addr2;
-+      const u16 *m = mask;
-+
-+      return (((a1[0] ^ a2[0]) & ~m[0]) |
-+              ((a1[1] ^ a2[1]) & ~m[1]) |
-+              ((a1[2] ^ a2[2]) & ~m[2]));
-+}
-+
- /**
-  * eth_type_trans - determine the packet's protocol ID.
-  * @skb: received socket data
-@@ -172,8 +184,12 @@ __be16 eth_type_trans(struct sk_buff *sk
-                       skb->pkt_type = PACKET_MULTICAST;
-       }
-       else if (unlikely(!ether_addr_equal_64bits(eth->h_dest,
--                                                 dev->dev_addr)))
-+                                                 dev->dev_addr))) {
-               skb->pkt_type = PACKET_OTHERHOST;
-+              if (eth_check_local_mask(eth->h_dest, dev->dev_addr,
-+                                       dev->local_addr_mask))
-+                      skb->gro_skip = 1;
-+      }
-       /*
-        * Some variants of DSA tagging don't have an ethertype field
diff --git a/target/linux/generic/pending-4.19/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/pending-4.19/681-NET-add-of_get_mac_address_mtd.patch
deleted file mode 100644 (file)
index 13f5640..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-From: John Crispin <blogic@openwrt.org>
-Subject: NET: add mtd-mac-address support to of_get_mac_address()
-
-Many embedded devices have information such as mac addresses stored inside mtd
-devices. This patch allows us to add a property inside a node describing a
-network interface. The new property points at a mtd partition with an offset
-where the mac address can be found.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/of/of_net.c    |   37 +++++++++++++++++++++++++++++++++++++
- include/linux/of_net.h |    1 +
- 2 files changed, 38 insertions(+)
-
---- a/drivers/of/of_net.c
-+++ b/drivers/of/of_net.c
-@@ -11,6 +11,7 @@
- #include <linux/of_net.h>
- #include <linux/phy.h>
- #include <linux/export.h>
-+#include <linux/mtd/mtd.h>
- /**
-  * of_get_phy_mode - Get phy mode for given device_node
-@@ -39,7 +40,7 @@ int of_get_phy_mode(struct device_node *
- }
- EXPORT_SYMBOL_GPL(of_get_phy_mode);
--static const void *of_get_mac_addr(struct device_node *np, const char *name)
-+static void *of_get_mac_addr(struct device_node *np, const char *name)
- {
-       struct property *pp = of_find_property(np, name, NULL);
-@@ -48,6 +49,79 @@ static const void *of_get_mac_addr(struc
-       return NULL;
- }
-+static const void *of_get_mac_address_mtd(struct device_node *np)
-+{
-+#ifdef CONFIG_MTD
-+      struct device_node *mtd_np = NULL;
-+      struct property *prop;
-+      size_t retlen;
-+      int size, ret;
-+      struct mtd_info *mtd;
-+      const char *part;
-+      const __be32 *list;
-+      phandle phandle;
-+      u32 mac_inc = 0;
-+      u8 mac[ETH_ALEN];
-+      void *addr;
-+      u32 inc_idx;
-+
-+      list = of_get_property(np, "mtd-mac-address", &size);
-+      if (!list || (size != (2 * sizeof(*list))))
-+              return NULL;
-+
-+      phandle = be32_to_cpup(list++);
-+      if (phandle)
-+              mtd_np = of_find_node_by_phandle(phandle);
-+
-+      if (!mtd_np)
-+              return NULL;
-+
-+      part = of_get_property(mtd_np, "label", NULL);
-+      if (!part)
-+              part = mtd_np->name;
-+
-+      mtd = get_mtd_device_nm(part);
-+      if (IS_ERR(mtd))
-+              return NULL;
-+
-+      ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
-+      put_mtd_device(mtd);
-+
-+      if (of_property_read_u32(np, "mtd-mac-address-increment-byte", &inc_idx))
-+              inc_idx = 5;
-+      if (inc_idx > 5)
-+              return NULL;
-+
-+      if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
-+              mac[inc_idx] += mac_inc;
-+
-+      if (!is_valid_ether_addr(mac))
-+              return NULL;
-+
-+      addr = of_get_mac_addr(np, "mac-address");
-+      if (addr) {
-+              memcpy(addr, mac, ETH_ALEN);
-+              return addr;
-+      }
-+
-+      prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-+      if (!prop)
-+              return NULL;
-+
-+      prop->name = "mac-address";
-+      prop->length = ETH_ALEN;
-+      prop->value = kmemdup(mac, ETH_ALEN, GFP_KERNEL);
-+      if (!prop->value || of_add_property(np, prop))
-+              goto free;
-+
-+      return prop->value;
-+free:
-+      kfree(prop->value);
-+      kfree(prop);
-+#endif
-+      return NULL;
-+}
-+
- /**
-  * Search the device tree for the best MAC address to use.  'mac-address' is
-  * checked first, because that is supposed to contain to "most recent" MAC
-@@ -65,11 +139,18 @@ static const void *of_get_mac_addr(struc
-  * addresses.  Some older U-Boots only initialized 'local-mac-address'.  In
-  * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
-  * but is all zeros.
-+ *
-+ * If a mtd-mac-address property exists, try to fetch the MAC address from the
-+ * specified mtd device, and store it as a 'mac-address' property
- */
- const void *of_get_mac_address(struct device_node *np)
- {
-       const void *addr;
-+      addr = of_get_mac_address_mtd(np);
-+      if (addr)
-+              return addr;
-+
-       addr = of_get_mac_addr(np, "mac-address");
-       if (addr)
-               return addr;
diff --git a/target/linux/generic/pending-4.19/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-4.19/703-phy-add-detach-callback-to-struct-phy_driver.patch
deleted file mode 100644 (file)
index 0cf187a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: generic: add detach callback to struct phy_driver
-
-lede-commit: fe61fc2d7d0b3fb348b502f68f98243b3ddf5867
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/phy/phy_device.c | 3 +++
- include/linux/phy.h          | 6 ++++++
- 2 files changed, 9 insertions(+)
-
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -1130,6 +1130,9 @@ void phy_detach(struct phy_device *phyde
-       struct module *ndev_owner = dev->dev.parent->driver->owner;
-       struct mii_bus *bus;
-+      if (phydev->drv && phydev->drv->detach)
-+              phydev->drv->detach(phydev);
-+
-       if (phydev->sysfs_links) {
-               sysfs_remove_link(&dev->dev.kobj, "phydev");
-               sysfs_remove_link(&phydev->mdio.dev.kobj, "attached_dev");
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -560,6 +560,12 @@ struct phy_driver {
-        */
-       int (*did_interrupt)(struct phy_device *phydev);
-+      /*
-+       * Called before an ethernet device is detached
-+       * from the PHY.
-+       */
-+      void (*detach)(struct phy_device *phydev);
-+
-       /* Clears up any memory if needed */
-       void (*remove)(struct phy_device *phydev);
diff --git a/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch b/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch
deleted file mode 100644 (file)
index e56e77a..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: net: phy: allow to configure AR803x PHYs via platform data
-
-Add a patch for the at803x phy driver, in order to be able
-to configure some register settings via platform data.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/phy/at803x.c                 | 56 ++++++++++++++++++++++++++++++++
- include/linux/platform_data/phy-at803x.h | 11 +++++++
- 2 files changed, 67 insertions(+)
- create mode 100644 include/linux/platform_data/phy-at803x.h
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -12,12 +12,14 @@
-  */
- #include <linux/phy.h>
-+#include <linux/mdio.h>
- #include <linux/module.h>
- #include <linux/string.h>
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
- #include <linux/of_gpio.h>
- #include <linux/gpio/consumer.h>
-+#include <linux/platform_data/phy-at803x.h>
- #define AT803X_INTR_ENABLE                    0x12
- #define AT803X_INTR_ENABLE_AUTONEG_ERR                BIT(15)
-@@ -45,6 +47,11 @@
- #define AT803X_REG_CHIP_CONFIG                        0x1f
- #define AT803X_BT_BX_REG_SEL                  0x8000
-+#define AT803X_PCS_SMART_EEE_CTRL3                    0x805D
-+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK  0x3
-+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT 12
-+#define AT803X_SMART_EEE_CTRL3_LPI_EN                 BIT(8)
-+
- #define AT803X_DEBUG_ADDR                     0x1D
- #define AT803X_DEBUG_DATA                     0x1E
-@@ -73,6 +80,7 @@ MODULE_LICENSE("GPL");
- struct at803x_priv {
-       bool phy_reset:1;
-+      int prev_speed;
- };
- struct at803x_context {
-@@ -249,8 +257,16 @@ static int at803x_probe(struct phy_devic
-       return 0;
- }
-+static void at803x_disable_smarteee(struct phy_device *phydev)
-+{
-+      phy_write_mmd(phydev, MDIO_MMD_PCS, AT803X_PCS_SMART_EEE_CTRL3,
-+              1 << AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT);
-+      phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);
-+}
-+
- static int at803x_config_init(struct phy_device *phydev)
- {
-+      struct at803x_platform_data *pdata;
-       int ret;
-       ret = genphy_config_init(phydev);
-@@ -271,6 +287,26 @@ static int at803x_config_init(struct phy
-                       return ret;
-       }
-+      pdata = dev_get_platdata(&phydev->mdio.dev);
-+      if (pdata) {
-+              if (pdata->disable_smarteee)
-+                      at803x_disable_smarteee(phydev);
-+
-+              if (pdata->enable_rgmii_rx_delay)
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0,
-+                              AT803X_DEBUG_RX_CLK_DLY_EN);
-+              else
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
-+                              AT803X_DEBUG_RX_CLK_DLY_EN, 0);
-+
-+              if (pdata->enable_rgmii_tx_delay)
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN);
-+              else
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN, 0);
-+      }
-+
-       return 0;
- }
-@@ -308,6 +344,8 @@ static int at803x_config_intr(struct phy
- static void at803x_link_change_notify(struct phy_device *phydev)
- {
-       struct at803x_priv *priv = phydev->priv;
-+      struct at803x_platform_data *pdata;
-+      pdata = dev_get_platdata(&phydev->mdio.dev);
-       /*
-        * Conduct a hardware reset for AT8030/2 every time a link loss is
-@@ -336,6 +374,24 @@ static void at803x_link_change_notify(st
-       } else {
-               priv->phy_reset = false;
-       }
-+      if (pdata && pdata->fixup_rgmii_tx_delay &&
-+          phydev->speed != priv->prev_speed) {
-+              switch (phydev->speed) {
-+              case SPEED_10:
-+              case SPEED_100:
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN);
-+                      break;
-+              case SPEED_1000:
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+
-+              priv->prev_speed = phydev->speed;
-+      }
- }
- static int at803x_aneg_done(struct phy_device *phydev)
---- /dev/null
-+++ b/include/linux/platform_data/phy-at803x.h
-@@ -0,0 +1,11 @@
-+#ifndef _PHY_AT803X_PDATA_H
-+#define _PHY_AT803X_PDATA_H
-+
-+struct at803x_platform_data {
-+      int disable_smarteee:1;
-+      int enable_rgmii_tx_delay:1;
-+      int enable_rgmii_rx_delay:1;
-+      int fixup_rgmii_tx_delay:1;
-+};
-+
-+#endif /* _PHY_AT803X_PDATA_H */
diff --git a/target/linux/generic/pending-4.19/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/pending-4.19/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
deleted file mode 100644 (file)
index 1f81b37..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Roman Yeryomin <roman@advem.lv>
-Subject: kernel: add at803x fix for sgmii mode
-
-Some (possibly broken) bootloaders incorreclty initialize at8033
-phy. This patch enables sgmii autonegotiation mode.
-
-[john@phrozen.org: felix added this to his upstream queue]
-
-Signed-off-by: Roman Yeryomin <roman@advem.lv>
----
- drivers/net/phy/at803x.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -46,6 +46,7 @@
- #define AT803X_FUNC_DATA                      0x4003
- #define AT803X_REG_CHIP_CONFIG                        0x1f
- #define AT803X_BT_BX_REG_SEL                  0x8000
-+#define AT803X_SGMII_ANEG_EN                  0x1000
- #define AT803X_PCS_SMART_EEE_CTRL3                    0x805D
- #define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK  0x3
-@@ -268,6 +269,27 @@ static int at803x_config_init(struct phy
- {
-       struct at803x_platform_data *pdata;
-       int ret;
-+      u32 v;
-+
-+      if (phydev->drv->phy_id == ATH8031_PHY_ID &&
-+              phydev->interface == PHY_INTERFACE_MODE_SGMII)
-+      {
-+              v = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
-+              /* select SGMII/fiber page */
-+              ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
-+                                              v & ~AT803X_BT_BX_REG_SEL);
-+              if (ret)
-+                      return ret;
-+              /* enable SGMII autonegotiation */
-+              ret = phy_write(phydev, MII_BMCR, AT803X_SGMII_ANEG_EN);
-+              if (ret)
-+                      return ret;
-+              /* select copper page */
-+              ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
-+                                              v | AT803X_BT_BX_REG_SEL);
-+              if (ret)
-+                      return ret;
-+      }
-       ret = genphy_config_init(phydev);
-       if (ret < 0)
diff --git a/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch b/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch
deleted file mode 100644 (file)
index 496700f..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -329,6 +329,14 @@ static int at803x_config_init(struct phy
-                               AT803X_DEBUG_TX_CLK_DLY_EN, 0);
-       }
-+#ifdef CONFIG_OF_MDIO
-+      if (phydev->mdio.dev.of_node &&
-+              of_property_read_bool(phydev->mdio.dev.of_node,
-+                                    "at803x-disable-smarteee")) {
-+              at803x_disable_smarteee(phydev);
-+      }
-+#endif
-+
-       return 0;
- }
-@@ -367,6 +375,7 @@ static void at803x_link_change_notify(st
- {
-       struct at803x_priv *priv = phydev->priv;
-       struct at803x_platform_data *pdata;
-+      u8 fixup_rgmii_tx_delay = 0;
-       pdata = dev_get_platdata(&phydev->mdio.dev);
-       /*
-@@ -396,8 +405,19 @@ static void at803x_link_change_notify(st
-       } else {
-               priv->phy_reset = false;
-       }
--      if (pdata && pdata->fixup_rgmii_tx_delay &&
--          phydev->speed != priv->prev_speed) {
-+
-+      if (pdata && pdata->fixup_rgmii_tx_delay)
-+              fixup_rgmii_tx_delay = 1;
-+
-+#ifdef CONFIG_OF_MDIO
-+      if (phydev->mdio.dev.of_node &&
-+              of_property_read_bool(phydev->mdio.dev.of_node,
-+                                    "at803x-fixup-rgmii-tx-delay")) {
-+                      fixup_rgmii_tx_delay = 1;
-+      }
-+#endif
-+
-+      if (fixup_rgmii_tx_delay && phydev->speed != priv->prev_speed) {
-               switch (phydev->speed) {
-               case SPEED_10:
-               case SPEED_100:
diff --git a/target/linux/generic/pending-4.19/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch b/target/linux/generic/pending-4.19/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
deleted file mode 100644 (file)
index cb02c71..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Subject: [PATCH] bcma: get SoC device struct & copy its DMA params to the
- subdevices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For bus devices to be fully usable it's required to set their DMA
-parameters.
-
-For years it has been missing and remained unnoticed because of
-mips_dma_alloc_coherent() silently handling the empty coherent_dma_mask.
-Kernel 4.19 came with a lot of DMA changes and caused a regression on
-the bcm47xx. Starting with the commit f8c55dc6e828 ("MIPS: use generic
-dma noncoherent ops for simple noncoherent platforms") DMA coherent
-allocations just fail. Example:
-[    1.114914] bgmac_bcma bcma0:2: Allocation of TX ring 0x200 failed
-[    1.121215] bgmac_bcma bcma0:2: Unable to alloc memory for DMA
-[    1.127626] bgmac_bcma: probe of bcma0:2 failed with error -12
-[    1.133838] bgmac_bcma: Broadcom 47xx GBit MAC driver loaded
-
-This change fixes above regression in addition to the MIPS bcm47xx
-commit 321c46b91550 ("MIPS: BCM47XX: Setup struct device for the SoC").
-
-It also fixes another *old* GPIO regression caused by a parent pointing
-to the NULL:
-[    0.157054] missing gpiochip .dev parent pointer
-[    0.157287] bcma: bus0: Error registering GPIO driver: -22
-introduced by the commit 74f4e0cc6108 ("bcma: switch GPIO portions to
-use GPIOLIB_IRQCHIP").
-
-Fixes: f8c55dc6e828 ("MIPS: use generic dma noncoherent ops for simple noncoherent platforms")
-Fixes: 74f4e0cc6108 ("bcma: switch GPIO portions to use GPIOLIB_IRQCHIP")
-Cc: linux-mips@linux-mips.org
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
-
---- a/drivers/bcma/host_soc.c
-+++ b/drivers/bcma/host_soc.c
-@@ -191,6 +191,8 @@ int __init bcma_host_soc_init(struct bcm
-       struct bcma_bus *bus = &soc->bus;
-       int err;
-+      bus->dev = soc->dev;
-+
-       /* Scan bus and initialize it */
-       err = bcma_bus_early_register(bus);
-       if (err)
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -236,12 +236,16 @@ EXPORT_SYMBOL(bcma_core_irq);
- void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
- {
-+      struct device *dev = &core->dev;
-+
-       core->dev.release = bcma_release_core_dev;
-       core->dev.bus = &bcma_bus_type;
-       dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
-       core->dev.parent = bus->dev;
--      if (bus->dev)
-+      if (bus->dev) {
-               bcma_of_fill_device(bus->dev, core);
-+              dma_coerce_mask_and_coherent(dev, bus->dev->coherent_dma_mask);
-+      }
-       switch (bus->hosttype) {
-       case BCMA_HOSTTYPE_PCI:
diff --git a/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch
deleted file mode 100644 (file)
index c8c28b5..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: debloat: add kernel config option to disabling common PCI quirks
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/pci/Kconfig  | 6 ++++++
- drivers/pci/quirks.c | 6 ++++++
- 2 files changed, 12 insertions(+)
-
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -89,6 +89,13 @@ config XEN_PCIDEV_FRONTEND
-           The PCI device frontend driver allows the kernel to import arbitrary
-           PCI devices from a PCI backend to support PCI driver domains.
-+config PCI_DISABLE_COMMON_QUIRKS
-+      bool "PCI disable common quirks"
-+      depends on PCI
-+      help
-+        If you don't know what to do here, say N.
-+
-+
- config PCI_ATS
-       bool
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -207,6 +207,7 @@ static void quirk_mmio_always_on(struct
- DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
-                               PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /*
-  * The Mellanox Tavor device gives false positive parity errors.  Mark this
-  * device with a broken_parity_status to allow PCI scanning code to "skip"
-@@ -3152,6 +3153,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
-+
- /*
-  * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
-  * To work around this, query the size it should be configured to by the
-@@ -3177,6 +3180,8 @@ static void quirk_intel_ntb(struct pci_d
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
- /*
-  * Some BIOS implementations leave the Intel GPU interrupts enabled, even
-  * though no one is handling them (e.g., if the i915 driver is never
-@@ -3215,6 +3220,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
-+
- /*
-  * PCI devices which are on Intel chips can skip the 10ms delay
-  * before entering D3 mode.
diff --git a/target/linux/generic/pending-4.19/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.19/811-pci_disable_usb_common_quirks.patch
deleted file mode 100644 (file)
index 7d36af7..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: debloat: disable common USB quirks
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/usb/host/pci-quirks.c | 16 ++++++++++++++++
- drivers/usb/host/pci-quirks.h | 18 +++++++++++++++++-
- include/linux/usb/hcd.h       |  7 +++++++
- 3 files changed, 40 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/host/pci-quirks.c
-+++ b/drivers/usb/host/pci-quirks.c
-@@ -125,6 +125,8 @@ struct amd_chipset_type {
-       u8 rev;
- };
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
- static struct amd_chipset_info {
-       struct pci_dev  *nb_dev;
-       struct pci_dev  *smbus_dev;
-@@ -621,6 +623,10 @@ bool usb_amd_pt_check_port(struct device
- }
- EXPORT_SYMBOL_GPL(usb_amd_pt_check_port);
-+#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
-+
-+#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
-+
- /*
-  * Make sure the controller is completely inactive, unable to
-  * generate interrupts or do DMA.
-@@ -700,8 +706,17 @@ reset_needed:
-       uhci_reset_hc(pdev, base);
-       return 1;
- }
-+#else
-+int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
-+{
-+      return 0;
-+}
-+
-+#endif
- EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
- static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
- {
-       u16 cmd;
-@@ -1268,3 +1283,4 @@ static void quirk_usb_early_handoff(stru
- }
- DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
-                       PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
-+#endif
---- a/drivers/usb/host/pci-quirks.h
-+++ b/drivers/usb/host/pci-quirks.h
-@@ -5,6 +5,9 @@
- #ifdef CONFIG_USB_PCI
- void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
- int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
-+#endif  /* CONFIG_USB_PCI */
-+
-+#if defined(CONFIG_USB_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
- int usb_amd_find_chipset_info(void);
- int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev);
- bool usb_amd_hang_symptom_quirk(void);
-@@ -19,6 +22,18 @@ void sb800_prefetch(struct device *dev,
- bool usb_amd_pt_check_port(struct device *device, int port);
- #else
- struct pci_dev;
-+static inline int usb_amd_find_chipset_info(void)
-+{
-+      return 0;
-+}
-+static inline bool usb_amd_hang_symptom_quirk(void)
-+{
-+      return false;
-+}
-+static inline bool usb_amd_prefetch_quirk(void)
-+{
-+      return false;
-+}
- static inline void usb_amd_quirk_pll_disable(void) {}
- static inline void usb_amd_quirk_pll_enable(void) {}
- static inline void usb_asmedia_modifyflowcontrol(struct pci_dev *pdev) {}
-@@ -29,6 +44,11 @@ static inline bool usb_amd_pt_check_port
- {
-       return false;
- }
-+static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
-+static inline bool usb_xhci_needs_pci_reset(struct pci_dev *pdev)
-+{
-+      return false;
-+}
- #endif  /* CONFIG_USB_PCI */
- #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
---- a/include/linux/usb/hcd.h
-+++ b/include/linux/usb/hcd.h
-@@ -473,7 +473,14 @@ extern int usb_hcd_pci_probe(struct pci_
- extern void usb_hcd_pci_remove(struct pci_dev *dev);
- extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
-+#else
-+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
-+{
-+      return 0;
-+}
-+#endif
- #ifdef CONFIG_PM
- extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
diff --git a/target/linux/generic/pending-4.19/834-ledtrig-libata.patch b/target/linux/generic/pending-4.19/834-ledtrig-libata.patch
deleted file mode 100644 (file)
index 70d3de0..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: libata: add ledtrig support
-
-This adds a LED trigger for each ATA port indicating disk activity.
-
-As this is needed only on specific platforms (NAS SoCs and such),
-these platforms should define ARCH_WANTS_LIBATA_LEDS if there
-are boards with LED(s) intended to indicate ATA disk activity and
-need the OS to take care of that.
-In that way, if not selected, LED trigger support not will be
-included in libata-core and both, codepaths and structures remain
-untouched.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/ata/Kconfig       | 16 ++++++++++++++++
- drivers/ata/libata-core.c | 41 +++++++++++++++++++++++++++++++++++++++++
- include/linux/libata.h    |  9 +++++++++
- 3 files changed, 66 insertions(+)
-
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -46,6 +46,22 @@ config ATA_VERBOSE_ERROR
-         If unsure, say Y.
-+config ARCH_WANT_LIBATA_LEDS
-+      bool
-+
-+config ATA_LEDS
-+      bool "support ATA port LED triggers"
-+      depends on ARCH_WANT_LIBATA_LEDS
-+      select NEW_LEDS
-+      select LEDS_CLASS
-+      select LEDS_TRIGGERS
-+      default y
-+      help
-+        This option adds a LED trigger for each registered ATA port.
-+        It is used to drive disk activity leds connected via GPIO.
-+
-+        If unsure, say N.
-+
- config ATA_ACPI
-       bool "ATA ACPI Support"
-       depends on ACPI
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -731,6 +731,19 @@ u64 ata_tf_read_block(const struct ata_t
-       return block;
- }
-+#ifdef CONFIG_ATA_LEDS
-+#define LIBATA_BLINK_DELAY 20 /* ms */
-+static inline void ata_led_act(struct ata_port *ap)
-+{
-+      unsigned long led_delay = LIBATA_BLINK_DELAY;
-+
-+      if (unlikely(!ap->ledtrig))
-+              return;
-+
-+      led_trigger_blink_oneshot(ap->ledtrig, &led_delay, &led_delay, 0);
-+}
-+#endif
-+
- /**
-  *    ata_build_rw_tf - Build ATA taskfile for given read/write request
-  *    @tf: Target ATA taskfile
-@@ -5131,6 +5144,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
-               if (tag < 0)
-                       return NULL;
-       }
-+#ifdef CONFIG_ATA_LEDS
-+      ata_led_act(ap);
-+#endif
-       qc = __ata_qc_from_tag(ap, tag);
-       qc->tag = qc->hw_tag = tag;
-@@ -6041,6 +6057,9 @@ struct ata_port *ata_port_alloc(struct a
-       ap->stats.unhandled_irq = 1;
-       ap->stats.idle_irq = 1;
- #endif
-+#ifdef CONFIG_ATA_LEDS
-+      ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
-+#endif
-       ata_sff_port_init(ap);
-       return ap;
-@@ -6076,6 +6095,12 @@ static void ata_host_release(struct kref
-               kfree(ap->pmp_link);
-               kfree(ap->slave_link);
-+#ifdef CONFIG_ATA_LEDS
-+              if (ap->ledtrig) {
-+                      led_trigger_unregister(ap->ledtrig);
-+                      kfree(ap->ledtrig);
-+              };
-+#endif
-               kfree(ap);
-               host->ports[i] = NULL;
-       }
-@@ -6539,7 +6564,23 @@ int ata_host_register(struct ata_host *h
-               host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
-               host->ports[i]->local_port_no = i + 1;
-       }
-+#ifdef CONFIG_ATA_LEDS
-+      for (i = 0; i < host->n_ports; i++) {
-+              if (unlikely(!host->ports[i]->ledtrig))
-+                      continue;
-+              snprintf(host->ports[i]->ledtrig_name,
-+                      sizeof(host->ports[i]->ledtrig_name), "ata%u",
-+                      host->ports[i]->print_id);
-+
-+              host->ports[i]->ledtrig->name = host->ports[i]->ledtrig_name;
-+
-+              if (led_trigger_register(host->ports[i]->ledtrig)) {
-+                      kfree(host->ports[i]->ledtrig);
-+                      host->ports[i]->ledtrig = NULL;
-+              }
-+      }
-+#endif
-       /* Create associated sysfs transport objects  */
-       for (i = 0; i < host->n_ports; i++) {
-               rc = ata_tport_add(host->dev,host->ports[i]);
---- a/include/linux/libata.h
-+++ b/include/linux/libata.h
-@@ -38,6 +38,9 @@
- #include <linux/acpi.h>
- #include <linux/cdrom.h>
- #include <linux/sched.h>
-+#ifdef CONFIG_ATA_LEDS
-+#include <linux/leds.h>
-+#endif
- /*
-  * Define if arch has non-standard setup.  This is a _PCI_ standard
-@@ -893,6 +896,12 @@ struct ata_port {
- #ifdef CONFIG_ATA_ACPI
-       struct ata_acpi_gtm     __acpi_init_gtm; /* use ata_acpi_init_gtm() */
- #endif
-+
-+#ifdef CONFIG_ATA_LEDS
-+      struct led_trigger      *ledtrig;
-+      char                    ledtrig_name[8];
-+#endif
-+
-       /* owned by EH */
-       u8                      sector_buf[ATA_SECT_SIZE] ____cacheline_aligned;
- };
diff --git a/target/linux/generic/pending-4.19/840-media-i2c-tda1997x-select-V4L2_FWNODE.patch b/target/linux/generic/pending-4.19/840-media-i2c-tda1997x-select-V4L2_FWNODE.patch
deleted file mode 100644 (file)
index 65fcfb5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 237e88dcbcb0098e1a8a0887fb7299fcf18650a5 Mon Sep 17 00:00:00 2001
-From: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Date: Mon, 18 Mar 2019 17:39:26 +0100
-Subject: [PATCH] media: i2c: tda1997x: select V4L2_FWNODE
-
-Building tda1997x fails now unless V4L2_FWNODE is selected:
-
-drivers/media/i2c/tda1997x.o: in function `tda1997x_parse_dt'
-undefined reference to `v4l2_fwnode_endpoint_parse'
-
-While at it, also sort the selections alphabetically
-
-Fixes: 9ac0038db9a7 ("media: i2c: Add TDA1997x HDMI receiver driver")
-Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Cc: Akinobu Mita <akinobu.mita@gmail.com>
-Cc: Bingbu Cao <bingbu.cao@intel.com>
-Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>
-Cc: Matt Ranostay <matt.ranostay@konsulko.com>
-Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
-Cc: Robin Leblon <robin.leblon@ncentric.com>
-Cc: Rui Miguel Silva <rui.silva@linaro.org>
-Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
-Cc: Tim Harvey <tharvey@gateworks.com>
-Cc: linux-kernel@vger.kernel.org
-Cc: stable@vger.kernel.org # v4.17+
----
- drivers/media/i2c/Kconfig | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -60,8 +60,9 @@ config VIDEO_TDA1997X
-       tristate "NXP TDA1997x HDMI receiver"
-       depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
-       depends on SND_SOC
--      select SND_PCM
-       select HDMI
-+      select SND_PCM
-+      select V4L2_FWNODE
-       ---help---
-         V4L2 subdevice driver for the NXP TDA1997x HDMI receivers.
diff --git a/target/linux/generic/pending-4.19/920-mangle_bootargs.patch b/target/linux/generic/pending-4.19/920-mangle_bootargs.patch
deleted file mode 100644 (file)
index 51af6b5..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Imre Kaloz <kaloz@openwrt.org>
-Subject: init: add CONFIG_MANGLE_BOOTARGS and disable it by default
-
-Enabling this option renames the bootloader supplied root=
-and rootfstype= variables, which might have to be know but
-would break the automatisms OpenWrt uses.
-
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- init/Kconfig |  9 +++++++++
- init/main.c  | 24 ++++++++++++++++++++++++
- 2 files changed, 33 insertions(+)
-
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1531,6 +1531,15 @@ config EMBEDDED
-         an embedded system so certain expert options are available
-         for configuration.
-+config MANGLE_BOOTARGS
-+      bool "Rename offending bootargs"
-+      depends on EXPERT
-+      help
-+        Sometimes the bootloader passed bogus root= and rootfstype=
-+        parameters to the kernel, and while you want to ignore them,
-+        you need to know the values f.e. to support dual firmware
-+        layouts on the flash.
-+
- config HAVE_PERF_EVENTS
-       bool
-       help
---- a/init/main.c
-+++ b/init/main.c
-@@ -366,6 +366,29 @@ static inline void setup_nr_cpu_ids(void
- static inline void smp_prepare_cpus(unsigned int maxcpus) { }
- #endif
-+#ifdef CONFIG_MANGLE_BOOTARGS
-+static void __init mangle_bootargs(char *command_line)
-+{
-+      char *rootdev;
-+      char *rootfs;
-+
-+      rootdev = strstr(command_line, "root=/dev/mtdblock");
-+
-+      if (rootdev)
-+              strncpy(rootdev, "mangled_rootblock=", 18);
-+
-+      rootfs = strstr(command_line, "rootfstype");
-+
-+      if (rootfs)
-+              strncpy(rootfs, "mangled_fs", 10);
-+
-+}
-+#else
-+static void __init mangle_bootargs(char *command_line)
-+{
-+}
-+#endif
-+
- /*
-  * We need to store the untouched command line for future reference.
-  * We also need to store the touched command line since the parameter
-@@ -558,6 +581,7 @@ asmlinkage __visible void __init start_k
-       add_device_randomness(command_line, strlen(command_line));
-       boot_init_stack_canary();
-       mm_init_cpumask(&init_mm);
-+      mangle_bootargs(command_line);
-       setup_command_line(command_line);
-       setup_nr_cpu_ids();
-       setup_per_cpu_areas();
diff --git a/target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch b/target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
deleted file mode 100644 (file)
index 524c6f9..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From d9c8bc8c1408f3e8529db6e4e04017b4c579c342 Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Sun, 18 Feb 2018 17:08:04 +0100
-Subject: [PATCH] w1: gpio: fix problem with platfom data in w1-gpio
-
-In devices, where fdt is used, is impossible to apply platform data
-without proper fdt node.
-
-This patch allow to use platform data in devices with fdt.
-
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- drivers/w1/masters/w1-gpio.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/w1/masters/w1-gpio.c
-+++ b/drivers/w1/masters/w1-gpio.c
-@@ -113,17 +113,16 @@ static int w1_gpio_probe_dt(struct platf
- static int w1_gpio_probe(struct platform_device *pdev)
- {
-       struct w1_bus_master *master;
--      struct w1_gpio_platform_data *pdata;
-+      struct w1_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
-       int err;
--      if (of_have_populated_dt()) {
-+      if (of_have_populated_dt() && !pdata) {
-               err = w1_gpio_probe_dt(pdev);
-               if (err < 0)
-                       return err;
-+              pdata = dev_get_platdata(&pdev->dev);
-       }
--      pdata = dev_get_platdata(&pdev->dev);
--
-       if (!pdata) {
-               dev_err(&pdev->dev, "No configuration data\n");
-               return -ENXIO;
diff --git a/target/linux/generic/pending-4.9/100-MIPS-fix-cache-flushing-for-highmem-pages.patch b/target/linux/generic/pending-4.9/100-MIPS-fix-cache-flushing-for-highmem-pages.patch
deleted file mode 100644 (file)
index 622fab6..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: MIPS: fix cache flushing for highmem pages
-
-Most cache flush ops were no-op for highmem pages. This led to nasty
-segfaults and (in the case of page_address(page) == NULL) kernel
-crashes.
-
-Fix this by always flushing highmem pages using kmap/kunmap_atomic
-around the actual cache flush. This might be a bit inefficient, but at
-least it's stable.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/arch/mips/mm/cache.c
-+++ b/arch/mips/mm/cache.c
-@@ -115,6 +115,13 @@ void __flush_anon_page(struct page *page
- {
-       unsigned long addr = (unsigned long) page_address(page);
-+      if (PageHighMem(page)) {
-+              addr = (unsigned long)kmap_atomic(page);
-+              flush_data_cache_page(addr);
-+              __kunmap_atomic((void *)addr);
-+              return;
-+      }
-+
-       if (pages_do_alias(addr, vmaddr)) {
-               if (page_mapcount(page) && !Page_dcache_dirty(page)) {
-                       void *kaddr;
diff --git a/target/linux/generic/pending-4.9/110-ehci_hcd_ignore_oc.patch b/target/linux/generic/pending-4.9/110-ehci_hcd_ignore_oc.patch
deleted file mode 100644 (file)
index 644d936..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Florian Fainelli <florian@openwrt.org>
-Subject: USB: EHCI: add ignore_oc flag to disable overcurrent checking
-
-This patch adds an ignore_oc flag which can be set by EHCI controller
-not supporting or wanting to disable overcurrent checking. The EHCI
-platform data in include/linux/usb/ehci_pdriver.h is also augmented to
-take advantage of this new flag.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- drivers/usb/host/ehci-hcd.c      |    2 +-
- drivers/usb/host/ehci-hub.c      |    4 ++--
- drivers/usb/host/ehci-platform.c |    1 +
- drivers/usb/host/ehci.h          |    1 +
- include/linux/usb/ehci_pdriver.h |    1 +
- 5 files changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -651,7 +651,7 @@ static int ehci_run (struct usb_hcd *hcd
-               "USB %x.%x started, EHCI %x.%02x%s\n",
-               ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
-               temp >> 8, temp & 0xff,
--              ignore_oc ? ", overcurrent ignored" : "");
-+              (ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
-       ehci_writel(ehci, INTR_MASK,
-                   &ehci->regs->intr_enable); /* Turn On Interrupts */
---- a/drivers/usb/host/ehci-hub.c
-+++ b/drivers/usb/host/ehci-hub.c
-@@ -638,7 +638,7 @@ ehci_hub_status_data (struct usb_hcd *hc
-        * always set, seem to clear PORT_OCC and PORT_CSC when writing to
-        * PORT_POWER; that's surprising, but maybe within-spec.
-        */
--      if (!ignore_oc)
-+      if (!ignore_oc && !ehci->ignore_oc)
-               mask = PORT_CSC | PORT_PEC | PORT_OCC;
-       else
-               mask = PORT_CSC | PORT_PEC;
-@@ -1008,7 +1008,7 @@ int ehci_hub_control(
-               if (temp & PORT_PEC)
-                       status |= USB_PORT_STAT_C_ENABLE << 16;
--              if ((temp & PORT_OCC) && !ignore_oc){
-+              if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
-                       status |= USB_PORT_STAT_C_OVERCURRENT << 16;
-                       /*
---- a/drivers/usb/host/ehci-platform.c
-+++ b/drivers/usb/host/ehci-platform.c
-@@ -259,6 +259,8 @@ static int ehci_platform_probe(struct pl
-               hcd->has_tt = 1;
-       if (pdata->reset_on_resume)
-               priv->reset_on_resume = true;
-+      if (pdata->ignore_oc)
-+              ehci->ignore_oc = 1;
- #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
-       if (ehci->big_endian_mmio) {
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -230,6 +230,7 @@ struct ehci_hcd {                  /* one per controlle
-       unsigned                frame_index_bug:1; /* MosChip (AKA NetMos) */
-       unsigned                need_oc_pp_cycle:1; /* MPC834X port power */
-       unsigned                imx28_write_fix:1; /* For Freescale i.MX28 */
-+      unsigned                ignore_oc:1;
-       /* required for usb32 quirk */
-       #define OHCI_CTRL_HCFS          (3 << 6)
---- a/include/linux/usb/ehci_pdriver.h
-+++ b/include/linux/usb/ehci_pdriver.h
-@@ -49,6 +49,7 @@ struct usb_ehci_pdata {
-       unsigned        no_io_watchdog:1;
-       unsigned        reset_on_resume:1;
-       unsigned        dma_mask_64:1;
-+      unsigned        ignore_oc:1;
-       /* Turn on all power and clocks */
-       int (*power_on)(struct platform_device *pdev);
diff --git a/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
deleted file mode 100644 (file)
index d010445..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Tobias Wolf <dev-NTEO@vplace.de>
-Subject: mm: Fix alloc_node_mem_map with ARCH_PFN_OFFSET calculation
-
-An rt288x (ralink) based router (Belkin F5D8235 v1) does not boot with any
-kernel beyond version 4.3 resulting in:
-
-BUG: Bad page state in process swapper  pfn:086ac
-
-bisect resulted in:
-
-a1c34a3bf00af2cede839879502e12dc68491ad5 is the first bad commit
-commit a1c34a3bf00af2cede839879502e12dc68491ad5
-Author: Laura Abbott <laura@labbott.name>
-Date:   Thu Nov 5 18:48:46 2015 -0800
-
-    mm: Don't offset memmap for flatmem
-
-    Srinivas Kandagatla reported bad page messages when trying to remove the
-    bottom 2MB on an ARM based IFC6410 board
-
-      BUG: Bad page state in process swapper  pfn:fffa8
-      page:ef7fb500 count:0 mapcount:0 mapping:  (null) index:0x0
-      flags: 0x96640253(locked|error|dirty|active|arch_1|reclaim|mlocked)
-      page dumped because: PAGE_FLAGS_CHECK_AT_FREE flag(s) set
-      bad because of flags:
-      flags: 0x200041(locked|active|mlocked)
-      Modules linked in:
-      CPU: 0 PID: 0 Comm: swapper Not tainted 3.19.0-rc3-00007-g412f9ba-dirty
-#816
-      Hardware name: Qualcomm (Flattened Device Tree)
-        unwind_backtrace
-        show_stack
-        dump_stack
-        bad_page
-        free_pages_prepare
-        free_hot_cold_page
-        __free_pages
-        free_highmem_page
-        mem_init
-        start_kernel
-      Disabling lock debugging due to kernel taint
-    [...]
-:040000 040000 2de013c372345fd471cd58f0553c9b38b0ef1cc4
-0a8156f848733dfa21e16c196dfb6c0a76290709 M      mm
-
-This fix for ARM does not account ARCH_PFN_OFFSET for mem_map as later used by
-page_to_pfn anymore.
-
-The following output was generated with two hacked in printk statements:
-
-printk("before %p vs. %p or %p\n", mem_map, mem_map - offset, mem_map -
-(pgdat->node_start_pfn - ARCH_PFN_OFFSET));
-               if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
-                       mem_map -= offset + (pgdat->node_start_pfn - ARCH_PFN_OFFSET);
-printk("after %p\n", mem_map);
-
-Output:
-
-[    0.000000] before 8861b280 vs. 8861b280 or 8851b280
-[    0.000000] after 8851b280
-
-As seen in the first line mem_map with subtraction of offset does not equal the
-mem_map after subtraction of ARCH_PFN_OFFSET.
-
-After adding the offset of ARCH_PFN_OFFSET as well to mem_map as the
-previously calculated offset is zero for the named platform it is able to boot
-4.4 and 4.9-rc7 again.
-
-Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
----
-
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -5922,7 +5922,7 @@ static void __ref alloc_node_mem_map(str
-               mem_map = NODE_DATA(0)->node_mem_map;
- #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
-               if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
--                      mem_map -= offset;
-+                      mem_map -= offset + (pgdat->node_start_pfn - ARCH_PFN_OFFSET);
- #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
-       }
- #endif
diff --git a/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch b/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch
deleted file mode 100644 (file)
index b3de75f..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Giuseppe Lippolis <giu.lippolis@gmail.com>
-Subject: Add the linux,spidev compatible in spidev Several device in ramips have this binding in the dts
-
-Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
----
- drivers/spi/spidev.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -696,6 +696,7 @@ static struct class *spidev_class;
- static const struct of_device_id spidev_dt_ids[] = {
-       { .compatible = "rohm,dh2228fv" },
-       { .compatible = "lineartechnology,ltc2488" },
-+      { .compatible = "siliconlabs,si3210" },
-       {},
- };
- MODULE_DEVICE_TABLE(of, spidev_dt_ids);
diff --git a/target/linux/generic/pending-4.9/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch b/target/linux/generic/pending-4.9/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch
deleted file mode 100644 (file)
index 8c2d68b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: spi: use gpio_set_value_cansleep for setting chipselect GPIO
-
-Sleeping is safe inside spi_transfer_one_message, and some GPIO chips
-need to sleep for setting values
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -700,7 +700,7 @@ static void spi_set_cs(struct spi_device
-               enable = !enable;
-       if (gpio_is_valid(spi->cs_gpio))
--              gpio_set_value(spi->cs_gpio, !enable);
-+              gpio_set_value_cansleep(spi->cs_gpio, !enable);
-       else if (spi->master->set_cs)
-               spi->master->set_cs(spi, !enable);
- }
diff --git a/target/linux/generic/pending-4.9/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/pending-4.9/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
deleted file mode 100644 (file)
index c97e932..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: jffs2: use .rename2 and add RENAME_WHITEOUT support
-
-It is required for renames on overlayfs
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/fs/jffs2/dir.c
-+++ b/fs/jffs2/dir.c
-@@ -752,6 +752,24 @@ static int jffs2_mknod (struct inode *di
-       return ret;
- }
-+static int jffs2_whiteout (struct inode *old_dir, struct dentry *old_dentry)
-+{
-+      struct dentry *wh;
-+      int err;
-+
-+      wh = d_alloc(old_dentry->d_parent, &old_dentry->d_name);
-+      if (!wh)
-+              return -ENOMEM;
-+
-+      err = jffs2_mknod(old_dir, wh, S_IFCHR | WHITEOUT_MODE,
-+                        WHITEOUT_DEV);
-+      if (err)
-+              return err;
-+
-+      d_rehash(wh);
-+      return 0;
-+}
-+
- static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
-                        struct inode *new_dir_i, struct dentry *new_dentry,
-                        unsigned int flags)
-@@ -762,7 +780,7 @@ static int jffs2_rename (struct inode *o
-       uint8_t type;
-       uint32_t now;
--      if (flags & ~RENAME_NOREPLACE)
-+      if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT))
-               return -EINVAL;
-       /* The VFS will check for us and prevent trying to rename a
-@@ -828,9 +846,14 @@ static int jffs2_rename (struct inode *o
-       if (d_is_dir(old_dentry) && !victim_f)
-               inc_nlink(new_dir_i);
--      /* Unlink the original */
--      ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
--                            old_dentry->d_name.name, old_dentry->d_name.len, NULL, now);
-+      if (flags & RENAME_WHITEOUT)
-+              /* Replace with whiteout */
-+              ret = jffs2_whiteout(old_dir_i, old_dentry);
-+      else
-+              /* Unlink the original */
-+              ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-+                                    old_dentry->d_name.name,
-+                                    old_dentry->d_name.len, NULL, now);
-       /* We don't touch inode->i_nlink */
diff --git a/target/linux/generic/pending-4.9/141-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/pending-4.9/141-jffs2-add-RENAME_EXCHANGE-support.patch
deleted file mode 100644 (file)
index 093a73a..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: jffs2: add RENAME_EXCHANGE support
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/fs/jffs2/dir.c
-+++ b/fs/jffs2/dir.c
-@@ -777,18 +777,31 @@ static int jffs2_rename (struct inode *o
-       int ret;
-       struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
-       struct jffs2_inode_info *victim_f = NULL;
-+      struct inode *fst_inode = d_inode(old_dentry);
-+      struct inode *snd_inode = d_inode(new_dentry);
-       uint8_t type;
-       uint32_t now;
--      if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT))
-+      if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT|RENAME_EXCHANGE))
-               return -EINVAL;
-+      if ((flags & RENAME_EXCHANGE) && (old_dir_i != new_dir_i)) {
-+              if (S_ISDIR(fst_inode->i_mode) && !S_ISDIR(snd_inode->i_mode)) {
-+                      inc_nlink(new_dir_i);
-+                      drop_nlink(old_dir_i);
-+              }
-+              else if (!S_ISDIR(fst_inode->i_mode) && S_ISDIR(snd_inode->i_mode)) {
-+                      drop_nlink(new_dir_i);
-+                      inc_nlink(old_dir_i);
-+              }
-+      }
-+
-       /* The VFS will check for us and prevent trying to rename a
-        * file over a directory and vice versa, but if it's a directory,
-        * the VFS can't check whether the victim is empty. The filesystem
-        * needs to do that for itself.
-        */
--      if (d_really_is_positive(new_dentry)) {
-+      if (d_really_is_positive(new_dentry) && !(flags & RENAME_EXCHANGE)) {
-               victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
-               if (d_is_dir(new_dentry)) {
-                       struct jffs2_full_dirent *fd;
-@@ -823,7 +836,7 @@ static int jffs2_rename (struct inode *o
-       if (ret)
-               return ret;
--      if (victim_f) {
-+      if (victim_f && !(flags & RENAME_EXCHANGE)) {
-               /* There was a victim. Kill it off nicely */
-               if (d_is_dir(new_dentry))
-                       clear_nlink(d_inode(new_dentry));
-@@ -849,6 +862,12 @@ static int jffs2_rename (struct inode *o
-       if (flags & RENAME_WHITEOUT)
-               /* Replace with whiteout */
-               ret = jffs2_whiteout(old_dir_i, old_dentry);
-+      else if (flags & RENAME_EXCHANGE)
-+              /* Replace the original */
-+              ret = jffs2_do_link(c, JFFS2_INODE_INFO(old_dir_i),
-+                                  d_inode(new_dentry)->i_ino, type,
-+                                  old_dentry->d_name.name, old_dentry->d_name.len,
-+                                  now);
-       else
-               /* Unlink the original */
-               ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-@@ -880,7 +899,7 @@ static int jffs2_rename (struct inode *o
-               return ret;
-       }
--      if (d_is_dir(old_dentry))
-+      if (d_is_dir(old_dentry) && !(flags & RENAME_EXCHANGE))
-               drop_nlink(old_dir_i);
-       new_dir_i->i_mtime = new_dir_i->i_ctime = old_dir_i->i_mtime = old_dir_i->i_ctime = ITIME(now);
diff --git a/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch
deleted file mode 100644 (file)
index 9ee93c9..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Stephen Hemminger <stephen@networkplumber.org>
-Subject: bridge: allow receiption on disabled port
-
-When an ethernet device is enslaved to a bridge, and the bridge STP
-detects loss of carrier (or operational state down), then normally
-packet receiption is blocked.
-
-This breaks control applications like WPA which maybe expecting to
-receive packets to negotiate to bring link up. The bridge needs to
-block forwarding packets from these disabled ports, but there is no
-hard requirement to not allow local packet delivery.
-
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -231,7 +231,10 @@ static void __br_handle_local_finish(str
- /* note: already called with rcu_read_lock */
- static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
- {
--      __br_handle_local_finish(skb);
-+      struct net_bridge_port *p = br_port_get_rcu(skb->dev);
-+
-+      if (p->state != BR_STATE_DISABLED)
-+              __br_handle_local_finish(skb);
-       /* return 1 to signal the okfn() was called so it's ok to use the skb */
-       return 1;
-@@ -321,6 +324,17 @@ rx_handler_result_t br_handle_frame(stru
- forward:
-       switch (p->state) {
-+      case BR_STATE_DISABLED:
-+              if (ether_addr_equal(p->br->dev->dev_addr, dest))
-+                      skb->pkt_type = PACKET_HOST;
-+
-+              if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING,
-+                      dev_net(skb->dev), NULL, skb, skb->dev, NULL,
-+                      br_handle_local_finish) == 1) {
-+                      return RX_HANDLER_PASS;
-+              }
-+              break;
-+
-       case BR_STATE_FORWARDING:
-               rhook = rcu_dereference(br_should_route_hook);
-               if (rhook) {
diff --git a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
deleted file mode 100644 (file)
index 1b6290f..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Subject: mtd: part: add generic parsing of linux,part-probe
-
-This moves the linux,part-probe device tree parsing code from
-physmap_of.c to mtdpart.c. Now all drivers can use this feature by just
-providing a reference to their device tree node in struct
-mtd_part_parser_data.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- Documentation/devicetree/bindings/mtd/nand.txt | 16 +++++++++
- drivers/mtd/maps/physmap_of.c                  | 46 +-------------------------
- drivers/mtd/mtdpart.c                          | 45 +++++++++++++++++++++++++
- 3 files changed, 62 insertions(+), 45 deletions(-)
-
---- a/Documentation/devicetree/bindings/mtd/nand.txt
-+++ b/Documentation/devicetree/bindings/mtd/nand.txt
-@@ -44,6 +44,22 @@ Optional NAND chip properties:
-                    used by the upper layers, and you want to make your NAND
-                    as reliable as possible.
-+- linux,part-probe: list of name as strings of the partition parser
-+                  which should be used to parse the partition table.
-+                  They will be tried in the specified ordering and
-+                  the next one will be used if the previous one
-+                  failed.
-+
-+                  Example: linux,part-probe = "cmdlinepart", "ofpart";
-+
-+                  This is also the default value, which will be used
-+                  if this attribute is not specified. It could be
-+                  that the flash driver in use overwrote the default
-+                  value and uses some other default.
-+
-+                  Possible values are: bcm47xxpart, afs, ar7part,
-+                  ofoldpart, ofpart, bcm63xxpart, RedBoot, cmdlinepart
-+
- The ECC strength and ECC step size properties define the correction capability
- of a controller. Together, they say a controller can correct "{strength} bit
- errors per {size} bytes".
---- a/drivers/mtd/maps/physmap_of.c
-+++ b/drivers/mtd/maps/physmap_of.c
-@@ -113,47 +113,9 @@ static struct mtd_info *obsolete_probe(s
- static const char * const part_probe_types_def[] = {
-       "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL };
--static const char * const *of_get_probes(struct device_node *dp)
--{
--      const char *cp;
--      int cplen;
--      unsigned int l;
--      unsigned int count;
--      const char **res;
--
--      cp = of_get_property(dp, "linux,part-probe", &cplen);
--      if (cp == NULL)
--              return part_probe_types_def;
--
--      count = 0;
--      for (l = 0; l != cplen; l++)
--              if (cp[l] == 0)
--                      count++;
--
--      res = kzalloc((count + 1)*sizeof(*res), GFP_KERNEL);
--      if (!res)
--              return NULL;
--      count = 0;
--      while (cplen > 0) {
--              res[count] = cp;
--              l = strlen(cp) + 1;
--              cp += l;
--              cplen -= l;
--              count++;
--      }
--      return res;
--}
--
--static void of_free_probes(const char * const *probes)
--{
--      if (probes != part_probe_types_def)
--              kfree(probes);
--}
--
- static const struct of_device_id of_flash_match[];
- static int of_flash_probe(struct platform_device *dev)
- {
--      const char * const *part_probe_types;
-       const struct of_device_id *match;
-       struct device_node *dp = dev->dev.of_node;
-       struct resource res;
-@@ -317,14 +279,8 @@ static int of_flash_probe(struct platfor
-       info->cmtd->dev.parent = &dev->dev;
-       mtd_set_of_node(info->cmtd, dp);
--      part_probe_types = of_get_probes(dp);
--      if (!part_probe_types) {
--              err = -ENOMEM;
--              goto err_out;
--      }
--      mtd_device_parse_register(info->cmtd, part_probe_types, NULL,
-+      mtd_device_parse_register(info->cmtd, part_probe_types_def, NULL,
-                       NULL, 0);
--      of_free_probes(part_probe_types);
-       kfree(mtd_list);
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -29,6 +29,7 @@
- #include <linux/kmod.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-+#include <linux/of.h>
- #include <linux/err.h>
- #include <linux/of.h>
-@@ -827,6 +828,42 @@ void deregister_mtd_parser(struct mtd_pa
- EXPORT_SYMBOL_GPL(deregister_mtd_parser);
- /*
-+ * Parses the linux,part-probe device tree property.
-+ * When a non null value is returned it has to be freed with kfree() by
-+ * the caller.
-+ */
-+static const char * const *of_get_probes(struct device_node *dp)
-+{
-+      const char *cp;
-+      int cplen;
-+      unsigned int l;
-+      unsigned int count;
-+      const char **res;
-+
-+      cp = of_get_property(dp, "linux,part-probe", &cplen);
-+      if (cp == NULL)
-+              return NULL;
-+
-+      count = 0;
-+      for (l = 0; l != cplen; l++)
-+              if (cp[l] == 0)
-+                      count++;
-+
-+      res = kzalloc((count + 1) * sizeof(*res), GFP_KERNEL);
-+      if (!res)
-+              return NULL;
-+      count = 0;
-+      while (cplen > 0) {
-+              res[count] = cp;
-+              l = strlen(cp) + 1;
-+              cp += l;
-+              cplen -= l;
-+              count++;
-+      }
-+      return res;
-+}
-+
-+/*
-  * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you
-  * are changing this array!
-  */
-@@ -975,6 +1012,13 @@ int parse_mtd_partitions(struct mtd_info
-       struct mtd_partitions pparts = { };
-       struct mtd_part_parser *parser;
-       int ret, err = 0;
-+      const char *const *types_of = NULL;
-+
-+      if (mtd_get_of_node(master)) {
-+              types_of = of_get_probes(mtd_get_of_node(master));
-+              if (types_of != NULL)
-+                      types = types_of;
-+      }
-       if (!types)
-               types = mtd_is_partition(master) ? default_subpartition_types :
-@@ -1016,6 +1060,7 @@ int parse_mtd_partitions(struct mtd_info
-               if (ret < 0 && !err)
-                       err = ret;
-       }
-+      kfree(types_of);
-       return err;
- }
diff --git a/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch b/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch
deleted file mode 100644 (file)
index 33f2891..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Mathias Kresin <dev@kresin.me>
-Subject: MIPS: PCI: add controllers before the specified head
-
-With commit 23dac14d058f ("MIPS: PCI: Use struct list_head lists") new
-controllers are added after the specified head where they were added
-before the specified head previously.
-
-Use list_add_tail to restore the former order.
-
-This patches fixes the following PCI error on lantiq:
-
-  pci 0000:01:00.0: BAR 0: error updating (0x1c000004 != 0x000000)
-
-Fixes: 23dac14d058f ("MIPS: PCI: Use struct list_head lists")
-Signed-off-by: Mathias Kresin <dev@kresin.me>
----
- arch/mips/pci/pci-legacy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/pci/pci-legacy.c
-+++ b/arch/mips/pci/pci-legacy.c
-@@ -194,7 +194,7 @@ void register_pci_controller(struct pci_
-       }
-       INIT_LIST_HEAD(&hose->list);
--      list_add(&hose->list, &controllers);
-+      list_add_tail(&hose->list, &controllers);
-       /*
-        * Do not panic here but later - this might happen before console init.
diff --git a/target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch b/target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch
deleted file mode 100644 (file)
index f2d5df5..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: net: phy: at803x: add support for AT8032
-
-Like AT8030, this PHY needs the GPIO reset workaround
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -62,6 +62,7 @@
- #define ATH8030_PHY_ID 0x004dd076
- #define ATH8031_PHY_ID 0x004dd074
-+#define ATH8032_PHY_ID 0x004dd023
- #define ATH8035_PHY_ID 0x004dd072
- MODULE_DESCRIPTION("Atheros 803x PHY driver");
-@@ -259,7 +260,8 @@ static int at803x_probe(struct phy_devic
-       if (!priv)
-               return -ENOMEM;
--      if (phydev->drv->phy_id != ATH8030_PHY_ID)
-+      if (phydev->drv->phy_id != ATH8030_PHY_ID &&
-+          phydev->drv->phy_id != ATH8032_PHY_ID)
-               goto does_not_require_reset_workaround;
-       gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
-@@ -335,7 +337,7 @@ static void at803x_link_change_notify(st
-       struct at803x_priv *priv = phydev->priv;
-       /*
--       * Conduct a hardware reset for AT8030 every time a link loss is
-+       * Conduct a hardware reset for AT8030/2 every time a link loss is
-        * signalled. This is necessary to circumvent a hardware bug that
-        * occurs when the cable is unplugged while TX packets are pending
-        * in the FIFO. In such cases, the FIFO enters an error mode it
-@@ -447,6 +449,24 @@ static struct phy_driver at803x_driver[]
-       .aneg_done              = at803x_aneg_done,
-       .ack_interrupt          = &at803x_ack_interrupt,
-       .config_intr            = &at803x_config_intr,
-+}, {
-+      /* ATHEROS 8032 */
-+      .phy_id                 = ATH8032_PHY_ID,
-+      .name                   = "Atheros 8032 ethernet",
-+      .phy_id_mask            = 0xffffffef,
-+      .probe                  = at803x_probe,
-+      .config_init            = at803x_config_init,
-+      .link_change_notify     = at803x_link_change_notify,
-+      .set_wol                = at803x_set_wol,
-+      .get_wol                = at803x_get_wol,
-+      .suspend                = at803x_suspend,
-+      .resume                 = at803x_resume,
-+      .features               = PHY_BASIC_FEATURES,
-+      .flags                  = PHY_HAS_INTERRUPT,
-+      .config_aneg            = genphy_config_aneg,
-+      .read_status            = genphy_read_status,
-+      .ack_interrupt          = at803x_ack_interrupt,
-+      .config_intr            = at803x_config_intr,
- } };
- module_phy_driver(at803x_driver);
-@@ -454,6 +474,7 @@ module_phy_driver(at803x_driver);
- static struct mdio_device_id __maybe_unused atheros_tbl[] = {
-       { ATH8030_PHY_ID, 0xffffffef },
-       { ATH8031_PHY_ID, 0xffffffef },
-+      { ATH8032_PHY_ID, 0xffffffef },
-       { ATH8035_PHY_ID, 0xffffffef },
-       { }
- };
diff --git a/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch b/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
deleted file mode 100644 (file)
index 8899664..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From patchwork Fri Jul 21 18:36:24 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [2/5] e1000e: Fix wrong comment related to link detection
-From: Benjamin Poirier <bpoirier@suse.com>
-X-Patchwork-Id: 9857489
-Message-Id: <20170721183627.13373-2-bpoirier@suse.com>
-To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-Cc: Lennart Sorensen <lsorense@csclub.uwaterloo.ca>,
- intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
- linux-kernel@vger.kernel.org
-Date: Fri, 21 Jul 2017 11:36:24 -0700
-
-Reading e1000e_check_for_copper_link() shows that get_link_status is set to
-false after link has been detected. Therefore, it stays TRUE until then.
-
-Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
-Tested-by: Aaron Brown <aaron.f.brown@intel.com>
----
- drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/intel/e1000e/netdev.c
-+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -5067,7 +5067,7 @@ static bool e1000e_has_link(struct e1000
-       /* get_link_status is set on LSC (link status) interrupt or
-        * Rx sequence error interrupt.  get_link_status will stay
--       * false until the check_for_link establishes link
-+       * true until the check_for_link establishes link
-        * for copper adapters ONLY
-        */
-       switch (hw->phy.media_type) {
-@@ -5085,7 +5085,7 @@ static bool e1000e_has_link(struct e1000
-               break;
-       case e1000_media_type_internal_serdes:
-               ret_val = hw->mac.ops.check_for_link(hw);
--              link_active = adapter->hw.mac.serdes_has_link;
-+              link_active = hw->mac.serdes_has_link;
-               break;
-       default:
-       case e1000_media_type_unknown:
diff --git a/target/linux/generic/pending-4.9/201-extra_optimization.patch b/target/linux/generic/pending-4.9/201-extra_optimization.patch
deleted file mode 100644 (file)
index 3d0fc82..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: Upgrade to Linux 2.6.19
-
-- Includes large parts of the patch from #1021 by dpalffy
-- Includes RB532 NAND driver changes by n0-1
-
-[john@phrozen.org: feix will add this to his upstream queue]
-
-lede-commit: bff468813f78f81e36ebb2a3f4354de7365e640f
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -655,12 +655,12 @@ KBUILD_CFLAGS    += $(call cc-option,-fdata
- endif
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
-+KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
- else
- ifdef CONFIG_PROFILE_ALL_BRANCHES
--KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
-+KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
- else
--KBUILD_CFLAGS   += -O2
-+KBUILD_CFLAGS   += -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
- endif
- endif
diff --git a/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch
deleted file mode 100644 (file)
index f275194..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a config option for keeping the kallsyms table uncompressed, saving ~9kb kernel size after lzma on ar71xx
-
-[john@phrozen.org: added to my upstream queue 30.12.2016]
-lede-commit: e0e3509b5ce2ccf93d4d67ea907613f5f7ec2eed
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- init/Kconfig            | 11 +++++++++++
- kernel/kallsyms.c       |  8 ++++++++
- scripts/kallsyms.c      | 12 ++++++++++++
- scripts/link-vmlinux.sh |  4 ++++
- 4 files changed, 35 insertions(+)
-
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1370,6 +1370,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
-         the unaligned access emulation.
-         see arch/parisc/kernel/unaligned.c for reference
-+config KALLSYMS_UNCOMPRESSED
-+      bool "Keep kallsyms uncompressed"
-+      depends on KALLSYMS
-+      help
-+              Normally kallsyms contains compressed symbols (using a token table),
-+              reducing the uncompressed kernel image size. Keeping the symbol table
-+              uncompressed significantly improves the size of this part in compressed
-+              kernel images.
-+
-+              Say N unless you need compressed kernel images to be small.
-+
- config HAVE_PCSPKR_PLATFORM
-       bool
---- a/kernel/kallsyms.c
-+++ b/kernel/kallsyms.c
-@@ -113,6 +113,11 @@ static unsigned int kallsyms_expand_symb
-        * For every byte on the compressed symbol data, copy the table
-        * entry for that byte.
-        */
-+#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
-+      memcpy(result, data + 1, len - 1);
-+      result += len - 1;
-+      len = 0;
-+#endif
-       while (len) {
-               tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
-               data++;
-@@ -145,6 +150,9 @@ tail:
-  */
- static char kallsyms_get_symbol_type(unsigned int off)
- {
-+#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
-+      return kallsyms_names[off + 1];
-+#endif
-       /*
-        * Get just the first code, look it up in the token table,
-        * and return the first char from this token.
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -61,6 +61,7 @@ static struct addr_range percpu_range =
- static struct sym_entry *table;
- static unsigned int table_size, table_cnt;
- static int all_symbols = 0;
-+static int uncompressed = 0;
- static int absolute_percpu = 0;
- static char symbol_prefix_char = '\0';
- static int base_relative = 0;
-@@ -446,6 +447,9 @@ static void write_src(void)
-       free(markers);
-+      if (uncompressed)
-+              return;
-+
-       output_label("kallsyms_token_table");
-       off = 0;
-       for (i = 0; i < 256; i++) {
-@@ -504,6 +508,9 @@ static void *find_token(unsigned char *s
- {
-       int i;
-+      if (uncompressed)
-+              return NULL;
-+
-       for (i = 0; i < len - 1; i++) {
-               if (str[i] == token[0] && str[i+1] == token[1])
-                       return &str[i];
-@@ -576,6 +583,9 @@ static void optimize_result(void)
- {
-       int i, best;
-+      if (uncompressed)
-+              return;
-+
-       /* using the '\0' symbol last allows compress_symbols to use standard
-        * fast string functions */
-       for (i = 255; i >= 0; i--) {
-@@ -764,6 +774,8 @@ int main(int argc, char **argv)
-                               symbol_prefix_char = *p;
-                       } else if (strcmp(argv[i], "--base-relative") == 0)
-                               base_relative = 1;
-+                      else if (strcmp(argv[i], "--uncompressed") == 0)
-+                              uncompressed = 1;
-                       else
-                               usage();
-               }
---- a/scripts/link-vmlinux.sh
-+++ b/scripts/link-vmlinux.sh
-@@ -136,6 +136,10 @@ kallsyms()
-               kallsymopt="${kallsymopt} --base-relative"
-       fi
-+      if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
-+              kallsymopt="${kallsymopt} --uncompressed"
-+      fi
-+
-       local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
-                     ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
diff --git a/target/linux/generic/pending-4.9/205-backtrace_module_info.patch b/target/linux/generic/pending-4.9/205-backtrace_module_info.patch
deleted file mode 100644 (file)
index 03c14e0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries
-
-[john@phrozen.org: felix will add this to his upstream queue]
-
-lede-commit 53827cdc824556cda910b23ce5030c363b8f1461
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- lib/vsprintf.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
---- a/lib/vsprintf.c
-+++ b/lib/vsprintf.c
-@@ -669,8 +669,10 @@ char *symbol_string(char *buf, char *end
-                   struct printf_spec spec, const char *fmt)
- {
-       unsigned long value;
--#ifdef CONFIG_KALLSYMS
-       char sym[KSYM_SYMBOL_LEN];
-+#ifndef CONFIG_KALLSYMS
-+      struct module *mod;
-+      int len;
- #endif
-       if (fmt[1] == 'R')
-@@ -684,11 +686,16 @@ char *symbol_string(char *buf, char *end
-               sprint_symbol(sym, value);
-       else
-               sprint_symbol_no_offset(sym, value);
--
--      return string(buf, end, sym, spec);
- #else
--      return special_hex_number(buf, end, value, sizeof(void *));
-+      len = snprintf(sym, sizeof(sym), "0x%lx", value);
-+
-+      mod = __module_address(value);
-+      if (mod)
-+              snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
-+                       mod->name, mod->core_layout.base,
-+                       mod->core_layout.size);
- #endif
-+      return string(buf, end, sym, spec);
- }
- static noinline_for_stack
diff --git a/target/linux/generic/pending-4.9/220-optimize_inlining.patch b/target/linux/generic/pending-4.9/220-optimize_inlining.patch
deleted file mode 100644 (file)
index 75c04ea..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/arch/x86/Kconfig.debug
-+++ b/arch/x86/Kconfig.debug
-@@ -287,20 +287,6 @@ config CPA_DEBUG
-       ---help---
-         Do change_page_attr() self-tests every 30 seconds.
--config OPTIMIZE_INLINING
--      bool "Allow gcc to uninline functions marked 'inline'"
--      ---help---
--        This option determines if the kernel forces gcc to inline the functions
--        developers have marked 'inline'. Doing so takes away freedom from gcc to
--        do what it thinks is best, which is desirable for the gcc 3.x series of
--        compilers. The gcc 4.x series have a rewritten inlining algorithm and
--        enabling this option will generate a smaller kernel there. Hopefully
--        this algorithm is so good that allowing gcc 4.x and above to make the
--        decision will become the default in the future. Until then this option
--        is there to test gcc for this.
--
--        If unsure, say N.
--
- config DEBUG_ENTRY
-       bool "Debug low-level entry code"
-       depends on DEBUG_KERNEL
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -117,6 +117,20 @@ endmenu # "printk and dmesg options"
- menu "Compile-time checks and compiler options"
-+config OPTIMIZE_INLINING
-+      bool "Allow gcc to uninline functions marked 'inline'"
-+      ---help---
-+        This option determines if the kernel forces gcc to inline the functions
-+        developers have marked 'inline'. Doing so takes away freedom from gcc to
-+        do what it thinks is best, which is desirable for the gcc 3.x series of
-+        compilers. The gcc 4.x series have a rewritten inlining algorithm and
-+        enabling this option will generate a smaller kernel there. Hopefully
-+        this algorithm is so good that allowing gcc 4.x and above to make the
-+        decision will become the default in the future. Until then this option
-+        is there to test gcc for this.
-+
-+        If unsure, say N.
-+
- config DEBUG_INFO
-       bool "Compile the kernel with debug info"
-       depends on DEBUG_KERNEL && !COMPILE_TEST
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -273,9 +273,6 @@ config ZONE_DMA32
- config AUDIT_ARCH
-       def_bool y if X86_64
--config ARCH_SUPPORTS_OPTIMIZED_INLINING
--      def_bool y
--
- config ARCH_SUPPORTS_DEBUG_PAGEALLOC
-       def_bool y
---- a/include/linux/compiler-gcc.h
-+++ b/include/linux/compiler-gcc.h
-@@ -89,8 +89,7 @@
-  * of extern inline functions at link time.
-  * A lot of inline functions can cause havoc with function tracing.
-  */
--#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) ||              \
--    !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
-+#if !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
- #define inline \
-       inline __attribute__((always_inline, unused)) notrace __gnu_inline
- #else
diff --git a/target/linux/generic/pending-4.9/240-remove-unsane-filenames-from-deps_initramfs-list.patch b/target/linux/generic/pending-4.9/240-remove-unsane-filenames-from-deps_initramfs-list.patch
deleted file mode 100644 (file)
index 5dc38ed..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: usr: sanitize deps_initramfs list
-
-If any filename in the intramfs dependency
-list contains a colon, that causes a kernel
-build error like this:
-
-/devel/openwrt/build_dir/linux-ar71xx_generic/linux-3.6.6/usr/Makefile:58: *** multiple target patterns.  Stop.
-make[5]: *** [usr] Error 2
-
-Fix it by removing such filenames from the
-deps_initramfs list.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- usr/Makefile | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data
-       include $(obj)/.initramfs_data.cpio.d
- endif
-+deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
-+
- quiet_cmd_initfs = GEN     $@
-       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
-@@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra
-       initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
-       initramfs_data.cpio
- # do not try to update files included in initramfs
--$(deps_initramfs): ;
-+$(deps_initramfs_sane): ;
--$(deps_initramfs): klibcdirs
-+$(deps_initramfs_sane): klibcdirs
- # We rebuild initramfs_data.cpio if:
- # 1) Any included file is newer then initramfs_data.cpio
- # 2) There are changes in which files are included (added or deleted)
- # 3) If gen_init_cpio are newer than initramfs_data.cpio
- # 4) arguments to gen_initramfs.sh changes
--$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
-+$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
-       $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
-       $(call if_changed,initfs)
diff --git a/target/linux/generic/pending-4.9/261-enable_wilink_platform_without_drivers.patch b/target/linux/generic/pending-4.9/261-enable_wilink_platform_without_drivers.patch
deleted file mode 100644 (file)
index 9955ab3..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Imre Kaloz <kaloz@openwrt.org>
-Subject: [PATCH] hack: net: wireless: make the wl12xx glue code available with
- compat-wireless, too
-
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- drivers/net/wireless/ti/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/ti/Kconfig
-+++ b/drivers/net/wireless/ti/Kconfig
-@@ -19,7 +19,7 @@ source "drivers/net/wireless/ti/wlcore/K
- config WILINK_PLATFORM_DATA
-       bool "TI WiLink platform data"
--      depends on WLCORE_SDIO || WL1251_SDIO
-+      depends on WLCORE_SDIO || WL1251_SDIO || ARCH_OMAP2PLUS
-       default y
-       ---help---
-       Small platform data bit needed to pass data to the sdio modules.
diff --git a/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch
deleted file mode 100644 (file)
index 68a0833..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Mark Miller <mark@mirell.org>
-Subject: mips: expose CONFIG_BOOT_RAW
-
-This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
-certain Broadcom chipsets running CFE in order to load the kernel.
-
-Signed-off-by: Mark Miller <mark@mirell.org>
-Acked-by: Rob Landley <rob@landley.net>
----
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1068,9 +1068,6 @@ config FW_ARC
- config ARCH_MAY_HAVE_PC_FDC
-       bool
--config BOOT_RAW
--      bool
--
- config CEVT_BCM1480
-       bool
-@@ -2967,6 +2964,18 @@ choice
-               bool "Extend builtin kernel arguments with bootloader arguments"
- endchoice
-+config BOOT_RAW
-+      bool "Enable the kernel to be executed from the load address"
-+      default n
-+      help
-+       Allow the kernel to be executed from the load address for
-+       bootloaders which cannot read the ELF format. This places
-+       a jump to start_kernel at the load address.
-+
-+       If unsure, say N.
-+
-+
-+
- endmenu
- config LOCKDEP_SUPPORT
diff --git a/target/linux/generic/pending-4.9/302-mips_no_branch_likely.patch b/target/linux/generic/pending-4.9/302-mips_no_branch_likely.patch
deleted file mode 100644 (file)
index 0e46002..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: mips: use -mno-branch-likely for kernel and userspace
-
-saves ~11k kernel size after lzma and ~12k squashfs size in the
-
-lede-commit: 41a039f46450ffae9483d6216422098669da2900
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -90,7 +90,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- # machines may also.  Since BFD is incredibly buggy with respect to
- # crossformat linking we rely on the elf2ecoff tool for format conversion.
- #
--cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe
-+cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
- cflags-y                      += -msoft-float
- LDFLAGS_vmlinux                       += -G 0 -static -n -nostdlib
- KBUILD_AFLAGS_MODULE          += -mlong-calls
diff --git a/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch b/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch
deleted file mode 100644 (file)
index 889c79a..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-From:   Manuel Lauss <manuel.lauss@gmail.com>
-Subject: [RFC PATCH v4 2/2] MIPS: make FPU emulator optional
-
-This small patch makes the MIPS FPU emulator optional. The kernel
-kills float-users on systems without a hardware FPU by sending a SIGILL.
-
-Disabling the emulator shrinks vmlinux by about 54kBytes (32bit,
-optimizing for size).
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
----
-v4: rediffed because of patch 1/2, should now work with micromips as well
-v3: updated patch description with size savings.
-v2: incorporated changes suggested by Jonas Gorski
-    force the fpu emulator on for micromips: relocating the parts
-    of the mmips code in the emulator to other areas would be a
-    much larger change; I went the cheap route instead with this.
-
- arch/mips/Kbuild                     |  2 +-
- arch/mips/Kconfig                    | 14 ++++++++++++++
- arch/mips/include/asm/fpu.h          |  5 +++--
- arch/mips/include/asm/fpu_emulator.h | 15 +++++++++++++++
- 4 files changed, 33 insertions(+), 3 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -2891,6 +2891,20 @@ config MIPS_O32_FP64_SUPPORT
-         If unsure, say N.
-+config MIPS_FPU_EMULATOR
-+      bool "MIPS FPU Emulator"
-+      default y
-+      help
-+        This option lets you disable the built-in MIPS FPU (Coprocessor 1)
-+        emulator, which handles floating-point instructions on processors
-+        without a hardware FPU.  It is generally a good idea to keep the
-+        emulator built-in, unless you are perfectly sure you have a
-+        complete soft-float environment.  With the emulator disabled, all
-+        users of float operations will be killed with an illegal instr-
-+        uction exception.
-+
-+        Say Y, please.
-+
- config USE_OF
-       bool
-       select OF
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -287,7 +287,7 @@ OBJCOPYFLAGS               += --remove-section=.regin
- head-y := arch/mips/kernel/head.o
- libs-y                        += arch/mips/lib/
--libs-y                        += arch/mips/math-emu/
-+libs-$(CONFIG_MIPS_FPU_EMULATOR)      += arch/mips/math-emu/
- # See arch/mips/Kbuild for content of core part of the kernel
- core-y += arch/mips/
---- a/arch/mips/include/asm/fpu.h
-+++ b/arch/mips/include/asm/fpu.h
-@@ -227,8 +227,10 @@ static inline int init_fpu(void)
-               /* Restore FRE */
-               write_c0_config5(config5);
-               enable_fpu_hazard();
--      } else
-+      } else if (IS_ENABLED(CONFIG_MIPS_FPU_EMULATOR))
-               fpu_emulator_init_fpu();
-+      else
-+              ret = SIGILL;
-       return ret;
- }
---- a/arch/mips/include/asm/fpu_emulator.h
-+++ b/arch/mips/include/asm/fpu_emulator.h
-@@ -30,6 +30,7 @@
- #include <asm/local.h>
- #include <asm/processor.h>
-+#ifdef CONFIG_MIPS_FPU_EMULATOR
- #ifdef CONFIG_DEBUG_FS
- struct mips_fpu_emulator_stats {
-@@ -63,6 +64,16 @@ do {                                                                        \
- extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
-                                   struct mips_fpu_struct *ctx, int has_fpu,
-                                   void *__user *fault_addr);
-+#else /* no CONFIG_MIPS_FPU_EMULATOR */
-+static inline int fpu_emulator_cop1Handler(struct pt_regs *xcp,
-+                              struct mips_fpu_struct *ctx, int has_fpu,
-+                              void *__user *fault_addr)
-+{
-+      *fault_addr = NULL;
-+      return SIGILL;  /* we don't speak MIPS FPU */
-+}
-+#endif        /* CONFIG_MIPS_FPU_EMULATOR */
-+
- void force_fcr31_sig(unsigned long fcr31, void __user *fault_addr,
-                    struct task_struct *tsk);
- int process_fpemu_return(int sig, void __user *fault_addr,
---- a/arch/mips/include/asm/dsemul.h
-+++ b/arch/mips/include/asm/dsemul.h
-@@ -41,6 +41,7 @@ struct task_struct;
- extern int mips_dsemul(struct pt_regs *regs, mips_instruction ir,
-                      unsigned long branch_pc, unsigned long cont_pc);
-+#ifdef CONFIG_MIPS_FPU_EMULATOR
- /**
-  * do_dsemulret() - Return from a delay slot 'emulation' frame
-  * @xcp:      User thread register context.
-@@ -88,5 +89,27 @@ extern bool dsemul_thread_rollback(struc
-  * before @mm is freed in order to avoid memory leaks.
-  */
- extern void dsemul_mm_cleanup(struct mm_struct *mm);
-+#else
-+static inline bool do_dsemulret(struct pt_regs *xcp)
-+{
-+      return false;
-+}
-+
-+static inline bool dsemul_thread_cleanup(struct task_struct *tsk)
-+{
-+      return false;
-+}
-+
-+static inline bool dsemul_thread_rollback(struct pt_regs *regs)
-+{
-+      return false;
-+}
-+
-+static inline void dsemul_mm_cleanup(struct mm_struct *mm)
-+{
-+
-+}
-+
-+#endif
- #endif /* __MIPS_ASM_DSEMUL_H__ */
diff --git a/target/linux/generic/pending-4.9/305-mips_module_reloc.patch b/target/linux/generic/pending-4.9/305-mips_module_reloc.patch
deleted file mode 100644 (file)
index 10d9f0b..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: mips: replace -mlong-calls with -mno-long-calls to make function calls faster in kernel modules to achieve this, try to
-
-lede-commit: 3b3d64743ba2a874df9d70cd19e242205b0a788c
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/Makefile             |   5 +
- arch/mips/include/asm/module.h |   5 +
- arch/mips/kernel/module.c      | 279 ++++++++++++++++++++++++++++++++++++++++-
- 3 files changed, 284 insertions(+), 5 deletions(-)
-
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -93,8 +93,18 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
- cflags-y                      += -msoft-float
- LDFLAGS_vmlinux                       += -G 0 -static -n -nostdlib
-+ifdef CONFIG_64BIT
- KBUILD_AFLAGS_MODULE          += -mlong-calls
- KBUILD_CFLAGS_MODULE          += -mlong-calls
-+else
-+  ifdef CONFIG_DYNAMIC_FTRACE
-+    KBUILD_AFLAGS_MODULE      += -mlong-calls
-+    KBUILD_CFLAGS_MODULE      += -mlong-calls
-+  else
-+    KBUILD_AFLAGS_MODULE      += -mno-long-calls
-+    KBUILD_CFLAGS_MODULE      += -mno-long-calls
-+  endif
-+endif
- ifeq ($(CONFIG_RELOCATABLE),y)
- LDFLAGS_vmlinux                       += --emit-relocs
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -11,6 +11,11 @@ struct mod_arch_specific {
-       const struct exception_table_entry *dbe_start;
-       const struct exception_table_entry *dbe_end;
-       struct mips_hi16 *r_mips_hi16_list;
-+
-+      void *phys_plt_tbl;
-+      void *virt_plt_tbl;
-+      unsigned int phys_plt_offset;
-+      unsigned int virt_plt_offset;
- };
- typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -44,14 +44,221 @@ struct mips_hi16 {
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
--#ifdef MODULE_START
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+      unsigned long ret = 0;
-+      unsigned int i, j;
-+      Elf_Sym *syms;
-+
-+      /* Everything marked ALLOC (this includes the exported symbols) */
-+      for (i = 1; i < hdr->e_shnum; ++i) {
-+              unsigned int info = sechdrs[i].sh_info;
-+
-+              if (sechdrs[i].sh_type != SHT_REL
-+                  && sechdrs[i].sh_type != SHT_RELA)
-+                      continue;
-+
-+              /* Not a valid relocation section? */
-+              if (info >= hdr->e_shnum)
-+                      continue;
-+
-+              /* Don't bother with non-allocated sections */
-+              if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+                      continue;
-+
-+              /* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+              if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+                  != is_init)
-+                      continue;
-+
-+              syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+              if (sechdrs[i].sh_type == SHT_REL) {
-+                      Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+                      unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+                      for (j = 0; j < size; ++j) {
-+                              Elf_Sym *sym;
-+
-+                              if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+                                      continue;
-+
-+                              sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+                              if (!is_init && sym->st_shndx != SHN_UNDEF)
-+                                      continue;
-+
-+                              ret += 4 * sizeof(int);
-+                      }
-+              } else {
-+                      Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+                      unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+                      for (j = 0; j < size; ++j) {
-+                              Elf_Sym *sym;
-+
-+                              if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+                                      continue;
-+
-+                              sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+                              if (!is_init && sym->st_shndx != SHN_UNDEF)
-+                                      continue;
-+
-+                              ret += 4 * sizeof(int);
-+                      }
-+              }
-+      }
-+
-+      return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+      unsigned order;
-+      struct page *page;
-+      struct page *p;
-+
-+      size = PAGE_ALIGN(size);
-+      order = get_order(size);
-+
-+      page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+                      __GFP_THISNODE, order);
-+      if (!page)
-+              return NULL;
-+
-+      split_page(page, order);
-+
-+      /* mark all pages except for the last one */
-+      for (p = page; p + 1 < page + (size >> PAGE_SHIFT); ++p)
-+              set_bit(PG_owner_priv_1, &p->flags);
-+
-+      for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+              __free_page(p);
-+
-+      return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr)
-+{
-+      struct page *page;
-+      bool free;
-+
-+      page = virt_to_page(ptr);
-+      do {
-+              free = test_and_clear_bit(PG_owner_priv_1, &page->flags);
-+              __free_page(page);
-+              page++;
-+      } while (free);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
-+#ifdef MODULE_START
-       return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
-                               GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,
-                               __builtin_return_address(0));
-+#else
-+      void *ptr;
-+
-+      if (size == 0)
-+              return NULL;
-+
-+      ptr = alloc_phys(size);
-+
-+      /* If we failed to allocate physically contiguous memory,
-+       * fall back to regular vmalloc. The module loader code will
-+       * create jump tables to handle long jumps */
-+      if (!ptr)
-+              return vmalloc(size);
-+
-+      return ptr;
-+#endif
- }
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+      return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+      return (KSEGX(ptr) == KSEG0);
- #endif
-+}
-+
-+/* Free memory returned from module_alloc */
-+void module_memfree(void *module_region)
-+{
-+      if (is_phys_addr(module_region))
-+              free_phys(module_region);
-+      else
-+              vfree(module_region);
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+      void *ptr;
-+
-+      if (phys)
-+              ptr = kmalloc(size, GFP_KERNEL);
-+      else
-+              ptr = vmalloc(size);
-+      return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+      if (is_phys_addr(ptr))
-+              kfree(ptr);
-+      else
-+              vfree(ptr);
-+}
-+
-+int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
-+                            char *secstrings, struct module *mod)
-+{
-+      unsigned int symindex = 0;
-+      unsigned int core_size, init_size;
-+      int i;
-+
-+      mod->arch.phys_plt_offset = 0;
-+      mod->arch.virt_plt_offset = 0;
-+      mod->arch.phys_plt_tbl = NULL;
-+      mod->arch.virt_plt_tbl = NULL;
-+
-+      if (IS_ENABLED(CONFIG_64BIT))
-+              return 0;
-+
-+      for (i = 1; i < hdr->e_shnum; i++)
-+              if (sechdrs[i].sh_type == SHT_SYMTAB)
-+                      symindex = i;
-+
-+      core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+      init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+      if ((core_size + init_size) == 0)
-+              return 0;
-+
-+      mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+      if (!mod->arch.phys_plt_tbl)
-+              return -ENOMEM;
-+
-+      mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+      if (!mod->arch.virt_plt_tbl) {
-+              __module_free(mod->arch.phys_plt_tbl);
-+              mod->arch.phys_plt_tbl = NULL;
-+              return -ENOMEM;
-+      }
-+
-+      return 0;
-+}
- int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
- {
-@@ -65,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo
-       return 0;
- }
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+                               void *start, Elf_Addr v)
-+{
-+      unsigned *tramp = start + *plt_offset;
-+      *plt_offset += 4 * sizeof(int);
-+
-+      /* adjust carry for addiu */
-+      if (v & 0x00008000)
-+              v += 0x10000;
-+
-+      tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+      tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+      tramp[2] = 0x03200008;                  /* jr t9 */
-+      tramp[3] = 0x00000000;                  /* nop */
-+
-+      return (Elf_Addr) tramp;
-+}
-+
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+      if (is_phys_addr(location))
-+              return add_plt_entry_to(&me->arch.phys_plt_offset,
-+                              me->arch.phys_plt_tbl, v);
-+      else
-+              return add_plt_entry_to(&me->arch.virt_plt_offset,
-+                              me->arch.virt_plt_tbl, v);
-+
-+}
-+
- static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
- {
-+      u32 ofs = *location & 0x03ffffff;
-+
-       if (v % 4) {
-               pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
-                      me->name);
-@@ -74,13 +312,17 @@ static int apply_r_mips_26_rel(struct mo
-       }
-       if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--              pr_err("module %s: relocation overflow\n",
--                     me->name);
--              return -ENOEXEC;
-+              v = add_plt_entry(me, location, v + (ofs << 2));
-+              if (!v) {
-+                      pr_err("module %s: relocation overflow\n",
-+                             me->name);
-+                      return -ENOEXEC;
-+              }
-+              ofs = 0;
-       }
-       *location = (*location & ~0x03ffffff) |
--                  ((*location + (v >> 2)) & 0x03ffffff);
-+                  ((ofs + (v >> 2)) & 0x03ffffff);
-       return 0;
- }
-@@ -349,9 +591,36 @@ int module_finalize(const Elf_Ehdr *hdr,
-               list_add(&me->arch.dbe_list, &dbe_list);
-               spin_unlock_irq(&dbe_lock);
-       }
-+
-+      /* Get rid of the fixup trampoline if we're running the module
-+       * from physically mapped address space */
-+      if (me->arch.phys_plt_offset == 0) {
-+              __module_free(me->arch.phys_plt_tbl);
-+              me->arch.phys_plt_tbl = NULL;
-+      }
-+      if (me->arch.virt_plt_offset == 0) {
-+              __module_free(me->arch.virt_plt_tbl);
-+              me->arch.virt_plt_tbl = NULL;
-+      }
-+
-       return 0;
- }
-+void module_arch_freeing_init(struct module *mod)
-+{
-+      if (mod->state == MODULE_STATE_LIVE)
-+              return;
-+
-+      if (mod->arch.phys_plt_tbl) {
-+              __module_free(mod->arch.phys_plt_tbl);
-+              mod->arch.phys_plt_tbl = NULL;
-+      }
-+      if (mod->arch.virt_plt_tbl) {
-+              __module_free(mod->arch.virt_plt_tbl);
-+              mod->arch.virt_plt_tbl = NULL;
-+      }
-+}
-+
- void module_arch_cleanup(struct module *mod)
- {
-       spin_lock_irq(&dbe_lock);
diff --git a/target/linux/generic/pending-4.9/306-mips_mem_functions_performance.patch b/target/linux/generic/pending-4.9/306-mips_mem_functions_performance.patch
deleted file mode 100644 (file)
index 2e404b2..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: [PATCH] mips: allow the compiler to optimize memset, memcmp, memcpy  for better performance and (in some instances) smaller code
-
-lede-commit: 07e59c7bc7f375f792ec9734be42fe4fa391a8bb
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/boot/compressed/Makefile |  3 ++-
- arch/mips/include/asm/string.h     | 38 ++++++++++++++++++++++++++++++++++++++
- arch/mips/lib/Makefile             |  2 +-
- arch/mips/lib/memcmp.c             | 22 ++++++++++++++++++++++
- 4 files changed, 63 insertions(+), 2 deletions(-)
- create mode 100644 arch/mips/lib/memcmp.c
-
---- a/arch/mips/boot/compressed/Makefile
-+++ b/arch/mips/boot/compressed/Makefile
-@@ -23,7 +23,8 @@ KBUILD_CFLAGS := $(shell echo $(KBUILD_C
- KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS))
- KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \
--      -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull"
-+      -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" \
-+      -D__ZBOOT__
- KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
-       -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -140,4 +140,42 @@ extern void *memcpy(void *__to, __const_
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#ifndef __ZBOOT__
-+#define memset(__s, __c, len)                                 \
-+({                                                            \
-+      size_t __len = (len);                                   \
-+      void *__ret;                                            \
-+      if (__builtin_constant_p(len) && __len >= 64)           \
-+              __ret = memset((__s), (__c), __len);            \
-+      else                                                    \
-+              __ret = __builtin_memset((__s), (__c), __len);  \
-+      __ret;                                                  \
-+})
-+
-+#define memcpy(dst, src, len)                                 \
-+({                                                            \
-+      size_t __len = (len);                                   \
-+      void *__ret;                                            \
-+      if (__builtin_constant_p(len) && __len >= 64)           \
-+              __ret = memcpy((dst), (src), __len);            \
-+      else                                                    \
-+              __ret = __builtin_memcpy((dst), (src), __len);  \
-+      __ret;                                                  \
-+})
-+
-+#define memmove(dst, src, len)                                        \
-+({                                                            \
-+      size_t __len = (len);                                   \
-+      void *__ret;                                            \
-+      if (__builtin_constant_p(len) && __len >= 64)           \
-+              __ret = memmove((dst), (src), __len);           \
-+      else                                                    \
-+              __ret = __builtin_memmove((dst), (src), __len); \
-+      __ret;                                                  \
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
-+#endif
-+
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -4,7 +4,7 @@
- lib-y += bitops.o csum_partial.o delay.o memcpy.o memset.o \
-          mips-atomic.o strlen_user.o strncpy_user.o \
--         strnlen_user.o uncached.o
-+         strnlen_user.o uncached.o memcmp.o
- obj-y                 += iomap.o
- obj-$(CONFIG_PCI)     += iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+      const unsigned char *su1, *su2;
-+      int res = 0;
-+
-+      for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+              if ((res = *su1 - *su2) != 0)
-+                      break;
-+      return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic/pending-4.9/307-mips_highmem_offset.patch b/target/linux/generic/pending-4.9/307-mips_highmem_offset.patch
deleted file mode 100644 (file)
index 0529b0c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: adjust mips highmem offset to avoid the need for -mlong-calls on systems with >256M RAM
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/include/asm/mach-generic/spaces.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/include/asm/mach-generic/spaces.h
-+++ b/arch/mips/include/asm/mach-generic/spaces.h
-@@ -46,7 +46,7 @@
-  * Memory above this physical address will be considered highmem.
-  */
- #ifndef HIGHMEM_START
--#define HIGHMEM_START         _AC(0x20000000, UL)
-+#define HIGHMEM_START         _AC(0x10000000, UL)
- #endif
- #endif /* CONFIG_32BIT */
diff --git a/target/linux/generic/pending-4.9/308-mips32r2_tune.patch b/target/linux/generic/pending-4.9/308-mips32r2_tune.patch
deleted file mode 100644 (file)
index 9e1efe2..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add -mtune=34kc to MIPS CFLAGS when building for mips32r2
-
-This provides a good tradeoff across at least 24Kc-74Kc, while also
-producing smaller code.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/mips/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -153,7 +153,7 @@ cflags-$(CONFIG_CPU_R4X00) += -march=r46
- cflags-$(CONFIG_CPU_TX49XX)   += -march=r4600 -Wa,--trap
- cflags-$(CONFIG_CPU_MIPS32_R1)        += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
-                       -Wa,-mips32 -Wa,--trap
--cflags-$(CONFIG_CPU_MIPS32_R2)        += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
-+cflags-$(CONFIG_CPU_MIPS32_R2)        += $(call cc-option,-march=mips32r2 -mtune=34kc,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
-                       -Wa,-mips32r2 -Wa,--trap
- cflags-$(CONFIG_CPU_MIPS32_R6)        += -march=mips32r6 -Wa,--trap
- cflags-$(CONFIG_CPU_MIPS64_R1)        += $(call cc-option,-march=mips64,-mips64 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \
diff --git a/target/linux/generic/pending-4.9/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch b/target/linux/generic/pending-4.9/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch
deleted file mode 100644 (file)
index b9c072b..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-From 87ec87c2ad615c1a177cd08ef5fa29fc739f6e50 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 23 Dec 2018 18:06:53 +0100
-Subject: [PATCH] MIPS: Add CPU option reporting to /proc/cpuinfo
-
-Many MIPS CPUs have optional CPU features which are not activates for
-all CPU cores. Print the CPU options which are implemented in the core
-in /proc/cpuinfo. This makes it possible to see what features are
-supported and which are not supported. This should cover all standard
-MIPS extensions, before it only printed information about the main MIPS
-ASEs.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- arch/mips/kernel/proc.c | 116 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 116 insertions(+)
-
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -128,6 +128,114 @@ static int show_cpuinfo(struct seq_file
-               seq_printf(m, "micromips kernel\t: %s\n",
-                     (read_c0_config3() & MIPS_CONF3_ISA_OE) ?  "yes" : "no");
-       }
-+
-+      seq_printf(m, "Options implemented\t:");
-+      if (cpu_has_tlb)
-+              seq_printf(m, "%s", " tlb");
-+      if (cpu_has_ftlb)
-+              seq_printf(m, "%s", " ftlb");
-+      if (cpu_has_tlbinv)
-+              seq_printf(m, "%s", " tlbinv");
-+      if (cpu_has_segments)
-+              seq_printf(m, "%s", " segments");
-+      if (cpu_has_rixiex)
-+              seq_printf(m, "%s", " rixiex");
-+      if (cpu_has_ldpte)
-+              seq_printf(m, "%s", " ldpte");
-+      if (cpu_has_maar)
-+              seq_printf(m, "%s", " maar");
-+      if (cpu_has_rw_llb)
-+              seq_printf(m, "%s", " rw_llb");
-+      if (cpu_has_4kex)
-+              seq_printf(m, "%s", " 4kex");
-+      if (cpu_has_3k_cache)
-+              seq_printf(m, "%s", " 3k_cache");
-+      if (cpu_has_4k_cache)
-+              seq_printf(m, "%s", " 4k_cache");
-+      if (cpu_has_6k_cache)
-+              seq_printf(m, "%s", " 6k_cache");
-+      if (cpu_has_8k_cache)
-+              seq_printf(m, "%s", " 8k_cache");
-+      if (cpu_has_tx39_cache)
-+              seq_printf(m, "%s", " tx39_cache");
-+      if (cpu_has_octeon_cache)
-+              seq_printf(m, "%s", " octeon_cache");
-+      if (cpu_has_fpu)
-+              seq_printf(m, "%s", " fpu");
-+      if (cpu_has_32fpr)
-+              seq_printf(m, "%s", " 32fpr");
-+      if (cpu_has_cache_cdex_p)
-+              seq_printf(m, "%s", " cache_cdex_p");
-+      if (cpu_has_cache_cdex_s)
-+              seq_printf(m, "%s", " cache_cdex_s");
-+      if (cpu_has_prefetch)
-+              seq_printf(m, "%s", " prefetch");
-+      if (cpu_has_mcheck)
-+              seq_printf(m, "%s", " mcheck");
-+      if (cpu_has_ejtag)
-+              seq_printf(m, "%s", " ejtag");
-+      if (cpu_has_llsc)
-+              seq_printf(m, "%s", " llsc");
-+      if (cpu_has_bp_ghist)
-+              seq_printf(m, "%s", " bp_ghist");
-+      if (cpu_has_guestctl0ext)
-+              seq_printf(m, "%s", " guestctl0ext");
-+      if (cpu_has_guestctl1)
-+              seq_printf(m, "%s", " guestctl1");
-+      if (cpu_has_guestctl2)
-+              seq_printf(m, "%s", " guestctl2");
-+      if (cpu_has_guestid)
-+              seq_printf(m, "%s", " guestid");
-+      if (cpu_has_drg)
-+              seq_printf(m, "%s", " drg");
-+      if (cpu_has_rixi)
-+              seq_printf(m, "%s", " rixi");
-+      if (cpu_has_lpa)
-+              seq_printf(m, "%s", " lpa");
-+      if (cpu_has_mvh)
-+              seq_printf(m, "%s", " mvh");
-+      if (cpu_has_vtag_icache)
-+              seq_printf(m, "%s", " vtag_icache");
-+      if (cpu_has_dc_aliases)
-+              seq_printf(m, "%s", " dc_aliases");
-+      if (cpu_has_ic_fills_f_dc)
-+              seq_printf(m, "%s", " ic_fills_f_dc");
-+      if (cpu_has_pindexed_dcache)
-+              seq_printf(m, "%s", " pindexed_dcache");
-+      if (cpu_has_userlocal)
-+              seq_printf(m, "%s", " userlocal");
-+      if (cpu_has_nofpuex)
-+              seq_printf(m, "%s", " nofpuex");
-+      if (cpu_has_vint)
-+              seq_printf(m, "%s", " vint");
-+      if (cpu_has_veic)
-+              seq_printf(m, "%s", " veic");
-+      if (cpu_has_inclusive_pcaches)
-+              seq_printf(m, "%s", " inclusive_pcaches");
-+      if (cpu_has_perf_cntr_intr_bit)
-+              seq_printf(m, "%s", " perf_cntr_intr_bit");
-+      if (cpu_has_fre)
-+              seq_printf(m, "%s", " fre");
-+      if (cpu_has_cdmm)
-+              seq_printf(m, "%s", " cdmm");
-+      if (cpu_has_small_pages)
-+              seq_printf(m, "%s", " small_pages");
-+      if (cpu_has_nan_legacy)
-+              seq_printf(m, "%s", " nan_legacy");
-+      if (cpu_has_nan_2008)
-+              seq_printf(m, "%s", " nan_2008");
-+      if (cpu_has_ebase_wg)
-+              seq_printf(m, "%s", " ebase_wg");
-+      if (cpu_has_badinstr)
-+              seq_printf(m, "%s", " badinstr");
-+      if (cpu_has_badinstrp)
-+              seq_printf(m, "%s", " badinstrp");
-+      if (cpu_has_contextconfig)
-+              seq_printf(m, "%s", " contextconfig");
-+      if (cpu_has_perf)
-+              seq_printf(m, "%s", " perf");
-+      seq_printf(m, "\n");
-+
-       seq_printf(m, "shadow register sets\t: %d\n",
-                     cpu_data[n].srsets);
-       seq_printf(m, "kscratch registers\t: %d\n",
diff --git a/target/linux/generic/pending-4.9/310-arm_module_unresolved_weak_sym.patch b/target/linux/generic/pending-4.9/310-arm_module_unresolved_weak_sym.patch
deleted file mode 100644 (file)
index cc1a51d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: fix errors in unresolved weak symbols on arm
-
-lede-commit: 570699d4838a907c3ef9f2819bf19eb72997b32f
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- arch/arm/kernel/module.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -88,6 +88,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
-                       return -ENOEXEC;
-               }
-+              if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+                  ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+                      continue;
-+
-               loc = dstsec->sh_addr + rel->r_offset;
-               switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch
deleted file mode 100644 (file)
index c7abd99..0000000
+++ /dev/null
@@ -1,269 +0,0 @@
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Subject: MIPS: kexec: Accept command line parameters from userspace.
-
-Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
----
- arch/mips/kernel/machine_kexec.c   |  153 +++++++++++++++++++++++++++++++-----
- arch/mips/kernel/machine_kexec.h   |   20 +++++
- arch/mips/kernel/relocate_kernel.S |   21 +++--
- 3 files changed, 167 insertions(+), 27 deletions(-)
- create mode 100644 arch/mips/kernel/machine_kexec.h
-
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -10,14 +10,11 @@
- #include <linux/mm.h>
- #include <linux/delay.h>
-+#include <asm/bootinfo.h>
- #include <asm/cacheflush.h>
- #include <asm/page.h>
--
--extern const unsigned char relocate_new_kernel[];
--extern const size_t relocate_new_kernel_size;
--
--extern unsigned long kexec_start_address;
--extern unsigned long kexec_indirection_page;
-+#include <asm/uaccess.h>
-+#include "machine_kexec.h"
- int (*_machine_kexec_prepare)(struct kimage *) = NULL;
- void (*_machine_kexec_shutdown)(void) = NULL;
-@@ -28,9 +25,115 @@ atomic_t kexec_ready_to_reboot = ATOMIC_
- void (*_crash_smp_send_stop)(void) = NULL;
- #endif
-+static void machine_kexec_print_args(void)
-+{
-+      unsigned long argc = (int)kexec_args[0];
-+      int i;
-+
-+      pr_info("kexec_args[0] (argc): %lu\n", argc);
-+      pr_info("kexec_args[1] (argv): %p\n", (void *)kexec_args[1]);
-+      pr_info("kexec_args[2] (env ): %p\n", (void *)kexec_args[2]);
-+      pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]);
-+
-+      for (i = 0; i < argc; i++) {
-+              pr_info("kexec_argv[%d] = %p, %s\n",
-+                              i, kexec_argv[i], kexec_argv[i]);
-+      }
-+}
-+
-+static void machine_kexec_init_argv(struct kimage *image)
-+{
-+      void __user *buf = NULL;
-+      size_t bufsz;
-+      size_t size;
-+      int i;
-+
-+      bufsz = 0;
-+      for (i = 0; i < image->nr_segments; i++) {
-+              struct kexec_segment *seg;
-+
-+              seg = &image->segment[i];
-+              if (seg->bufsz < 6)
-+                      continue;
-+
-+              if (strncmp((char *) seg->buf, "kexec ", 6))
-+                      continue;
-+
-+              buf = seg->buf;
-+              bufsz = seg->bufsz;
-+              break;
-+      }
-+
-+      if (!buf)
-+              return;
-+
-+      size = KEXEC_COMMAND_LINE_SIZE;
-+      size = min(size, bufsz);
-+      if (size < bufsz)
-+              pr_warn("kexec command line truncated to %zd bytes\n", size);
-+
-+      /* Copy to kernel space */
-+      copy_from_user(kexec_argv_buf, buf, size);
-+      kexec_argv_buf[size - 1] = 0;
-+}
-+
-+static void machine_kexec_parse_argv(struct kimage *image)
-+{
-+      char *reboot_code_buffer;
-+      int reloc_delta;
-+      char *ptr;
-+      int argc;
-+      int i;
-+
-+      ptr = kexec_argv_buf;
-+      argc = 0;
-+
-+      /*
-+       * convert command line string to array of parameters
-+       * (as bootloader does).
-+       */
-+      while (ptr && *ptr && (KEXEC_MAX_ARGC > argc)) {
-+              if (*ptr == ' ') {
-+                      *ptr++ = '\0';
-+                      continue;
-+              }
-+
-+              kexec_argv[argc++] = ptr;
-+              ptr = strchr(ptr, ' ');
-+      }
-+
-+      if (!argc)
-+              return;
-+
-+      kexec_args[0] = argc;
-+      kexec_args[1] = (unsigned long)kexec_argv;
-+      kexec_args[2] = 0;
-+      kexec_args[3] = 0;
-+
-+      reboot_code_buffer = page_address(image->control_code_page);
-+      reloc_delta = reboot_code_buffer - (char *)kexec_relocate_new_kernel;
-+
-+      kexec_args[1] += reloc_delta;
-+      for (i = 0; i < argc; i++)
-+              kexec_argv[i] += reloc_delta;
-+}
-+
- int
- machine_kexec_prepare(struct kimage *kimage)
- {
-+      /*
-+       * Whenever arguments passed from kexec-tools, Init the arguments as
-+       * the original ones to try avoiding booting failure.
-+       */
-+
-+      kexec_args[0] = fw_arg0;
-+      kexec_args[1] = fw_arg1;
-+      kexec_args[2] = fw_arg2;
-+      kexec_args[3] = fw_arg3;
-+
-+      machine_kexec_init_argv(kimage);
-+      machine_kexec_parse_argv(kimage);
-+
-       if (_machine_kexec_prepare)
-               return _machine_kexec_prepare(kimage);
-       return 0;
-@@ -67,10 +170,12 @@ machine_kexec(struct kimage *image)
-       unsigned long *ptr;
-       reboot_code_buffer =
--        (unsigned long)page_address(image->control_code_page);
-+              (unsigned long)page_address(image->control_code_page);
-+      pr_info("reboot_code_buffer = %p\n", (void *)reboot_code_buffer);
-       kexec_start_address =
-               (unsigned long) phys_to_virt(image->start);
-+      pr_info("kexec_start_address = %p\n", (void *)kexec_start_address);
-       if (image->type == KEXEC_TYPE_DEFAULT) {
-               kexec_indirection_page =
-@@ -78,9 +183,19 @@ machine_kexec(struct kimage *image)
-       } else {
-               kexec_indirection_page = (unsigned long)&image->head;
-       }
-+      pr_info("kexec_indirection_page = %p\n", (void *)kexec_indirection_page);
--      memcpy((void*)reboot_code_buffer, relocate_new_kernel,
--             relocate_new_kernel_size);
-+      pr_info("Where is memcpy: %p\n", memcpy);
-+      pr_info("kexec_relocate_new_kernel = %p, kexec_relocate_new_kernel_end = %p\n",
-+              (void *)kexec_relocate_new_kernel, &kexec_relocate_new_kernel_end);
-+      pr_info("Copy %lu bytes from %p to %p\n", KEXEC_RELOCATE_NEW_KERNEL_SIZE,
-+              (void *)kexec_relocate_new_kernel, (void *)reboot_code_buffer);
-+      memcpy((void*)reboot_code_buffer, kexec_relocate_new_kernel,
-+             KEXEC_RELOCATE_NEW_KERNEL_SIZE);
-+
-+      pr_info("Before _print_args().\n");
-+      machine_kexec_print_args();
-+      pr_info("Before eval loop.\n");
-       /*
-        * The generic kexec code builds a page list with physical
-@@ -102,15 +217,16 @@ machine_kexec(struct kimage *image)
-       /*
-        * we do not want to be bothered.
-        */
-+      pr_info("Before irq_disable.\n");
-       local_irq_disable();
--      printk("Will call new kernel at %08lx\n", image->start);
--      printk("Bye ...\n");
-+      pr_info("Will call new kernel at %08lx\n", image->start);
-+      pr_info("Bye ...\n");
-       __flush_cache_all();
- #ifdef CONFIG_SMP
-       /* All secondary cpus now may jump to kexec_wait cycle */
-       relocated_kexec_smp_wait = reboot_code_buffer +
--              (void *)(kexec_smp_wait - relocate_new_kernel);
-+              (void *)(kexec_smp_wait - kexec_relocate_new_kernel);
-       smp_wmb();
-       atomic_set(&kexec_ready_to_reboot, 1);
- #endif
---- /dev/null
-+++ b/arch/mips/kernel/machine_kexec.h
-@@ -0,0 +1,20 @@
-+#ifndef _MACHINE_KEXEC_H
-+#define _MACHINE_KEXEC_H
-+
-+#ifndef __ASSEMBLY__
-+extern const unsigned char kexec_relocate_new_kernel[];
-+extern unsigned long kexec_relocate_new_kernel_end;
-+extern unsigned long kexec_start_address;
-+extern unsigned long kexec_indirection_page;
-+
-+extern char kexec_argv_buf[];
-+extern char *kexec_argv[];
-+
-+#define KEXEC_RELOCATE_NEW_KERNEL_SIZE        ((unsigned long)&kexec_relocate_new_kernel_end - (unsigned long)kexec_relocate_new_kernel)
-+#endif /* !__ASSEMBLY__ */
-+
-+#define KEXEC_COMMAND_LINE_SIZE               256
-+#define KEXEC_ARGV_SIZE                       (KEXEC_COMMAND_LINE_SIZE / 16)
-+#define KEXEC_MAX_ARGC                        (KEXEC_ARGV_SIZE / sizeof(long))
-+
-+#endif
---- a/arch/mips/kernel/relocate_kernel.S
-+++ b/arch/mips/kernel/relocate_kernel.S
-@@ -12,8 +12,9 @@
- #include <asm/mipsregs.h>
- #include <asm/stackframe.h>
- #include <asm/addrspace.h>
-+#include "machine_kexec.h"
--LEAF(relocate_new_kernel)
-+LEAF(kexec_relocate_new_kernel)
-       PTR_L a0,       arg0
-       PTR_L a1,       arg1
-       PTR_L a2,       arg2
-@@ -98,7 +99,7 @@ done:
- #endif
-       /* jump to kexec_start_address */
-       j               s1
--      END(relocate_new_kernel)
-+      END(kexec_relocate_new_kernel)
- #ifdef CONFIG_SMP
- /*
-@@ -184,9 +185,15 @@ kexec_indirection_page:
-       PTR             0
-       .size           kexec_indirection_page, PTRSIZE
--relocate_new_kernel_end:
-+kexec_argv_buf:
-+      EXPORT(kexec_argv_buf)
-+      .skip           KEXEC_COMMAND_LINE_SIZE
-+      .size           kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE
-+
-+kexec_argv:
-+      EXPORT(kexec_argv)
-+      .skip           KEXEC_ARGV_SIZE
-+      .size           kexec_argv, KEXEC_ARGV_SIZE
--relocate_new_kernel_size:
--      EXPORT(relocate_new_kernel_size)
--      PTR             relocate_new_kernel_end - relocate_new_kernel
--      .size           relocate_new_kernel_size, PTRSIZE
-+kexec_relocate_new_kernel_end:
-+      EXPORT(kexec_relocate_new_kernel_end)
diff --git a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch
deleted file mode 100644 (file)
index ca89f87..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Subject: openwrt: arc - add OWRTDTB section
-
-This change allows OpenWRT to patch resulting kernel binary with
-external .dtb.
-
-That allows us to re-use exactky the same vmlinux on different boards
-given its ARC core configurations match (at least cache line sizes etc).
-
-""patch-dtb" searches for ASCII "OWRTDTB:" strign and copies external
-.dtb right after it, keeping the string in place.
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- arch/arc/kernel/head.S        | 10 ++++++++++
- arch/arc/kernel/setup.c       |  4 +++-
- arch/arc/kernel/vmlinux.lds.S | 13 +++++++++++++
- 3 files changed, 26 insertions(+), 1 deletion(-)
-
---- a/arch/arc/kernel/head.S
-+++ b/arch/arc/kernel/head.S
-@@ -59,6 +59,16 @@
- #endif
- .endm
-+; Here "patch-dtb" will embed external .dtb
-+; Note "patch-dtb" searches for ASCII "OWRTDTB:" string
-+; and pastes .dtb right after it, hense the string precedes
-+; __image_dtb symbol.
-+      .section .owrt, "aw",@progbits
-+      .ascii  "OWRTDTB:"
-+ENTRY(__image_dtb)
-+      .fill   0x4000
-+END(__image_dtb)
-+
-       .section .init.text, "ax",@progbits
- ;----------------------------------------------------------------
---- a/arch/arc/kernel/setup.c
-+++ b/arch/arc/kernel/setup.c
-@@ -444,7 +444,7 @@ ignore_uboot_args:
- #endif
-       if (use_embedded_dtb) {
--              machine_desc = setup_machine_fdt(__dtb_start);
-+              machine_desc = setup_machine_fdt(&__image_dtb);
-               if (!machine_desc)
-                       panic("Embedded DT invalid\n");
-       }
-@@ -460,6 +460,8 @@ ignore_uboot_args:
-       }
- }
-+extern struct boot_param_header __image_dtb;
-+
- void __init setup_arch(char **cmdline_p)
- {
-       handle_uboot_args();
---- a/arch/arc/kernel/vmlinux.lds.S
-+++ b/arch/arc/kernel/vmlinux.lds.S
-@@ -30,6 +30,19 @@ SECTIONS
-       . = CONFIG_LINUX_LINK_BASE;
-+      /*
-+       * In OpenWRT we want to patch built binary embedding .dtb of choice.
-+       * This is implemented with "patch-dtb" utility which searches for
-+       * "OWRTDTB:" string in first 16k of image and if it is found
-+       * copies .dtb right after mentioned string.
-+       *
-+       * Note: "OWRTDTB:" won't be overwritten with .dtb, .dtb will follow it.
-+       */
-+      .owrt : {
-+              *(.owrt)
-+              . = ALIGN(PAGE_SIZE);
-+      }
-+
-       _int_vec_base_lds = .;
-       .vector : {
-               *(.vector)
diff --git a/target/linux/generic/pending-4.9/333-arc-enable-unaligned-access-in-kernel-mode.patch b/target/linux/generic/pending-4.9/333-arc-enable-unaligned-access-in-kernel-mode.patch
deleted file mode 100644 (file)
index 4e0265a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Subject: arc: enable unaligned access in kernel mode
-
-This enables misaligned access handling even in kernel mode.
-Some wireless drivers (ath9k-htc and mt7601u) use misaligned accesses
-here and there and to cope with that without fixing stuff in the drivers
-we're just gracefully handling it on ARC.
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- arch/arc/kernel/unaligned.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arc/kernel/unaligned.c
-+++ b/arch/arc/kernel/unaligned.c
-@@ -206,7 +206,7 @@ int misaligned_fixup(unsigned long addre
-       char buf[TASK_COMM_LEN];
-       /* handle user mode only and only if enabled by sysadmin */
--      if (!user_mode(regs) || !unaligned_enabled)
-+      if (!unaligned_enabled)
-               return 1;
-       if (no_unaligned_warning) {
diff --git a/target/linux/generic/pending-4.9/340-MIPS-mm-remove-mips_dma_mapping_error.patch b/target/linux/generic/pending-4.9/340-MIPS-mm-remove-mips_dma_mapping_error.patch
deleted file mode 100644 (file)
index 4091542..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 5 Dec 2017 12:34:31 +0100
-Subject: [PATCH] MIPS: mm: remove mips_dma_mapping_error
-
-dma_mapping_error() already checks if ops->mapping_error is a null
-pointer
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/arch/mips/mm/dma-default.c
-+++ b/arch/mips/mm/dma-default.c
-@@ -394,11 +394,6 @@ static void mips_dma_sync_sg_for_device(
-       }
- }
--int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
--{
--      return 0;
--}
--
- int mips_dma_supported(struct device *dev, u64 mask)
- {
-       return plat_dma_supported(dev, mask);
-@@ -427,7 +422,6 @@ static struct dma_map_ops mips_default_d
-       .sync_single_for_device = mips_dma_sync_single_for_device,
-       .sync_sg_for_cpu = mips_dma_sync_sg_for_cpu,
-       .sync_sg_for_device = mips_dma_sync_sg_for_device,
--      .mapping_error = mips_dma_mapping_error,
-       .dma_supported = mips_dma_supported
- };
diff --git a/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch b/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
deleted file mode 100644 (file)
index 15788c7..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 5 Dec 2017 12:46:01 +0100
-Subject: [PATCH] MIPS: mm: remove no-op dma_map_ops where possible
-
-If no post-DMA flush is required, and the platform does not provide
-plat_unmap_dma_mem(), there is no need to include unmap or sync_for_cpu
-ops.
-
-With this patch they are compiled out to improve icache footprint
-on devices that handle lots of DMA traffic (especially network routers).
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -214,6 +214,7 @@ config BMIPS_GENERIC
-       select BRCMSTB_L2_IRQ
-       select IRQ_MIPS_CPU
-       select DMA_NONCOHERENT
-+      select DMA_UNMAP_POST_FLUSH
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_BIG_ENDIAN
-@@ -339,6 +340,7 @@ config MACH_JAZZ
-       select CSRC_R4K
-       select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN
-       select GENERIC_ISA_DMA
-+      select DMA_UNMAP_POST_FLUSH
-       select HAVE_PCSPKR_PLATFORM
-       select IRQ_MIPS_CPU
-       select I8253
-@@ -1129,6 +1131,9 @@ config DMA_NONCOHERENT
-       bool
-       select NEED_DMA_MAP_STATE
-+config DMA_UNMAP_POST_FLUSH
-+      bool
-+
- config NEED_DMA_MAP_STATE
-       bool
-@@ -1653,6 +1658,7 @@ config CPU_R10000
-       select CPU_SUPPORTS_64BIT_KERNEL
-       select CPU_SUPPORTS_HIGHMEM
-       select CPU_SUPPORTS_HUGEPAGES
-+      select DMA_UNMAP_POST_FLUSH
-       help
-         MIPS Technologies R10000-series processors.
-@@ -1898,9 +1904,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
-       bool
- config SYS_HAS_CPU_MIPS32_R5
-+      select DMA_UNMAP_POST_FLUSH
-       bool
- config SYS_HAS_CPU_MIPS32_R6
-+      select DMA_UNMAP_POST_FLUSH
-       bool
- config SYS_HAS_CPU_MIPS64_R1
-@@ -1910,6 +1918,7 @@ config SYS_HAS_CPU_MIPS64_R2
-       bool
- config SYS_HAS_CPU_MIPS64_R6
-+      select DMA_UNMAP_POST_FLUSH
-       bool
- config SYS_HAS_CPU_R3000
---- a/arch/mips/mm/dma-default.c
-+++ b/arch/mips/mm/dma-default.c
-@@ -290,8 +290,9 @@ static inline void __dma_sync(struct pag
-       } while (left);
- }
--static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
--      size_t size, enum dma_data_direction direction, unsigned long attrs)
-+static void __maybe_unused
-+mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size,
-+                  enum dma_data_direction direction, unsigned long attrs)
- {
-       if (cpu_needs_post_dma_flush(dev))
-               __dma_sync(dma_addr_to_page(dev, dma_addr),
-@@ -330,9 +331,10 @@ static dma_addr_t mips_dma_map_page(stru
-       return plat_map_dma_mem_page(dev, page) + offset;
- }
--static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
--      int nhwentries, enum dma_data_direction direction,
--      unsigned long attrs)
-+static void __maybe_unused
-+mips_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
-+                int nhwentries, enum dma_data_direction direction,
-+                unsigned long attrs)
- {
-       int i;
-       struct scatterlist *sg;
-@@ -346,8 +348,9 @@ static void mips_dma_unmap_sg(struct dev
-       }
- }
--static void mips_dma_sync_single_for_cpu(struct device *dev,
--      dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
-+static void __maybe_unused
-+mips_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
-+                           size_t size, enum dma_data_direction direction)
- {
-       if (cpu_needs_post_dma_flush(dev))
-               __dma_sync(dma_addr_to_page(dev, dma_handle),
-@@ -363,9 +366,9 @@ static void mips_dma_sync_single_for_dev
-                          dma_handle & ~PAGE_MASK, size, direction);
- }
--static void mips_dma_sync_sg_for_cpu(struct device *dev,
--      struct scatterlist *sglist, int nelems,
--      enum dma_data_direction direction)
-+static void __maybe_unused
-+mips_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist,
-+                       int nelems, enum dma_data_direction direction)
- {
-       int i;
-       struct scatterlist *sg;
-@@ -415,12 +418,14 @@ static struct dma_map_ops mips_default_d
-       .free = mips_dma_free_coherent,
-       .mmap = mips_dma_mmap,
-       .map_page = mips_dma_map_page,
--      .unmap_page = mips_dma_unmap_page,
-       .map_sg = mips_dma_map_sg,
-+#ifdef CONFIG_DMA_UNMAP_POST_FLUSH
-+      .unmap_page = mips_dma_unmap_page,
-       .unmap_sg = mips_dma_unmap_sg,
-       .sync_single_for_cpu = mips_dma_sync_single_for_cpu,
--      .sync_single_for_device = mips_dma_sync_single_for_device,
-       .sync_sg_for_cpu = mips_dma_sync_sg_for_cpu,
-+#endif
-+      .sync_single_for_device = mips_dma_sync_single_for_device,
-       .sync_sg_for_device = mips_dma_sync_sg_for_device,
-       .dma_supported = mips_dma_supported
- };
diff --git a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
deleted file mode 100644 (file)
index c9e3ca3..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: make rootfs split/detection more generic - patch can be moved to generic-2.6 after testing on other platforms
-
-lede-commit: 328e660b31f0937d52c5ae3d6e7029409918a9df
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/Kconfig            | 17 +++++++++++++++++
- drivers/mtd/mtdpart.c          | 35 +++++++++++++++++++++++++++++++++++
- include/linux/mtd/partitions.h |  2 ++
- 3 files changed, 54 insertions(+)
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -12,6 +12,23 @@ menuconfig MTD
- if MTD
-+menu "OpenWrt specific MTD options"
-+
-+config MTD_ROOTFS_ROOT_DEV
-+      bool "Automatically set 'rootfs' partition to be root filesystem"
-+      default y
-+
-+config MTD_SPLIT_FIRMWARE
-+      bool "Automatically split firmware partition for kernel+rootfs"
-+      default y
-+
-+config MTD_SPLIT_FIRMWARE_NAME
-+      string "Firmware partition name"
-+      depends on MTD_SPLIT_FIRMWARE
-+      default "firmware"
-+
-+endmenu
-+
- config MTD_TESTS
-       tristate "MTD tests support (DANGEROUS)"
-       depends on m
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -29,11 +29,13 @@
- #include <linux/kmod.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-+#include <linux/magic.h>
- #include <linux/of.h>
- #include <linux/err.h>
- #include <linux/of.h>
- #include "mtdcore.h"
-+#include "mtdsplit/mtdsplit.h"
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -53,6 +55,8 @@ struct mtd_part {
-       struct list_head list;
- };
-+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
-+
- /*
-  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
-  * the pointer to that structure.
-@@ -650,6 +654,7 @@ int mtd_add_partition(struct mtd_info *p
-       mutex_unlock(&mtd_partitions_mutex);
-       add_mtd_device(&new->mtd);
-+      mtd_partition_split(parent, new);
-       mtd_add_partition_attrs(new);
-@@ -728,6 +733,29 @@ int mtd_del_partition(struct mtd_info *m
- }
- EXPORT_SYMBOL_GPL(mtd_del_partition);
-+#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
-+#define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
-+#else
-+#define SPLIT_FIRMWARE_NAME   "unused"
-+#endif
-+
-+static void split_firmware(struct mtd_info *master, struct mtd_part *part)
-+{
-+}
-+
-+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
-+{
-+      static int rootfs_found = 0;
-+
-+      if (rootfs_found)
-+              return;
-+
-+      if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
-+          !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
-+          !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
-+              split_firmware(master, part);
-+}
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -759,6 +787,7 @@ int add_mtd_partitions(struct mtd_info *
-               mutex_unlock(&mtd_partitions_mutex);
-               add_mtd_device(&slave->mtd);
-+              mtd_partition_split(master, slave);
-               mtd_add_partition_attrs(slave);
-               /* Look for subpartitions */
-               parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
diff --git a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
deleted file mode 100644 (file)
index 5a9d3f7..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: mtd: add support for different partition parser types
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdpart.c          |   56 ++++++++++++++++++++++++++++++++++++++++
- include/linux/mtd/partitions.h |   11 ++++++++
- 2 files changed, 67 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -56,6 +56,10 @@ struct mtd_part {
- };
- static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
-+static int parse_mtd_partitions_by_type(struct mtd_info *master,
-+                                      enum mtd_parser_type type,
-+                                      const struct mtd_partition **pparts,
-+                                      struct mtd_part_parser_data *data);
- /*
-  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
-@@ -733,6 +737,36 @@ int mtd_del_partition(struct mtd_info *m
- }
- EXPORT_SYMBOL_GPL(mtd_del_partition);
-+static int
-+run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
-+{
-+      struct mtd_partition *parts;
-+      int nr_parts;
-+      int i;
-+
-+      nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, (const struct mtd_partition **)&parts,
-+                                              NULL);
-+      if (nr_parts <= 0)
-+              return nr_parts;
-+
-+      if (WARN_ON(!parts))
-+              return 0;
-+
-+      for (i = 0; i < nr_parts; i++) {
-+              /* adjust partition offsets */
-+              parts[i].offset += slave->offset;
-+
-+              mtd_add_partition(slave->parent,
-+                                parts[i].name,
-+                                parts[i].offset,
-+                                parts[i].size);
-+      }
-+
-+      kfree(parts);
-+
-+      return nr_parts;
-+}
-+
- #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #else
-@@ -1109,6 +1143,61 @@ void mtd_part_parser_cleanup(struct mtd_
-       }
- }
-+static struct mtd_part_parser *
-+get_partition_parser_by_type(enum mtd_parser_type type,
-+                           struct mtd_part_parser *start)
-+{
-+      struct mtd_part_parser *p, *ret = NULL;
-+
-+      spin_lock(&part_parser_lock);
-+
-+      p = list_prepare_entry(start, &part_parsers, list);
-+      if (start)
-+              mtd_part_parser_put(start);
-+
-+      list_for_each_entry_continue(p, &part_parsers, list) {
-+              if (p->type == type && try_module_get(p->owner)) {
-+                      ret = p;
-+                      break;
-+              }
-+      }
-+
-+      spin_unlock(&part_parser_lock);
-+
-+      return ret;
-+}
-+
-+static int parse_mtd_partitions_by_type(struct mtd_info *master,
-+                                      enum mtd_parser_type type,
-+                                      const struct mtd_partition **pparts,
-+                                      struct mtd_part_parser_data *data)
-+{
-+      struct mtd_part_parser *prev = NULL;
-+      int ret = 0;
-+
-+      while (1) {
-+              struct mtd_part_parser *parser;
-+
-+              parser = get_partition_parser_by_type(type, prev);
-+              if (!parser)
-+                      break;
-+
-+              ret = (*parser->parse_fn)(master, pparts, data);
-+
-+              if (ret > 0) {
-+                      mtd_part_parser_put(parser);
-+                      printk(KERN_NOTICE
-+                             "%d %s partitions found on MTD device %s\n",
-+                             ret, parser->name, master->name);
-+                      break;
-+              }
-+
-+              prev = parser;
-+      }
-+
-+      return ret;
-+}
-+
- int mtd_is_partition(const struct mtd_info *mtd)
- {
-       struct mtd_part *part;
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -73,6 +73,10 @@ struct mtd_part_parser_data {
-  * Functions dealing with the various ways of partitioning the space
-  */
-+enum mtd_parser_type {
-+      MTD_PARSER_TYPE_DEVICE = 0,
-+};
-+
- struct mtd_part_parser {
-       struct list_head list;
-       struct module *owner;
-@@ -81,6 +85,7 @@ struct mtd_part_parser {
-       int (*parse_fn)(struct mtd_info *, const struct mtd_partition **,
-                       struct mtd_part_parser_data *);
-       void (*cleanup)(const struct mtd_partition *pparts, int nr_parts);
-+      enum mtd_parser_type type;
- };
- /* Container for passing around a set of parsed partitions */
diff --git a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
deleted file mode 100644 (file)
index 42d9536..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: kernel/3.10: allow to use partition parsers for rootfs and firmware split
-
-lede-commit: 3b71cd94bc9517bc25267dccb393b07d4b54564e
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdpart.c          | 37 +++++++++++++++++++++++++++++++++++++
- include/linux/mtd/partitions.h |  2 ++
- 2 files changed, 39 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -775,6 +775,7 @@ run_parsers_by_type(struct mtd_part *sla
- static void split_firmware(struct mtd_info *master, struct mtd_part *part)
- {
-+      run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
- }
- static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
-@@ -784,6 +785,12 @@ static void mtd_partition_split(struct m
-       if (rootfs_found)
-               return;
-+      if (!strcmp(part->mtd.name, "rootfs")) {
-+              run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
-+
-+              rootfs_found = 1;
-+      }
-+
-       if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
-           !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
-           !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -75,6 +75,8 @@ struct mtd_part_parser_data {
- enum mtd_parser_type {
-       MTD_PARSER_TYPE_DEVICE = 0,
-+      MTD_PARSER_TYPE_ROOTFS,
-+      MTD_PARSER_TYPE_FIRMWARE,
- };
- struct mtd_part_parser {
diff --git a/target/linux/generic/pending-4.9/403-mtd-hook-mtdsplit-to-Kbuild.patch b/target/linux/generic/pending-4.9/403-mtd-hook-mtdsplit-to-Kbuild.patch
deleted file mode 100644 (file)
index 917cd9c..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: [PATCH] kernel/3.10: move squashfs check from rootfs split code into a separate file
-
-lede-commit: d89bea92b31b4e157a0fa438e75370f089f73427
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/Kconfig  | 2 ++
- drivers/mtd/Makefile | 2 ++
- 2 files changed, 4 insertions(+)
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -27,6 +27,8 @@ config MTD_SPLIT_FIRMWARE_NAME
-       depends on MTD_SPLIT_FIRMWARE
-       default "firmware"
-+source "drivers/mtd/mtdsplit/Kconfig"
-+
- endmenu
- config MTD_TESTS
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -6,6 +6,8 @@
- obj-$(CONFIG_MTD)             += mtd.o
- mtd-y                         := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
-+obj-$(CONFIG_MTD_SPLIT)               += mtdsplit/
-+
- obj-$(CONFIG_MTD_OF_PARTS)    += ofpart.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
diff --git a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
deleted file mode 100644 (file)
index b599774..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: kernel/3.10: add separate rootfs partition parser
-
-lede-commit: daec7ad7688415156e2730e401503d09bd3acf91
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdpart.c          | 29 +++++++++++++++++++++++++++++
- include/linux/mtd/mtd.h        | 18 ++++++++++++++++++
- include/linux/mtd/partitions.h |  2 ++
- 3 files changed, 49 insertions(+)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -1222,6 +1222,24 @@ int mtd_is_partition(const struct mtd_in
- }
- EXPORT_SYMBOL_GPL(mtd_is_partition);
-+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd)
-+{
-+      if (!mtd_is_partition(mtd))
-+              return (struct mtd_info *)mtd;
-+
-+      return mtd_to_part(mtd)->parent;
-+}
-+EXPORT_SYMBOL_GPL(mtdpart_get_master);
-+
-+uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
-+{
-+      if (!mtd_is_partition(mtd))
-+              return 0;
-+
-+      return mtd_to_part(mtd)->offset;
-+}
-+EXPORT_SYMBOL_GPL(mtdpart_get_offset);
-+
- /* Returns the size of the entire flash chip */
- uint64_t mtd_get_device_size(const struct mtd_info *mtd)
- {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -485,6 +485,24 @@ static inline uint32_t mtd_mod_by_eb(uin
-       return do_div(sz, mtd->erasesize);
- }
-+static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd)
-+{
-+      if (mtd_mod_by_eb(sz, mtd) == 0)
-+              return sz;
-+
-+      /* Round up to next erase block */
-+      return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize;
-+}
-+
-+static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd)
-+{
-+      if (mtd_mod_by_eb(sz, mtd) == 0)
-+              return sz;
-+
-+      /* Round down to the start of the current erase block */
-+      return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize;
-+}
-+
- static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
- {
-       if (mtd->writesize_shift)
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -116,6 +116,8 @@ int mtd_is_partition(const struct mtd_in
- int mtd_add_partition(struct mtd_info *master, const char *name,
-                     long long offset, long long length);
- int mtd_del_partition(struct mtd_info *master, int partno);
-+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
-+uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
- uint64_t mtd_get_device_size(const struct mtd_info *mtd);
- #endif
diff --git a/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch
deleted file mode 100644 (file)
index 5a59dfa..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: mtd: implement write support for partitions covering only a part of an eraseblock (buffer data that would otherwise be erased)
-
-lede-commit: 87a8e8ac1067f58ba831c4aae443f3655c31cd80
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/mtdpart.c   | 90 ++++++++++++++++++++++++++++++++++++++++++++-----
- include/linux/mtd/mtd.h |  4 +++
- 2 files changed, 85 insertions(+), 9 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -37,6 +37,8 @@
- #include "mtdcore.h"
- #include "mtdsplit/mtdsplit.h"
-+#define MTD_ERASE_PARTIAL     0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- static DEFINE_MUTEX(mtd_partitions_mutex);
-@@ -246,13 +248,61 @@ static int part_erase(struct mtd_info *m
-       struct mtd_part *part = mtd_to_part(mtd);
-       int ret;
-+
-+      instr->partial_start = false;
-+      if (mtd->flags & MTD_ERASE_PARTIAL) {
-+              size_t readlen = 0;
-+              u64 mtd_ofs;
-+
-+              instr->erase_buf = kmalloc(part->parent->erasesize, GFP_ATOMIC);
-+              if (!instr->erase_buf)
-+                      return -ENOMEM;
-+
-+              mtd_ofs = part->offset + instr->addr;
-+              instr->erase_buf_ofs = do_div(mtd_ofs, part->parent->erasesize);
-+
-+              if (instr->erase_buf_ofs > 0) {
-+                      instr->addr -= instr->erase_buf_ofs;
-+                      ret = mtd_read(part->parent,
-+                              instr->addr + part->offset,
-+                              part->parent->erasesize,
-+                              &readlen, instr->erase_buf);
-+
-+                      instr->len += instr->erase_buf_ofs;
-+                      instr->partial_start = true;
-+              } else {
-+                      mtd_ofs = part->offset + part->mtd.size;
-+                      instr->erase_buf_ofs = part->parent->erasesize -
-+                              do_div(mtd_ofs, part->parent->erasesize);
-+
-+                      if (instr->erase_buf_ofs > 0) {
-+                              instr->len += instr->erase_buf_ofs;
-+                              ret = mtd_read(part->parent,
-+                                      part->offset + instr->addr +
-+                                      instr->len - part->parent->erasesize,
-+                                      part->parent->erasesize, &readlen,
-+                                      instr->erase_buf);
-+                      } else {
-+                              ret = 0;
-+                      }
-+              }
-+              if (ret < 0) {
-+                      kfree(instr->erase_buf);
-+                      return ret;
-+              }
-+
-+      }
-+
-       instr->addr += part->offset;
-       ret = part->parent->_erase(part->parent, instr);
-       if (ret) {
-               if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
-                       instr->fail_addr -= part->offset;
-               instr->addr -= part->offset;
-+              if (mtd->flags & MTD_ERASE_PARTIAL)
-+                      kfree(instr->erase_buf);
-       }
-+
-       return ret;
- }
-@@ -260,6 +310,25 @@ void mtd_erase_callback(struct erase_inf
- {
-       if (instr->mtd->_erase == part_erase) {
-               struct mtd_part *part = mtd_to_part(instr->mtd);
-+              size_t wrlen = 0;
-+
-+              if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+                      if (instr->partial_start) {
-+                              part->parent->_write(part->parent,
-+                                      instr->addr, instr->erase_buf_ofs,
-+                                      &wrlen, instr->erase_buf);
-+                              instr->addr += instr->erase_buf_ofs;
-+                      } else {
-+                              instr->len -= instr->erase_buf_ofs;
-+                              part->parent->_write(part->parent,
-+                                      instr->addr + instr->len,
-+                                      instr->erase_buf_ofs, &wrlen,
-+                                      instr->erase_buf +
-+                                      part->parent->erasesize -
-+                                      instr->erase_buf_ofs);
-+                      }
-+                      kfree(instr->erase_buf);
-+              }
-               if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
-                       instr->fail_addr -= part->offset;
-@@ -566,19 +635,22 @@ static struct mtd_part *allocate_partiti
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               /* Doesn't start on a boundary of major erase size */
--              /* FIXME: Let it be writable if it is on a boundary of
--               * _minor_ erase size though */
--              slave->mtd.flags &= ~MTD_WRITEABLE;
--              printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n",
--                      part->name);
-+              slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+              if (((u32)slave->mtd.size) > parent->erasesize)
-+                      slave->mtd.flags &= ~MTD_WRITEABLE;
-+              else
-+                      slave->mtd.erasesize = slave->mtd.size;
-       }
--      tmp = slave->mtd.size;
-+      tmp = slave->offset + slave->mtd.size;
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
--              slave->mtd.flags &= ~MTD_WRITEABLE;
--              printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n",
--                      part->name);
-+              slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+              if ((u32)slave->mtd.size > parent->erasesize)
-+                      slave->mtd.flags &= ~MTD_WRITEABLE;
-+              else
-+                      slave->mtd.erasesize = slave->mtd.size;
-       }
-       mtd_set_ooblayout(&slave->mtd, &part_ooblayout_ops);
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -55,6 +55,10 @@ struct erase_info {
-       u_long priv;
-       u_char state;
-       struct erase_info *next;
-+
-+      u8 *erase_buf;
-+      u32 erase_buf_ofs;
-+      bool partial_start;
- };
- struct mtd_erase_region_info {
diff --git a/target/linux/generic/pending-4.9/412-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/pending-4.9/412-mtd-partial_eraseblock_unlock.patch
deleted file mode 100644 (file)
index 1e8c909..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Tim Harvey <tharvey@gateworks.com>
-Subject: mtd: allow partial block unlock
-
-This allows sysupgrade for devices such as the Gateworks Avila/Cambria
-product families based on the ixp4xx using the redboot bootloader with
-combined FIS directory and RedBoot config partitions on larger FLASH
-devices with larger eraseblocks.
-
-This second iteration of this patch addresses previous issues:
-- whitespace breakage fixed
-- unlock in all scenarios
-- simplification and fix logic bug
-
-[john@phrozen.org: this should be moved to the ixp4xx folder]
-
-Signed-off-by: Tim Harvey <tharvey@gateworks.com>
----
- drivers/mtd/mtdpart.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -348,7 +348,16 @@ static int part_lock(struct mtd_info *mt
- static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
- {
-       struct mtd_part *part = mtd_to_part(mtd);
--      return part->parent->_unlock(part->parent, ofs + part->offset, len);
-+
-+      ofs += part->offset;
-+
-+      if (mtd->flags & MTD_ERASE_PARTIAL) {
-+              /* round up len to next erasesize and round down offset to prev block */
-+              len = (mtd_div_by_eb(len, part->parent) + 1) * part->parent->erasesize;
-+              ofs &= ~(part->parent->erasesize - 1);
-+      }
-+
-+      return part->parent->_unlock(part->parent, ofs, len);
- }
- static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/target/linux/generic/pending-4.9/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-4.9/419-mtd-redboot-add-of_match_table-with-DT-binding.patch
deleted file mode 100644 (file)
index 4da571a..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Subject: [PATCH] mtd: redboot: add of_match_table with DT binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows parsing RedBoot compatible partitions for properly described
-flash device in DT.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
----
-
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -29,6 +29,7 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/module.h>
-+#include <linux/mod_devicetable.h>
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-@@ -289,9 +290,16 @@ static int parse_redboot_partitions(stru
-       return ret;
- }
-+static const struct of_device_id redboot_parser_of_match_table[] = {
-+      { .compatible = "ecoscentric,redboot-fis-partitions" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, redboot_parser_of_match_table);
-+
- static struct mtd_part_parser redboot_parser = {
-       .parse_fn = parse_redboot_partitions,
-       .name = "RedBoot",
-+      .of_match_table = redboot_parser_of_match_table,
- };
- module_mtd_part_parser(redboot_parser);
diff --git a/target/linux/generic/pending-4.9/420-mtd-redboot_space.patch b/target/linux/generic/pending-4.9/420-mtd-redboot_space.patch
deleted file mode 100644 (file)
index 6a612a0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: add patch for including unpartitioned space in the rootfs partition for redboot devices (if applicable)
-
-[john@phrozen.org: used by ixp and others]
-
-lede-commit: 394918851f84e4d00fa16eb900e7700e95091f00
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/redboot.c | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -266,14 +266,21 @@ static int parse_redboot_partitions(stru
- #endif
-               names += strlen(names)+1;
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-               if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--                      i++;
--                      parts[i].offset = parts[i-1].size + parts[i-1].offset;
--                      parts[i].size = fl->next->img->flash_base - parts[i].offset;
--                      parts[i].name = nullname;
--              }
-+                      if (!strcmp(parts[i].name, "rootfs")) {
-+                              parts[i].size = fl->next->img->flash_base;
-+                              parts[i].size &= ~(master->erasesize - 1);
-+                              parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+                              nrparts--;
-+                      } else {
-+                              i++;
-+                              parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+                              parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+                              parts[i].name = nullname;
- #endif
-+                      }
-+              }
-               tmp_fl = fl;
-               fl = fl->next;
-               kfree(tmp_fl);
diff --git a/target/linux/generic/pending-4.9/430-mtd-add-myloader-partition-parser.patch b/target/linux/generic/pending-4.9/430-mtd-add-myloader-partition-parser.patch
deleted file mode 100644 (file)
index eb969a0..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Florian Fainelli <f.fainelli@gmail.com>
-Subject: Add myloader partition table parser
-
-[john@phozen.org: shoud be upstreamable]
-
-lede-commit: d8bf22859b51faa09d22c056fe221a45d2f7a3b8
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- drivers/mtd/Kconfig  | 16 ++++++++++++++++
- drivers/mtd/Makefile |  1 +
- 2 files changed, 17 insertions(+)
-
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -178,6 +178,22 @@ menu "Partition parsers"
- source "drivers/mtd/parsers/Kconfig"
- endmenu
-+config MTD_MYLOADER_PARTS
-+      tristate "MyLoader partition parsing"
-+      depends on ADM5120 || ATH25 || ATH79
-+      ---help---
-+        MyLoader is a bootloader which allows the user to define partitions
-+        in flash devices, by putting a table in the second erase block
-+        on the device, similar to a partition table. This table gives the 
-+        offsets and lengths of the user defined partitions.
-+
-+        If you need code which can detect and parse these tables, and
-+        register MTD 'partitions' corresponding to each image detected,
-+        enable this option.
-+
-+        You will still need the parsing functions to be called by the driver
-+        for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- #
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)  += afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
- obj-$(CONFIG_MTD_BCM63XX_PARTS)       += bcm63xxpart.o
- obj-$(CONFIG_MTD_BCM47XX_PARTS)       += bcm47xxpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- obj-y                         += parsers/
- # 'Users' - code which presents functionality to userspace.
diff --git a/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
deleted file mode 100644 (file)
index cbd185e..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Subject: [PATCH] mtd: bcm47xxpart: check for bad blocks when calculating offsets
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
-
---- a/drivers/mtd/parsers/parser_trx.c
-+++ b/drivers/mtd/parsers/parser_trx.c
-@@ -30,6 +30,33 @@ struct trx_header {
-       uint32_t offset[3];
- } __packed;
-+/*
-+ * Calculate real end offset (address) for a given amount of data. It checks
-+ * all blocks skipping bad ones.
-+ */
-+static size_t parser_trx_real_offset(struct mtd_info *mtd, size_t bytes)
-+{
-+      size_t real_offset = 0;
-+
-+      if (mtd_block_isbad(mtd, real_offset))
-+              pr_warn("Base offset shouldn't be at bad block");
-+
-+      while (bytes >= mtd->erasesize) {
-+              bytes -= mtd->erasesize;
-+              real_offset += mtd->erasesize;
-+              while (mtd_block_isbad(mtd, real_offset)) {
-+                      real_offset += mtd->erasesize;
-+
-+                      if (real_offset >= mtd->size)
-+                              return real_offset - mtd->erasesize;
-+              }
-+      }
-+
-+      real_offset += bytes;
-+
-+      return real_offset;
-+}
-+
- static const char *parser_trx_data_part_name(struct mtd_info *master,
-                                            size_t offset)
- {
-@@ -84,21 +111,21 @@ static int parser_trx_parse(struct mtd_i
-       if (trx.offset[2]) {
-               part = &parts[curr_part++];
-               part->name = "loader";
--              part->offset = trx.offset[i];
-+              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
-               i++;
-       }
-       if (trx.offset[i]) {
-               part = &parts[curr_part++];
-               part->name = "linux";
--              part->offset = trx.offset[i];
-+              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
-               i++;
-       }
-       if (trx.offset[i]) {
-               part = &parts[curr_part++];
--              part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
--              part->offset = trx.offset[i];
-+              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
-+              part->name = parser_trx_data_part_name(mtd, part->offset);
-               i++;
-       }
diff --git a/target/linux/generic/pending-4.9/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch b/target/linux/generic/pending-4.9/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
deleted file mode 100644 (file)
index 3970641..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Subject: mtd: bcm47xxpart: detect T_Meter partition
-
-It can be found on many Netgear devices. It consists of many 0x30 blocks
-starting with 4D 54.
-
-Signed-off-by: RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
----
- drivers/mtd/bcm47xxpart.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -40,6 +40,7 @@
- #define NVRAM_HEADER                  0x48534C46      /* FLSH */
- #define POT_MAGIC1                    0x54544f50      /* POTT */
- #define POT_MAGIC2                    0x504f          /* OP */
-+#define T_METER_MAGIC                 0x4D540000      /* MT */
- #define ML_MAGIC1                     0x39685a42
- #define ML_MAGIC2                     0x26594131
- #define TRX_MAGIC                     0x30524448
-@@ -183,6 +184,15 @@ static int bcm47xxpart_parse(struct mtd_
-                                            MTD_WRITEABLE);
-                       continue;
-               }
-+
-+              /* T_Meter */
-+              if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
-+                  (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
-+                  (le32_to_cpu(buf[0x060 / 4]) & 0xFFFF0000) == T_METER_MAGIC) {
-+                      bcm47xxpart_add_part(&parts[curr_part++], "T_Meter", offset,
-+                                           MTD_WRITEABLE);
-+                      continue;
-+              }
-               /* TRX */
-               if (buf[0x000 / 4] == TRX_MAGIC) {
diff --git a/target/linux/generic/pending-4.9/440-block2mtd_init.patch b/target/linux/generic/pending-4.9/440-block2mtd_init.patch
deleted file mode 100644 (file)
index 8834788..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: block2mtd
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/devices/block2mtd.c | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -26,6 +26,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
- #include <linux/slab.h>
-@@ -219,7 +220,7 @@ static void block2mtd_free_device(struct
- static struct block2mtd_dev *add_device(char *devname, int erase_size,
--              int timeout)
-+              const char *mtdname, int timeout)
- {
- #ifndef MODULE
-       int i;
-@@ -227,6 +228,7 @@ static struct block2mtd_dev *add_device(
-       const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
-       struct block_device *bdev = ERR_PTR(-ENODEV);
-       struct block2mtd_dev *dev;
-+      struct mtd_partition *part;
-       char *name;
-       if (!devname)
-@@ -283,13 +285,16 @@ static struct block2mtd_dev *add_device(
-       /* Setup the MTD structure */
-       /* make the name contain the block device in */
--      name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
-+      if (!mtdname)
-+              mtdname = devname;
-+      name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
-       if (!name)
-               goto err_destroy_mutex;
-+      strcpy(name, mtdname);
-       dev->mtd.name = name;
--      dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+      dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
-       dev->mtd.erasesize = erase_size;
-       dev->mtd.writesize = 1;
-       dev->mtd.writebufsize = PAGE_SIZE;
-@@ -302,7 +307,11 @@ static struct block2mtd_dev *add_device(
-       dev->mtd.priv = dev;
-       dev->mtd.owner = THIS_MODULE;
--      if (mtd_device_register(&dev->mtd, NULL, 0)) {
-+      part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+      part->name = name;
-+      part->offset = 0;
-+      part->size = dev->mtd.size;
-+      if (mtd_device_register(&dev->mtd, part, 1)) {
-               /* Device didn't get added, so free the entry */
-               goto err_destroy_mutex;
-       }
-@@ -310,8 +319,7 @@ static struct block2mtd_dev *add_device(
-       list_add(&dev->list, &blkmtd_device_list);
-       pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n",
-               dev->mtd.index,
--              dev->mtd.name + strlen("block2mtd: "),
--              dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+              mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-       return dev;
- err_destroy_mutex:
-@@ -384,7 +392,7 @@ static int block2mtd_setup2(const char *
-       /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
-       char buf[80 + 12 + 80 + 8];
-       char *str = buf;
--      char *token[2];
-+      char *token[3];
-       char *name;
-       size_t erase_size = PAGE_SIZE;
-       unsigned long timeout = MTD_DEFAULT_TIMEOUT;
-@@ -398,7 +406,7 @@ static int block2mtd_setup2(const char *
-       strcpy(str, val);
-       kill_final_newline(str);
--      for (i = 0; i < 2; i++)
-+      for (i = 0; i < 3; i++)
-               token[i] = strsep(&str, ",");
-       if (str) {
-@@ -424,8 +432,10 @@ static int block2mtd_setup2(const char *
-                       return 0;
-               }
-       }
-+      if (token[2] && (strlen(token[2]) + 1 > 80))
-+              pr_err("mtd device name too long\n");
--      add_device(name, erase_size, timeout);
-+      add_device(name, erase_size, token[2], timeout);
-       return 0;
- }
-@@ -459,7 +469,7 @@ static int block2mtd_setup(const char *v
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic/pending-4.9/441-block2mtd_probe.patch b/target/linux/generic/pending-4.9/441-block2mtd_probe.patch
deleted file mode 100644 (file)
index fee970a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: block2mtd
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/devices/block2mtd.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -392,7 +392,7 @@ static int block2mtd_setup2(const char *
-       /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
-       char buf[80 + 12 + 80 + 8];
-       char *str = buf;
--      char *token[3];
-+      char *token[4];
-       char *name;
-       size_t erase_size = PAGE_SIZE;
-       unsigned long timeout = MTD_DEFAULT_TIMEOUT;
-@@ -406,7 +406,7 @@ static int block2mtd_setup2(const char *
-       strcpy(str, val);
-       kill_final_newline(str);
--      for (i = 0; i < 3; i++)
-+      for (i = 0; i < 4; i++)
-               token[i] = strsep(&str, ",");
-       if (str) {
-@@ -435,6 +435,9 @@ static int block2mtd_setup2(const char *
-       if (token[2] && (strlen(token[2]) + 1 > 80))
-               pr_err("mtd device name too long\n");
-+      if (token[3] && kstrtoul(token[3], 0, &timeout))
-+              pr_err("invalid timeout\n");
-+
-       add_device(name, erase_size, token[2], timeout);
-       return 0;
-@@ -469,7 +472,7 @@ static int block2mtd_setup(const char *v
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic/pending-4.9/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch b/target/linux/generic/pending-4.9/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch
deleted file mode 100644 (file)
index feaf8cb..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Fri, 23 Feb 2018 17:12:16 +0100
-Subject: [PATCH] mtd: m25p80: allow fallback from spi_flash_read to regular
- SPI transfer
-
-Some flash controllers, e.g. on the ath79 platform can support a fast
-flash read via memory mapping, but only if the flash chip is in
-3-byte address mode.
-
-Since spi_flash_read_supported does not have access to the same data as
-spi_flash_read, the driver can't detect an unsupported call until m25p80
-has decided to use spi_flash_read.
-
-Allow the driver to indicate a fallback to a regular SPI transfer by
-returning -EOPNOTSUPP
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -155,9 +155,11 @@ static ssize_t m25p80_read(struct spi_no
-               msg.data_nbits = m25p80_rx_nbits(nor);
-               ret = spi_flash_read(spi, &msg);
--              if (ret < 0)
--                      return ret;
--              return msg.retlen;
-+              if (ret != -EOPNOTSUPP) {
-+                      if (ret < 0)
-+                              return ret;
-+                      return msg.retlen;
-+              }
-       }
-       spi_message_init(&m);
diff --git a/target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
deleted file mode 100644 (file)
index c52d7de..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: disable cfi cmdset 0002 erase suspend
-
-on some platforms, erase suspend leads to data corruption and lockups when write
-ops collide with erase ops. this has been observed on the buffalo wzr-hp-g300nh.
-rather than play whack-a-mole with a hard to reproduce issue on a variety of devices,
-simply disable erase suspend, as it will usually not produce any useful gain on
-the small filesystems used on embedded hardware.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/chips/cfi_cmdset_0002.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -807,7 +807,7 @@ static int get_chip(struct map_info *map
-               return 0;
-       case FL_ERASING:
--              if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
-+              if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
-                   !(mode == FL_READY || mode == FL_POINT ||
-                   (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
-                       goto sleep;
diff --git a/target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
deleted file mode 100644 (file)
index 905675e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-From: George Kashperko <george@znau.edu.ua>
-Subject: Issue map read after Write Buffer Load command to ensure chip is ready to receive data.
-
-Signed-off-by: George Kashperko <george@znau.edu.ua>
----
- drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
- 1 file changed, 1 insertion(+)
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1829,6 +1829,7 @@ static int __xipram do_write_buffer(stru
-       /* Write Buffer Load */
-       map_write(map, CMD(0x25), cmd_adr);
-+      (void) map_read(map, cmd_adr);
-       chip->state = FL_WRITING_TO_BUFFER;
diff --git a/target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch
deleted file mode 100644 (file)
index 27addde..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: Disable software protection bits for Macronix flashes.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1601,6 +1601,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-       if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
-           JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-+          JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
-           JEDEC_MFR(info) == SNOR_MFR_SST ||
-           info->flags & SPI_NOR_HAS_LOCK) {
-               write_enable(nor);
diff --git a/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
deleted file mode 100644 (file)
index e1681d6..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 9 Jan 2018 20:41:48 +0100
-Subject: [PATCH] Revert "mtd: spi-nor: fix Spansion regressions (aliased with
- Winbond)"
-
-This reverts commit 67b9bcd36906e12a15ffec19463afbbd6a41660e.
-
-The underlying issue breaking Spansion flash has been fixed with "mtd: spi-nor:
-wait until lock/unlock operations are ready" and "mtd: spi-nor: wait for SR_WIP
-to clear on initial unlock", so we can support unlocking for Winbond flash
-again.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
----
- drivers/mtd/spi-nor/spi-nor.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1603,6 +1603,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-           JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-           JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
-           JEDEC_MFR(info) == SNOR_MFR_SST ||
-+          JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-           info->flags & SPI_NOR_HAS_LOCK) {
-               write_enable(nor);
-               write_sr(nor, 0);
-@@ -1621,7 +1622,8 @@ int spi_nor_scan(struct spi_nor *nor, co
-       /* NOR protection support for STmicro/Micron chips and similar */
-       if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
--                      info->flags & SPI_NOR_HAS_LOCK) {
-+          JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-+          info->flags & SPI_NOR_HAS_LOCK) {
-               nor->flash_lock = stm_lock;
-               nor->flash_unlock = stm_unlock;
-               nor->flash_is_locked = stm_is_locked;
diff --git a/target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch b/target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
deleted file mode 100644 (file)
index f4ccc5f..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sat, 4 Nov 2017 07:40:23 +0100
-Subject: [PATCH] mtd: spi-nor: support limiting 4K sectors support based on
- flash size
-
-Some devices need 4K sectors to be able to deal with small flash chips.
-For instance, w25x05 is 64 KiB in size, and without 4K sectors, the
-entire chip is just one erase block.
-On bigger flash chip sizes, using 4K sectors can significantly slow down
-many operations, including using a writable filesystem. There are several
-platforms where it makes sense to use a single kernel on both kinds of
-devices.
-
-To support this properly, allow configuring an upper flash chip size
-limit for 4K sectors support.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/mtd/spi-nor/Kconfig
-+++ b/drivers/mtd/spi-nor/Kconfig
-@@ -29,6 +29,17 @@ config MTD_SPI_NOR_USE_4K_SECTORS
-         Please note that some tools/drivers/filesystems may not work with
-         4096 B erase size (e.g. UBIFS requires 15 KiB as a minimum).
-+config MTD_SPI_NOR_USE_4K_SECTORS_LIMIT
-+      int "Maximum flash chip size to use 4K sectors on (in KiB)"
-+      depends on MTD_SPI_NOR_USE_4K_SECTORS
-+      default "4096"
-+      help
-+        There are many flash chips that support 4K sectors, but are so large
-+        that using them significantly slows down writing large amounts of
-+        data or using a writable filesystem.
-+        Any flash chip larger than the size specified in this option will
-+        not use 4K sectors.
-+
- config SPI_ATMEL_QUADSPI
-       tristate "Atmel Quad SPI Controller"
-       depends on ARCH_AT91 || (ARM && COMPILE_TEST && !ARCH_EBSA110)
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1648,10 +1648,12 @@ int spi_nor_scan(struct spi_nor *nor, co
- #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
-       /* prefer "small sector" erase if possible */
--      if (info->flags & SECT_4K) {
-+      if ((info->flags & SECT_4K) && (mtd->size <=
-+          CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT * 1024)) {
-               nor->erase_opcode = SPINOR_OP_BE_4K;
-               mtd->erasesize = 4096;
--      } else if (info->flags & SECT_4K_PMC) {
-+      } else if ((info->flags & SECT_4K_PMC) && (mtd->size <=
-+                 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT * 1024)) {
-               nor->erase_opcode = SPINOR_OP_BE_4K_PMC;
-               mtd->erasesize = 4096;
-       } else
diff --git a/target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch b/target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
deleted file mode 100644 (file)
index d54ee4f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Robert Marko <robimarko@gmail.com>
-To: linux-mtd@lists.infradead.org
-Subject: mtd: spi-nor: Add Winbond w25q128jv support
-Date: Mon, 25 Jun 2018 13:17:48 +0200
-
-Datasheet:
-http://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
-
-Testing done on Mikrotik Routerboard  wAP R board.
-It does not support Dual or Quad modes.
-
-Signed-off-by: Robert Marko <robimarko@gmail.com>
----
-
-Changes in v2:
-       - Correct the title
----
- drivers/mtd/spi-nor/spi-nor.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1152,6 +1152,11 @@ static const struct flash_info spi_nor_i
-                       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-                       SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-       },
-+      {
-+              "w25q128jv", INFO(0xef7018, 0, 64 * 1024, 256,
-+                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-+                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-+      },
-       { "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
-       { "w25q80bl", INFO(0xef4014, 0, 64 * 1024,  16, SECT_4K) },
-       { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
diff --git a/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch b/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch
deleted file mode 100644 (file)
index ac1fda5..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Piotr Dymacz <pepe2k@gmail.com>
-Subject: kernel/mtd: add support for EON EN25Q128
-
-Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -954,6 +954,7 @@ static const struct flash_info spi_nor_i
-       { "en25q32b",   INFO(0x1c3016, 0, 64 * 1024,   64, 0) },
-       { "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128, 0) },
-       { "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
-+      { "en25q128",   INFO(0x1c3018, 0, 64 * 1024,  256, SECT_4K) },
-       { "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },
-       { "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },
-       { "en25s64",    INFO(0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
diff --git a/target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch b/target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch
deleted file mode 100644 (file)
index 62f6314..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: André Valentin <avalentin@marcant.net>
-Subject: linux/mtd: add id for mx25u3235f needed by ZyXEL NBG6817
-
-Signed-off-by: André Valentin <avalentin@marcant.net>
----
- drivers/mtd/spi-nor/spi-nor.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1020,6 +1020,7 @@ static const struct flash_info spi_nor_i
-       { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, SECT_4K) },
-       { "mx25l3255e",  INFO(0xc29e16, 0, 64 * 1024,  64, SECT_4K) },
-       { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
-+      { "mx25u3235f",  INFO(0xc22536, 0, 64 * 1024, 64, 0) },
-       { "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
-       { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
-       { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
diff --git a/target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch b/target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
deleted file mode 100644 (file)
index 011f4b4..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From b02f3405c935a28200db26b63e42086057565cf4 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sat, 31 Mar 2018 20:09:54 +0200
-Subject: [PATCH] mtd: spi-nor: Add support for XM25QH64A and XM25QH128A
-
-These devices are produced by Wuhan Xinxin Semiconductor Manufacturing
-Corp. (XMC) and found on some routers from Chinese manufactures.
-
-The data sheets can be found here:
-http://www.xmcwh.com/Uploads/2018-03-01/5a9799e4cb355.pdf
-http://www.xmcwh.com/Uploads/2018-02-05/5a77e6dbe968b.pdf
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/mtd/spi-nor/spi-nor.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1177,6 +1177,10 @@ static const struct flash_info spi_nor_i
-       { "3S400AN", S3AN_INFO(0x1f2400, 256, 264) },
-       { "3S700AN", S3AN_INFO(0x1f2500, 512, 264) },
-       { "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) },
-+
-+      /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
-+      { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+      { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { },
- };
diff --git a/target/linux/generic/pending-4.9/479-mtd-spi-nor-add-eon-en25qh32.patch b/target/linux/generic/pending-4.9/479-mtd-spi-nor-add-eon-en25qh32.patch
deleted file mode 100644 (file)
index b8d5101..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -955,6 +955,7 @@ static const struct flash_info spi_nor_i
-       { "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128, 0) },
-       { "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
-       { "en25q128",   INFO(0x1c3018, 0, 64 * 1024,  256, SECT_4K) },
-+      { "en25qh32",   INFO(0x1c7016, 0, 64 * 1024,   64, 0) },
-       { "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },
-       { "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },
-       { "en25s64",    INFO(0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
diff --git a/target/linux/generic/pending-4.9/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/pending-4.9/480-mtd-set-rootfs-to-be-root-dev.patch
deleted file mode 100644 (file)
index 1bc958c..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: kernel/3.1[02]: move MTD root device setup code to mtdcore
-
-The current code only allows to automatically set
-root device on MTD partitions. Move the code to MTD
-core to allow to use it with all MTD devices.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdcore.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -40,6 +40,7 @@
- #include <linux/slab.h>
- #include <linux/reboot.h>
- #include <linux/leds.h>
-+#include <linux/root_dev.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-@@ -570,6 +571,15 @@ int add_mtd_device(struct mtd_info *mtd)
-          of this try_ nonsense, and no bitching about it
-          either. :) */
-       __module_get(THIS_MODULE);
-+
-+      if (!strcmp(mtd->name, "rootfs") &&
-+          IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
-+          ROOT_DEV == 0) {
-+              pr_notice("mtd: device %d (%s) set to be root filesystem\n",
-+                        mtd->index, mtd->name);
-+              ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
-+      }
-+
-       return 0;
- fail_added:
diff --git a/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
deleted file mode 100644 (file)
index 168cfe5..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: ubi: auto-attach mtd device named "ubi" or "data" on boot
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
---- a/drivers/mtd/ubi/build.c
-+++ b/drivers/mtd/ubi/build.c
-@@ -1226,6 +1226,73 @@ static struct mtd_info * __init open_mtd
-       return mtd;
- }
-+/*
-+ * This function tries attaching mtd partitions named either "ubi" or "data"
-+ * during boot.
-+ */
-+static void __init ubi_auto_attach(void)
-+{
-+      int err;
-+      struct mtd_info *mtd;
-+      loff_t offset = 0;
-+      size_t len;
-+      char magic[4];
-+
-+      /* try attaching mtd device named "ubi" or "data" */
-+      mtd = open_mtd_device("ubi");
-+      if (IS_ERR(mtd))
-+              mtd = open_mtd_device("data");
-+
-+      if (IS_ERR(mtd))
-+              return;
-+
-+      /* get the first not bad block */
-+      if (mtd_can_have_bb(mtd))
-+              while (mtd_block_isbad(mtd, offset)) {
-+                      offset += mtd->erasesize;
-+
-+                      if (offset > mtd->size) {
-+                              pr_err("UBI error: Failed to find a non-bad "
-+                                     "block on mtd%d\n", mtd->index);
-+                              goto cleanup;
-+                      }
-+              }
-+
-+      /* check if the read from flash was successful */
-+      err = mtd_read(mtd, offset, 4, &len, (void *) magic);
-+      if ((err && !mtd_is_bitflip(err)) || len != 4) {
-+              pr_err("UBI error: unable to read from mtd%d\n", mtd->index);
-+              goto cleanup;
-+      }
-+
-+      /* check for a valid ubi magic */
-+      if (strncmp(magic, "UBI#", 4)) {
-+              pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index);
-+              goto cleanup;
-+      }
-+
-+      /* don't auto-add media types where UBI doesn't makes sense */
-+      if (mtd->type != MTD_NANDFLASH &&
-+          mtd->type != MTD_NORFLASH &&
-+          mtd->type != MTD_DATAFLASH &&
-+          mtd->type != MTD_MLCNANDFLASH)
-+              goto cleanup;
-+
-+      mutex_lock(&ubi_devices_mutex);
-+      pr_notice("UBI: auto-attach mtd%d\n", mtd->index);
-+      err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
-+      mutex_unlock(&ubi_devices_mutex);
-+      if (err < 0) {
-+              pr_err("UBI error: cannot attach mtd%d\n", mtd->index);
-+              goto cleanup;
-+      }
-+
-+      return;
-+
-+cleanup:
-+      put_mtd_device(mtd);
-+}
-+
- static int __init ubi_init(void)
- {
-       int err, i, k;
-@@ -1309,6 +1376,12 @@ static int __init ubi_init(void)
-               }
-       }
-+      /* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd
-+       * parameter was given */
-+      if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
-+          !ubi_is_module() && !mtd_devs)
-+              ubi_auto_attach();
-+
-       err = ubiblock_init();
-       if (err) {
-               pr_err("UBI error: block: cannot initialize, error %d", err);
diff --git a/target/linux/generic/pending-4.9/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/pending-4.9/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
deleted file mode 100644 (file)
index adc653d..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: ubi: auto-create ubiblock device for rootfs
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
---- a/drivers/mtd/ubi/block.c
-+++ b/drivers/mtd/ubi/block.c
-@@ -635,6 +635,44 @@ static void __init ubiblock_create_from_
-       }
- }
-+#define UBIFS_NODE_MAGIC  0x06101831
-+static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc)
-+{
-+      int ret;
-+      uint32_t magic_of, magic;
-+      ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4);
-+      if (ret)
-+              return 0;
-+      magic = le32_to_cpu(magic_of);
-+      return magic == UBIFS_NODE_MAGIC;
-+}
-+
-+static void __init ubiblock_create_auto_rootfs(void)
-+{
-+      int ubi_num, ret, is_ubifs;
-+      struct ubi_volume_desc *desc;
-+      struct ubi_volume_info vi;
-+
-+      for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++) {
-+              desc = ubi_open_volume_nm(ubi_num, "rootfs", UBI_READONLY);
-+              if (IS_ERR(desc))
-+                      continue;
-+
-+              ubi_get_volume_info(desc, &vi);
-+              is_ubifs = ubi_vol_is_ubifs(desc);
-+              ubi_close_volume(desc);
-+              if (is_ubifs)
-+                      break;
-+
-+              ret = ubiblock_create(&vi);
-+              if (ret)
-+                      pr_err("UBI error: block: can't add '%s' volume, err=%d\n",
-+                              vi.name, ret);
-+              /* always break if we get here */
-+              break;
-+      }
-+}
-+
- static void ubiblock_remove_all(void)
- {
-       struct ubiblock *next;
-@@ -667,6 +705,10 @@ int __init ubiblock_init(void)
-        */
-       ubiblock_create_from_param();
-+      /* auto-attach "rootfs" volume if existing and non-ubifs */
-+      if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV))
-+              ubiblock_create_auto_rootfs();
-+
-       /*
-        * Block devices are only created upon user requests, so we ignore
-        * existing volumes.
diff --git a/target/linux/generic/pending-4.9/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/pending-4.9/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
deleted file mode 100644 (file)
index 69a35c2..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: try auto-mounting ubi0:rootfs in init/do_mounts.c
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- init/do_mounts.c | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -438,7 +438,28 @@ retry:
- out:
-       put_page(page);
- }
-- 
-+
-+static int __init mount_ubi_rootfs(void)
-+{
-+      int flags = MS_SILENT;
-+      int err, tried = 0;
-+
-+      while (tried < 2) {
-+              err = do_mount_root("ubi0:rootfs", "ubifs", flags, \
-+                                      root_mount_data);
-+              switch (err) {
-+                      case -EACCES:
-+                              flags |= MS_RDONLY;
-+                              tried++;
-+                              break;
-+                      default:
-+                              return err;
-+              }
-+      }
-+
-+      return -EINVAL;
-+}
-+
- #ifdef CONFIG_ROOT_NFS
- #define NFSROOT_TIMEOUT_MIN   5
-@@ -532,6 +553,10 @@ void __init mount_root(void)
-                       change_floppy("root floppy");
-       }
- #endif
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+      if (!mount_ubi_rootfs())
-+              return;
-+#endif
- #ifdef CONFIG_BLOCK
-       {
-               int err = create_dev("/dev/root", ROOT_DEV);
diff --git a/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
deleted file mode 100644 (file)
index 8b8bef2..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: ubi: set ROOT_DEV to ubiblock "rootfs" if unset
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/mtd/ubi/block.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/mtd/ubi/block.c
-+++ b/drivers/mtd/ubi/block.c
-@@ -50,6 +50,7 @@
- #include <linux/scatterlist.h>
- #include <linux/idr.h>
- #include <asm/div64.h>
-+#include <linux/root_dev.h>
- #include "ubi-media.h"
- #include "ubi.h"
-@@ -447,6 +448,15 @@ int ubiblock_create(struct ubi_volume_in
-       dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
-                dev->ubi_num, dev->vol_id, vi->name);
-       mutex_unlock(&devices_mutex);
-+
-+      if (!strcmp(vi->name, "rootfs") &&
-+          IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
-+          ROOT_DEV == 0) {
-+              pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n",
-+                        dev->ubi_num, dev->vol_id, vi->name);
-+              ROOT_DEV = MKDEV(gd->major, gd->first_minor);
-+      }
-+
-       return 0;
- out_free_queue:
diff --git a/target/linux/generic/pending-4.9/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-4.9/494-mtd-ubi-add-EOF-marker-support.patch
deleted file mode 100644 (file)
index 0b23149..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: mtd: add EOF marker support to the UBI layer
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/ubi/attach.c | 25 ++++++++++++++++++++++---
- drivers/mtd/ubi/ubi.h    |  1 +
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/ubi/attach.c
-+++ b/drivers/mtd/ubi/attach.c
-@@ -939,6 +939,13 @@ static bool vol_ignored(int vol_id)
- #endif
- }
-+static bool ec_hdr_has_eof(struct ubi_ec_hdr *ech)
-+{
-+      return ech->padding1[0] == 'E' &&
-+             ech->padding1[1] == 'O' &&
-+             ech->padding1[2] == 'F';
-+}
-+
- /**
-  * scan_peb - scan and process UBI headers of a PEB.
-  * @ubi: UBI device description object
-@@ -971,9 +978,21 @@ static int scan_peb(struct ubi_device *u
-               return 0;
-       }
--      err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
--      if (err < 0)
--              return err;
-+      if (!ai->eof_found) {
-+              err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
-+              if (err < 0)
-+                      return err;
-+
-+              if (ec_hdr_has_eof(ech)) {
-+                      pr_notice("UBI: EOF marker found, PEBs from %d will be erased\n",
-+                              pnum);
-+                      ai->eof_found = true;
-+              }
-+      }
-+
-+      if (ai->eof_found)
-+              err = UBI_IO_FF_BITFLIPS;
-+
-       switch (err) {
-       case 0:
-               break;
---- a/drivers/mtd/ubi/ubi.h
-+++ b/drivers/mtd/ubi/ubi.h
-@@ -779,6 +779,7 @@ struct ubi_attach_info {
-       int mean_ec;
-       uint64_t ec_sum;
-       int ec_count;
-+      bool eof_found;
-       struct kmem_cache *aeb_slab_cache;
-       struct ubi_ec_hdr *ech;
-       struct ubi_vid_io_buf *vidb;
diff --git a/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch
deleted file mode 100644 (file)
index 31e7f2a..0000000
+++ /dev/null
@@ -1,5180 +0,0 @@
-From: Alexandros C. Couloumbis <alex@ozo.com>
-Subject: fs: add jffs2/lzma support (not activated by default yet)
-
-lede-commit: c2c88d315fa0e881f8b19da07b62859b915b11b2
-Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
----
- fs/jffs2/Kconfig             |    9 +
- fs/jffs2/Makefile            |    3 +
- fs/jffs2/compr.c             |    6 +
- fs/jffs2/compr.h             |   10 +-
- fs/jffs2/compr_lzma.c        |  128 +++
- fs/jffs2/super.c             |   33 +-
- include/linux/lzma.h         |   62 ++
- include/linux/lzma/LzFind.h  |  115 +++
- include/linux/lzma/LzHash.h  |   54 +
- include/linux/lzma/LzmaDec.h |  231 +++++
- include/linux/lzma/LzmaEnc.h |   80 ++
- include/linux/lzma/Types.h   |  226 +++++
- include/uapi/linux/jffs2.h   |    1 +
- lib/Kconfig                  |    6 +
- lib/Makefile                 |   12 +
- lib/lzma/LzFind.c            |  761 ++++++++++++++
- lib/lzma/LzmaDec.c           |  999 +++++++++++++++++++
- lib/lzma/LzmaEnc.c           | 2271 ++++++++++++++++++++++++++++++++++++++++++
- lib/lzma/Makefile            |    7 +
- 19 files changed, 5008 insertions(+), 6 deletions(-)
- create mode 100644 fs/jffs2/compr_lzma.c
- create mode 100644 include/linux/lzma.h
- create mode 100644 include/linux/lzma/LzFind.h
- create mode 100644 include/linux/lzma/LzHash.h
- create mode 100644 include/linux/lzma/LzmaDec.h
- create mode 100644 include/linux/lzma/LzmaEnc.h
- create mode 100644 include/linux/lzma/Types.h
- create mode 100644 lib/lzma/LzFind.c
- create mode 100644 lib/lzma/LzmaDec.c
- create mode 100644 lib/lzma/LzmaEnc.c
- create mode 100644 lib/lzma/Makefile
-
---- a/fs/jffs2/Kconfig
-+++ b/fs/jffs2/Kconfig
-@@ -139,6 +139,15 @@ config JFFS2_LZO
-         This feature was added in July, 2007. Say 'N' if you need
-         compatibility with older bootloaders or kernels.
-+config JFFS2_LZMA
-+      bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
-+      select LZMA_COMPRESS
-+      select LZMA_DECOMPRESS
-+      depends on JFFS2_FS
-+      default n
-+      help
-+        JFFS2 wrapper to the LZMA C SDK
-+
- config JFFS2_RTIME
-       bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
-       depends on JFFS2_FS
---- a/fs/jffs2/Makefile
-+++ b/fs/jffs2/Makefile
-@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)  += compr_rub
- jffs2-$(CONFIG_JFFS2_RTIME)   += compr_rtime.o
- jffs2-$(CONFIG_JFFS2_ZLIB)    += compr_zlib.o
- jffs2-$(CONFIG_JFFS2_LZO)     += compr_lzo.o
-+jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
- jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
-+
-+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
---- a/fs/jffs2/compr.c
-+++ b/fs/jffs2/compr.c
-@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
- #ifdef CONFIG_JFFS2_LZO
-       jffs2_lzo_init();
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_init();
-+#endif
- /* Setting default compression mode */
- #ifdef CONFIG_JFFS2_CMODE_NONE
-       jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
- int jffs2_compressors_exit(void)
- {
- /* Unregistering compressors */
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_exit();
-+#endif
- #ifdef CONFIG_JFFS2_LZO
-       jffs2_lzo_exit();
- #endif
---- a/fs/jffs2/compr.h
-+++ b/fs/jffs2/compr.h
-@@ -29,9 +29,9 @@
- #define JFFS2_DYNRUBIN_PRIORITY  20
- #define JFFS2_LZARI_PRIORITY     30
- #define JFFS2_RTIME_PRIORITY     50
--#define JFFS2_ZLIB_PRIORITY      60
--#define JFFS2_LZO_PRIORITY       80
--
-+#define JFFS2_LZMA_PRIORITY      70
-+#define JFFS2_ZLIB_PRIORITY      80
-+#define JFFS2_LZO_PRIORITY       90
- #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
- #define JFFS2_DYNRUBIN_DISABLED  /*      for decompression */
-@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
- int jffs2_lzo_init(void);
- void jffs2_lzo_exit(void);
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+int jffs2_lzma_init(void);
-+void jffs2_lzma_exit(void);
-+#endif
- #endif /* __JFFS2_COMPR_H__ */
---- /dev/null
-+++ b/fs/jffs2/compr_lzma.c
-@@ -0,0 +1,128 @@
-+/*
-+ * JFFS2 -- Journalling Flash File System, Version 2.
-+ *
-+ * For licensing information, see the file 'LICENCE' in this directory.
-+ *
-+ * JFFS2 wrapper to the LZMA C SDK
-+ *
-+ */
-+
-+#include <linux/lzma.h>
-+#include "compr.h"
-+
-+#ifdef __KERNEL__
-+      static DEFINE_MUTEX(deflate_mutex);
-+#endif
-+
-+CLzmaEncHandle *p;
-+Byte propsEncoded[LZMA_PROPS_SIZE];
-+SizeT propsSize = sizeof(propsEncoded);
-+
-+STATIC void lzma_free_workspace(void)
-+{
-+      LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
-+}
-+
-+STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
-+{
-+      if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
-+      {
-+              PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
-+              return -ENOMEM;
-+      }
-+
-+      if (LzmaEnc_SetProps(p, props) != SZ_OK)
-+      {
-+              lzma_free_workspace();
-+              return -1;
-+      }
-+      
-+      if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
-+      {
-+              lzma_free_workspace();
-+              return -1;
-+      }
-+
-+        return 0;
-+}
-+
-+STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
-+                            uint32_t *sourcelen, uint32_t *dstlen)
-+{
-+      SizeT compress_size = (SizeT)(*dstlen);
-+      int ret;
-+
-+      #ifdef __KERNEL__
-+              mutex_lock(&deflate_mutex);
-+      #endif
-+
-+      ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
-+              0, NULL, &lzma_alloc, &lzma_alloc);
-+
-+      #ifdef __KERNEL__
-+              mutex_unlock(&deflate_mutex);
-+      #endif
-+
-+      if (ret != SZ_OK)
-+              return -1;
-+
-+      *dstlen = (uint32_t)compress_size;
-+
-+      return 0;
-+}
-+
-+STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
-+                               uint32_t srclen, uint32_t destlen)
-+{
-+      int ret;
-+      SizeT dl = (SizeT)destlen;
-+      SizeT sl = (SizeT)srclen;
-+      ELzmaStatus status;
-+      
-+      ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
-+              propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
-+
-+      if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
-+              return -1;
-+
-+      return 0;
-+}
-+
-+static struct jffs2_compressor jffs2_lzma_comp = {
-+      .priority = JFFS2_LZMA_PRIORITY,
-+      .name = "lzma",
-+      .compr = JFFS2_COMPR_LZMA,
-+      .compress = &jffs2_lzma_compress,
-+      .decompress = &jffs2_lzma_decompress,
-+      .disabled = 0,
-+};
-+
-+int INIT jffs2_lzma_init(void)
-+{
-+        int ret;
-+      CLzmaEncProps props;
-+      LzmaEncProps_Init(&props);
-+
-+        props.dictSize = LZMA_BEST_DICT(0x2000);
-+        props.level = LZMA_BEST_LEVEL;
-+        props.lc = LZMA_BEST_LC;
-+        props.lp = LZMA_BEST_LP;
-+        props.pb = LZMA_BEST_PB;
-+        props.fb = LZMA_BEST_FB;
-+
-+      ret = lzma_alloc_workspace(&props);
-+        if (ret < 0)
-+                return ret;
-+
-+      ret = jffs2_register_compressor(&jffs2_lzma_comp);
-+      if (ret)
-+              lzma_free_workspace();
-+      
-+        return ret;
-+}
-+
-+void jffs2_lzma_exit(void)
-+{
-+      jffs2_unregister_compressor(&jffs2_lzma_comp);
-+      lzma_free_workspace();
-+}
---- a/fs/jffs2/super.c
-+++ b/fs/jffs2/super.c
-@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
-       BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
-       BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
--      pr_info("version 2.2."
-+      pr_info("version 2.2"
- #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
-              " (NAND)"
- #endif
- #ifdef CONFIG_JFFS2_SUMMARY
--             " (SUMMARY) "
-+             " (SUMMARY)"
- #endif
--             " Â© 2001-2006 Red Hat, Inc.\n");
-+#ifdef CONFIG_JFFS2_ZLIB
-+             " (ZLIB)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZO
-+             " (LZO)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZMA
-+             " (LZMA)"
-+#endif
-+#ifdef CONFIG_JFFS2_RTIME
-+             " (RTIME)"
-+#endif
-+#ifdef CONFIG_JFFS2_RUBIN
-+             " (RUBIN)"
-+#endif
-+#ifdef  CONFIG_JFFS2_CMODE_NONE
-+             " (CMODE_NONE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_PRIORITY
-+             " (CMODE_PRIORITY)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_SIZE
-+             " (CMODE_SIZE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
-+             " (CMODE_FAVOURLZO)"
-+#endif
-+             " (c) 2001-2006 Red Hat, Inc.\n");
-       jffs2_inode_cachep = kmem_cache_create("jffs2_i",
-                                            sizeof(struct jffs2_inode_info),
---- /dev/null
-+++ b/include/linux/lzma.h
-@@ -0,0 +1,62 @@
-+#ifndef __LZMA_H__
-+#define __LZMA_H__
-+
-+#ifdef __KERNEL__
-+      #include <linux/kernel.h>
-+      #include <linux/sched.h>
-+      #include <linux/slab.h>
-+      #include <linux/vmalloc.h>
-+      #include <linux/init.h>
-+      #define LZMA_MALLOC vmalloc
-+      #define LZMA_FREE vfree
-+      #define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
-+      #define INIT __init
-+      #define STATIC static
-+#else
-+      #include <stdint.h>
-+      #include <stdlib.h>
-+      #include <stdio.h>
-+      #include <unistd.h>
-+      #include <string.h>
-+      #include <asm/types.h>
-+      #include <errno.h>
-+      #include <linux/jffs2.h>
-+      #ifndef PAGE_SIZE
-+              extern int page_size;
-+              #define PAGE_SIZE page_size
-+      #endif
-+      #define LZMA_MALLOC malloc
-+      #define LZMA_FREE free
-+      #define PRINT_ERROR(msg) fprintf(stderr, msg)
-+      #define INIT
-+      #define STATIC
-+#endif
-+
-+#include "lzma/LzmaDec.h"
-+#include "lzma/LzmaEnc.h"
-+
-+#define LZMA_BEST_LEVEL (9)
-+#define LZMA_BEST_LC    (0)
-+#define LZMA_BEST_LP    (0)
-+#define LZMA_BEST_PB    (0)
-+#define LZMA_BEST_FB  (273)
-+
-+#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
-+
-+static void *p_lzma_malloc(void *p, size_t size)
-+{
-+        if (size == 0)
-+                return NULL;
-+
-+        return LZMA_MALLOC(size);
-+}
-+
-+static void p_lzma_free(void *p, void *address)
-+{
-+        if (address != NULL)
-+                LZMA_FREE(address);
-+}
-+
-+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzFind.h
-@@ -0,0 +1,115 @@
-+/* LzFind.h -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_FIND_H
-+#define __LZ_FIND_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef UInt32 CLzRef;
-+
-+typedef struct _CMatchFinder
-+{
-+  Byte *buffer;
-+  UInt32 pos;
-+  UInt32 posLimit;
-+  UInt32 streamPos;
-+  UInt32 lenLimit;
-+
-+  UInt32 cyclicBufferPos;
-+  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
-+
-+  UInt32 matchMaxLen;
-+  CLzRef *hash;
-+  CLzRef *son;
-+  UInt32 hashMask;
-+  UInt32 cutValue;
-+
-+  Byte *bufferBase;
-+  ISeqInStream *stream;
-+  int streamEndWasReached;
-+
-+  UInt32 blockSize;
-+  UInt32 keepSizeBefore;
-+  UInt32 keepSizeAfter;
-+
-+  UInt32 numHashBytes;
-+  int directInput;
-+  size_t directInputRem;
-+  int btMode;
-+  int bigHash;
-+  UInt32 historySize;
-+  UInt32 fixedHashSize;
-+  UInt32 hashSizeSum;
-+  UInt32 numSons;
-+  SRes result;
-+  UInt32 crc[256];
-+} CMatchFinder;
-+
-+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
-+#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
-+
-+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
-+
-+int MatchFinder_NeedMove(CMatchFinder *p);
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
-+void MatchFinder_MoveBlock(CMatchFinder *p);
-+void MatchFinder_ReadIfRequired(CMatchFinder *p);
-+
-+void MatchFinder_Construct(CMatchFinder *p);
-+
-+/* Conditions:
-+     historySize <= 3 GB
-+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
-+*/
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc);
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-+    UInt32 *distances, UInt32 maxLen);
-+
-+/*
-+Conditions:
-+  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
-+  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
-+*/
-+
-+typedef void (*Mf_Init_Func)(void *object);
-+typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
-+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
-+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
-+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
-+typedef void (*Mf_Skip_Func)(void *object, UInt32);
-+
-+typedef struct _IMatchFinder
-+{
-+  Mf_Init_Func Init;
-+  Mf_GetIndexByte_Func GetIndexByte;
-+  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
-+  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
-+  Mf_GetMatches_Func GetMatches;
-+  Mf_Skip_Func Skip;
-+} IMatchFinder;
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
-+
-+void MatchFinder_Init(CMatchFinder *p);
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzHash.h
-@@ -0,0 +1,54 @@
-+/* LzHash.h -- HASH functions for LZ algorithms
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_HASH_H
-+#define __LZ_HASH_H
-+
-+#define kHash2Size (1 << 10)
-+#define kHash3Size (1 << 16)
-+#define kHash4Size (1 << 20)
-+
-+#define kFix3HashSize (kHash2Size)
-+#define kFix4HashSize (kHash2Size + kHash3Size)
-+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
-+
-+#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
-+
-+#define HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
-+
-+#define HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
-+
-+#define HASH5_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
-+  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
-+  hash4Value &= (kHash4Size - 1); }
-+
-+/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
-+#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
-+
-+
-+#define MT_HASH2_CALC \
-+  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
-+
-+#define MT_HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
-+
-+#define MT_HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaDec.h
-@@ -0,0 +1,231 @@
-+/* LzmaDec.h -- LZMA Decoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_DEC_H
-+#define __LZMA_DEC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* #define _LZMA_PROB32 */
-+/* _LZMA_PROB32 can increase the speed on some CPUs,
-+   but memory usage for CLzmaDec::probs will be doubled in that case */
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+
-+/* ---------- LZMA Properties ---------- */
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaProps
-+{
-+  unsigned lc, lp, pb;
-+  UInt32 dicSize;
-+} CLzmaProps;
-+
-+/* LzmaProps_Decode - decodes properties
-+Returns:
-+  SZ_OK
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
-+
-+
-+/* ---------- LZMA Decoder state ---------- */
-+
-+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
-+   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
-+
-+#define LZMA_REQUIRED_INPUT_MAX 20
-+
-+typedef struct
-+{
-+  CLzmaProps prop;
-+  CLzmaProb *probs;
-+  Byte *dic;
-+  const Byte *buf;
-+  UInt32 range, code;
-+  SizeT dicPos;
-+  SizeT dicBufSize;
-+  UInt32 processedPos;
-+  UInt32 checkDicSize;
-+  unsigned state;
-+  UInt32 reps[4];
-+  unsigned remainLen;
-+  int needFlush;
-+  int needInitState;
-+  UInt32 numProbs;
-+  unsigned tempBufSize;
-+  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
-+} CLzmaDec;
-+
-+#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
-+
-+void LzmaDec_Init(CLzmaDec *p);
-+
-+/* There are two types of LZMA streams:
-+     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-+     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-+
-+typedef enum
-+{
-+  LZMA_FINISH_ANY,   /* finish at any point */
-+  LZMA_FINISH_END    /* block must be finished at the end */
-+} ELzmaFinishMode;
-+
-+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
-+
-+   You must use LZMA_FINISH_END, when you know that current output buffer
-+   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
-+
-+   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
-+   and output value of destLen will be less than output buffer size limit.
-+   You can check status result also.
-+
-+   You can use multiple checks to test data integrity after full decompression:
-+     1) Check Result and "status" variable.
-+     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
-+     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
-+        You must use correct finish mode in that case. */
-+
-+typedef enum
-+{
-+  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
-+  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
-+  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
-+  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
-+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
-+} ELzmaStatus;
-+
-+/* ELzmaStatus is used only as output value for function call */
-+
-+
-+/* ---------- Interfaces ---------- */
-+
-+/* There are 3 levels of interfaces:
-+     1) Dictionary Interface
-+     2) Buffer Interface
-+     3) One Call Interface
-+   You can select any of these interfaces, but don't mix functions from different
-+   groups for same object. */
-+
-+
-+/* There are two variants to allocate state for Dictionary Interface:
-+     1) LzmaDec_Allocate / LzmaDec_Free
-+     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
-+   You can use variant 2, if you set dictionary buffer manually.
-+   For Buffer Interface you must always use variant 1.
-+
-+LzmaDec_Allocate* can return:
-+  SZ_OK
-+  SZ_ERROR_MEM         - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+   
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
-+
-+SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
-+
-+/* ---------- Dictionary Interface ---------- */
-+
-+/* You can use it, if you want to eliminate the overhead for data copying from
-+   dictionary to some other external buffer.
-+   You must work with CLzmaDec variables directly in this interface.
-+
-+   STEPS:
-+     LzmaDec_Constr()
-+     LzmaDec_Allocate()
-+     for (each new stream)
-+     {
-+       LzmaDec_Init()
-+       while (it needs more decompression)
-+       {
-+         LzmaDec_DecodeToDic()
-+         use data from CLzmaDec::dic and update CLzmaDec::dicPos
-+       }
-+     }
-+     LzmaDec_Free()
-+*/
-+
-+/* LzmaDec_DecodeToDic
-+   
-+   The decoding to internal dictionary buffer (CLzmaDec::dic).
-+   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (dicLimit).
-+  LZMA_FINISH_ANY - Decode just dicLimit bytes.
-+  LZMA_FINISH_END - Stream must be finished after dicLimit.
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_NEEDS_MORE_INPUT
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+*/
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- Buffer Interface ---------- */
-+
-+/* It's zlib-like interface.
-+   See LzmaDec_DecodeToDic description for information about STEPS and return results,
-+   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
-+   to work with CLzmaDec variables manually.
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+*/
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaDecode
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+  SZ_ERROR_MEM  - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-+*/
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaEnc.h
-@@ -0,0 +1,80 @@
-+/*  LzmaEnc.h -- LZMA Encoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_ENC_H
-+#define __LZMA_ENC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaEncProps
-+{
-+  int level;       /*  0 <= level <= 9 */
-+  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
-+                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
-+                       default = (1 << 24) */
-+  int lc;          /* 0 <= lc <= 8, default = 3 */
-+  int lp;          /* 0 <= lp <= 4, default = 0 */
-+  int pb;          /* 0 <= pb <= 4, default = 2 */
-+  int algo;        /* 0 - fast, 1 - normal, default = 1 */
-+  int fb;          /* 5 <= fb <= 273, default = 32 */
-+  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
-+  int numHashBytes; /* 2, 3 or 4, default = 4 */
-+  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
-+  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
-+  int numThreads;  /* 1 or 2, default = 2 */
-+} CLzmaEncProps;
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p);
-+void LzmaEncProps_Normalize(CLzmaEncProps *p);
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
-+
-+
-+/* ---------- CLzmaEncHandle Interface ---------- */
-+
-+/* LzmaEnc_* functions can return the following exit codes:
-+Returns:
-+  SZ_OK           - OK
-+  SZ_ERROR_MEM    - Memory allocation error
-+  SZ_ERROR_PARAM  - Incorrect paramater in props
-+  SZ_ERROR_WRITE  - Write callback error.
-+  SZ_ERROR_PROGRESS - some break from progress callback
-+  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
-+*/
-+
-+typedef void * CLzmaEncHandle;
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
-+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaEncode
-+Return code:
-+  SZ_OK               - OK
-+  SZ_ERROR_MEM        - Memory allocation error
-+  SZ_ERROR_PARAM      - Incorrect paramater
-+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
-+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
-+*/
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/Types.h
-@@ -0,0 +1,226 @@
-+/* Types.h -- Basic types
-+2009-11-23 : Igor Pavlov : Public domain */
-+
-+#ifndef __7Z_TYPES_H
-+#define __7Z_TYPES_H
-+
-+#include <stddef.h>
-+
-+#ifdef _WIN32
-+#include <windows.h>
-+#endif
-+
-+#ifndef EXTERN_C_BEGIN
-+#ifdef __cplusplus
-+#define EXTERN_C_BEGIN extern "C" {
-+#define EXTERN_C_END }
-+#else
-+#define EXTERN_C_BEGIN
-+#define EXTERN_C_END
-+#endif
-+#endif
-+
-+EXTERN_C_BEGIN
-+
-+#define SZ_OK 0
-+
-+#define SZ_ERROR_DATA 1
-+#define SZ_ERROR_MEM 2
-+#define SZ_ERROR_CRC 3
-+#define SZ_ERROR_UNSUPPORTED 4
-+#define SZ_ERROR_PARAM 5
-+#define SZ_ERROR_INPUT_EOF 6
-+#define SZ_ERROR_OUTPUT_EOF 7
-+#define SZ_ERROR_READ 8
-+#define SZ_ERROR_WRITE 9
-+#define SZ_ERROR_PROGRESS 10
-+#define SZ_ERROR_FAIL 11
-+#define SZ_ERROR_THREAD 12
-+
-+#define SZ_ERROR_ARCHIVE 16
-+#define SZ_ERROR_NO_ARCHIVE 17
-+
-+typedef int SRes;
-+
-+#ifdef _WIN32
-+typedef DWORD WRes;
-+#else
-+typedef int WRes;
-+#endif
-+
-+#ifndef RINOK
-+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
-+#endif
-+
-+typedef unsigned char Byte;
-+typedef short Int16;
-+typedef unsigned short UInt16;
-+
-+#ifdef _LZMA_UINT32_IS_ULONG
-+typedef long Int32;
-+typedef unsigned long UInt32;
-+#else
-+typedef int Int32;
-+typedef unsigned int UInt32;
-+#endif
-+
-+#ifdef _SZ_NO_INT_64
-+
-+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
-+   NOTES: Some code will work incorrectly in that case! */
-+
-+typedef long Int64;
-+typedef unsigned long UInt64;
-+
-+#else
-+
-+#if defined(_MSC_VER) || defined(__BORLANDC__)
-+typedef __int64 Int64;
-+typedef unsigned __int64 UInt64;
-+#else
-+typedef long long int Int64;
-+typedef unsigned long long int UInt64;
-+#endif
-+
-+#endif
-+
-+#ifdef _LZMA_NO_SYSTEM_SIZE_T
-+typedef UInt32 SizeT;
-+#else
-+typedef size_t SizeT;
-+#endif
-+
-+typedef int Bool;
-+#define True 1
-+#define False 0
-+
-+
-+#ifdef _WIN32
-+#define MY_STD_CALL __stdcall
-+#else
-+#define MY_STD_CALL
-+#endif
-+
-+#ifdef _MSC_VER
-+
-+#if _MSC_VER >= 1300
-+#define MY_NO_INLINE __declspec(noinline)
-+#else
-+#define MY_NO_INLINE
-+#endif
-+
-+#define MY_CDECL __cdecl
-+#define MY_FAST_CALL __fastcall
-+
-+#else
-+
-+#define MY_CDECL
-+#define MY_FAST_CALL
-+
-+#endif
-+
-+
-+/* The following interfaces use first parameter as pointer to structure */
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) < input(*size)) is allowed */
-+} ISeqInStream;
-+
-+/* it can return SZ_ERROR_INPUT_EOF */
-+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
-+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
-+
-+typedef struct
-+{
-+  size_t (*Write)(void *p, const void *buf, size_t size);
-+    /* Returns: result - the number of actually written bytes.
-+       (result < size) means error */
-+} ISeqOutStream;
-+
-+typedef enum
-+{
-+  SZ_SEEK_SET = 0,
-+  SZ_SEEK_CUR = 1,
-+  SZ_SEEK_END = 2
-+} ESzSeek;
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ISeekInStream;
-+
-+typedef struct
-+{
-+  SRes (*Look)(void *p, void **buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) > input(*size)) is not allowed
-+       (output(*size) < input(*size)) is allowed */
-+  SRes (*Skip)(void *p, size_t offset);
-+    /* offset must be <= output(*size) of Look */
-+
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* reads directly (without buffer). It's same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ILookInStream;
-+
-+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
-+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
-+
-+/* reads via ILookInStream::Read */
-+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
-+
-+#define LookToRead_BUF_SIZE (1 << 14)
-+
-+typedef struct
-+{
-+  ILookInStream s;
-+  ISeekInStream *realStream;
-+  size_t pos;
-+  size_t size;
-+  Byte buf[LookToRead_BUF_SIZE];
-+} CLookToRead;
-+
-+void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
-+void LookToRead_Init(CLookToRead *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToLook;
-+
-+void SecToLook_CreateVTable(CSecToLook *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToRead;
-+
-+void SecToRead_CreateVTable(CSecToRead *p);
-+
-+typedef struct
-+{
-+  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
-+    /* Returns: result. (result != SZ_OK) means break.
-+       Value (UInt64)(Int64)-1 for size means unknown value. */
-+} ICompressProgress;
-+
-+typedef struct
-+{
-+  void *(*Alloc)(void *p, size_t size);
-+  void (*Free)(void *p, void *address); /* address can be 0 */
-+} ISzAlloc;
-+
-+#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
-+#define IAlloc_Free(p, a) (p)->Free((p), a)
-+
-+EXTERN_C_END
-+
-+#endif
---- a/include/uapi/linux/jffs2.h
-+++ b/include/uapi/linux/jffs2.h
-@@ -46,6 +46,7 @@
- #define JFFS2_COMPR_DYNRUBIN  0x05
- #define JFFS2_COMPR_ZLIB      0x06
- #define JFFS2_COMPR_LZO               0x07
-+#define JFFS2_COMPR_LZMA      0x08
- /* Compatibility flags. */
- #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
- #define JFFS2_NODE_ACCURATE 0x2000
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -241,6 +241,12 @@ config LZ4_DECOMPRESS
- source "lib/xz/Kconfig"
-+config LZMA_COMPRESS
-+    tristate
-+
-+config LZMA_DECOMPRESS
-+    tristate
-+
- #
- # These all provide a common interface (hence the apparent duplication with
- # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -2,6 +2,16 @@
- # Makefile for some libs needed in the kernel.
- #
-+ifdef CONFIG_JFFS2_ZLIB
-+      CONFIG_ZLIB_INFLATE:=y
-+      CONFIG_ZLIB_DEFLATE:=y
-+endif
-+
-+ifdef CONFIG_JFFS2_LZMA
-+      CONFIG_LZMA_DECOMPRESS:=y
-+      CONFIG_LZMA_COMPRESS:=y
-+endif
-+
- ifdef CONFIG_FUNCTION_TRACER
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
- KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
-@@ -109,6 +119,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
- obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
- obj-$(CONFIG_XZ_DEC) += xz/
- obj-$(CONFIG_RAID6_PQ) += raid6/
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma/
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
---- /dev/null
-+++ b/lib/lzma/LzFind.c
-@@ -0,0 +1,761 @@
-+/* LzFind.c -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+#include "LzFind.h"
-+#include "LzHash.h"
-+
-+#define kEmptyHashValue 0
-+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
-+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
-+#define kNormalizeMask (~(kNormalizeStepMin - 1))
-+#define kMaxHistorySize ((UInt32)3 << 30)
-+
-+#define kStartMaxLen 3
-+
-+static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  if (!p->directInput)
-+  {
-+    alloc->Free(alloc, p->bufferBase);
-+    p->bufferBase = 0;
-+  }
-+}
-+
-+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
-+
-+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
-+{
-+  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
-+  if (p->directInput)
-+  {
-+    p->blockSize = blockSize;
-+    return 1;
-+  }
-+  if (p->bufferBase == 0 || p->blockSize != blockSize)
-+  {
-+    LzInWindow_Free(p, alloc);
-+    p->blockSize = blockSize;
-+    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
-+  }
-+  return (p->bufferBase != 0);
-+}
-+
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-+
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-+
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-+{
-+  p->posLimit -= subValue;
-+  p->pos -= subValue;
-+  p->streamPos -= subValue;
-+}
-+
-+static void MatchFinder_ReadBlock(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached || p->result != SZ_OK)
-+    return;
-+  if (p->directInput)
-+  {
-+    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-+    if (curSize > p->directInputRem)
-+      curSize = (UInt32)p->directInputRem;
-+    p->directInputRem -= curSize;
-+    p->streamPos += curSize;
-+    if (p->directInputRem == 0)
-+      p->streamEndWasReached = 1;
-+    return;
-+  }
-+  for (;;)
-+  {
-+    Byte *dest = p->buffer + (p->streamPos - p->pos);
-+    size_t size = (p->bufferBase + p->blockSize - dest);
-+    if (size == 0)
-+      return;
-+    p->result = p->stream->Read(p->stream, dest, &size);
-+    if (p->result != SZ_OK)
-+      return;
-+    if (size == 0)
-+    {
-+      p->streamEndWasReached = 1;
-+      return;
-+    }
-+    p->streamPos += (UInt32)size;
-+    if (p->streamPos - p->pos > p->keepSizeAfter)
-+      return;
-+  }
-+}
-+
-+void MatchFinder_MoveBlock(CMatchFinder *p)
-+{
-+  memmove(p->bufferBase,
-+    p->buffer - p->keepSizeBefore,
-+    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
-+  p->buffer = p->bufferBase + p->keepSizeBefore;
-+}
-+
-+int MatchFinder_NeedMove(CMatchFinder *p)
-+{
-+  if (p->directInput)
-+    return 0;
-+  /* if (p->streamEndWasReached) return 0; */
-+  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
-+}
-+
-+void MatchFinder_ReadIfRequired(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached)
-+    return;
-+  if (p->keepSizeAfter >= p->streamPos - p->pos)
-+    MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
-+{
-+  if (MatchFinder_NeedMove(p))
-+    MatchFinder_MoveBlock(p);
-+  MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
-+{
-+  p->cutValue = 32;
-+  p->btMode = 1;
-+  p->numHashBytes = 4;
-+  p->bigHash = 0;
-+}
-+
-+#define kCrcPoly 0xEDB88320
-+
-+void MatchFinder_Construct(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  p->bufferBase = 0;
-+  p->directInput = 0;
-+  p->hash = 0;
-+  MatchFinder_SetDefaultSettings(p);
-+
-+  for (i = 0; i < 256; i++)
-+  {
-+    UInt32 r = i;
-+    int j;
-+    for (j = 0; j < 8; j++)
-+      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-+    p->crc[i] = r;
-+  }
-+}
-+
-+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->hash);
-+  p->hash = 0;
-+}
-+
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  MatchFinder_FreeThisClassMemory(p, alloc);
-+  LzInWindow_Free(p, alloc);
-+}
-+
-+static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
-+{
-+  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
-+  if (sizeInBytes / sizeof(CLzRef) != num)
-+    return 0;
-+  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
-+}
-+
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc)
-+{
-+  UInt32 sizeReserv;
-+  if (historySize > kMaxHistorySize)
-+  {
-+    MatchFinder_Free(p, alloc);
-+    return 0;
-+  }
-+  sizeReserv = historySize >> 1;
-+  if (historySize > ((UInt32)2 << 30))
-+    sizeReserv = historySize >> 2;
-+  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
-+
-+  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
-+  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
-+  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
-+  if (LzInWindow_Create(p, sizeReserv, alloc))
-+  {
-+    UInt32 newCyclicBufferSize = historySize + 1;
-+    UInt32 hs;
-+    p->matchMaxLen = matchMaxLen;
-+    {
-+      p->fixedHashSize = 0;
-+      if (p->numHashBytes == 2)
-+        hs = (1 << 16) - 1;
-+      else
-+      {
-+        hs = historySize - 1;
-+        hs |= (hs >> 1);
-+        hs |= (hs >> 2);
-+        hs |= (hs >> 4);
-+        hs |= (hs >> 8);
-+        hs >>= 1;
-+        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
-+        if (hs > (1 << 24))
-+        {
-+          if (p->numHashBytes == 3)
-+            hs = (1 << 24) - 1;
-+          else
-+            hs >>= 1;
-+        }
-+      }
-+      p->hashMask = hs;
-+      hs++;
-+      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
-+      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
-+      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
-+      hs += p->fixedHashSize;
-+    }
-+
-+    {
-+      UInt32 prevSize = p->hashSizeSum + p->numSons;
-+      UInt32 newSize;
-+      p->historySize = historySize;
-+      p->hashSizeSum = hs;
-+      p->cyclicBufferSize = newCyclicBufferSize;
-+      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
-+      newSize = p->hashSizeSum + p->numSons;
-+      if (p->hash != 0 && prevSize == newSize)
-+        return 1;
-+      MatchFinder_FreeThisClassMemory(p, alloc);
-+      p->hash = AllocRefs(newSize, alloc);
-+      if (p->hash != 0)
-+      {
-+        p->son = p->hash + p->hashSizeSum;
-+        return 1;
-+      }
-+    }
-+  }
-+  MatchFinder_Free(p, alloc);
-+  return 0;
-+}
-+
-+static void MatchFinder_SetLimits(CMatchFinder *p)
-+{
-+  UInt32 limit = kMaxValForNormalize - p->pos;
-+  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  limit2 = p->streamPos - p->pos;
-+  if (limit2 <= p->keepSizeAfter)
-+  {
-+    if (limit2 > 0)
-+      limit2 = 1;
-+  }
-+  else
-+    limit2 -= p->keepSizeAfter;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  {
-+    UInt32 lenLimit = p->streamPos - p->pos;
-+    if (lenLimit > p->matchMaxLen)
-+      lenLimit = p->matchMaxLen;
-+    p->lenLimit = lenLimit;
-+  }
-+  p->posLimit = p->pos + limit;
-+}
-+
-+void MatchFinder_Init(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < p->hashSizeSum; i++)
-+    p->hash[i] = kEmptyHashValue;
-+  p->cyclicBufferPos = 0;
-+  p->buffer = p->bufferBase;
-+  p->pos = p->streamPos = p->cyclicBufferSize;
-+  p->result = SZ_OK;
-+  p->streamEndWasReached = 0;
-+  MatchFinder_ReadBlock(p);
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
-+{
-+  return (p->pos - p->historySize - 1) & kNormalizeMask;
-+}
-+
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-+{
-+  UInt32 i;
-+  for (i = 0; i < numItems; i++)
-+  {
-+    UInt32 value = items[i];
-+    if (value <= subValue)
-+      value = kEmptyHashValue;
-+    else
-+      value -= subValue;
-+    items[i] = value;
-+  }
-+}
-+
-+static void MatchFinder_Normalize(CMatchFinder *p)
-+{
-+  UInt32 subValue = MatchFinder_GetSubValue(p);
-+  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
-+  MatchFinder_ReduceOffsets(p, subValue);
-+}
-+
-+static void MatchFinder_CheckLimits(CMatchFinder *p)
-+{
-+  if (p->pos == kMaxValForNormalize)
-+    MatchFinder_Normalize(p);
-+  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
-+    MatchFinder_CheckAndMoveAndRead(p);
-+  if (p->cyclicBufferPos == p->cyclicBufferSize)
-+    p->cyclicBufferPos = 0;
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  son[_cyclicBufferPos] = curMatch;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+      return distances;
-+    {
-+      const Byte *pb = cur - delta;
-+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
-+      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
-+      {
-+        UInt32 len = 0;
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+            return distances;
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return distances;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        if (++len != lenLimit && pb[len] == cur[len])
-+          while (++len != lenLimit)
-+            if (pb[len] != cur[len])
-+              break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return distances;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        {
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+#define MOVE_POS \
-+  ++p->cyclicBufferPos; \
-+  p->buffer++; \
-+  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
-+
-+#define MOVE_POS_RET MOVE_POS return offset;
-+
-+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-+
-+#define GET_MATCHES_HEADER2(minLen, ret_op) \
-+  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-+  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-+  cur = p->buffer;
-+
-+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
-+#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
-+
-+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
-+
-+#define GET_MATCHES_FOOTER(offset, maxLen) \
-+  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
-+  distances + offset, maxLen) - distances); MOVE_POS_RET;
-+
-+#define SKIP_FOOTER \
-+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
-+
-+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(2)
-+  HASH2_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 1)
-+}
-+
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 2)
-+}
-+
-+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, delta2, maxLen, offset;
-+  GET_MATCHES_HEADER(3)
-+
-+  HASH3_CALC;
-+
-+  delta2 = p->pos - p->hash[hash2Value];
-+  curMatch = p->hash[kFix3HashSize + hashValue];
-+  
-+  p->hash[hash2Value] =
-+  p->hash[kFix3HashSize + hashValue] = p->pos;
-+
-+
-+  maxLen = 2;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[0] = maxLen;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+  
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      p->son[p->cyclicBufferPos] = curMatch;
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances + offset, maxLen) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances, 2) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(2)
-+    HASH2_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value;
-+    SKIP_HEADER(3)
-+    HASH3_CALC;
-+    curMatch = p->hash[kFix3HashSize + hashValue];
-+    p->hash[hash2Value] =
-+    p->hash[kFix3HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] = p->pos;
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] =
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
-+{
-+  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-+  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
-+  if (!p->btMode)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 2)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 3)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
-+  }
-+  else
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
-+  }
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaDec.c
-@@ -0,0 +1,999 @@
-+/* LzmaDec.c -- LZMA Decoder
-+2009-09-20 : Igor Pavlov : Public domain */
-+
-+#include "LzmaDec.h"
-+
-+#include <string.h>
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+#define RC_INIT_SIZE 5
-+
-+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
-+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
-+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
-+  { UPDATE_0(p); i = (i + i); A0; } else \
-+  { UPDATE_1(p); i = (i + i) + 1; A1; }
-+#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
-+
-+#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
-+#define TREE_DECODE(probs, limit, i) \
-+  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
-+
-+/* #define _LZMA_SIZE_OPT */
-+
-+#ifdef _LZMA_SIZE_OPT
-+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-+#else
-+#define TREE_6_DECODE(probs, i) \
-+  { i = 1; \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  i -= 0x40; }
-+#endif
-+
-+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0_CHECK range = bound;
-+#define UPDATE_1_CHECK range -= bound; code -= bound;
-+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
-+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
-+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
-+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
-+#define TREE_DECODE_CHECK(probs, limit, i) \
-+  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
-+
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-+
-+
-+#define kNumStates 12
-+#define kNumLitStates 7
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+#define LZMA_DIC_MIN (1 << 12)
-+
-+/* First LZMA-symbol is always decoded.
-+And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
-+Out:
-+  Result:
-+    SZ_OK - OK
-+    SZ_ERROR_DATA - Error
-+  p->remainLen:
-+    < kMatchSpecLenStart : normal remain
-+    = kMatchSpecLenStart : finished
-+    = kMatchSpecLenStart + 1 : Flush marker
-+    = kMatchSpecLenStart + 2 : State Init Marker
-+*/
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  CLzmaProb *probs = p->probs;
-+
-+  unsigned state = p->state;
-+  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
-+  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
-+  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
-+  unsigned lc = p->prop.lc;
-+
-+  Byte *dic = p->dic;
-+  SizeT dicBufSize = p->dicBufSize;
-+  SizeT dicPos = p->dicPos;
-+  
-+  UInt32 processedPos = p->processedPos;
-+  UInt32 checkDicSize = p->checkDicSize;
-+  unsigned len = 0;
-+
-+  const Byte *buf = p->buf;
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+
-+  do
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = processedPos & pbMask;
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0(prob)
-+    {
-+      unsigned symbol;
-+      UPDATE_0(prob);
-+      prob = probs + Literal;
-+      if (checkDicSize != 0 || processedPos != 0)
-+        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
-+        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        state -= (state < 4) ? state : 3;
-+        symbol = 1;
-+        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        state -= (state < 10) ? 3 : 6;
-+        symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      dic[dicPos++] = (Byte)symbol;
-+      processedPos++;
-+      continue;
-+    }
-+    else
-+    {
-+      UPDATE_1(prob);
-+      prob = probs + IsRep + state;
-+      IF_BIT_0(prob)
-+      {
-+        UPDATE_0(prob);
-+        state += kNumStates;
-+        prob = probs + LenCoder;
-+      }
-+      else
-+      {
-+        UPDATE_1(prob);
-+        if (checkDicSize == 0 && processedPos == 0)
-+          return SZ_ERROR_DATA;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0(prob)
-+        {
-+          UPDATE_0(prob);
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+            dicPos++;
-+            processedPos++;
-+            state = state < kNumLitStates ? 9 : 11;
-+            continue;
-+          }
-+          UPDATE_1(prob);
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          UPDATE_1(prob);
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            distance = rep1;
-+          }
-+          else
-+          {
-+            UPDATE_1(prob);
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0(prob)
-+            {
-+              UPDATE_0(prob);
-+              distance = rep2;
-+            }
-+            else
-+            {
-+              UPDATE_1(prob);
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        state = state < kNumLitStates ? 8 : 11;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0(probLen)
-+        {
-+          UPDATE_0(probLen);
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = (1 << kLenNumLowBits);
-+        }
-+        else
-+        {
-+          UPDATE_1(probLen);
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0(probLen)
-+          {
-+            UPDATE_0(probLen);
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = (1 << kLenNumMidBits);
-+          }
-+          else
-+          {
-+            UPDATE_1(probLen);
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = (1 << kLenNumHighBits);
-+          }
-+        }
-+        TREE_DECODE(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state >= kNumStates)
-+      {
-+        UInt32 distance;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-+        TREE_6_DECODE(prob, distance);
-+        if (distance >= kStartPosModelIndex)
-+        {
-+          unsigned posSlot = (unsigned)distance;
-+          int numDirectBits = (int)(((distance >> 1) - 1));
-+          distance = (2 | (distance & 1));
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            distance <<= numDirectBits;
-+            prob = probs + SpecPos + distance - posSlot - 1;
-+            {
-+              UInt32 mask = 1;
-+              unsigned i = 1;
-+              do
-+              {
-+                GET_BIT2(prob + i, i, ; , distance |= mask);
-+                mask <<= 1;
-+              }
-+              while (--numDirectBits != 0);
-+            }
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE
-+              range >>= 1;
-+              
-+              {
-+                UInt32 t;
-+                code -= range;
-+                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
-+                distance = (distance << 1) + (t + 1);
-+                code += range & t;
-+              }
-+              /*
-+              distance <<= 1;
-+              if (code >= range)
-+              {
-+                code -= range;
-+                distance |= 1;
-+              }
-+              */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            distance <<= kNumAlignBits;
-+            {
-+              unsigned i = 1;
-+              GET_BIT2(prob + i, i, ; , distance |= 1);
-+              GET_BIT2(prob + i, i, ; , distance |= 2);
-+              GET_BIT2(prob + i, i, ; , distance |= 4);
-+              GET_BIT2(prob + i, i, ; , distance |= 8);
-+            }
-+            if (distance == (UInt32)0xFFFFFFFF)
-+            {
-+              len += kMatchSpecLenStart;
-+              state -= kNumStates;
-+              break;
-+            }
-+          }
-+        }
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        rep0 = distance + 1;
-+        if (checkDicSize == 0)
-+        {
-+          if (distance >= processedPos)
-+            return SZ_ERROR_DATA;
-+        }
-+        else if (distance >= checkDicSize)
-+          return SZ_ERROR_DATA;
-+        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
-+      }
-+
-+      len += kMatchMinLen;
-+
-+      if (limit == dicPos)
-+        return SZ_ERROR_DATA;
-+      {
-+        SizeT rem = limit - dicPos;
-+        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
-+        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
-+
-+        processedPos += curLen;
-+
-+        len -= curLen;
-+        if (pos + curLen <= dicBufSize)
-+        {
-+          Byte *dest = dic + dicPos;
-+          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
-+          const Byte *lim = dest + curLen;
-+          dicPos += curLen;
-+          do
-+            *(dest) = (Byte)*(dest + src);
-+          while (++dest != lim);
-+        }
-+        else
-+        {
-+          do
-+          {
-+            dic[dicPos++] = dic[pos];
-+            if (++pos == dicBufSize)
-+              pos = 0;
-+          }
-+          while (--curLen != 0);
-+        }
-+      }
-+    }
-+  }
-+  while (dicPos < limit && buf < bufLimit);
-+  NORMALIZE;
-+  p->buf = buf;
-+  p->range = range;
-+  p->code = code;
-+  p->remainLen = len;
-+  p->dicPos = dicPos;
-+  p->processedPos = processedPos;
-+  p->reps[0] = rep0;
-+  p->reps[1] = rep1;
-+  p->reps[2] = rep2;
-+  p->reps[3] = rep3;
-+  p->state = state;
-+
-+  return SZ_OK;
-+}
-+
-+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
-+{
-+  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
-+  {
-+    Byte *dic = p->dic;
-+    SizeT dicPos = p->dicPos;
-+    SizeT dicBufSize = p->dicBufSize;
-+    unsigned len = p->remainLen;
-+    UInt32 rep0 = p->reps[0];
-+    if (limit - dicPos < len)
-+      len = (unsigned)(limit - dicPos);
-+
-+    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
-+      p->checkDicSize = p->prop.dicSize;
-+
-+    p->processedPos += len;
-+    p->remainLen -= len;
-+    while (len-- != 0)
-+    {
-+      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+      dicPos++;
-+    }
-+    p->dicPos = dicPos;
-+  }
-+}
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  do
-+  {
-+    SizeT limit2 = limit;
-+    if (p->checkDicSize == 0)
-+    {
-+      UInt32 rem = p->prop.dicSize - p->processedPos;
-+      if (limit - p->dicPos > rem)
-+        limit2 = p->dicPos + rem;
-+    }
-+    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
-+    if (p->processedPos >= p->prop.dicSize)
-+      p->checkDicSize = p->prop.dicSize;
-+    LzmaDec_WriteRem(p, limit);
-+  }
-+  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
-+
-+  if (p->remainLen > kMatchSpecLenStart)
-+  {
-+    p->remainLen = kMatchSpecLenStart;
-+  }
-+  return 0;
-+}
-+
-+typedef enum
-+{
-+  DUMMY_ERROR, /* unexpected end of input stream */
-+  DUMMY_LIT,
-+  DUMMY_MATCH,
-+  DUMMY_REP
-+} ELzmaDummy;
-+
-+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
-+{
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+  const Byte *bufLimit = buf + inSize;
-+  CLzmaProb *probs = p->probs;
-+  unsigned state = p->state;
-+  ELzmaDummy res;
-+
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0_CHECK(prob)
-+    {
-+      UPDATE_0_CHECK
-+
-+      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
-+
-+      prob = probs + Literal;
-+      if (p->checkDicSize != 0 || p->processedPos != 0)
-+        prob += (LZMA_LIT_SIZE *
-+          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
-+          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        unsigned symbol = 1;
-+        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
-+            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        unsigned symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      res = DUMMY_LIT;
-+    }
-+    else
-+    {
-+      unsigned len;
-+      UPDATE_1_CHECK;
-+
-+      prob = probs + IsRep + state;
-+      IF_BIT_0_CHECK(prob)
-+      {
-+        UPDATE_0_CHECK;
-+        state = 0;
-+        prob = probs + LenCoder;
-+        res = DUMMY_MATCH;
-+      }
-+      else
-+      {
-+        UPDATE_1_CHECK;
-+        res = DUMMY_REP;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0_CHECK(prob)
-+        {
-+          UPDATE_0_CHECK;
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+            NORMALIZE_CHECK;
-+            return DUMMY_REP;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+          }
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0_CHECK(prob)
-+            {
-+              UPDATE_0_CHECK;
-+            }
-+            else
-+            {
-+              UPDATE_1_CHECK;
-+            }
-+          }
-+        }
-+        state = kNumStates;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0_CHECK(probLen)
-+        {
-+          UPDATE_0_CHECK;
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = 1 << kLenNumLowBits;
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0_CHECK(probLen)
-+          {
-+            UPDATE_0_CHECK;
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = 1 << kLenNumMidBits;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = 1 << kLenNumHighBits;
-+          }
-+        }
-+        TREE_DECODE_CHECK(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state < 4)
-+      {
-+        unsigned posSlot;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-+            kNumPosSlotBits);
-+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+
-+          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
-+
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE_CHECK
-+              range >>= 1;
-+              code -= range & (((code - range) >> 31) - 1);
-+              /* if (code >= range) code -= range; */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            numDirectBits = kNumAlignBits;
-+          }
-+          {
-+            unsigned i = 1;
-+            do
-+            {
-+              GET_BIT_CHECK(prob + i, i);
-+            }
-+            while (--numDirectBits != 0);
-+          }
-+        }
-+      }
-+    }
-+  }
-+  NORMALIZE_CHECK;
-+  return res;
-+}
-+
-+
-+static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
-+{
-+  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
-+  p->range = 0xFFFFFFFF;
-+  p->needFlush = 0;
-+}
-+
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-+{
-+  p->needFlush = 1;
-+  p->remainLen = 0;
-+  p->tempBufSize = 0;
-+
-+  if (initDic)
-+  {
-+    p->processedPos = 0;
-+    p->checkDicSize = 0;
-+    p->needInitState = 1;
-+  }
-+  if (initState)
-+    p->needInitState = 1;
-+}
-+
-+void LzmaDec_Init(CLzmaDec *p)
-+{
-+  p->dicPos = 0;
-+  LzmaDec_InitDicAndState(p, True, True);
-+}
-+
-+static void LzmaDec_InitStateReal(CLzmaDec *p)
-+{
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
-+  UInt32 i;
-+  CLzmaProb *probs = p->probs;
-+  for (i = 0; i < numProbs; i++)
-+    probs[i] = kBitModelTotal >> 1;
-+  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
-+  p->state = 0;
-+  p->needInitState = 0;
-+}
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-+    ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT inSize = *srcLen;
-+  (*srcLen) = 0;
-+  LzmaDec_WriteRem(p, dicLimit);
-+  
-+  *status = LZMA_STATUS_NOT_SPECIFIED;
-+
-+  while (p->remainLen != kMatchSpecLenStart)
-+  {
-+      int checkEndMarkNow;
-+
-+      if (p->needFlush != 0)
-+      {
-+        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
-+          p->tempBuf[p->tempBufSize++] = *src++;
-+        if (p->tempBufSize < RC_INIT_SIZE)
-+        {
-+          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+          return SZ_OK;
-+        }
-+        if (p->tempBuf[0] != 0)
-+          return SZ_ERROR_DATA;
-+
-+        LzmaDec_InitRc(p, p->tempBuf);
-+        p->tempBufSize = 0;
-+      }
-+
-+      checkEndMarkNow = 0;
-+      if (p->dicPos >= dicLimit)
-+      {
-+        if (p->remainLen == 0 && p->code == 0)
-+        {
-+          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
-+          return SZ_OK;
-+        }
-+        if (finishMode == LZMA_FINISH_ANY)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_OK;
-+        }
-+        if (p->remainLen != 0)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_ERROR_DATA;
-+        }
-+        checkEndMarkNow = 1;
-+      }
-+
-+      if (p->needInitState)
-+        LzmaDec_InitStateReal(p);
-+  
-+      if (p->tempBufSize == 0)
-+      {
-+        SizeT processed;
-+        const Byte *bufLimit;
-+        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            memcpy(p->tempBuf, src, inSize);
-+            p->tempBufSize = (unsigned)inSize;
-+            (*srcLen) += inSize;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+          bufLimit = src;
-+        }
-+        else
-+          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
-+        p->buf = src;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
-+          return SZ_ERROR_DATA;
-+        processed = (SizeT)(p->buf - src);
-+        (*srcLen) += processed;
-+        src += processed;
-+        inSize -= processed;
-+      }
-+      else
-+      {
-+        unsigned rem = p->tempBufSize, lookAhead = 0;
-+        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
-+          p->tempBuf[rem++] = src[lookAhead++];
-+        p->tempBufSize = rem;
-+        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            (*srcLen) += lookAhead;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+        }
-+        p->buf = p->tempBuf;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
-+          return SZ_ERROR_DATA;
-+        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
-+        (*srcLen) += lookAhead;
-+        src += lookAhead;
-+        inSize -= lookAhead;
-+        p->tempBufSize = 0;
-+      }
-+  }
-+  if (p->code == 0)
-+    *status = LZMA_STATUS_FINISHED_WITH_MARK;
-+  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
-+}
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT outSize = *destLen;
-+  SizeT inSize = *srcLen;
-+  *srcLen = *destLen = 0;
-+  for (;;)
-+  {
-+    SizeT inSizeCur = inSize, outSizeCur, dicPos;
-+    ELzmaFinishMode curFinishMode;
-+    SRes res;
-+    if (p->dicPos == p->dicBufSize)
-+      p->dicPos = 0;
-+    dicPos = p->dicPos;
-+    if (outSize > p->dicBufSize - dicPos)
-+    {
-+      outSizeCur = p->dicBufSize;
-+      curFinishMode = LZMA_FINISH_ANY;
-+    }
-+    else
-+    {
-+      outSizeCur = dicPos + outSize;
-+      curFinishMode = finishMode;
-+    }
-+
-+    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
-+    src += inSizeCur;
-+    inSize -= inSizeCur;
-+    *srcLen += inSizeCur;
-+    outSizeCur = p->dicPos - dicPos;
-+    memcpy(dest, p->dic + dicPos, outSizeCur);
-+    dest += outSizeCur;
-+    outSize -= outSizeCur;
-+    *destLen += outSizeCur;
-+    if (res != 0)
-+      return res;
-+    if (outSizeCur == 0 || outSize == 0)
-+      return SZ_OK;
-+  }
-+}
-+
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->probs);
-+  p->probs = 0;
-+}
-+
-+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->dic);
-+  p->dic = 0;
-+}
-+
-+void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  LzmaDec_FreeProbs(p, alloc);
-+  LzmaDec_FreeDict(p, alloc);
-+}
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-+{
-+  UInt32 dicSize;
-+  Byte d;
-+  
-+  if (size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_UNSUPPORTED;
-+  else
-+    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
-+ 
-+  if (dicSize < LZMA_DIC_MIN)
-+    dicSize = LZMA_DIC_MIN;
-+  p->dicSize = dicSize;
-+
-+  d = data[0];
-+  if (d >= (9 * 5 * 5))
-+    return SZ_ERROR_UNSUPPORTED;
-+
-+  p->lc = d % 9;
-+  d /= 9;
-+  p->pb = d / 5;
-+  p->lp = d % 5;
-+
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
-+{
-+  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
-+  if (p->probs == 0 || numProbs != p->numProbs)
-+  {
-+    LzmaDec_FreeProbs(p, alloc);
-+    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
-+    p->numProbs = numProbs;
-+    if (p->probs == 0)
-+      return SZ_ERROR_MEM;
-+  }
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  SizeT dicBufSize;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  dicBufSize = propNew.dicSize;
-+  if (p->dic == 0 || dicBufSize != p->dicBufSize)
-+  {
-+    LzmaDec_FreeDict(p, alloc);
-+    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
-+    if (p->dic == 0)
-+    {
-+      LzmaDec_FreeProbs(p, alloc);
-+      return SZ_ERROR_MEM;
-+    }
-+  }
-+  p->dicBufSize = dicBufSize;
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc)
-+{
-+  CLzmaDec p;
-+  SRes res;
-+  SizeT inSize = *srcLen;
-+  SizeT outSize = *destLen;
-+  *srcLen = *destLen = 0;
-+  if (inSize < RC_INIT_SIZE)
-+    return SZ_ERROR_INPUT_EOF;
-+
-+  LzmaDec_Construct(&p);
-+  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
-+  if (res != 0)
-+    return res;
-+  p.dic = dest;
-+  p.dicBufSize = outSize;
-+
-+  LzmaDec_Init(&p);
-+  
-+  *srcLen = inSize;
-+  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-+
-+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-+    res = SZ_ERROR_INPUT_EOF;
-+
-+  (*destLen) = p.dicPos;
-+  LzmaDec_FreeProbs(&p, alloc);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaEnc.c
-@@ -0,0 +1,2271 @@
-+/* LzmaEnc.c -- LZMA Encoder
-+2009-11-24 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+/* #define SHOW_STAT */
-+/* #define SHOW_STAT2 */
-+
-+#if defined(SHOW_STAT) || defined(SHOW_STAT2)
-+#include <stdio.h>
-+#endif
-+
-+#include "LzmaEnc.h"
-+
-+/* disable MT */
-+#define _7ZIP_ST
-+
-+#include "LzFind.h"
-+#ifndef _7ZIP_ST
-+#include "LzFindMt.h"
-+#endif
-+
-+#ifdef SHOW_STAT
-+static int ttt = 0;
-+#endif
-+
-+#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
-+
-+#define kBlockSize (9 << 10)
-+#define kUnpackBlockSize (1 << 18)
-+#define kMatchArraySize (1 << 21)
-+#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
-+
-+#define kNumMaxDirectBits (31)
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+#define kProbInitValue (kBitModelTotal >> 1)
-+
-+#define kNumMoveReducingBits 4
-+#define kNumBitPriceShiftBits 4
-+#define kBitPrice (1 << kNumBitPriceShiftBits)
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p)
-+{
-+  p->level = 5;
-+  p->dictSize = p->mc = 0;
-+  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
-+  p->writeEndMark = 0;
-+}
-+
-+void LzmaEncProps_Normalize(CLzmaEncProps *p)
-+{
-+  int level = p->level;
-+  if (level < 0) level = 5;
-+  p->level = level;
-+  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
-+  if (p->lc < 0) p->lc = 3;
-+  if (p->lp < 0) p->lp = 0;
-+  if (p->pb < 0) p->pb = 2;
-+  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
-+  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
-+  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
-+  if (p->numHashBytes < 0) p->numHashBytes = 4;
-+  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
-+  if (p->numThreads < 0)
-+    p->numThreads =
-+      #ifndef _7ZIP_ST
-+      ((p->btMode && p->algo) ? 2 : 1);
-+      #else
-+      1;
-+      #endif
-+}
-+
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-+{
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+  return props.dictSize;
-+}
-+
-+/* #define LZMA_LOG_BSR */
-+/* Define it for Intel's CPU */
-+
-+
-+#ifdef LZMA_LOG_BSR
-+
-+#define kDicLogSizeMaxCompress 30
-+
-+#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
-+
-+UInt32 GetPosSlot1(UInt32 pos)
-+{
-+  UInt32 res;
-+  BSR2_RET(pos, res);
-+  return res;
-+}
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
-+
-+#else
-+
-+#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
-+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
-+
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
-+{
-+  int c = 2, slotFast;
-+  g_FastPos[0] = 0;
-+  g_FastPos[1] = 1;
-+  
-+  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
-+  {
-+    UInt32 k = (1 << ((slotFast >> 1) - 1));
-+    UInt32 j;
-+    for (j = 0; j < k; j++, c++)
-+      g_FastPos[c] = (Byte)slotFast;
-+  }
-+}
-+
-+#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
-+  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
-+  res = p->g_FastPos[pos >> i] + (i * 2); }
-+/*
-+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
-+  p->g_FastPos[pos >> 6] + 12 : \
-+  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
-+*/
-+
-+#define GetPosSlot1(pos) p->g_FastPos[pos]
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
-+
-+#endif
-+
-+
-+#define LZMA_NUM_REPS 4
-+
-+typedef unsigned CState;
-+
-+typedef struct
-+{
-+  UInt32 price;
-+
-+  CState state;
-+  int prev1IsChar;
-+  int prev2;
-+
-+  UInt32 posPrev2;
-+  UInt32 backPrev2;
-+
-+  UInt32 posPrev;
-+  UInt32 backPrev;
-+  UInt32 backs[LZMA_NUM_REPS];
-+} COptimal;
-+
-+#define kNumOpts (1 << 12)
-+
-+#define kNumLenToPosStates 4
-+#define kNumPosSlotBits 6
-+#define kDicLogSizeMin 0
-+#define kDicLogSizeMax 32
-+#define kDistTableSizeMax (kDicLogSizeMax * 2)
-+
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+#define kAlignMask (kAlignTableSize - 1)
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
-+
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+#define LZMA_PB_MAX 4
-+#define LZMA_LC_MAX 8
-+#define LZMA_LP_MAX 4
-+
-+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
-+
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define LZMA_MATCH_LEN_MIN 2
-+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
-+
-+#define kNumStates 12
-+
-+typedef struct
-+{
-+  CLzmaProb choice;
-+  CLzmaProb choice2;
-+  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
-+  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
-+  CLzmaProb high[kLenNumHighSymbols];
-+} CLenEnc;
-+
-+typedef struct
-+{
-+  CLenEnc p;
-+  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
-+  UInt32 tableSize;
-+  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
-+} CLenPriceEnc;
-+
-+typedef struct
-+{
-+  UInt32 range;
-+  Byte cache;
-+  UInt64 low;
-+  UInt64 cacheSize;
-+  Byte *buf;
-+  Byte *bufLim;
-+  Byte *bufBase;
-+  ISeqOutStream *outStream;
-+  UInt64 processed;
-+  SRes res;
-+} CRangeEnc;
-+
-+typedef struct
-+{
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+} CSaveState;
-+
-+typedef struct
-+{
-+  IMatchFinder matchFinder;
-+  void *matchFinderObj;
-+
-+  #ifndef _7ZIP_ST
-+  Bool mtMode;
-+  CMatchFinderMt matchFinderMt;
-+  #endif
-+
-+  CMatchFinder matchFinderBase;
-+
-+  #ifndef _7ZIP_ST
-+  Byte pad[128];
-+  #endif
-+  
-+  UInt32 optimumEndIndex;
-+  UInt32 optimumCurrentIndex;
-+
-+  UInt32 longestMatchLength;
-+  UInt32 numPairs;
-+  UInt32 numAvail;
-+  COptimal opt[kNumOpts];
-+  
-+  #ifndef LZMA_LOG_BSR
-+  Byte g_FastPos[1 << kNumLogBits];
-+  #endif
-+
-+  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
-+  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
-+  UInt32 numFastBytes;
-+  UInt32 additionalOffset;
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+
-+  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
-+  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
-+  UInt32 alignPrices[kAlignTableSize];
-+  UInt32 alignPriceCount;
-+
-+  UInt32 distTableSize;
-+
-+  unsigned lc, lp, pb;
-+  unsigned lpMask, pbMask;
-+
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  unsigned lclp;
-+
-+  Bool fastMode;
-+  
-+  CRangeEnc rc;
-+
-+  Bool writeEndMark;
-+  UInt64 nowPos64;
-+  UInt32 matchPriceCount;
-+  Bool finished;
-+  Bool multiThread;
-+
-+  SRes result;
-+  UInt32 dictSize;
-+  UInt32 matchFinderCycles;
-+
-+  int needInit;
-+
-+  CSaveState saveState;
-+} CLzmaEnc;
-+
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CSaveState *dest = &p->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
-+}
-+
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *dest = (CLzmaEnc *)pp;
-+  const CSaveState *p = &dest->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
-+}
-+
-+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+
-+  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
-+      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
-+    return SZ_ERROR_PARAM;
-+  p->dictSize = props.dictSize;
-+  p->matchFinderCycles = props.mc;
-+  {
-+    unsigned fb = props.fb;
-+    if (fb < 5)
-+      fb = 5;
-+    if (fb > LZMA_MATCH_LEN_MAX)
-+      fb = LZMA_MATCH_LEN_MAX;
-+    p->numFastBytes = fb;
-+  }
-+  p->lc = props.lc;
-+  p->lp = props.lp;
-+  p->pb = props.pb;
-+  p->fastMode = (props.algo == 0);
-+  p->matchFinderBase.btMode = props.btMode;
-+  {
-+    UInt32 numHashBytes = 4;
-+    if (props.btMode)
-+    {
-+      if (props.numHashBytes < 2)
-+        numHashBytes = 2;
-+      else if (props.numHashBytes < 4)
-+        numHashBytes = props.numHashBytes;
-+    }
-+    p->matchFinderBase.numHashBytes = numHashBytes;
-+  }
-+
-+  p->matchFinderBase.cutValue = props.mc;
-+
-+  p->writeEndMark = props.writeEndMark;
-+
-+  #ifndef _7ZIP_ST
-+  /*
-+  if (newMultiThread != _multiThread)
-+  {
-+    ReleaseMatchFinder();
-+    _multiThread = newMultiThread;
-+  }
-+  */
-+  p->multiThread = (props.numThreads > 1);
-+  #endif
-+
-+  return SZ_OK;
-+}
-+
-+static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
-+static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
-+static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
-+static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
-+
-+#define IsCharState(s) ((s) < 7)
-+
-+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
-+
-+#define kInfinityPrice (1 << 30)
-+
-+static void RangeEnc_Construct(CRangeEnc *p)
-+{
-+  p->outStream = 0;
-+  p->bufBase = 0;
-+}
-+
-+#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
-+
-+#define RC_BUF_SIZE (1 << 16)
-+static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  if (p->bufBase == 0)
-+  {
-+    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
-+    if (p->bufBase == 0)
-+      return 0;
-+    p->bufLim = p->bufBase + RC_BUF_SIZE;
-+  }
-+  return 1;
-+}
-+
-+static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->bufBase);
-+  p->bufBase = 0;
-+}
-+
-+static void RangeEnc_Init(CRangeEnc *p)
-+{
-+  /* Stream.Init(); */
-+  p->low = 0;
-+  p->range = 0xFFFFFFFF;
-+  p->cacheSize = 1;
-+  p->cache = 0;
-+
-+  p->buf = p->bufBase;
-+
-+  p->processed = 0;
-+  p->res = SZ_OK;
-+}
-+
-+static void RangeEnc_FlushStream(CRangeEnc *p)
-+{
-+  size_t num;
-+  if (p->res != SZ_OK)
-+    return;
-+  num = p->buf - p->bufBase;
-+  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
-+    p->res = SZ_ERROR_WRITE;
-+  p->processed += num;
-+  p->buf = p->bufBase;
-+}
-+
-+static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
-+{
-+  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
-+  {
-+    Byte temp = p->cache;
-+    do
-+    {
-+      Byte *buf = p->buf;
-+      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
-+      p->buf = buf;
-+      if (buf == p->bufLim)
-+        RangeEnc_FlushStream(p);
-+      temp = 0xFF;
-+    }
-+    while (--p->cacheSize != 0);
-+    p->cache = (Byte)((UInt32)p->low >> 24);
-+  }
-+  p->cacheSize++;
-+  p->low = (UInt32)p->low << 8;
-+}
-+
-+static void RangeEnc_FlushData(CRangeEnc *p)
-+{
-+  int i;
-+  for (i = 0; i < 5; i++)
-+    RangeEnc_ShiftLow(p);
-+}
-+
-+static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
-+{
-+  do
-+  {
-+    p->range >>= 1;
-+    p->low += p->range & (0 - ((value >> --numBits) & 1));
-+    if (p->range < kTopValue)
-+    {
-+      p->range <<= 8;
-+      RangeEnc_ShiftLow(p);
-+    }
-+  }
-+  while (numBits != 0);
-+}
-+
-+static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
-+{
-+  UInt32 ttt = *prob;
-+  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
-+  if (symbol == 0)
-+  {
-+    p->range = newBound;
-+    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
-+  }
-+  else
-+  {
-+    p->low += newBound;
-+    p->range -= newBound;
-+    ttt -= ttt >> kNumMoveBits;
-+  }
-+  *prob = (CLzmaProb)ttt;
-+  if (p->range < kTopValue)
-+  {
-+    p->range <<= 8;
-+    RangeEnc_ShiftLow(p);
-+  }
-+}
-+
-+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
-+{
-+  symbol |= 0x100;
-+  do
-+  {
-+    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
-+{
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-+{
-+  UInt32 i;
-+  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-+  {
-+    const int kCyclesBits = kNumBitPriceShiftBits;
-+    UInt32 w = i;
-+    UInt32 bitCount = 0;
-+    int j;
-+    for (j = 0; j < kCyclesBits; j++)
-+    {
-+      w = w * w;
-+      bitCount <<= 1;
-+      while (w >= ((UInt32)1 << 16))
-+      {
-+        w >>= 1;
-+        bitCount++;
-+      }
-+    }
-+    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
-+  }
-+}
-+
-+
-+#define GET_PRICE(prob, symbol) \
-+  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICEa(prob, symbol) \
-+  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= 0x100;
-+  do
-+  {
-+    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+
-+static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0;)
-+  {
-+    UInt32 bit;
-+    i--;
-+    bit = (symbol >> i) & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+  }
-+}
-+
-+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = 0; i < numBitLevels; i++)
-+  {
-+    UInt32 bit = symbol & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+    symbol >>= 1;
-+  }
-+}
-+
-+static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= (1 << numBitLevels);
-+  while (symbol != 1)
-+  {
-+    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
-+    symbol >>= 1;
-+  }
-+  return price;
-+}
-+
-+static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0; i--)
-+  {
-+    UInt32 bit = symbol & 1;
-+    symbol >>= 1;
-+    price += GET_PRICEa(probs[m], bit);
-+    m = (m << 1) | bit;
-+  }
-+  return price;
-+}
-+
-+
-+static void LenEnc_Init(CLenEnc *p)
-+{
-+  unsigned i;
-+  p->choice = p->choice2 = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
-+    p->low[i] = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
-+    p->mid[i] = kProbInitValue;
-+  for (i = 0; i < kLenNumHighSymbols; i++)
-+    p->high[i] = kProbInitValue;
-+}
-+
-+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
-+{
-+  if (symbol < kLenNumLowSymbols)
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 0);
-+    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
-+  }
-+  else
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 1);
-+    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 0);
-+      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 1);
-+      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
-+    }
-+  }
-+}
-+
-+static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
-+{
-+  UInt32 a0 = GET_PRICE_0a(p->choice);
-+  UInt32 a1 = GET_PRICE_1a(p->choice);
-+  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
-+  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
-+  UInt32 i = 0;
-+  for (i = 0; i < kLenNumLowSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
-+  }
-+  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
-+  }
-+  for (; i < numSymbols; i++)
-+    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
-+}
-+
-+static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
-+{
-+  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
-+  p->counters[posState] = p->tableSize;
-+}
-+
-+static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
-+{
-+  UInt32 posState;
-+  for (posState = 0; posState < numPosStates; posState++)
-+    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
-+{
-+  LenEnc_Encode(&p->p, rc, symbol, posState);
-+  if (updatePrice)
-+    if (--p->counters[posState] == 0)
-+      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+
-+
-+
-+static void MovePos(CLzmaEnc *p, UInt32 num)
-+{
-+  #ifdef SHOW_STAT
-+  ttt += num;
-+  printf("\n MovePos %d", num);
-+  #endif
-+  if (num != 0)
-+  {
-+    p->additionalOffset += num;
-+    p->matchFinder.Skip(p->matchFinderObj, num);
-+  }
-+}
-+
-+static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
-+{
-+  UInt32 lenRes = 0, numPairs;
-+  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
-+  #ifdef SHOW_STAT
-+  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
-+  ttt++;
-+  {
-+    UInt32 i;
-+    for (i = 0; i < numPairs; i += 2)
-+      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
-+  }
-+  #endif
-+  if (numPairs > 0)
-+  {
-+    lenRes = p->matches[numPairs - 2];
-+    if (lenRes == p->numFastBytes)
-+    {
-+      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+      UInt32 distance = p->matches[numPairs - 1] + 1;
-+      UInt32 numAvail = p->numAvail;
-+      if (numAvail > LZMA_MATCH_LEN_MAX)
-+        numAvail = LZMA_MATCH_LEN_MAX;
-+      {
-+        const Byte *pby2 = pby - distance;
-+        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
-+      }
-+    }
-+  }
-+  p->additionalOffset++;
-+  *numDistancePairsRes = numPairs;
-+  return lenRes;
-+}
-+
-+
-+#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
-+#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
-+#define IsShortRep(p) ((p)->backPrev == 0)
-+
-+static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
-+{
-+  return
-+    GET_PRICE_0(p->isRepG0[state]) +
-+    GET_PRICE_0(p->isRep0Long[state][posState]);
-+}
-+
-+static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
-+{
-+  UInt32 price;
-+  if (repIndex == 0)
-+  {
-+    price = GET_PRICE_0(p->isRepG0[state]);
-+    price += GET_PRICE_1(p->isRep0Long[state][posState]);
-+  }
-+  else
-+  {
-+    price = GET_PRICE_1(p->isRepG0[state]);
-+    if (repIndex == 1)
-+      price += GET_PRICE_0(p->isRepG1[state]);
-+    else
-+    {
-+      price += GET_PRICE_1(p->isRepG1[state]);
-+      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
-+    }
-+  }
-+  return price;
-+}
-+
-+static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
-+{
-+  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
-+    GetPureRepPrice(p, repIndex, state, posState);
-+}
-+
-+static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
-+{
-+  UInt32 posMem = p->opt[cur].posPrev;
-+  UInt32 backMem = p->opt[cur].backPrev;
-+  p->optimumEndIndex = cur;
-+  do
-+  {
-+    if (p->opt[cur].prev1IsChar)
-+    {
-+      MakeAsChar(&p->opt[posMem])
-+      p->opt[posMem].posPrev = posMem - 1;
-+      if (p->opt[cur].prev2)
-+      {
-+        p->opt[posMem - 1].prev1IsChar = False;
-+        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
-+        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
-+      }
-+    }
-+    {
-+      UInt32 posPrev = posMem;
-+      UInt32 backCur = backMem;
-+      
-+      backMem = p->opt[posPrev].backPrev;
-+      posMem = p->opt[posPrev].posPrev;
-+      
-+      p->opt[posPrev].backPrev = backCur;
-+      p->opt[posPrev].posPrev = cur;
-+      cur = posPrev;
-+    }
-+  }
-+  while (cur != 0);
-+  *backRes = p->opt[0].backPrev;
-+  p->optimumCurrentIndex  = p->opt[0].posPrev;
-+  return p->optimumCurrentIndex;
-+}
-+
-+#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
-+
-+static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
-+  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
-+  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
-+  UInt32 *matches;
-+  const Byte *data;
-+  Byte curByte, matchByte;
-+  if (p->optimumEndIndex != p->optimumCurrentIndex)
-+  {
-+    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
-+    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
-+    *backRes = opt->backPrev;
-+    p->optimumCurrentIndex = opt->posPrev;
-+    return lenRes;
-+  }
-+  p->optimumCurrentIndex = p->optimumEndIndex = 0;
-+  
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  if (numAvail < 2)
-+  {
-+    *backRes = (UInt32)(-1);
-+    return 1;
-+  }
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  repMaxIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 lenTest;
-+    const Byte *data2;
-+    reps[i] = p->reps[i];
-+    data2 = data - (reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+    {
-+      repLens[i] = 0;
-+      continue;
-+    }
-+    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+    repLens[i] = lenTest;
-+    if (lenTest > repLens[repMaxIndex])
-+      repMaxIndex = i;
-+  }
-+  if (repLens[repMaxIndex] >= p->numFastBytes)
-+  {
-+    UInt32 lenRes;
-+    *backRes = repMaxIndex;
-+    lenRes = repLens[repMaxIndex];
-+    MovePos(p, lenRes - 1);
-+    return lenRes;
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+  curByte = *data;
-+  matchByte = *(data - (reps[0] + 1));
-+
-+  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
-+  {
-+    *backRes = (UInt32)-1;
-+    return 1;
-+  }
-+
-+  p->opt[0].state = (CState)p->state;
-+
-+  posState = (position & p->pbMask);
-+
-+  {
-+    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
-+        (!IsCharState(p->state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+  }
-+
-+  MakeAsChar(&p->opt[1]);
-+
-+  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
-+  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
-+
-+  if (matchByte == curByte)
-+  {
-+    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
-+    if (shortRepPrice < p->opt[1].price)
-+    {
-+      p->opt[1].price = shortRepPrice;
-+      MakeAsShortRep(&p->opt[1]);
-+    }
-+  }
-+  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
-+
-+  if (lenEnd < 2)
-+  {
-+    *backRes = p->opt[1].backPrev;
-+    return 1;
-+  }
-+
-+  p->opt[1].posPrev = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+    p->opt[0].backs[i] = reps[i];
-+
-+  len = lenEnd;
-+  do
-+    p->opt[len--].price = kInfinityPrice;
-+  while (len >= 2);
-+
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 repLen = repLens[i];
-+    UInt32 price;
-+    if (repLen < 2)
-+      continue;
-+    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
-+    do
-+    {
-+      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
-+      COptimal *opt = &p->opt[repLen];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = i;
-+        opt->prev1IsChar = False;
-+      }
-+    }
-+    while (--repLen >= 2);
-+  }
-+
-+  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
-+
-+  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
-+  if (len <= mainLen)
-+  {
-+    UInt32 offs = 0;
-+    while (len > matches[offs])
-+      offs += 2;
-+    for (; ; len++)
-+    {
-+      COptimal *opt;
-+      UInt32 distance = matches[offs + 1];
-+
-+      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
-+      UInt32 lenToPosState = GetLenToPosState(len);
-+      if (distance < kNumFullDistances)
-+        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
-+      else
-+      {
-+        UInt32 slot;
-+        GetPosSlot2(distance, slot);
-+        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
-+      }
-+      opt = &p->opt[len];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = distance + LZMA_NUM_REPS;
-+        opt->prev1IsChar = False;
-+      }
-+      if (len == matches[offs])
-+      {
-+        offs += 2;
-+        if (offs == numPairs)
-+          break;
-+      }
-+    }
-+  }
-+
-+  cur = 0;
-+
-+    #ifdef SHOW_STAT2
-+    if (position >= 0)
-+    {
-+      unsigned i;
-+      printf("\n pos = %4X", position);
-+      for (i = cur; i <= lenEnd; i++)
-+      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
-+    }
-+    #endif
-+
-+  for (;;)
-+  {
-+    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
-+    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
-+    Bool nextIsChar;
-+    Byte curByte, matchByte;
-+    const Byte *data;
-+    COptimal *curOpt;
-+    COptimal *nextOpt;
-+
-+    cur++;
-+    if (cur == lenEnd)
-+      return Backward(p, backRes, cur);
-+
-+    newLen = ReadMatchDistances(p, &numPairs);
-+    if (newLen >= p->numFastBytes)
-+    {
-+      p->numPairs = numPairs;
-+      p->longestMatchLength = newLen;
-+      return Backward(p, backRes, cur);
-+    }
-+    position++;
-+    curOpt = &p->opt[cur];
-+    posPrev = curOpt->posPrev;
-+    if (curOpt->prev1IsChar)
-+    {
-+      posPrev--;
-+      if (curOpt->prev2)
-+      {
-+        state = p->opt[curOpt->posPrev2].state;
-+        if (curOpt->backPrev2 < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      else
-+        state = p->opt[posPrev].state;
-+      state = kLiteralNextStates[state];
-+    }
-+    else
-+      state = p->opt[posPrev].state;
-+    if (posPrev == cur - 1)
-+    {
-+      if (IsShortRep(curOpt))
-+        state = kShortRepNextStates[state];
-+      else
-+        state = kLiteralNextStates[state];
-+    }
-+    else
-+    {
-+      UInt32 pos;
-+      const COptimal *prevOpt;
-+      if (curOpt->prev1IsChar && curOpt->prev2)
-+      {
-+        posPrev = curOpt->posPrev2;
-+        pos = curOpt->backPrev2;
-+        state = kRepNextStates[state];
-+      }
-+      else
-+      {
-+        pos = curOpt->backPrev;
-+        if (pos < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      prevOpt = &p->opt[posPrev];
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        UInt32 i;
-+        reps[0] = prevOpt->backs[pos];
-+        for (i = 1; i <= pos; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+        for (; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i];
-+      }
-+      else
-+      {
-+        UInt32 i;
-+        reps[0] = (pos - LZMA_NUM_REPS);
-+        for (i = 1; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+      }
-+    }
-+    curOpt->state = (CState)state;
-+
-+    curOpt->backs[0] = reps[0];
-+    curOpt->backs[1] = reps[1];
-+    curOpt->backs[2] = reps[2];
-+    curOpt->backs[3] = reps[3];
-+
-+    curPrice = curOpt->price;
-+    nextIsChar = False;
-+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+    curByte = *data;
-+    matchByte = *(data - (reps[0] + 1));
-+
-+    posState = (position & p->pbMask);
-+
-+    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
-+    {
-+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+      curAnd1Price +=
-+        (!IsCharState(state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+    }
-+
-+    nextOpt = &p->opt[cur + 1];
-+
-+    if (curAnd1Price < nextOpt->price)
-+    {
-+      nextOpt->price = curAnd1Price;
-+      nextOpt->posPrev = cur;
-+      MakeAsChar(nextOpt);
-+      nextIsChar = True;
-+    }
-+
-+    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
-+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-+    
-+    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
-+    {
-+      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
-+      if (shortRepPrice <= nextOpt->price)
-+      {
-+        nextOpt->price = shortRepPrice;
-+        nextOpt->posPrev = cur;
-+        MakeAsShortRep(nextOpt);
-+        nextIsChar = True;
-+      }
-+    }
-+    numAvailFull = p->numAvail;
-+    {
-+      UInt32 temp = kNumOpts - 1 - cur;
-+      if (temp < numAvailFull)
-+        numAvailFull = temp;
-+    }
-+
-+    if (numAvailFull < 2)
-+      continue;
-+    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
-+
-+    if (!nextIsChar && matchByte != curByte) /* speed optimization */
-+    {
-+      /* try Literal + rep0 */
-+      UInt32 temp;
-+      UInt32 lenTest2;
-+      const Byte *data2 = data - (reps[0] + 1);
-+      UInt32 limit = p->numFastBytes + 1;
-+      if (limit > numAvailFull)
-+        limit = numAvailFull;
-+
-+      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
-+      lenTest2 = temp - 1;
-+      if (lenTest2 >= 2)
-+      {
-+        UInt32 state2 = kLiteralNextStates[state];
-+        UInt32 posStateNext = (position + 1) & p->pbMask;
-+        UInt32 nextRepMatchPrice = curAnd1Price +
-+            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+            GET_PRICE_1(p->isRep[state2]);
-+        /* for (; lenTest2 >= 2; lenTest2--) */
-+        {
-+          UInt32 curAndLenPrice;
-+          COptimal *opt;
-+          UInt32 offset = cur + 1 + lenTest2;
-+          while (lenEnd < offset)
-+            p->opt[++lenEnd].price = kInfinityPrice;
-+          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+          opt = &p->opt[offset];
-+          if (curAndLenPrice < opt->price)
-+          {
-+            opt->price = curAndLenPrice;
-+            opt->posPrev = cur + 1;
-+            opt->backPrev = 0;
-+            opt->prev1IsChar = True;
-+            opt->prev2 = False;
-+          }
-+        }
-+      }
-+    }
-+    
-+    startLen = 2; /* speed optimization */
-+    {
-+    UInt32 repIndex;
-+    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
-+    {
-+      UInt32 lenTest;
-+      UInt32 lenTestTemp;
-+      UInt32 price;
-+      const Byte *data2 = data - (reps[repIndex] + 1);
-+      if (data[0] != data2[0] || data[1] != data2[1])
-+        continue;
-+      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+      while (lenEnd < cur + lenTest)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+      lenTestTemp = lenTest;
-+      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
-+      do
-+      {
-+        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
-+        COptimal *opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = repIndex;
-+          opt->prev1IsChar = False;
-+        }
-+      }
-+      while (--lenTest >= 2);
-+      lenTest = lenTestTemp;
-+      
-+      if (repIndex == 0)
-+        startLen = lenTest + 1;
-+        
-+      /* if (_maxMode) */
-+        {
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kRepNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice =
-+                price + p->repLenEnc.prices[posState][lenTest - 2] +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (position + lenTest + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = repIndex;
-+              }
-+            }
-+          }
-+        }
-+    }
-+    }
-+    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
-+    if (newLen > numAvail)
-+    {
-+      newLen = numAvail;
-+      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
-+      matches[numPairs] = newLen;
-+      numPairs += 2;
-+    }
-+    if (newLen >= startLen)
-+    {
-+      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
-+      UInt32 offs, curBack, posSlot;
-+      UInt32 lenTest;
-+      while (lenEnd < cur + newLen)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+
-+      offs = 0;
-+      while (startLen > matches[offs])
-+        offs += 2;
-+      curBack = matches[offs + 1];
-+      GetPosSlot2(curBack, posSlot);
-+      for (lenTest = /*2*/ startLen; ; lenTest++)
-+      {
-+        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
-+        UInt32 lenToPosState = GetLenToPosState(lenTest);
-+        COptimal *opt;
-+        if (curBack < kNumFullDistances)
-+          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
-+        else
-+          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-+        
-+        opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = curBack + LZMA_NUM_REPS;
-+          opt->prev1IsChar = False;
-+        }
-+
-+        if (/*_maxMode && */lenTest == matches[offs])
-+        {
-+          /* Try Match + Literal + Rep0 */
-+          const Byte *data2 = data - (curBack + 1);
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kMatchNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice = curAndLenPrice +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (posStateNext + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = curBack + LZMA_NUM_REPS;
-+              }
-+            }
-+          }
-+          offs += 2;
-+          if (offs == numPairs)
-+            break;
-+          curBack = matches[offs + 1];
-+          if (curBack >= kNumFullDistances)
-+            GetPosSlot2(curBack, posSlot);
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
-+
-+static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
-+  const Byte *data;
-+  const UInt32 *matches;
-+
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  *backRes = (UInt32)-1;
-+  if (numAvail < 2)
-+    return 1;
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+
-+  repLen = repIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
-+    if (len >= p->numFastBytes)
-+    {
-+      *backRes = i;
-+      MovePos(p, len - 1);
-+      return len;
-+    }
-+    if (len > repLen)
-+    {
-+      repIndex = i;
-+      repLen = len;
-+    }
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+
-+  mainDist = 0; /* for GCC */
-+  if (mainLen >= 2)
-+  {
-+    mainDist = matches[numPairs - 1];
-+    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
-+    {
-+      if (!ChangePair(matches[numPairs - 3], mainDist))
-+        break;
-+      numPairs -= 2;
-+      mainLen = matches[numPairs - 2];
-+      mainDist = matches[numPairs - 1];
-+    }
-+    if (mainLen == 2 && mainDist >= 0x80)
-+      mainLen = 1;
-+  }
-+
-+  if (repLen >= 2 && (
-+        (repLen + 1 >= mainLen) ||
-+        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
-+        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
-+  {
-+    *backRes = repIndex;
-+    MovePos(p, repLen - 1);
-+    return repLen;
-+  }
-+  
-+  if (mainLen < 2 || numAvail <= 2)
-+    return 1;
-+
-+  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
-+  if (p->longestMatchLength >= 2)
-+  {
-+    UInt32 newDistance = matches[p->numPairs - 1];
-+    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
-+        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
-+        (p->longestMatchLength > mainLen + 1) ||
-+        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
-+      return 1;
-+  }
-+  
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len, limit;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    limit = mainLen - 1;
-+    for (len = 2; len < limit && data[len] == data2[len]; len++);
-+    if (len >= limit)
-+      return 1;
-+  }
-+  *backRes = mainDist + LZMA_NUM_REPS;
-+  MovePos(p, mainLen - 2);
-+  return mainLen;
-+}
-+
-+static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
-+{
-+  UInt32 len;
-+  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+  p->state = kMatchNextStates[p->state];
-+  len = LZMA_MATCH_LEN_MIN;
-+  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
-+  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
-+  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
-+}
-+
-+static SRes CheckErrors(CLzmaEnc *p)
-+{
-+  if (p->result != SZ_OK)
-+    return p->result;
-+  if (p->rc.res != SZ_OK)
-+    p->result = SZ_ERROR_WRITE;
-+  if (p->matchFinderBase.result != SZ_OK)
-+    p->result = SZ_ERROR_READ;
-+  if (p->result != SZ_OK)
-+    p->finished = True;
-+  return p->result;
-+}
-+
-+static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
-+{
-+  /* ReleaseMFStream(); */
-+  p->finished = True;
-+  if (p->writeEndMark)
-+    WriteEndMarker(p, nowPos & p->pbMask);
-+  RangeEnc_FlushData(&p->rc);
-+  RangeEnc_FlushStream(&p->rc);
-+  return CheckErrors(p);
-+}
-+
-+static void FillAlignPrices(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < kAlignTableSize; i++)
-+    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
-+  p->alignPriceCount = 0;
-+}
-+
-+static void FillDistancesPrices(CLzmaEnc *p)
-+{
-+  UInt32 tempPrices[kNumFullDistances];
-+  UInt32 i, lenToPosState;
-+  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
-+  {
-+    UInt32 posSlot = GetPosSlot1(i);
-+    UInt32 footerBits = ((posSlot >> 1) - 1);
-+    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
-+  }
-+
-+  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
-+  {
-+    UInt32 posSlot;
-+    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
-+    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
-+    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
-+    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
-+
-+    {
-+      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
-+      UInt32 i;
-+      for (i = 0; i < kStartPosModelIndex; i++)
-+        distancesPrices[i] = posSlotPrices[i];
-+      for (; i < kNumFullDistances; i++)
-+        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
-+    }
-+  }
-+  p->matchPriceCount = 0;
-+}
-+
-+void LzmaEnc_Construct(CLzmaEnc *p)
-+{
-+  RangeEnc_Construct(&p->rc);
-+  MatchFinder_Construct(&p->matchFinderBase);
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Construct(&p->matchFinderMt);
-+  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
-+  #endif
-+
-+  {
-+    CLzmaEncProps props;
-+    LzmaEncProps_Init(&props);
-+    LzmaEnc_SetProps(p, &props);
-+  }
-+
-+  #ifndef LZMA_LOG_BSR
-+  LzmaEnc_FastPosInit(p->g_FastPos);
-+  #endif
-+
-+  LzmaEnc_InitPriceTables(p->ProbPrices);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
-+{
-+  void *p;
-+  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
-+  if (p != 0)
-+    LzmaEnc_Construct((CLzmaEnc *)p);
-+  return p;
-+}
-+
-+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->litProbs);
-+  alloc->Free(alloc, p->saveState.litProbs);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-+  #endif
-+  MatchFinder_Free(&p->matchFinderBase, allocBig);
-+  LzmaEnc_FreeLits(p, alloc);
-+  RangeEnc_Free(&p->rc, alloc);
-+}
-+
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
-+  alloc->Free(alloc, p);
-+}
-+
-+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
-+{
-+  UInt32 nowPos32, startPos32;
-+  if (p->needInit)
-+  {
-+    p->matchFinder.Init(p->matchFinderObj);
-+    p->needInit = 0;
-+  }
-+
-+  if (p->finished)
-+    return p->result;
-+  RINOK(CheckErrors(p));
-+
-+  nowPos32 = (UInt32)p->nowPos64;
-+  startPos32 = nowPos32;
-+
-+  if (p->nowPos64 == 0)
-+  {
-+    UInt32 numPairs;
-+    Byte curByte;
-+    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+      return Flush(p, nowPos32);
-+    ReadMatchDistances(p, &numPairs);
-+    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
-+    p->state = kLiteralNextStates[p->state];
-+    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
-+    LitEnc_Encode(&p->rc, p->litProbs, curByte);
-+    p->additionalOffset--;
-+    nowPos32++;
-+  }
-+
-+  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
-+  for (;;)
-+  {
-+    UInt32 pos, len, posState;
-+
-+    if (p->fastMode)
-+      len = GetOptimumFast(p, &pos);
-+    else
-+      len = GetOptimum(p, nowPos32, &pos);
-+
-+    #ifdef SHOW_STAT2
-+    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
-+    #endif
-+
-+    posState = nowPos32 & p->pbMask;
-+    if (len == 1 && pos == (UInt32)-1)
-+    {
-+      Byte curByte;
-+      CLzmaProb *probs;
-+      const Byte *data;
-+
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
-+      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+      curByte = *data;
-+      probs = LIT_PROBS(nowPos32, *(data - 1));
-+      if (IsCharState(p->state))
-+        LitEnc_Encode(&p->rc, probs, curByte);
-+      else
-+        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
-+      p->state = kLiteralNextStates[p->state];
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
-+        if (pos == 0)
-+        {
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
-+          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
-+        }
-+        else
-+        {
-+          UInt32 distance = p->reps[pos];
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
-+          if (pos == 1)
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
-+          else
-+          {
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
-+            if (pos == 3)
-+              p->reps[3] = p->reps[2];
-+            p->reps[2] = p->reps[1];
-+          }
-+          p->reps[1] = p->reps[0];
-+          p->reps[0] = distance;
-+        }
-+        if (len == 1)
-+          p->state = kShortRepNextStates[p->state];
-+        else
-+        {
-+          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+          p->state = kRepNextStates[p->state];
-+        }
-+      }
-+      else
-+      {
-+        UInt32 posSlot;
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+        p->state = kMatchNextStates[p->state];
-+        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+        pos -= LZMA_NUM_REPS;
-+        GetPosSlot(pos, posSlot);
-+        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-+        
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          UInt32 footerBits = ((posSlot >> 1) - 1);
-+          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+          UInt32 posReduced = pos - base;
-+
-+          if (posSlot < kEndPosModelIndex)
-+            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
-+          else
-+          {
-+            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
-+            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
-+            p->alignPriceCount++;
-+          }
-+        }
-+        p->reps[3] = p->reps[2];
-+        p->reps[2] = p->reps[1];
-+        p->reps[1] = p->reps[0];
-+        p->reps[0] = pos;
-+        p->matchPriceCount++;
-+      }
-+    }
-+    p->additionalOffset -= len;
-+    nowPos32 += len;
-+    if (p->additionalOffset == 0)
-+    {
-+      UInt32 processed;
-+      if (!p->fastMode)
-+      {
-+        if (p->matchPriceCount >= (1 << 7))
-+          FillDistancesPrices(p);
-+        if (p->alignPriceCount >= kAlignTableSize)
-+          FillAlignPrices(p);
-+      }
-+      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+        break;
-+      processed = nowPos32 - startPos32;
-+      if (useLimits)
-+      {
-+        if (processed + kNumOpts + 300 >= maxUnpackSize ||
-+            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
-+          break;
-+      }
-+      else if (processed >= (1 << 15))
-+      {
-+        p->nowPos64 += nowPos32 - startPos32;
-+        return CheckErrors(p);
-+      }
-+    }
-+  }
-+  p->nowPos64 += nowPos32 - startPos32;
-+  return Flush(p, nowPos32);
-+}
-+
-+#define kBigHashDicLimit ((UInt32)1 << 24)
-+
-+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 beforeSize = kNumOpts;
-+  Bool btMode;
-+  if (!RangeEnc_Alloc(&p->rc, alloc))
-+    return SZ_ERROR_MEM;
-+  btMode = (p->matchFinderBase.btMode != 0);
-+  #ifndef _7ZIP_ST
-+  p->mtMode = (p->multiThread && !p->fastMode && btMode);
-+  #endif
-+
-+  {
-+    unsigned lclp = p->lc + p->lp;
-+    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
-+    {
-+      LzmaEnc_FreeLits(p, alloc);
-+      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      if (p->litProbs == 0 || p->saveState.litProbs == 0)
-+      {
-+        LzmaEnc_FreeLits(p, alloc);
-+        return SZ_ERROR_MEM;
-+      }
-+      p->lclp = lclp;
-+    }
-+  }
-+
-+  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
-+
-+  if (beforeSize + p->dictSize < keepWindowSize)
-+    beforeSize = keepWindowSize - p->dictSize;
-+
-+  #ifndef _7ZIP_ST
-+  if (p->mtMode)
-+  {
-+    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
-+    p->matchFinderObj = &p->matchFinderMt;
-+    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
-+  }
-+  else
-+  #endif
-+  {
-+    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
-+      return SZ_ERROR_MEM;
-+    p->matchFinderObj = &p->matchFinderBase;
-+    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
-+  }
-+  return SZ_OK;
-+}
-+
-+void LzmaEnc_Init(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  p->state = 0;
-+  for (i = 0 ; i < LZMA_NUM_REPS; i++)
-+    p->reps[i] = 0;
-+
-+  RangeEnc_Init(&p->rc);
-+
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    UInt32 j;
-+    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
-+    {
-+      p->isMatch[i][j] = kProbInitValue;
-+      p->isRep0Long[i][j] = kProbInitValue;
-+    }
-+    p->isRep[i] = kProbInitValue;
-+    p->isRepG0[i] = kProbInitValue;
-+    p->isRepG1[i] = kProbInitValue;
-+    p->isRepG2[i] = kProbInitValue;
-+  }
-+
-+  {
-+    UInt32 num = 0x300 << (p->lp + p->lc);
-+    for (i = 0; i < num; i++)
-+      p->litProbs[i] = kProbInitValue;
-+  }
-+
-+  {
-+    for (i = 0; i < kNumLenToPosStates; i++)
-+    {
-+      CLzmaProb *probs = p->posSlotEncoder[i];
-+      UInt32 j;
-+      for (j = 0; j < (1 << kNumPosSlotBits); j++)
-+        probs[j] = kProbInitValue;
-+    }
-+  }
-+  {
-+    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
-+      p->posEncoders[i] = kProbInitValue;
-+  }
-+
-+  LenEnc_Init(&p->lenEnc.p);
-+  LenEnc_Init(&p->repLenEnc.p);
-+
-+  for (i = 0; i < (1 << kNumAlignBits); i++)
-+    p->posAlignEncoder[i] = kProbInitValue;
-+
-+  p->optimumEndIndex = 0;
-+  p->optimumCurrentIndex = 0;
-+  p->additionalOffset = 0;
-+
-+  p->pbMask = (1 << p->pb) - 1;
-+  p->lpMask = (1 << p->lp) - 1;
-+}
-+
-+void LzmaEnc_InitPrices(CLzmaEnc *p)
-+{
-+  if (!p->fastMode)
-+  {
-+    FillDistancesPrices(p);
-+    FillAlignPrices(p);
-+  }
-+
-+  p->lenEnc.tableSize =
-+  p->repLenEnc.tableSize =
-+      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
-+  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
-+  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
-+}
-+
-+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 i;
-+  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
-+    if (p->dictSize <= ((UInt32)1 << i))
-+      break;
-+  p->distTableSize = i * 2;
-+
-+  p->finished = False;
-+  p->result = SZ_OK;
-+  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
-+  LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  p->nowPos64 = 0;
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  p->rc.outStream = outStream;
-+  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
-+}
-+
-+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
-+    ISeqInStream *inStream, UInt32 keepWindowSize,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
-+{
-+  p->matchFinderBase.directInput = 1;
-+  p->matchFinderBase.bufferBase = (Byte *)src;
-+  p->matchFinderBase.directInputRem = srcLen;
-+}
-+
-+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-+    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+  p->needInit = 1;
-+
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+void LzmaEnc_Finish(CLzmaEncHandle pp)
-+{
-+  #ifndef _7ZIP_ST
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  if (p->mtMode)
-+    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
-+  #else
-+  pp = pp;
-+  #endif
-+}
-+
-+typedef struct
-+{
-+  ISeqOutStream funcTable;
-+  Byte *data;
-+  SizeT rem;
-+  Bool overflow;
-+} CSeqOutStreamBuf;
-+
-+static size_t MyWrite(void *pp, const void *data, size_t size)
-+{
-+  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
-+  if (p->rem < size)
-+  {
-+    size = p->rem;
-+    p->overflow = True;
-+  }
-+  memcpy(p->data, data, size);
-+  p->rem -= size;
-+  p->data += size;
-+  return size;
-+}
-+
-+
-+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+}
-+
-+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+}
-+
-+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
-+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  UInt64 nowPos64;
-+  SRes res;
-+  CSeqOutStreamBuf outStream;
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = False;
-+  p->finished = False;
-+  p->result = SZ_OK;
-+
-+  if (reInit)
-+    LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  nowPos64 = p->nowPos64;
-+  RangeEnc_Init(&p->rc);
-+  p->rc.outStream = &outStream.funcTable;
-+
-+  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-+  
-+  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+
-+  return res;
-+}
-+
-+static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
-+{
-+  SRes res = SZ_OK;
-+
-+  #ifndef _7ZIP_ST
-+  Byte allocaDummy[0x300];
-+  int i = 0;
-+  for (i = 0; i < 16; i++)
-+    allocaDummy[i] = (Byte)i;
-+  #endif
-+
-+  for (;;)
-+  {
-+    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
-+    if (res != SZ_OK || p->finished != 0)
-+      break;
-+    if (progress != 0)
-+    {
-+      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
-+      if (res != SZ_OK)
-+      {
-+        res = SZ_ERROR_PROGRESS;
-+        break;
-+      }
-+    }
-+  }
-+  LzmaEnc_Finish(p);
-+  return res;
-+}
-+
-+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
-+  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
-+}
-+
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  int i;
-+  UInt32 dictSize = p->dictSize;
-+  if (*size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_PARAM;
-+  *size = LZMA_PROPS_SIZE;
-+  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
-+
-+  for (i = 11; i <= 30; i++)
-+  {
-+    if (dictSize <= ((UInt32)2 << i))
-+    {
-+      dictSize = (2 << i);
-+      break;
-+    }
-+    if (dictSize <= ((UInt32)3 << i))
-+    {
-+      dictSize = (3 << i);
-+      break;
-+    }
-+  }
-+
-+  for (i = 0; i < 4; i++)
-+    props[1 + i] = (Byte)(dictSize >> (8 * i));
-+  return SZ_OK;
-+}
-+
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  SRes res;
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+
-+  CSeqOutStreamBuf outStream;
-+
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = writeEndMark;
-+
-+  p->rc.outStream = &outStream.funcTable;
-+  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
-+  if (res == SZ_OK)
-+    res = LzmaEnc_Encode2(p, progress);
-+
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+  return res;
-+}
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
-+  SRes res;
-+  if (p == 0)
-+    return SZ_ERROR_MEM;
-+
-+  res = LzmaEnc_SetProps(p, props);
-+  if (res == SZ_OK)
-+  {
-+    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
-+    if (res == SZ_OK)
-+      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
-+          writeEndMark, progress, alloc, allocBig);
-+  }
-+
-+  LzmaEnc_Destroy(p, alloc, allocBig);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/Makefile
-@@ -0,0 +1,7 @@
-+lzma_compress-objs := LzFind.o LzmaEnc.o
-+lzma_decompress-objs := LzmaDec.o
-+
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
-+
-+EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch b/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch
deleted file mode 100644 (file)
index e9952c6..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: fs: jffs2: EOF marker
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- fs/jffs2/build.c | 10 ++++++++++
- fs/jffs2/scan.c  | 21 +++++++++++++++++++--
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -117,6 +117,16 @@ static int jffs2_build_filesystem(struct
-       dbg_fsbuild("scanned flash completely\n");
-       jffs2_dbg_dump_block_lists_nolock(c);
-+      if (c->flags & (1 << 7)) {
-+              printk("%s(): unlocking the mtd device... ", __func__);
-+              mtd_unlock(c->mtd, 0, c->mtd->size);
-+              printk("done.\n");
-+
-+              printk("%s(): erasing all blocks after the end marker... ", __func__);
-+              jffs2_erase_pending_blocks(c, -1);
-+              printk("done.\n");
-+      }
-+
-       dbg_fsbuild("pass 1 starting\n");
-       c->flags |= JFFS2_SB_FLAG_BUILDING;
-       /* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in
-               /* reset summary info for next eraseblock scan */
-               jffs2_sum_reset_collected(s);
--              ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--                                              buf_size, s);
-+              if (c->flags & (1 << 7)) {
-+                      if (mtd_block_isbad(c->mtd, jeb->offset))
-+                              ret = BLK_STATE_BADBLOCK;
-+                      else
-+                              ret = BLK_STATE_ALLFF;
-+              } else
-+                      ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+                                                      buf_size, s);
-               if (ret < 0)
-                       goto out;
-@@ -561,6 +567,17 @@ full_scan:
-                       return err;
-       }
-+      if ((buf[0] == 0xde) &&
-+              (buf[1] == 0xad) &&
-+              (buf[2] == 0xc0) &&
-+              (buf[3] == 0xde)) {
-+              /* end of filesystem. erase everything after this point */
-+              printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+              c->flags |= (1 << 7);
-+
-+              return BLK_STATE_ALLFF;
-+      }
-+
-       /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
-       ofs = 0;
-       max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
diff --git a/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch
deleted file mode 100644 (file)
index ca96cbb..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: fs: ubifs: fix default compression selection in ubifs
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- fs/ubifs/sb.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
---- a/fs/ubifs/sb.c
-+++ b/fs/ubifs/sb.c
-@@ -63,6 +63,17 @@
- /* Default time granularity in nanoseconds */
- #define DEFAULT_TIME_GRAN 1000000000
-+static int get_default_compressor(void)
-+{
-+      if (ubifs_compr_present(UBIFS_COMPR_LZO))
-+              return UBIFS_COMPR_LZO;
-+
-+      if (ubifs_compr_present(UBIFS_COMPR_ZLIB))
-+              return UBIFS_COMPR_ZLIB;
-+
-+      return UBIFS_COMPR_NONE;
-+}
-+
- /**
-  * create_default_filesystem - format empty UBI volume.
-  * @c: UBIFS file-system description object
-@@ -183,7 +194,7 @@ static int create_default_filesystem(str
-       if (c->mount_opts.override_compr)
-               sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
-       else
--              sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO);
-+              sup->default_compr = cpu_to_le16(get_default_compressor());
-       generate_random_uuid(sup->uuid);
diff --git a/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch b/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch
deleted file mode 100644 (file)
index 81dac2a..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: add support for flushing conntrack via /proc
-
-lede-commit 8193bbe59a74d34d6a26d4a8cb857b1952905314
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/nf_conntrack_standalone.c | 59 ++++++++++++++++++++++++++++++++-
- 1 file changed, 58 insertions(+), 1 deletion(-)
-
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -17,6 +17,7 @@
- #include <linux/percpu.h>
- #include <linux/netdevice.h>
- #include <linux/security.h>
-+#include <linux/inet.h>
- #include <net/net_namespace.h>
- #ifdef CONFIG_SYSCTL
- #include <linux/sysctl.h>
-@@ -298,10 +299,66 @@ static int ct_open(struct inode *inode,
-                       sizeof(struct ct_iter_state));
- }
-+struct kill_request {
-+      u16 family;
-+      union nf_inet_addr addr;
-+};
-+
-+static int kill_matching(struct nf_conn *i, void *data)
-+{
-+      struct kill_request *kr = data;
-+      struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
-+      struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
-+
-+      if (!kr->family)
-+              return 1;
-+
-+      if (t1->src.l3num != kr->family)
-+              return 0;
-+
-+      return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
-+              nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
-+              nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
-+              nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
-+}
-+
-+static ssize_t ct_file_write(struct file *file, const char __user *buf,
-+                           size_t count, loff_t *ppos)
-+{
-+      struct seq_file *seq = file->private_data;
-+      struct net *net = seq_file_net(seq);
-+      struct kill_request kr = { };
-+      char req[INET6_ADDRSTRLEN] = { };
-+
-+      if (count == 0)
-+              return 0;
-+
-+      if (count >= INET6_ADDRSTRLEN)
-+              count = INET6_ADDRSTRLEN - 1;
-+
-+      if (copy_from_user(req, buf, count))
-+              return -EFAULT;
-+
-+      if (strnchr(req, count, ':')) {
-+              kr.family = AF_INET6;
-+              if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
-+                      return -EINVAL;
-+      } else if (strnchr(req, count, '.')) {
-+              kr.family = AF_INET;
-+              if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
-+                      return -EINVAL;
-+      }
-+
-+      nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0);
-+
-+      return count;
-+}
-+
- static const struct file_operations ct_file_ops = {
-       .owner   = THIS_MODULE,
-       .open    = ct_open,
-       .read    = seq_read,
-+      .write   = ct_file_write,
-       .llseek  = seq_lseek,
-       .release = seq_release_net,
- };
-@@ -405,7 +462,7 @@ static int nf_conntrack_standalone_init_
-       kuid_t root_uid;
-       kgid_t root_gid;
--      pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops);
-+      pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops);
-       if (!pde)
-               goto out_nf_conntrack;
diff --git a/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch
deleted file mode 100644 (file)
index d3a6afa..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a new version of my netfilter speedup patches for linux 2.6.39 and 3.0
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/uapi/linux/netfilter_ipv4/ip_tables.h |  1 +
- net/ipv4/netfilter/ip_tables.c                | 37 +++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
-
---- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
-@@ -88,6 +88,7 @@ struct ipt_ip {
- #define IPT_F_FRAG            0x01    /* Set if rule is a fragment rule */
- #define IPT_F_GOTO            0x02    /* Set if jump is a goto */
- #define IPT_F_MASK            0x03    /* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH    0x80    /* Internal: no default match rules present */
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN                0x01    /* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -58,6 +58,9 @@ ip_packet_match(const struct iphdr *ip,
- {
-       unsigned long ret;
-+      if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+              return true;
-+
-       if (NF_INVF(ipinfo, IPT_INV_SRCIP,
-                   (ip->saddr & ipinfo->smsk.s_addr) != ipinfo->src.s_addr) ||
-           NF_INVF(ipinfo, IPT_INV_DSTIP,
-@@ -88,6 +91,29 @@ ip_packet_match(const struct iphdr *ip,
-       return true;
- }
-+static void
-+ip_checkdefault(struct ipt_ip *ip)
-+{
-+      static const char iface_mask[IFNAMSIZ] = {};
-+
-+      if (ip->invflags || ip->flags & IPT_F_FRAG)
-+              return;
-+
-+      if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
-+              return;
-+
-+      if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
-+              return;
-+
-+      if (ip->smsk.s_addr || ip->dmsk.s_addr)
-+              return;
-+
-+      if (ip->proto)
-+              return;
-+
-+      ip->flags |= IPT_F_NO_DEF_MATCH;
-+}
-+
- static bool
- ip_checkentry(const struct ipt_ip *ip)
- {
-@@ -550,6 +576,8 @@ find_check_entry(struct ipt_entry *e, st
-       struct xt_mtchk_param mtpar;
-       struct xt_entry_match *ematch;
-+      ip_checkdefault(&e->ip);
-+
-       if (!xt_percpu_counter_alloc(alloc_state, &e->counters))
-               return -ENOMEM;
-@@ -830,6 +858,7 @@ copy_entries_to_user(unsigned int total_
-       const struct xt_table_info *private = table->private;
-       int ret = 0;
-       const void *loc_cpu_entry;
-+      u8 flags;
-       counters = alloc_counters(table);
-       if (IS_ERR(counters))
-@@ -857,6 +886,14 @@ copy_entries_to_user(unsigned int total_
-                       goto free_counters;
-               }
-+              flags = e->ip.flags & IPT_F_MASK;
-+              if (copy_to_user(userptr + off
-+                               + offsetof(struct ipt_entry, ip.flags),
-+                               &flags, sizeof(flags)) != 0) {
-+                      ret = -EFAULT;
-+                      goto free_counters;
-+              }
-+
-               for (i = sizeof(struct ipt_entry);
-                    i < e->target_offset;
-                    i += m->u.match_size) {
-@@ -1246,12 +1283,15 @@ compat_copy_entry_to_user(struct ipt_ent
-       compat_uint_t origsize;
-       const struct xt_entry_match *ematch;
-       int ret = 0;
-+      u8 flags = e->ip.flags & IPT_F_MASK;
-       origsize = *size;
-       ce = (struct compat_ipt_entry __user *)*dstptr;
-       if (copy_to_user(ce, e, sizeof(struct ipt_entry)) != 0 ||
-           copy_to_user(&ce->counters, &counters[i],
--          sizeof(counters[i])) != 0)
-+          sizeof(counters[i])) != 0 ||
-+          copy_to_user(&ce->ip.flags, &flags,
-+          sizeof(flags)) != 0)
-               return -EFAULT;
-       *dstptr += sizeof(struct compat_ipt_entry);
diff --git a/target/linux/generic/pending-4.9/611-netfilter_match_bypass_default_table.patch b/target/linux/generic/pending-4.9/611-netfilter_match_bypass_default_table.patch
deleted file mode 100644 (file)
index 12e4bd5..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: match bypass default table
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/ipv4/netfilter/ip_tables.c | 79 +++++++++++++++++++++++++++++++-----------
- 1 file changed, 58 insertions(+), 21 deletions(-)
-
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -254,6 +254,33 @@ struct ipt_entry *ipt_next_entry(const s
-       return (void *)entry + entry->next_offset;
- }
-+static bool
-+ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
-+{
-+      struct xt_entry_target *t;
-+      struct xt_standard_target *st;
-+
-+      if (e->target_offset != sizeof(struct ipt_entry))
-+              return false;
-+
-+      if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
-+              return false;
-+
-+      t = ipt_get_target(e);
-+      if (t->u.kernel.target->target)
-+              return false;
-+
-+      st = (struct xt_standard_target *) t;
-+      if (st->verdict == XT_RETURN)
-+              return false;
-+
-+      if (st->verdict >= 0)
-+              return false;
-+
-+      *verdict = (unsigned)(-st->verdict) - 1;
-+      return true;
-+}
-+
- /* Returns one of the generic firewall policies, like NF_ACCEPT. */
- unsigned int
- ipt_do_table(struct sk_buff *skb,
-@@ -274,28 +301,8 @@ ipt_do_table(struct sk_buff *skb,
-       unsigned int addend;
-       /* Initialization */
--      stackidx = 0;
--      ip = ip_hdr(skb);
--      indev = state->in ? state->in->name : nulldevname;
--      outdev = state->out ? state->out->name : nulldevname;
--      /* We handle fragments by dealing with the first fragment as
--       * if it was a normal packet.  All other fragments are treated
--       * normally, except that they will NEVER match rules that ask
--       * things we don't know, ie. tcp syn flag or ports).  If the
--       * rule is also a fragment-specific rule, non-fragments won't
--       * match it. */
--      acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
--      acpar.thoff   = ip_hdrlen(skb);
--      acpar.hotdrop = false;
--      acpar.net     = state->net;
--      acpar.in      = state->in;
--      acpar.out     = state->out;
--      acpar.family  = NFPROTO_IPV4;
--      acpar.hooknum = hook;
--
-       IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-       local_bh_disable();
--      addend = xt_write_recseq_begin();
-       private = table->private;
-       cpu        = smp_processor_id();
-       /*
-@@ -304,6 +311,23 @@ ipt_do_table(struct sk_buff *skb,
-        */
-       smp_read_barrier_depends();
-       table_base = private->entries;
-+
-+      e = get_entry(table_base, private->hook_entry[hook]);
-+      if (ipt_handle_default_rule(e, &verdict)) {
-+              struct xt_counters *counter;
-+
-+              counter = xt_get_this_cpu_counter(&e->counters);
-+              ADD_COUNTER(*counter, skb->len, 1);
-+              local_bh_enable();
-+              return verdict;
-+      }
-+
-+      stackidx = 0;
-+      ip = ip_hdr(skb);
-+      indev = state->in ? state->in->name : nulldevname;
-+      outdev = state->out ? state->out->name : nulldevname;
-+
-+      addend = xt_write_recseq_begin();
-       jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
-       /* Switch to alternate jumpstack if we're being invoked via TEE.
-@@ -316,7 +340,20 @@ ipt_do_table(struct sk_buff *skb,
-       if (static_key_false(&xt_tee_enabled))
-               jumpstack += private->stacksize * __this_cpu_read(nf_skb_duplicated);
--      e = get_entry(table_base, private->hook_entry[hook]);
-+      /* We handle fragments by dealing with the first fragment as
-+       * if it was a normal packet.  All other fragments are treated
-+       * normally, except that they will NEVER match rules that ask
-+       * things we don't know, ie. tcp syn flag or ports).  If the
-+       * rule is also a fragment-specific rule, non-fragments won't
-+       * match it. */
-+      acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
-+      acpar.thoff   = ip_hdrlen(skb);
-+      acpar.hotdrop = false;
-+      acpar.net     = state->net;
-+      acpar.in      = state->in;
-+      acpar.out     = state->out;
-+      acpar.family  = NFPROTO_IPV4;
-+      acpar.hooknum = hook;
-       do {
-               const struct xt_entry_target *t;
diff --git a/target/linux/generic/pending-4.9/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/pending-4.9/612-netfilter_match_reduce_memory_access.patch
deleted file mode 100644 (file)
index c6c5172..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: reduce match memory access
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/ipv4/netfilter/ip_tables.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -61,9 +61,9 @@ ip_packet_match(const struct iphdr *ip,
-       if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-               return true;
--      if (NF_INVF(ipinfo, IPT_INV_SRCIP,
-+      if (NF_INVF(ipinfo, IPT_INV_SRCIP, ipinfo->smsk.s_addr &&
-                   (ip->saddr & ipinfo->smsk.s_addr) != ipinfo->src.s_addr) ||
--          NF_INVF(ipinfo, IPT_INV_DSTIP,
-+          NF_INVF(ipinfo, IPT_INV_DSTIP, ipinfo->dmsk.s_addr &&
-                   (ip->daddr & ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr))
-               return false;
diff --git a/target/linux/generic/pending-4.9/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-4.9/613-netfilter_optional_tcp_window_check.patch
deleted file mode 100644 (file)
index 78a9617..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: netfilter: optional tcp window check
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/nf_conntrack_proto_tcp.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/net/netfilter/nf_conntrack_proto_tcp.c
-+++ b/net/netfilter/nf_conntrack_proto_tcp.c
-@@ -33,6 +33,9 @@
- #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
- #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
-+/* Do not check the TCP window for incoming packets  */
-+static int nf_ct_tcp_no_window_check __read_mostly = 1;
-+
- /* "Be conservative in what you do,
-     be liberal in what you accept from others."
-     If it's non-zero, we mark only out of window RST segments as INVALID. */
-@@ -513,6 +516,9 @@ static bool tcp_in_window(const struct n
-       s32 receiver_offset;
-       bool res, in_recv_win;
-+      if (nf_ct_tcp_no_window_check)
-+              return true;
-+
-       /*
-        * Get the required data from the packet.
-        */
-@@ -1479,6 +1485,13 @@ static struct ctl_table tcp_sysctl_table
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec,
-       },
-+      {
-+              .procname       = "nf_conntrack_tcp_no_window_check",
-+              .data           = &nf_ct_tcp_no_window_check,
-+              .maxlen         = sizeof(unsigned int),
-+              .mode           = 0644,
-+              .proc_handler   = proc_dointvec,
-+      },
-       { }
- };
- #endif /* CONFIG_SYSCTL */
diff --git a/target/linux/generic/pending-4.9/616-net_optimize_xfrm_calls.patch b/target/linux/generic/pending-4.9/616-net_optimize_xfrm_calls.patch
deleted file mode 100644 (file)
index a147f5f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a small xfrm related performance optimization
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- net/netfilter/nf_nat_core.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/net/netfilter/nf_nat_core.c
-+++ b/net/netfilter/nf_nat_core.c
-@@ -93,6 +93,9 @@ int nf_xfrm_me_harder(struct net *net, s
-       struct dst_entry *dst;
-       int err;
-+      if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
-+              return 0;
-+
-       err = xfrm_decode_session(skb, &fl, family);
-       if (err < 0)
-               return err;
diff --git a/target/linux/generic/pending-4.9/620-net_sched-codel-do-not-defer-queue-length-update.patch b/target/linux/generic/pending-4.9/620-net_sched-codel-do-not-defer-queue-length-update.patch
deleted file mode 100644 (file)
index 6fe863a..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Date: Mon, 21 Aug 2017 11:14:14 +0300
-Subject: [PATCH] net_sched/codel: do not defer queue length update
-
-When codel wants to drop last packet in ->dequeue() it cannot call
-qdisc_tree_reduce_backlog() right away - it will notify parent qdisc
-about zero qlen and HTB/HFSC will deactivate class. The same class will
-be deactivated second time by caller of ->dequeue(). Currently codel and
-fq_codel defer update. This triggers warning in HFSC when it's qlen != 0
-but there is no active classes.
-
-This patch update parent queue length immediately: just temporary increase
-qlen around qdisc_tree_reduce_backlog() to prevent first class deactivation
-if we have skb to return.
-
-This might open another problem in HFSC - now operation peek could fail and
-deactivate parent class.
-
-Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=109581
----
-
---- a/net/sched/sch_codel.c
-+++ b/net/sched/sch_codel.c
-@@ -95,11 +95,17 @@ static struct sk_buff *codel_qdisc_deque
-                           &q->stats, qdisc_pkt_len, codel_get_enqueue_time,
-                           drop_func, dequeue_func);
--      /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0,
--       * or HTB crashes. Defer it for next round.
-+      /* If our qlen is 0 qdisc_tree_reduce_backlog() will deactivate
-+       * parent class, dequeue in parent qdisc will do the same if we
-+       * return skb. Temporary increment qlen if we have skb.
-        */
--      if (q->stats.drop_count && sch->q.qlen) {
--              qdisc_tree_reduce_backlog(sch, q->stats.drop_count, q->stats.drop_len);
-+      if (q->stats.drop_count) {
-+              if (skb)
-+                      sch->q.qlen++;
-+              qdisc_tree_reduce_backlog(sch, q->stats.drop_count,
-+                                        q->stats.drop_len);
-+              if (skb)
-+                      sch->q.qlen--;
-               q->stats.drop_count = 0;
-               q->stats.drop_len = 0;
-       }
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -318,6 +318,21 @@ begin:
-       flow->dropped += q->cstats.drop_count - prev_drop_count;
-       flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
-+      /* If our qlen is 0 qdisc_tree_reduce_backlog() will deactivate
-+       * parent class, dequeue in parent qdisc will do the same if we
-+       * return skb. Temporary increment qlen if we have skb.
-+       */
-+      if (q->cstats.drop_count) {
-+              if (skb)
-+                      sch->q.qlen++;
-+              qdisc_tree_reduce_backlog(sch, q->cstats.drop_count,
-+                                        q->cstats.drop_len);
-+              if (skb)
-+                      sch->q.qlen--;
-+              q->cstats.drop_count = 0;
-+              q->cstats.drop_len = 0;
-+      }
-+
-       if (!skb) {
-               /* force a pass through old_flows to prevent starvation */
-               if ((head == &q->new_flows) && !list_empty(&q->old_flows))
-@@ -328,15 +343,6 @@ begin:
-       }
-       qdisc_bstats_update(sch, skb);
-       flow->deficit -= qdisc_pkt_len(skb);
--      /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0,
--       * or HTB crashes. Defer it for next round.
--       */
--      if (q->cstats.drop_count && sch->q.qlen) {
--              qdisc_tree_reduce_backlog(sch, q->cstats.drop_count,
--                                        q->cstats.drop_len);
--              q->cstats.drop_count = 0;
--              q->cstats.drop_len = 0;
--      }
-       return skb;
- }
diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch
deleted file mode 100644 (file)
index 018d006..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: net: add an optimization for dealing with raw sockets
-
-lede-commit: 4898039703d7315f0f3431c860123338ec3be0f6
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/uapi/linux/if_packet.h |  3 +++
- net/packet/af_packet.c         | 34 +++++++++++++++++++++++++++-------
- net/packet/internal.h          |  1 +
- 3 files changed, 31 insertions(+), 7 deletions(-)
-
---- a/include/uapi/linux/if_packet.h
-+++ b/include/uapi/linux/if_packet.h
-@@ -31,6 +31,8 @@ struct sockaddr_ll {
- #define PACKET_KERNEL         7               /* To kernel space      */
- /* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */
- #define PACKET_FASTROUTE      6               /* Fastrouted frame     */
-+#define PACKET_MASK_ANY               0xffffffff      /* mask for packet type bits */
-+
- /* Packet socket options */
-@@ -56,6 +58,7 @@ struct sockaddr_ll {
- #define PACKET_QDISC_BYPASS           20
- #define PACKET_ROLLOVER_STATS         21
- #define PACKET_FANOUT_DATA            22
-+#define PACKET_RECV_TYPE              23
- #define PACKET_FANOUT_HASH            0
- #define PACKET_FANOUT_LB              1
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -1780,6 +1780,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
-       struct sock *sk;
-       struct sockaddr_pkt *spkt;
-+      struct packet_sock *po;
-       /*
-        *      When we registered the protocol we saved the socket in the data
-@@ -1787,6 +1788,7 @@ static int packet_rcv_spkt(struct sk_buf
-        */
-       sk = pt->af_packet_priv;
-+      po = pkt_sk(sk);
-       /*
-        *      Yank back the headers [hope the device set this
-@@ -1799,7 +1801,7 @@ static int packet_rcv_spkt(struct sk_buf
-        *      so that this procedure is noop.
-        */
--      if (skb->pkt_type == PACKET_LOOPBACK)
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-               goto out;
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -2037,12 +2039,12 @@ static int packet_rcv(struct sk_buff *sk
-       unsigned int snaplen, res;
-       bool is_drop_n_account = false;
--      if (skb->pkt_type == PACKET_LOOPBACK)
--              goto drop;
--
-       sk = pt->af_packet_priv;
-       po = pkt_sk(sk);
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-+              goto drop;
-+
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-               goto drop;
-@@ -2168,12 +2170,12 @@ static int tpacket_rcv(struct sk_buff *s
-       BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
-       BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
--      if (skb->pkt_type == PACKET_LOOPBACK)
--              goto drop;
--
-       sk = pt->af_packet_priv;
-       po = pkt_sk(sk);
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-+              goto drop;
-+
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-               goto drop;
-@@ -3270,6 +3272,7 @@ static int packet_create(struct net *net
-       mutex_init(&po->pg_vec_lock);
-       po->rollover = NULL;
-       po->prot_hook.func = packet_rcv;
-+      po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
-       if (sock->type == SOCK_PACKET)
-               po->prot_hook.func = packet_rcv_spkt;
-@@ -3883,6 +3886,16 @@ packet_setsockopt(struct socket *sock, i
-               po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
-               return 0;
-       }
-+        case PACKET_RECV_TYPE:
-+        {
-+                unsigned int val;
-+                if (optlen != sizeof(val))
-+                        return -EINVAL;
-+                if (copy_from_user(&val, optval, sizeof(val)))
-+                        return -EFAULT;
-+                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
-+                return 0;
-+        }
-       default:
-               return -ENOPROTOOPT;
-       }
-@@ -3935,6 +3948,13 @@ static int packet_getsockopt(struct sock
-       case PACKET_VNET_HDR:
-               val = po->has_vnet_hdr;
-               break;
-+      case PACKET_RECV_TYPE:
-+              if (len > sizeof(unsigned int))
-+                      len = sizeof(unsigned int);
-+              val = po->pkt_type;
-+
-+              data = &val;
-+              break;
-       case PACKET_VERSION:
-               val = po->tp_version;
-               break;
---- a/net/packet/internal.h
-+++ b/net/packet/internal.h
-@@ -128,6 +128,7 @@ struct packet_sock {
-       struct net_device __rcu *cached_dev;
-       int                     (*xmit)(struct sk_buff *skb);
-       struct packet_type      prot_hook ____cacheline_aligned_in_smp;
-+      unsigned int            pkt_type;
- };
- static struct packet_sock *pkt_sk(struct sock *sk)
diff --git a/target/linux/generic/pending-4.9/655-increase_skb_pad.patch b/target/linux/generic/pending-4.9/655-increase_skb_pad.patch
deleted file mode 100644 (file)
index de96d9a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: kernel: add a few patches for avoiding unnecessary skb reallocations - significantly improves ethernet<->wireless performance
-
-lede-commit: 6f89cffc9add6939d44a6b54cf9a5e77849aa7fd
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/skbuff.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -2303,7 +2303,7 @@ static inline int pskb_network_may_pull(
-  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
-  */
- #ifndef NET_SKB_PAD
--#define NET_SKB_PAD   max(32, L1_CACHE_BYTES)
-+#define NET_SKB_PAD   max(64, L1_CACHE_BYTES)
- #endif
- int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
deleted file mode 100644 (file)
index af9a5b1..0000000
+++ /dev/null
@@ -1,500 +0,0 @@
-From: Steven Barth <steven@midlink.org>
-Subject: Add support for MAP-E FMRs (mesh mode)
-
-MAP-E FMRs (draft-ietf-softwire-map-10) are rules for IPv4-communication
-between MAP CEs (mesh mode) without the need to forward such data to a
-border relay. This is similar to how 6rd works but for IPv4 over IPv6.
-
-Signed-off-by: Steven Barth <cyrus@openwrt.org>
----
- include/net/ip6_tunnel.h       |  13 ++
- include/uapi/linux/if_tunnel.h |  13 ++
- net/ipv6/ip6_tunnel.c          | 276 +++++++++++++++++++++++++++++++++++++++--
- 3 files changed, 291 insertions(+), 11 deletions(-)
-
---- a/include/net/ip6_tunnel.h
-+++ b/include/net/ip6_tunnel.h
-@@ -17,6 +17,18 @@
- /* determine capability on a per-packet basis */
- #define IP6_TNL_F_CAP_PER_PACKET 0x40000
-+/* IPv6 tunnel FMR */
-+struct __ip6_tnl_fmr {
-+      struct __ip6_tnl_fmr *next; /* next fmr in list */
-+      struct in6_addr ip6_prefix;
-+      struct in_addr ip4_prefix;
-+
-+      __u8 ip6_prefix_len;
-+      __u8 ip4_prefix_len;
-+      __u8 ea_len;
-+      __u8 offset;
-+};
-+
- struct __ip6_tnl_parm {
-       char name[IFNAMSIZ];    /* name of tunnel device */
-       int link;               /* ifindex of underlying L2 interface */
-@@ -28,6 +40,7 @@ struct __ip6_tnl_parm {
-       __u32 flags;            /* tunnel flags */
-       struct in6_addr laddr;  /* local tunnel end-point address */
-       struct in6_addr raddr;  /* remote tunnel end-point address */
-+      struct __ip6_tnl_fmr *fmrs;     /* FMRs */
-       __be16                  i_flags;
-       __be16                  o_flags;
---- a/include/uapi/linux/if_tunnel.h
-+++ b/include/uapi/linux/if_tunnel.h
-@@ -75,10 +75,23 @@ enum {
-       IFLA_IPTUN_ENCAP_SPORT,
-       IFLA_IPTUN_ENCAP_DPORT,
-       IFLA_IPTUN_COLLECT_METADATA,
-+      IFLA_IPTUN_FMRS,
-       __IFLA_IPTUN_MAX,
- };
- #define IFLA_IPTUN_MAX        (__IFLA_IPTUN_MAX - 1)
-+enum {
-+      IFLA_IPTUN_FMR_UNSPEC,
-+      IFLA_IPTUN_FMR_IP6_PREFIX,
-+      IFLA_IPTUN_FMR_IP4_PREFIX,
-+      IFLA_IPTUN_FMR_IP6_PREFIX_LEN,
-+      IFLA_IPTUN_FMR_IP4_PREFIX_LEN,
-+      IFLA_IPTUN_FMR_EA_LEN,
-+      IFLA_IPTUN_FMR_OFFSET,
-+      __IFLA_IPTUN_FMR_MAX,
-+};
-+#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1)
-+
- enum tunnel_encap_types {
-       TUNNEL_ENCAP_NONE,
-       TUNNEL_ENCAP_FOU,
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -16,6 +16,8 @@
-  *      as published by the Free Software Foundation; either version
-  *      2 of the License, or (at your option) any later version.
-  *
-+ *    Changes:
-+ * Steven Barth <cyrus@openwrt.org>:          MAP-E FMR support
-  */
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-@@ -72,9 +74,9 @@ static bool log_ecn_error = true;
- module_param(log_ecn_error, bool, 0644);
- MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
--static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
-+static u32 HASH(const struct in6_addr *addr)
- {
--      u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2);
-+      u32 hash = ipv6_addr_hash(addr);
-       return hash_32(hash, IP6_TUNNEL_HASH_SIZE_SHIFT);
- }
-@@ -141,20 +143,29 @@ static struct net_device_stats *ip6_get_
- static struct ip6_tnl *
- ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
- {
--      unsigned int hash = HASH(remote, local);
-+      unsigned int hash = HASH(local);
-       struct ip6_tnl *t;
-       struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
-       struct in6_addr any;
-+      struct __ip6_tnl_fmr *fmr;
-       for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
--              if (ipv6_addr_equal(local, &t->parms.laddr) &&
--                  ipv6_addr_equal(remote, &t->parms.raddr) &&
--                  (t->dev->flags & IFF_UP))
-+              if (!ipv6_addr_equal(local, &t->parms.laddr) ||
-+                              !(t->dev->flags & IFF_UP))
-+                      continue;
-+
-+              if (ipv6_addr_equal(remote, &t->parms.raddr))
-                       return t;
-+
-+              for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
-+                      if (ipv6_prefix_equal(remote, &fmr->ip6_prefix,
-+                                      fmr->ip6_prefix_len))
-+                              return t;
-+              }
-       }
-       memset(&any, 0, sizeof(any));
--      hash = HASH(&any, local);
-+      hash = HASH(local);
-       for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
-               if (ipv6_addr_equal(local, &t->parms.laddr) &&
-                   ipv6_addr_any(&t->parms.raddr) &&
-@@ -162,7 +173,7 @@ ip6_tnl_lookup(struct net *net, const st
-                       return t;
-       }
--      hash = HASH(remote, &any);
-+      hash = HASH(&any);
-       for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
-               if (ipv6_addr_equal(remote, &t->parms.raddr) &&
-                   ipv6_addr_any(&t->parms.laddr) &&
-@@ -202,7 +213,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
-       if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
-               prio = 1;
--              h = HASH(remote, local);
-+              h = HASH(local);
-       }
-       return &ip6n->tnls[prio][h];
- }
-@@ -384,6 +395,12 @@ ip6_tnl_dev_uninit(struct net_device *de
-       struct net *net = t->net;
-       struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
-+      while (t->parms.fmrs) {
-+              struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
-+              kfree(t->parms.fmrs);
-+              t->parms.fmrs = next;
-+      }
-+
-       if (dev == ip6n->fb_tnl_dev)
-               RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
-       else
-@@ -780,6 +797,107 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
- }
- EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
-+/**
-+ * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR
-+ *   @dest: destination IPv6 address buffer
-+ *   @skb: received socket buffer
-+ *   @fmr: MAP FMR
-+ *   @xmit: Calculate for xmit or rcv
-+ **/
-+static void ip4ip6_fmr_calc(struct in6_addr *dest,
-+              const struct iphdr *iph, const uint8_t *end,
-+              const struct __ip6_tnl_fmr *fmr, bool xmit)
-+{
-+      int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len);
-+      u8 *portp = NULL;
-+      bool use_dest_addr;
-+      const struct iphdr *dsth = iph;
-+
-+      if ((u8*)dsth >= end)
-+              return;
-+
-+      /* find significant IP header */
-+      if (iph->protocol == IPPROTO_ICMP) {
-+              struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
-+              if (ih && ((u8*)&ih[1]) <= end && (
-+                      ih->type == ICMP_DEST_UNREACH ||
-+                      ih->type == ICMP_SOURCE_QUENCH ||
-+                      ih->type == ICMP_TIME_EXCEEDED ||
-+                      ih->type == ICMP_PARAMETERPROB ||
-+                      ih->type == ICMP_REDIRECT))
-+                              dsth = (const struct iphdr*)&ih[1];
-+      }
-+
-+      /* in xmit-path use dest port by default and source port only if
-+              this is an ICMP reply to something else; vice versa in rcv-path */
-+      use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph);
-+
-+      /* get dst port */
-+      if (((u8*)&dsth[1]) <= end && (
-+              dsth->protocol == IPPROTO_UDP ||
-+              dsth->protocol == IPPROTO_TCP ||
-+              dsth->protocol == IPPROTO_SCTP ||
-+              dsth->protocol == IPPROTO_DCCP)) {
-+                      /* for UDP, TCP, SCTP and DCCP source and dest port
-+                      follow IPv4 header directly */
-+                      portp = ((u8*)dsth) + dsth->ihl * 4;
-+
-+                      if (use_dest_addr)
-+                              portp += sizeof(u16);
-+      } else if (iph->protocol == IPPROTO_ICMP) {
-+              struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
-+
-+              /* use icmp identifier as port */
-+              if (((u8*)&ih) <= end && (
-+                  (use_dest_addr && (
-+                  ih->type == ICMP_ECHOREPLY ||
-+                      ih->type == ICMP_TIMESTAMPREPLY ||
-+                      ih->type == ICMP_INFO_REPLY ||
-+                      ih->type == ICMP_ADDRESSREPLY)) ||
-+                      (!use_dest_addr && (
-+                      ih->type == ICMP_ECHO ||
-+                      ih->type == ICMP_TIMESTAMP ||
-+                      ih->type == ICMP_INFO_REQUEST ||
-+                      ih->type == ICMP_ADDRESS)
-+                      )))
-+                              portp = (u8*)&ih->un.echo.id;
-+      }
-+
-+      if ((portp && &portp[2] <= end) || psidlen == 0) {
-+              int frombyte = fmr->ip6_prefix_len / 8;
-+              int fromrem = fmr->ip6_prefix_len % 8;
-+              int bytes = sizeof(struct in6_addr) - frombyte;
-+              const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr;
-+              u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len);
-+              u64 t = 0;
-+
-+              /* extract PSID from port and add it to eabits */
-+              u16 psidbits = 0;
-+              if (psidlen > 0) {
-+                      psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]);
-+                      psidbits >>= 16 - psidlen - fmr->offset;
-+                      psidbits = (u16)(psidbits << (16 - psidlen));
-+                      eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen));
-+              }
-+
-+              /* rewrite destination address */
-+              *dest = fmr->ip6_prefix;
-+              memcpy(&dest->s6_addr[10], addr, sizeof(*addr));
-+              dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen));
-+
-+              if (bytes > sizeof(u64))
-+                      bytes = sizeof(u64);
-+
-+              /* insert eabits */
-+              memcpy(&t, &dest->s6_addr[frombyte], bytes);
-+              t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1)
-+                      << (64 - fmr->ea_len - fromrem));
-+              t = cpu_to_be64(t | (eabits >> fromrem));
-+              memcpy(&dest->s6_addr[frombyte], &t, bytes);
-+      }
-+}
-+
-+
- static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
-                        const struct tnl_ptk_info *tpi,
-                        struct metadata_dst *tun_dst,
-@@ -832,6 +950,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
-       skb_reset_network_header(skb);
-       memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
-+      if (tpi->proto == htons(ETH_P_IP) && tunnel->parms.fmrs &&
-+              !ipv6_addr_equal(&ipv6h->saddr, &tunnel->parms.raddr)) {
-+                      /* Packet didn't come from BR, so lookup FMR */
-+                      struct __ip6_tnl_fmr *fmr;
-+                      struct in6_addr expected = tunnel->parms.raddr;
-+                      for (fmr = tunnel->parms.fmrs; fmr; fmr = fmr->next)
-+                              if (ipv6_prefix_equal(&ipv6h->saddr,
-+                                      &fmr->ip6_prefix, fmr->ip6_prefix_len))
-+                                              break;
-+
-+                      /* Check that IPv6 matches IPv4 source to prevent spoofing */
-+                      if (fmr)
-+                              ip4ip6_fmr_calc(&expected, ip_hdr(skb),
-+                                              skb_tail_pointer(skb), fmr, false);
-+
-+                      if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) {
-+                              rcu_read_unlock();
-+                              goto drop;
-+                      }
-+      }
-+
-       __skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
-       err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);
-@@ -962,6 +1101,7 @@ static void init_tel_txopt(struct ipv6_t
-       opt->ops.opt_nflen = 8;
- }
-+
- /**
-  * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
-  *   @t: the outgoing tunnel device
-@@ -1300,6 +1440,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
- {
-       struct ip6_tnl *t = netdev_priv(dev);
-       struct ipv6hdr *ipv6h;
-+      struct __ip6_tnl_fmr *fmr;
-       int encap_limit = -1;
-       __u16 offset;
-       struct flowi6 fl6;
-@@ -1362,6 +1503,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
-                       fl6.flowi6_mark = skb->mark;
-       }
-+      /* try to find matching FMR */
-+      for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
-+              unsigned mshift = 32 - fmr->ip4_prefix_len;
-+              if (ntohl(fmr->ip4_prefix.s_addr) >> mshift ==
-+                              ntohl(ip_hdr(skb)->daddr) >> mshift)
-+                      break;
-+      }
-+
-+      /* change dstaddr according to FMR */
-+      if (fmr)
-+              ip4ip6_fmr_calc(&fl6.daddr, ip_hdr(skb), skb_tail_pointer(skb), fmr, true);
-+
-       if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
-               return -1;
-@@ -1489,6 +1642,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
-       t->parms.flowinfo = p->flowinfo;
-       t->parms.link = p->link;
-       t->parms.proto = p->proto;
-+
-+      while (t->parms.fmrs) {
-+              struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
-+              kfree(t->parms.fmrs);
-+              t->parms.fmrs = next;
-+      }
-+      t->parms.fmrs = p->fmrs;
-+
-       dst_cache_reset(&t->dst_cache);
-       ip6_tnl_link_config(t);
-       return 0;
-@@ -1527,6 +1688,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
-       p->flowinfo = u->flowinfo;
-       p->link = u->link;
-       p->proto = u->proto;
-+      p->fmrs = NULL;
-       memcpy(p->name, u->name, sizeof(u->name));
- }
-@@ -1904,6 +2066,15 @@ static int ip6_tnl_validate(struct nlatt
-       return 0;
- }
-+static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = {
-+      [IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) },
-+      [IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) },
-+      [IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 },
-+      [IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 },
-+      [IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 },
-+      [IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 }
-+};
-+
- static void ip6_tnl_netlink_parms(struct nlattr *data[],
-                                 struct __ip6_tnl_parm *parms)
- {
-@@ -1938,6 +2109,46 @@ static void ip6_tnl_netlink_parms(struct
-       if (data[IFLA_IPTUN_COLLECT_METADATA])
-               parms->collect_md = true;
-+
-+      if (data[IFLA_IPTUN_FMRS]) {
-+              unsigned rem;
-+              struct nlattr *fmr;
-+              nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) {
-+                      struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c;
-+                      struct __ip6_tnl_fmr *nfmr;
-+
-+                      nla_parse_nested(fmrd, IFLA_IPTUN_FMR_MAX,
-+                              fmr, ip6_tnl_fmr_policy);
-+
-+                      if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL)))
-+                              continue;
-+
-+                      nfmr->offset = 6;
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX]))
-+                              nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX],
-+                                      sizeof(nfmr->ip6_prefix));
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX]))
-+                              nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX],
-+                                      sizeof(nfmr->ip4_prefix));
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN]))
-+                              nfmr->ip6_prefix_len = nla_get_u8(c);
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN]))
-+                              nfmr->ip4_prefix_len = nla_get_u8(c);
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN]))
-+                              nfmr->ea_len = nla_get_u8(c);
-+
-+                      if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET]))
-+                              nfmr->offset = nla_get_u8(c);
-+
-+                      nfmr->next = parms->fmrs;
-+                      parms->fmrs = nfmr;
-+              }
-+      }
- }
- static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
-@@ -2051,6 +2262,12 @@ static void ip6_tnl_dellink(struct net_d
- static size_t ip6_tnl_get_size(const struct net_device *dev)
- {
-+      const struct ip6_tnl *t = netdev_priv(dev);
-+      struct __ip6_tnl_fmr *c;
-+      int fmrs = 0;
-+      for (c = t->parms.fmrs; c; c = c->next)
-+              ++fmrs;
-+
-       return
-               /* IFLA_IPTUN_LINK */
-               nla_total_size(4) +
-@@ -2078,6 +2295,24 @@ static size_t ip6_tnl_get_size(const str
-               nla_total_size(2) +
-               /* IFLA_IPTUN_COLLECT_METADATA */
-               nla_total_size(0) +
-+              /* IFLA_IPTUN_FMRS */
-+              nla_total_size(0) +
-+              (
-+                      /* nest */
-+                      nla_total_size(0) +
-+                      /* IFLA_IPTUN_FMR_IP6_PREFIX */
-+                      nla_total_size(sizeof(struct in6_addr)) +
-+                      /* IFLA_IPTUN_FMR_IP4_PREFIX */
-+                      nla_total_size(sizeof(struct in_addr)) +
-+                      /* IFLA_IPTUN_FMR_EA_LEN */
-+                      nla_total_size(1) +
-+                      /* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */
-+                      nla_total_size(1) +
-+                      /* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */
-+                      nla_total_size(1) +
-+                      /* IFLA_IPTUN_FMR_OFFSET */
-+                      nla_total_size(1)
-+              ) * fmrs +
-               0;
- }
-@@ -2085,6 +2320,9 @@ static int ip6_tnl_fill_info(struct sk_b
- {
-       struct ip6_tnl *tunnel = netdev_priv(dev);
-       struct __ip6_tnl_parm *parm = &tunnel->parms;
-+      struct __ip6_tnl_fmr *c;
-+      int fmrcnt = 0;
-+      struct nlattr *fmrs;
-       if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
-           nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -2093,9 +2331,27 @@ static int ip6_tnl_fill_info(struct sk_b
-           nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
-           nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
-           nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
--          nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto))
-+          nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
-+          !(fmrs = nla_nest_start(skb, IFLA_IPTUN_FMRS)))
-               goto nla_put_failure;
-+      for (c = parm->fmrs; c; c = c->next) {
-+              struct nlattr *fmr = nla_nest_start(skb, ++fmrcnt);
-+              if (!fmr ||
-+                      nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX,
-+                              sizeof(c->ip6_prefix), &c->ip6_prefix) ||
-+                      nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX,
-+                              sizeof(c->ip4_prefix), &c->ip4_prefix) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) ||
-+                      nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset))
-+                              goto nla_put_failure;
-+
-+              nla_nest_end(skb, fmr);
-+      }
-+      nla_nest_end(skb, fmrs);
-+
-       if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
-           nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
-           nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
-@@ -2133,6 +2389,7 @@ static const struct nla_policy ip6_tnl_p
-       [IFLA_IPTUN_ENCAP_SPORT]        = { .type = NLA_U16 },
-       [IFLA_IPTUN_ENCAP_DPORT]        = { .type = NLA_U16 },
-       [IFLA_IPTUN_COLLECT_METADATA]   = { .type = NLA_FLAG },
-+      [IFLA_IPTUN_FMRS]               = { .type = NLA_NESTED },
- };
- static struct rtnl_link_ops ip6_link_ops __read_mostly = {
diff --git a/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
deleted file mode 100644 (file)
index 3f6b406..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-From: Jonas Gorski <jogo@openwrt.org>
-Subject: ipv6: allow rejecting with "source address failed policy"
-
-RFC6204 L-14 requires rejecting traffic from invalid addresses with
-ICMPv6 Destination Unreachable, Code 5 (Source address failed ingress/
-egress policy) on the LAN side, so add an appropriate rule for that.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- include/net/netns/ipv6.h       |  1 +
- include/uapi/linux/fib_rules.h |  4 +++
- include/uapi/linux/rtnetlink.h |  1 +
- net/ipv4/fib_semantics.c       |  4 +++
- net/ipv4/fib_trie.c            |  1 +
- net/ipv4/ipmr.c                |  1 +
- net/ipv6/fib6_rules.c          |  4 +++
- net/ipv6/ip6mr.c               |  2 ++
- net/ipv6/route.c               | 58 +++++++++++++++++++++++++++++++++++++++++-
- 9 files changed, 75 insertions(+), 1 deletion(-)
-
---- a/include/net/netns/ipv6.h
-+++ b/include/net/netns/ipv6.h
-@@ -66,6 +66,7 @@ struct netns_ipv6 {
-       unsigned long            ip6_rt_last_gc;
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-       struct rt6_info         *ip6_prohibit_entry;
-+      struct rt6_info         *ip6_policy_failed_entry;
-       struct rt6_info         *ip6_blk_hole_entry;
-       struct fib6_table       *fib6_local_tbl;
-       struct fib_rules_ops    *fib6_rules_ops;
---- a/include/uapi/linux/fib_rules.h
-+++ b/include/uapi/linux/fib_rules.h
-@@ -66,6 +66,10 @@ enum {
-       FR_ACT_BLACKHOLE,       /* Drop without notification */
-       FR_ACT_UNREACHABLE,     /* Drop with ENETUNREACH */
-       FR_ACT_PROHIBIT,        /* Drop with EACCES */
-+      FR_ACT_RES9,
-+      FR_ACT_RES10,
-+      FR_ACT_RES11,
-+      FR_ACT_POLICY_FAILED,   /* Drop with EACCES */
-       __FR_ACT_MAX,
- };
---- a/include/uapi/linux/rtnetlink.h
-+++ b/include/uapi/linux/rtnetlink.h
-@@ -215,6 +215,7 @@ enum {
-       RTN_THROW,              /* Not in this table            */
-       RTN_NAT,                /* Translate this address       */
-       RTN_XRESOLVE,           /* Use external resolver        */
-+      RTN_POLICY_FAILED,      /* Failed ingress/egress policy */
-       __RTN_MAX
- };
---- a/net/ipv4/fib_semantics.c
-+++ b/net/ipv4/fib_semantics.c
-@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX
-               .error  = -EINVAL,
-               .scope  = RT_SCOPE_NOWHERE,
-       },
-+      [RTN_POLICY_FAILED] = {
-+              .error  = -EACCES,
-+              .scope  = RT_SCOPE_UNIVERSE,
-+      },
- };
- static void rt_fibinfo_free(struct rtable __rcu **rtp)
---- a/net/ipv4/fib_trie.c
-+++ b/net/ipv4/fib_trie.c
-@@ -2406,6 +2406,7 @@ static const char *const rtn_type_names[
-       [RTN_THROW] = "THROW",
-       [RTN_NAT] = "NAT",
-       [RTN_XRESOLVE] = "XRESOLVE",
-+      [RTN_POLICY_FAILED] = "POLICY_FAILED",
- };
- static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
---- a/net/ipv4/ipmr.c
-+++ b/net/ipv4/ipmr.c
-@@ -159,6 +159,7 @@ static int ipmr_rule_action(struct fib_r
-       case FR_ACT_UNREACHABLE:
-               return -ENETUNREACH;
-       case FR_ACT_PROHIBIT:
-+      case FR_ACT_POLICY_FAILED:
-               return -EACCES;
-       case FR_ACT_BLACKHOLE:
-       default:
---- a/net/ipv6/fib6_rules.c
-+++ b/net/ipv6/fib6_rules.c
-@@ -77,6 +77,10 @@ static int fib6_rule_action(struct fib_r
-               err = -EACCES;
-               rt = net->ipv6.ip6_prohibit_entry;
-               goto discard_pkt;
-+      case FR_ACT_POLICY_FAILED:
-+              err = -EACCES;
-+              rt = net->ipv6.ip6_policy_failed_entry;
-+              goto discard_pkt;
-       }
-       tb_id = fib_rule_get_table(rule, arg);
---- a/net/ipv6/ip6mr.c
-+++ b/net/ipv6/ip6mr.c
-@@ -169,6 +169,8 @@ static int ip6mr_rule_action(struct fib_
-               return -ENETUNREACH;
-       case FR_ACT_PROHIBIT:
-               return -EACCES;
-+      case FR_ACT_POLICY_FAILED:
-+              return -EACCES;
-       case FR_ACT_BLACKHOLE:
-       default:
-               return -EINVAL;
---- a/net/ipv6/route.c
-+++ b/net/ipv6/route.c
-@@ -91,6 +91,8 @@ static int           ip6_pkt_discard(struct sk_bu
- static int            ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
- static int            ip6_pkt_prohibit(struct sk_buff *skb);
- static int            ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);
-+static int            ip6_pkt_policy_failed(struct sk_buff *skb);
-+static int            ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb);
- static void           ip6_link_failure(struct sk_buff *skb);
- static void           ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
-                                          struct sk_buff *skb, u32 mtu);
-@@ -300,6 +302,21 @@ static const struct rt6_info ip6_prohibi
-       .rt6i_ref       = ATOMIC_INIT(1),
- };
-+static const struct rt6_info ip6_policy_failed_entry_template = {
-+      .dst = {
-+              .__refcnt       = ATOMIC_INIT(1),
-+              .__use          = 1,
-+              .obsolete       = DST_OBSOLETE_FORCE_CHK,
-+              .error          = -EACCES,
-+              .input          = ip6_pkt_policy_failed,
-+              .output         = ip6_pkt_policy_failed_out,
-+      },
-+      .rt6i_flags     = (RTF_REJECT | RTF_NONEXTHOP),
-+      .rt6i_protocol  = RTPROT_KERNEL,
-+      .rt6i_metric    = ~(u32) 0,
-+      .rt6i_ref       = ATOMIC_INIT(1),
-+};
-+
- static const struct rt6_info ip6_blk_hole_entry_template = {
-       .dst = {
-               .__refcnt       = ATOMIC_INIT(1),
-@@ -1970,6 +1987,11 @@ static struct rt6_info *ip6_route_info_c
-                       rt->dst.output = ip6_pkt_prohibit_out;
-                       rt->dst.input = ip6_pkt_prohibit;
-                       break;
-+              case RTN_POLICY_FAILED:
-+                      rt->dst.error = -EACCES;
-+                      rt->dst.output = ip6_pkt_policy_failed_out;
-+                      rt->dst.input = ip6_pkt_policy_failed;
-+                      break;
-               case RTN_THROW:
-               case RTN_UNREACHABLE:
-               default:
-@@ -2613,6 +2635,17 @@ static int ip6_pkt_prohibit_out(struct n
-       return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
- }
-+static int ip6_pkt_policy_failed(struct sk_buff *skb)
-+{
-+      return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES);
-+}
-+
-+static int ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb)
-+{
-+      skb->dev = skb_dst(skb)->dev;
-+      return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES);
-+}
-+
- /*
-  *    Allocate a dst for local (unicast / anycast) address.
-  */
-@@ -2850,7 +2883,8 @@ static int rtm_to_fib6_config(struct sk_
-       if (rtm->rtm_type == RTN_UNREACHABLE ||
-           rtm->rtm_type == RTN_BLACKHOLE ||
-           rtm->rtm_type == RTN_PROHIBIT ||
--          rtm->rtm_type == RTN_THROW)
-+          rtm->rtm_type == RTN_THROW ||
-+          rtm->rtm_type == RTN_POLICY_FAILED)
-               cfg->fc_flags |= RTF_REJECT;
-       if (rtm->rtm_type == RTN_LOCAL)
-@@ -3222,6 +3256,9 @@ static int rt6_fill_node(struct net *net
-               case -EACCES:
-                       rtm->rtm_type = RTN_PROHIBIT;
-                       break;
-+              case -EPERM:
-+                      rtm->rtm_type = RTN_POLICY_FAILED;
-+                      break;
-               case -EAGAIN:
-                       rtm->rtm_type = RTN_THROW;
-                       break;
-@@ -3498,6 +3535,8 @@ static int ip6_route_dev_notify(struct n
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-               net->ipv6.ip6_prohibit_entry->dst.dev = dev;
-               net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
-+              net->ipv6.ip6_policy_failed_entry->dst.dev = dev;
-+              net->ipv6.ip6_policy_failed_entry->rt6i_idev = in6_dev_get(dev);
-               net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
-               net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
- #endif
-@@ -3509,6 +3548,7 @@ static int ip6_route_dev_notify(struct n
-               in6_dev_put(net->ipv6.ip6_null_entry->rt6i_idev);
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-               in6_dev_put(net->ipv6.ip6_prohibit_entry->rt6i_idev);
-+              in6_dev_put(net->ipv6.ip6_policy_failed_entry->rt6i_idev);
-               in6_dev_put(net->ipv6.ip6_blk_hole_entry->rt6i_idev);
- #endif
-       }
-@@ -3724,6 +3764,17 @@ static int __net_init ip6_route_net_init
-       net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
-       dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
-                        ip6_template_metrics, true);
-+
-+      net->ipv6.ip6_policy_failed_entry =
-+              kmemdup(&ip6_policy_failed_entry_template,
-+                      sizeof(*net->ipv6.ip6_policy_failed_entry), GFP_KERNEL);
-+      if (!net->ipv6.ip6_policy_failed_entry)
-+              goto out_ip6_blk_hole_entry;
-+      net->ipv6.ip6_policy_failed_entry->dst.path =
-+              (struct dst_entry *)net->ipv6.ip6_policy_failed_entry;
-+      net->ipv6.ip6_policy_failed_entry->dst.ops = &net->ipv6.ip6_dst_ops;
-+      dst_init_metrics(&net->ipv6.ip6_policy_failed_entry->dst,
-+                       ip6_template_metrics, true);
- #endif
-       net->ipv6.sysctl.flush_delay = 0;
-@@ -3742,6 +3793,8 @@ out:
-       return ret;
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-+out_ip6_blk_hole_entry:
-+      kfree(net->ipv6.ip6_blk_hole_entry);
- out_ip6_prohibit_entry:
-       kfree(net->ipv6.ip6_prohibit_entry);
- out_ip6_null_entry:
-@@ -3759,6 +3812,7 @@ static void __net_exit ip6_route_net_exi
- #ifdef CONFIG_IPV6_MULTIPLE_TABLES
-       kfree(net->ipv6.ip6_prohibit_entry);
-       kfree(net->ipv6.ip6_blk_hole_entry);
-+      kfree(net->ipv6.ip6_policy_failed_entry);
- #endif
-       dst_entries_destroy(&net->ipv6.ip6_dst_ops);
- }
-@@ -3832,6 +3886,9 @@ void __init ip6_route_init_special_entri
-       init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
-       init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
-       init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
-+      init_net.ipv6.ip6_policy_failed_entry->dst.dev = init_net.loopback_dev;
-+      init_net.ipv6.ip6_policy_failed_entry->rt6i_idev =
-+              in6_dev_get(init_net.loopback_dev);
-   #endif
- }
diff --git a/target/linux/generic/pending-4.9/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch b/target/linux/generic/pending-4.9/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
deleted file mode 100644 (file)
index cd62766..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Jonas Gorski <jogo@openwrt.org>
-Subject: net: provide defines for _POLICY_FAILED until all code is updated
-
-Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
-unreachable, conflicting with our name.
-
-Add appropriate defines to allow our code to build with the new
-name until we have updated our local patches for older kernels
-and userspace packages.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- include/uapi/linux/fib_rules.h | 2 ++
- include/uapi/linux/icmpv6.h    | 2 ++
- include/uapi/linux/rtnetlink.h | 2 ++
- 3 files changed, 6 insertions(+)
-
---- a/include/uapi/linux/fib_rules.h
-+++ b/include/uapi/linux/fib_rules.h
-@@ -73,6 +73,8 @@ enum {
-       __FR_ACT_MAX,
- };
-+#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
-+
- #define FR_ACT_MAX (__FR_ACT_MAX - 1)
- #endif
---- a/include/uapi/linux/icmpv6.h
-+++ b/include/uapi/linux/icmpv6.h
-@@ -118,6 +118,8 @@ struct icmp6hdr {
- #define ICMPV6_POLICY_FAIL            5
- #define ICMPV6_REJECT_ROUTE           6
-+#define ICMPV6_FAILED_POLICY          ICMPV6_POLICY_FAIL
-+
- /*
-  *    Codes for Time Exceeded
-  */
---- a/include/uapi/linux/rtnetlink.h
-+++ b/include/uapi/linux/rtnetlink.h
-@@ -219,6 +219,8 @@ enum {
-       __RTN_MAX
- };
-+#define RTN_FAILED_POLICY RTN_POLICY_FAILED
-+
- #define RTN_MAX (__RTN_MAX - 1)
diff --git a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
deleted file mode 100644 (file)
index d113be6..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: net: replace GRO optimization patch with a new one that supports VLANs/bridges with different MAC addresses
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/netdevice.h |  2 ++
- include/linux/skbuff.h    |  3 ++-
- net/core/dev.c            | 48 +++++++++++++++++++++++++++++++++++++++++++++++
- net/ethernet/eth.c        | 18 +++++++++++++++++-
- 4 files changed, 69 insertions(+), 2 deletions(-)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1752,6 +1752,8 @@ struct net_device {
-       struct netdev_hw_addr_list      mc;
-       struct netdev_hw_addr_list      dev_addrs;
-+      unsigned char           local_addr_mask[MAX_ADDR_LEN];
-+
- #ifdef CONFIG_SYSFS
-       struct kset             *queues_kset;
- #endif
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -747,7 +747,8 @@ struct sk_buff {
- #ifdef CONFIG_NET_SWITCHDEV
-       __u8                    offload_fwd_mark:1;
- #endif
--      /* 2, 4 or 5 bit hole */
-+      __u8                    gro_skip:1;
-+      /* 1, 3 or 4 bit hole */
- #ifdef CONFIG_NET_SCHED
-       __u16                   tc_index;       /* traffic control index */
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -4572,6 +4572,9 @@ static enum gro_result dev_gro_receive(s
-       enum gro_result ret;
-       int grow;
-+      if (skb->gro_skip)
-+              goto normal;
-+
-       if (!(skb->dev->features & NETIF_F_GRO))
-               goto normal;
-@@ -5864,6 +5867,48 @@ static void __netdev_adjacent_dev_unlink
-                                          &upper_dev->adj_list.lower);
- }
-+static void __netdev_addr_mask(unsigned char *mask, const unsigned char *addr,
-+                             struct net_device *dev)
-+{
-+      int i;
-+
-+      for (i = 0; i < dev->addr_len; i++)
-+              mask[i] |= addr[i] ^ dev->dev_addr[i];
-+}
-+
-+static void __netdev_upper_mask(unsigned char *mask, struct net_device *dev,
-+                              struct net_device *lower)
-+{
-+      struct net_device *cur;
-+      struct list_head *iter;
-+
-+      netdev_for_each_upper_dev_rcu(dev, cur, iter) {
-+              __netdev_addr_mask(mask, cur->dev_addr, lower);
-+              __netdev_upper_mask(mask, cur, lower);
-+      }
-+}
-+
-+static void __netdev_update_addr_mask(struct net_device *dev)
-+{
-+      unsigned char mask[MAX_ADDR_LEN];
-+      struct net_device *cur;
-+      struct list_head *iter;
-+
-+      memset(mask, 0, sizeof(mask));
-+      __netdev_upper_mask(mask, dev, dev);
-+      memcpy(dev->local_addr_mask, mask, dev->addr_len);
-+
-+      netdev_for_each_lower_dev(dev, cur, iter)
-+              __netdev_update_addr_mask(cur);
-+}
-+
-+static void netdev_update_addr_mask(struct net_device *dev)
-+{
-+      rcu_read_lock();
-+      __netdev_update_addr_mask(dev);
-+      rcu_read_unlock();
-+}
-+
- static int __netdev_upper_dev_link(struct net_device *dev,
-                                  struct net_device *upper_dev, bool master,
-                                  void *upper_priv, void *upper_info)
-@@ -5936,6 +5981,7 @@ static int __netdev_upper_dev_link(struc
-                       goto rollback_lower_mesh;
-       }
-+      netdev_update_addr_mask(dev);
-       ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
-                                           &changeupper_info.info);
-       ret = notifier_to_errno(ret);
-@@ -6062,6 +6108,7 @@ void netdev_upper_dev_unlink(struct net_
-       list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
-               __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
-+      netdev_update_addr_mask(dev);
-       call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
-                                     &changeupper_info.info);
- }
-@@ -6664,6 +6711,7 @@ int dev_set_mac_address(struct net_devic
-       if (err)
-               return err;
-       dev->addr_assign_type = NET_ADDR_SET;
-+      netdev_update_addr_mask(dev);
-       call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
-       add_device_randomness(dev->dev_addr, dev->addr_len);
-       return 0;
---- a/net/ethernet/eth.c
-+++ b/net/ethernet/eth.c
-@@ -143,6 +143,18 @@ u32 eth_get_headlen(void *data, unsigned
- }
- EXPORT_SYMBOL(eth_get_headlen);
-+static inline bool
-+eth_check_local_mask(const void *addr1, const void *addr2, const void *mask)
-+{
-+      const u16 *a1 = addr1;
-+      const u16 *a2 = addr2;
-+      const u16 *m = mask;
-+
-+      return (((a1[0] ^ a2[0]) & ~m[0]) |
-+              ((a1[1] ^ a2[1]) & ~m[1]) |
-+              ((a1[2] ^ a2[2]) & ~m[2]));
-+}
-+
- /**
-  * eth_type_trans - determine the packet's protocol ID.
-  * @skb: received socket data
-@@ -171,8 +183,12 @@ __be16 eth_type_trans(struct sk_buff *sk
-                       skb->pkt_type = PACKET_MULTICAST;
-       }
-       else if (unlikely(!ether_addr_equal_64bits(eth->h_dest,
--                                                 dev->dev_addr)))
-+                                                 dev->dev_addr))) {
-               skb->pkt_type = PACKET_OTHERHOST;
-+              if (eth_check_local_mask(eth->h_dest, dev->dev_addr,
-+                                       dev->local_addr_mask))
-+                      skb->gro_skip = 1;
-+      }
-       /*
-        * Some variants of DSA tagging don't have an ethertype field
diff --git a/target/linux/generic/pending-4.9/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/pending-4.9/681-NET-add-of_get_mac_address_mtd.patch
deleted file mode 100644 (file)
index b29b5f1..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-From: John Crispin <blogic@openwrt.org>
-Subject: NET: add mtd-mac-address support to of_get_mac_address()
-
-Many embedded devices have information such as mac addresses stored inside mtd
-devices. This patch allows us to add a property inside a node describing a
-network interface. The new property points at a mtd partition with an offset
-where the mac address can be found.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/of/of_net.c    |   37 +++++++++++++++++++++++++++++++++++++
- include/linux/of_net.h |    1 +
- 2 files changed, 38 insertions(+)
-
---- a/drivers/of/of_net.c
-+++ b/drivers/of/of_net.c
-@@ -10,6 +10,7 @@
- #include <linux/of_net.h>
- #include <linux/phy.h>
- #include <linux/export.h>
-+#include <linux/mtd/mtd.h>
- /**
-  * of_get_phy_mode - Get phy mode for given device_node
-@@ -38,7 +39,7 @@ int of_get_phy_mode(struct device_node *
- }
- EXPORT_SYMBOL_GPL(of_get_phy_mode);
--static const void *of_get_mac_addr(struct device_node *np, const char *name)
-+static void *of_get_mac_addr(struct device_node *np, const char *name)
- {
-       struct property *pp = of_find_property(np, name, NULL);
-@@ -47,6 +48,73 @@ static const void *of_get_mac_addr(struc
-       return NULL;
- }
-+static const void *of_get_mac_address_mtd(struct device_node *np)
-+{
-+#ifdef CONFIG_MTD
-+      struct device_node *mtd_np = NULL;
-+      struct property *prop;
-+      size_t retlen;
-+      int size, ret;
-+      struct mtd_info *mtd;
-+      const char *part;
-+      const __be32 *list;
-+      phandle phandle;
-+      u32 mac_inc = 0;
-+      u8 mac[ETH_ALEN];
-+      void *addr;
-+
-+      list = of_get_property(np, "mtd-mac-address", &size);
-+      if (!list || (size != (2 * sizeof(*list))))
-+              return NULL;
-+
-+      phandle = be32_to_cpup(list++);
-+      if (phandle)
-+              mtd_np = of_find_node_by_phandle(phandle);
-+
-+      if (!mtd_np)
-+              return NULL;
-+
-+      part = of_get_property(mtd_np, "label", NULL);
-+      if (!part)
-+              part = mtd_np->name;
-+
-+      mtd = get_mtd_device_nm(part);
-+      if (IS_ERR(mtd))
-+              return NULL;
-+
-+      ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
-+      put_mtd_device(mtd);
-+
-+      if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
-+              mac[5] += mac_inc;
-+
-+      if (!is_valid_ether_addr(mac))
-+              return NULL;
-+
-+      addr = of_get_mac_addr(np, "mac-address");
-+      if (addr) {
-+              memcpy(addr, mac, ETH_ALEN);
-+              return addr;
-+      }
-+
-+      prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-+      if (!prop)
-+              return NULL;
-+
-+      prop->name = "mac-address";
-+      prop->length = ETH_ALEN;
-+      prop->value = kmemdup(mac, ETH_ALEN, GFP_KERNEL);
-+      if (!prop->value || of_add_property(np, prop))
-+              goto free;
-+
-+      return prop->value;
-+free:
-+      kfree(prop->value);
-+      kfree(prop);
-+#endif
-+      return NULL;
-+}
-+
- /**
-  * Search the device tree for the best MAC address to use.  'mac-address' is
-  * checked first, because that is supposed to contain to "most recent" MAC
-@@ -64,11 +132,18 @@ static const void *of_get_mac_addr(struc
-  * addresses.  Some older U-Boots only initialized 'local-mac-address'.  In
-  * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
-  * but is all zeros.
-+ *
-+ * If a mtd-mac-address property exists, try to fetch the MAC address from the
-+ * specified mtd device, and store it as a 'mac-address' property
- */
- const void *of_get_mac_address(struct device_node *np)
- {
-       const void *addr;
-+      addr = of_get_mac_address_mtd(np);
-+      if (addr)
-+              return addr;
-+
-       addr = of_get_mac_addr(np, "mac-address");
-       if (addr)
-               return addr;
diff --git a/target/linux/generic/pending-4.9/701-phy_extension.patch b/target/linux/generic/pending-4.9/701-phy_extension.patch
deleted file mode 100644 (file)
index 628e1d3..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From: John Crispin <john@phrozen.org>
-Subject: net: phy: add phy_ethtool_ioctl()
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/net/phy/phy.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
- include/linux/phy.h   |  1 +
- 2 files changed, 45 insertions(+)
-
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -472,6 +472,50 @@ int phy_ethtool_ksettings_get(struct phy
- }
- EXPORT_SYMBOL(phy_ethtool_ksettings_get);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+      u32 cmd;
-+      int tmp;
-+      struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+      struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+      if (get_user(cmd, (u32 *) useraddr))
-+              return -EFAULT;
-+
-+      switch (cmd) {
-+      case ETHTOOL_GSET:
-+              phy_ethtool_gset(phydev, &ecmd);
-+              if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+                      return -EFAULT;
-+              return 0;
-+
-+      case ETHTOOL_SSET:
-+              if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+                      return -EFAULT;
-+              return phy_ethtool_sset(phydev, &ecmd);
-+
-+      case ETHTOOL_NWAY_RST:
-+              /* if autoneg is off, it's an error */
-+              tmp = phy_read(phydev, MII_BMCR);
-+              if (tmp & BMCR_ANENABLE) {
-+                      tmp |= (BMCR_ANRESTART);
-+                      phy_write(phydev, MII_BMCR, tmp);
-+                      return 0;
-+              }
-+              return -EINVAL;
-+
-+      case ETHTOOL_GLINK:
-+              edata.data = (phy_read(phydev,
-+                              MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+              if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+                      return -EFAULT;
-+              return 0;
-+      }
-+
-+      return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -827,6 +827,7 @@ int phy_ethtool_ksettings_get(struct phy
-                             struct ethtool_link_ksettings *cmd);
- int phy_ethtool_ksettings_set(struct phy_device *phydev,
-                             const struct ethtool_link_ksettings *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
- void phy_print_status(struct phy_device *phydev);
diff --git a/target/linux/generic/pending-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch
deleted file mode 100644 (file)
index 5c7ae72..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: generic: add detach callback to struct phy_driver
-
-lede-commit: fe61fc2d7d0b3fb348b502f68f98243b3ddf5867
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/phy/phy_device.c | 3 +++
- include/linux/phy.h          | 6 ++++++
- 2 files changed, 9 insertions(+)
-
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -998,6 +998,9 @@ void phy_detach(struct phy_device *phyde
-       struct mii_bus *bus;
-       int i;
-+      if (phydev->drv && phydev->drv->detach)
-+              phydev->drv->detach(phydev);
-+
-       phydev->attached_dev->phydev = NULL;
-       phydev->attached_dev = NULL;
-       phy_suspend(phydev);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -507,6 +507,12 @@ struct phy_driver {
-        */
-       int (*did_interrupt)(struct phy_device *phydev);
-+      /*
-+       * Called before an ethernet device is detached
-+       * from the PHY.
-+       */
-+      void (*detach)(struct phy_device *phydev);
-+
-       /* Clears up any memory if needed */
-       void (*remove)(struct phy_device *phydev);
diff --git a/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch b/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch
deleted file mode 100644 (file)
index 69b21be..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: net: phy: allow to configure AR803x PHYs via platform data
-
-Add a patch for the at803x phy driver, in order to be able
-to configure some register settings via platform data.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/phy/at803x.c                 | 56 ++++++++++++++++++++++++++++++++
- include/linux/platform_data/phy-at803x.h | 11 +++++++
- 2 files changed, 67 insertions(+)
- create mode 100644 include/linux/platform_data/phy-at803x.h
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -12,12 +12,14 @@
-  */
- #include <linux/phy.h>
-+#include <linux/mdio.h>
- #include <linux/module.h>
- #include <linux/string.h>
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
- #include <linux/of_gpio.h>
- #include <linux/gpio/consumer.h>
-+#include <linux/platform_data/phy-at803x.h>
- #define AT803X_INTR_ENABLE                    0x12
- #define AT803X_INTR_ENABLE_AUTONEG_ERR                BIT(15)
-@@ -45,6 +47,11 @@
- #define AT803X_REG_CHIP_CONFIG                        0x1f
- #define AT803X_BT_BX_REG_SEL                  0x8000
-+#define AT803X_PCS_SMART_EEE_CTRL3                    0x805D
-+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK  0x3
-+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT 12
-+#define AT803X_SMART_EEE_CTRL3_LPI_EN                 BIT(8)
-+
- #define AT803X_DEBUG_ADDR                     0x1D
- #define AT803X_DEBUG_DATA                     0x1E
-@@ -72,6 +79,7 @@ MODULE_LICENSE("GPL");
- struct at803x_priv {
-       bool phy_reset:1;
-       struct gpio_desc *gpiod_reset;
-+      int prev_speed;
- };
- struct at803x_context {
-@@ -276,8 +284,16 @@ does_not_require_reset_workaround:
-       return 0;
- }
-+static void at803x_disable_smarteee(struct phy_device *phydev)
-+{
-+      phy_write_mmd(phydev, MDIO_MMD_PCS, AT803X_PCS_SMART_EEE_CTRL3,
-+              1 << AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT);
-+      phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);
-+}
-+
- static int at803x_config_init(struct phy_device *phydev)
- {
-+      struct at803x_platform_data *pdata;
-       int ret;
-       ret = genphy_config_init(phydev);
-@@ -298,6 +314,26 @@ static int at803x_config_init(struct phy
-                       return ret;
-       }
-+      pdata = dev_get_platdata(&phydev->mdio.dev);
-+      if (pdata) {
-+              if (pdata->disable_smarteee)
-+                      at803x_disable_smarteee(phydev);
-+
-+              if (pdata->enable_rgmii_rx_delay)
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0,
-+                              AT803X_DEBUG_RX_CLK_DLY_EN);
-+              else
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
-+                              AT803X_DEBUG_RX_CLK_DLY_EN, 0);
-+
-+              if (pdata->enable_rgmii_tx_delay)
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN);
-+              else
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN, 0);
-+      }
-+
-       return 0;
- }
-@@ -335,6 +371,8 @@ static int at803x_config_intr(struct phy
- static void at803x_link_change_notify(struct phy_device *phydev)
- {
-       struct at803x_priv *priv = phydev->priv;
-+      struct at803x_platform_data *pdata;
-+      pdata = dev_get_platdata(&phydev->mdio.dev);
-       /*
-        * Conduct a hardware reset for AT8030/2 every time a link loss is
-@@ -363,6 +401,24 @@ static void at803x_link_change_notify(st
-       } else {
-               priv->phy_reset = false;
-       }
-+      if (pdata && pdata->fixup_rgmii_tx_delay &&
-+          phydev->speed != priv->prev_speed) {
-+              switch (phydev->speed) {
-+              case SPEED_10:
-+              case SPEED_100:
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN);
-+                      break;
-+              case SPEED_1000:
-+                      at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
-+                              AT803X_DEBUG_TX_CLK_DLY_EN, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+
-+              priv->prev_speed = phydev->speed;
-+      }
- }
- static int at803x_aneg_done(struct phy_device *phydev)
---- /dev/null
-+++ b/include/linux/platform_data/phy-at803x.h
-@@ -0,0 +1,11 @@
-+#ifndef _PHY_AT803X_PDATA_H
-+#define _PHY_AT803X_PDATA_H
-+
-+struct at803x_platform_data {
-+      int disable_smarteee:1;
-+      int enable_rgmii_tx_delay:1;
-+      int enable_rgmii_rx_delay:1;
-+      int fixup_rgmii_tx_delay:1;
-+};
-+
-+#endif /* _PHY_AT803X_PDATA_H */
diff --git a/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
deleted file mode 100644 (file)
index 381b2d0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Roman Yeryomin <roman@advem.lv>
-Subject: kernel: add at803x fix for sgmii mode
-
-Some (possibly broken) bootloaders incorreclty initialize at8033
-phy. This patch enables sgmii autonegotiation mode.
-
-[john@phrozen.org: felix added this to his upstream queue]
-
-Signed-off-by: Roman Yeryomin <roman@advem.lv>
----
- drivers/net/phy/at803x.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -46,6 +46,7 @@
- #define AT803X_FUNC_DATA                      0x4003
- #define AT803X_REG_CHIP_CONFIG                        0x1f
- #define AT803X_BT_BX_REG_SEL                  0x8000
-+#define AT803X_SGMII_ANEG_EN                  0x1000
- #define AT803X_PCS_SMART_EEE_CTRL3                    0x805D
- #define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK  0x3
-@@ -295,6 +296,27 @@ static int at803x_config_init(struct phy
- {
-       struct at803x_platform_data *pdata;
-       int ret;
-+      u32 v;
-+
-+      if (phydev->drv->phy_id == ATH8031_PHY_ID &&
-+              phydev->interface == PHY_INTERFACE_MODE_SGMII)
-+      {
-+              v = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
-+              /* select SGMII/fiber page */
-+              ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
-+                                              v & ~AT803X_BT_BX_REG_SEL);
-+              if (ret)
-+                      return ret;
-+              /* enable SGMII autonegotiation */
-+              ret = phy_write(phydev, MII_BMCR, AT803X_SGMII_ANEG_EN);
-+              if (ret)
-+                      return ret;
-+              /* select copper page */
-+              ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
-+                                              v | AT803X_BT_BX_REG_SEL);
-+              if (ret)
-+                      return ret;
-+      }
-       ret = genphy_config_init(phydev);
-       if (ret < 0)
diff --git a/target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch
deleted file mode 100644 (file)
index 6130ac8..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: debloat: add kernel config option to disabling common PCI quirks
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/pci/Kconfig  | 6 ++++++
- drivers/pci/quirks.c | 6 ++++++
- 2 files changed, 12 insertions(+)
-
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -71,6 +71,12 @@ config XEN_PCIDEV_FRONTEND
-           The PCI device frontend driver allows the kernel to import arbitrary
-           PCI devices from a PCI backend to support PCI driver domains.
-+config PCI_DISABLE_COMMON_QUIRKS
-+      bool "PCI disable common quirks"
-+      depends on PCI
-+      help
-+        If you don't know what to do here, say N.
-+
- config HT_IRQ
-       bool "Interrupts on hypertransport devices"
-       default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -41,6 +41,7 @@ static void quirk_mmio_always_on(struct
- DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
-                               PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -3055,6 +3056,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- /*
-  * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.  To
-@@ -3111,6 +3113,8 @@ static void fixup_debug_report(struct pc
-       }
- }
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
- /*
-  * Some BIOS implementations leave the Intel GPU interrupts enabled,
-  * even though no one is handling them (f.e. i915 driver is never loaded).
-@@ -3149,6 +3153,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
-+
- /*
-  * PCI devices which are on Intel chips can skip the 10ms delay
-  * before entering D3 mode.
diff --git a/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch
deleted file mode 100644 (file)
index 9dbb2ca..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: debloat: disable common USB quirks
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/usb/host/pci-quirks.c | 16 ++++++++++++++++
- drivers/usb/host/pci-quirks.h | 18 +++++++++++++++++-
- include/linux/usb/hcd.h       |  7 +++++++
- 3 files changed, 40 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/host/pci-quirks.c
-+++ b/drivers/usb/host/pci-quirks.c
-@@ -107,6 +107,8 @@ struct amd_chipset_type {
-       u8 rev;
- };
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
- static struct amd_chipset_info {
-       struct pci_dev  *nb_dev;
-       struct pci_dev  *smbus_dev;
-@@ -511,6 +513,10 @@ void usb_amd_dev_put(void)
- }
- EXPORT_SYMBOL_GPL(usb_amd_dev_put);
-+#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
-+
-+#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
-+
- /*
-  * Make sure the controller is completely inactive, unable to
-  * generate interrupts or do DMA.
-@@ -590,8 +596,17 @@ reset_needed:
-       uhci_reset_hc(pdev, base);
-       return 1;
- }
-+#else
-+int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
-+{
-+      return 0;
-+}
-+
-+#endif
- EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
- static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
- {
-       u16 cmd;
-@@ -1158,3 +1173,4 @@ static void quirk_usb_early_handoff(stru
- }
- DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
-                       PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
-+#endif
---- a/drivers/usb/host/pci-quirks.h
-+++ b/drivers/usb/host/pci-quirks.h
-@@ -4,6 +4,9 @@
- #ifdef CONFIG_PCI
- void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
- int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
-+#endif  /* CONFIG_PCI */
-+
-+#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
- int usb_amd_find_chipset_info(void);
- int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev);
- bool usb_amd_hang_symptom_quirk(void);
-@@ -17,12 +20,25 @@ void usb_disable_xhci_ports(struct pci_d
- void sb800_prefetch(struct device *dev, int on);
- #else
- struct pci_dev;
-+static inline int usb_amd_find_chipset_info(void)
-+{
-+      return 0;
-+}
-+static inline bool usb_amd_hang_symptom_quirk(void)
-+{
-+      return false;
-+}
-+static inline bool usb_amd_prefetch_quirk(void)
-+{
-+      return false;
-+}
- static inline void usb_amd_quirk_pll_disable(void) {}
- static inline void usb_amd_quirk_pll_enable(void) {}
- static inline void usb_asmedia_modifyflowcontrol(struct pci_dev *pdev) {}
- static inline void usb_amd_dev_put(void) {}
- static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
- static inline void sb800_prefetch(struct device *dev, int on) {}
-+static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
- #endif  /* CONFIG_PCI */
- #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
---- a/include/linux/usb/hcd.h
-+++ b/include/linux/usb/hcd.h
-@@ -461,7 +461,14 @@ extern int usb_hcd_pci_probe(struct pci_
- extern void usb_hcd_pci_remove(struct pci_dev *dev);
- extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
-+#else
-+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
-+{
-+      return 0;
-+}
-+#endif
- #ifdef CONFIG_PM
- extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
diff --git a/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch b/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch
deleted file mode 100644 (file)
index dc60557..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Subject: usb: Remove annoying warning about bogus URB
-
-When ath9k-htc Wi-Fi dongle is used with generic OHCI controller
-infinite stream of warnings appears in debug console like this:
--------------------------->8----------------------
-usb 1-1: new full-speed USB device number 2 using ohci-platform
-usb 1-1: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw requested
-usb 1-1: ath9k_htc: Transferred FW: ath9k_htc/htc_9271-1.4.0.fw, size:
-51008
-------------[ cut here ]------------
-WARNING: CPU: 0 PID: 19 at drivers/usb/core/urb.c:449
-usb_submit_urb+0x1b4/0x498()
-usb 1-1: BOGUS urb xfer, pipe 1 != type 3
-Modules linked in:
-CPU: 0 PID: 19 Comm: kworker/0:1 Not tainted
-4.4.0-rc4-00017-g00e2d79-dirty #3
-Workqueue: events request_firmware_work_func
-
-Stack Trace:
-  arc_unwind_core.constprop.1+0xa4/0x110
----[ end trace 649ef8c342817fc2 ]---
-------------[ cut here ]------------
-WARNING: CPU: 0 PID: 19 at drivers/usb/core/urb.c:449
-usb_submit_urb+0x1b4/0x498()
-usb 1-1: BOGUS urb xfer, pipe 1 != type 3
-Modules linked in:
-CPU: 0 PID: 19 Comm: kworker/0:1 Tainted: G        W
-4.4.0-rc4-00017-g00e2d79-dirty #3
-Workqueue: events request_firmware_work_func
-
-Stack Trace:
-  arc_unwind_core.constprop.1+0xa4/0x110
----[ end trace 649ef8c342817fc3 ]---
-------------[ cut here ]------------
--------------------------->8----------------------
-
-There're some discussions in mailing lists proposing to disable
-that particular check alltogether and magically all seem to work
-fine with muted warning.
-
-Anyways new thread on that regard could be found here:
-http://lists.infradead.org/pipermail/linux-snps-arc/2016-July/001310.html
-
-Let's see what comes out of that new discussion, hopefully patching
-of generic USB stuff won't be required then.
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- drivers/usb/core/urb.c | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/drivers/usb/core/urb.c
-+++ b/drivers/usb/core/urb.c
-@@ -321,9 +321,6 @@ EXPORT_SYMBOL_GPL(usb_unanchor_urb);
-  */
- int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
- {
--      static int                      pipetypes[4] = {
--              PIPE_CONTROL, PIPE_ISOCHRONOUS, PIPE_BULK, PIPE_INTERRUPT
--      };
-       int                             xfertype, max;
-       struct usb_device               *dev;
-       struct usb_host_endpoint        *ep;
-@@ -441,11 +438,6 @@ int usb_submit_urb(struct urb *urb, gfp_
-        * cause problems in HCDs if they get it wrong.
-        */
--      /* Check that the pipe's type matches the endpoint's type */
--      if (usb_pipetype(urb->pipe) != pipetypes[xfertype])
--              dev_WARN(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n",
--                      usb_pipetype(urb->pipe), pipetypes[xfertype]);
--
-       /* Check against a simple/standard policy */
-       allowed = (URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT | URB_DIR_MASK |
-                       URB_FREE_BUFFER);
diff --git a/target/linux/generic/pending-4.9/834-ledtrig-libata.patch b/target/linux/generic/pending-4.9/834-ledtrig-libata.patch
deleted file mode 100644 (file)
index 4715182..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-From: Daniel Golle <daniel@makrotopia.org>
-Subject: libata: add ledtrig support
-
-This adds a LED trigger for each ATA port indicating disk activity.
-
-As this is needed only on specific platforms (NAS SoCs and such),
-these platforms should define ARCH_WANTS_LIBATA_LEDS if there
-are boards with LED(s) intended to indicate ATA disk activity and
-need the OS to take care of that.
-In that way, if not selected, LED trigger support not will be
-included in libata-core and both, codepaths and structures remain
-untouched.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- drivers/ata/Kconfig       | 16 ++++++++++++++++
- drivers/ata/libata-core.c | 41 +++++++++++++++++++++++++++++++++++++++++
- include/linux/libata.h    |  9 +++++++++
- 3 files changed, 66 insertions(+)
-
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -46,6 +46,22 @@ config ATA_VERBOSE_ERROR
-         If unsure, say Y.
-+config ARCH_WANT_LIBATA_LEDS
-+      bool
-+
-+config ATA_LEDS
-+      bool "support ATA port LED triggers"
-+      depends on ARCH_WANT_LIBATA_LEDS
-+      select NEW_LEDS
-+      select LEDS_CLASS
-+      select LEDS_TRIGGERS
-+      default y
-+      help
-+        This option adds a LED trigger for each registered ATA port.
-+        It is used to drive disk activity leds connected via GPIO.
-+
-+        If unsure, say N.
-+
- config ATA_ACPI
-       bool "ATA ACPI Support"
-       depends on ACPI
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -731,6 +731,19 @@ u64 ata_tf_read_block(const struct ata_t
-       return block;
- }
-+#ifdef CONFIG_ATA_LEDS
-+#define LIBATA_BLINK_DELAY 20 /* ms */
-+static inline void ata_led_act(struct ata_port *ap)
-+{
-+      unsigned long led_delay = LIBATA_BLINK_DELAY;
-+
-+      if (unlikely(!ap->ledtrig))
-+              return;
-+
-+      led_trigger_blink_oneshot(ap->ledtrig, &led_delay, &led_delay, 0);
-+}
-+#endif
-+
- /**
-  *    ata_build_rw_tf - Build ATA taskfile for given read/write request
-  *    @tf: Target ATA taskfile
-@@ -4995,6 +5008,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
-               if (tag < 0)
-                       return NULL;
-       }
-+#ifdef CONFIG_ATA_LEDS
-+      ata_led_act(ap);
-+#endif
-       qc = __ata_qc_from_tag(ap, tag);
-       qc->tag = tag;
-@@ -5896,6 +5912,9 @@ struct ata_port *ata_port_alloc(struct a
-       ap->stats.unhandled_irq = 1;
-       ap->stats.idle_irq = 1;
- #endif
-+#ifdef CONFIG_ATA_LEDS
-+      ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
-+#endif
-       ata_sff_port_init(ap);
-       return ap;
-@@ -5917,6 +5936,12 @@ static void ata_host_release(struct devi
-               kfree(ap->pmp_link);
-               kfree(ap->slave_link);
-+#ifdef CONFIG_ATA_LEDS
-+              if (ap->ledtrig) {
-+                      led_trigger_unregister(ap->ledtrig);
-+                      kfree(ap->ledtrig);
-+              };
-+#endif
-               kfree(ap);
-               host->ports[i] = NULL;
-       }
-@@ -6363,7 +6388,23 @@ int ata_host_register(struct ata_host *h
-               host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
-               host->ports[i]->local_port_no = i + 1;
-       }
-+#ifdef CONFIG_ATA_LEDS
-+      for (i = 0; i < host->n_ports; i++) {
-+              if (unlikely(!host->ports[i]->ledtrig))
-+                      continue;
-+              snprintf(host->ports[i]->ledtrig_name,
-+                      sizeof(host->ports[i]->ledtrig_name), "ata%u",
-+                      host->ports[i]->print_id);
-+
-+              host->ports[i]->ledtrig->name = host->ports[i]->ledtrig_name;
-+
-+              if (led_trigger_register(host->ports[i]->ledtrig)) {
-+                      kfree(host->ports[i]->ledtrig);
-+                      host->ports[i]->ledtrig = NULL;
-+              }
-+      }
-+#endif
-       /* Create associated sysfs transport objects  */
-       for (i = 0; i < host->n_ports; i++) {
-               rc = ata_tport_add(host->dev,host->ports[i]);
---- a/include/linux/libata.h
-+++ b/include/linux/libata.h
-@@ -38,6 +38,9 @@
- #include <linux/acpi.h>
- #include <linux/cdrom.h>
- #include <linux/sched.h>
-+#ifdef CONFIG_ATA_LEDS
-+#include <linux/leds.h>
-+#endif
- /*
-  * Define if arch has non-standard setup.  This is a _PCI_ standard
-@@ -884,6 +887,12 @@ struct ata_port {
- #ifdef CONFIG_ATA_ACPI
-       struct ata_acpi_gtm     __acpi_init_gtm; /* use ata_acpi_init_gtm() */
- #endif
-+
-+#ifdef CONFIG_ATA_LEDS
-+      struct led_trigger      *ledtrig;
-+      char                    ledtrig_name[8];
-+#endif
-+
-       /* owned by EH */
-       u8                      sector_buf[ATA_SECT_SIZE] ____cacheline_aligned;
- };
diff --git a/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch b/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch
deleted file mode 100644 (file)
index d80246d..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From: John Crispin <john@phrozen.org>
-Subject: serial: do not accept sysrq characters via serial port
-
-many embedded boards have a disconnected TTL level serial which can
-generate some garbage that can lead to spurious false sysrq detects.
-
-[john@phrozen.org: sent upstream 22.12.2016]
-
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/linux/serial_core.h | 2 +-
- lib/Kconfig.debug           | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -456,7 +456,7 @@ extern void uart_handle_cts_change(struc
- extern void uart_insert_char(struct uart_port *port, unsigned int status,
-                unsigned int overrun, unsigned int ch, unsigned int flag);
--#ifdef SUPPORT_SYSRQ
-+#if defined(SUPPORT_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ_SERIAL)
- static inline int
- uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
- {
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -410,6 +410,11 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE
-         This may be set to 1 or 0 to enable or disable them all, or
-         to a bitmask as described in Documentation/sysrq.txt.
-+config MAGIC_SYSRQ_SERIAL
-+      bool "Enable magic SysRq key over serial"
-+      depends on MAGIC_SYSRQ
-+      default y
-+
- config DEBUG_KERNEL
-       bool "Kernel debugging"
-       help
diff --git a/target/linux/generic/pending-4.9/920-mangle_bootargs.patch b/target/linux/generic/pending-4.9/920-mangle_bootargs.patch
deleted file mode 100644 (file)
index 3422f41..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Imre Kaloz <kaloz@openwrt.org>
-Subject: init: add CONFIG_MANGLE_BOOTARGS and disable it by default
-
-Enabling this option renames the bootloader supplied root=
-and rootfstype= variables, which might have to be know but
-would break the automatisms OpenWrt uses.
-
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
- init/Kconfig |  9 +++++++++
- init/main.c  | 24 ++++++++++++++++++++++++
- 2 files changed, 33 insertions(+)
-
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1694,6 +1694,15 @@ config EMBEDDED
-         an embedded system so certain expert options are available
-         for configuration.
-+config MANGLE_BOOTARGS
-+      bool "Rename offending bootargs"
-+      depends on EXPERT
-+      help
-+        Sometimes the bootloader passed bogus root= and rootfstype=
-+        parameters to the kernel, and while you want to ignore them,
-+        you need to know the values f.e. to support dual firmware
-+        layouts on the flash.
-+
- config HAVE_PERF_EVENTS
-       bool
-       help
---- a/init/main.c
-+++ b/init/main.c
-@@ -353,6 +353,29 @@ static inline void setup_nr_cpu_ids(void
- static inline void smp_prepare_cpus(unsigned int maxcpus) { }
- #endif
-+#ifdef CONFIG_MANGLE_BOOTARGS
-+static void __init mangle_bootargs(char *command_line)
-+{
-+      char *rootdev;
-+      char *rootfs;
-+
-+      rootdev = strstr(command_line, "root=/dev/mtdblock");
-+
-+      if (rootdev)
-+              strncpy(rootdev, "mangled_rootblock=", 18);
-+
-+      rootfs = strstr(command_line, "rootfstype");
-+
-+      if (rootfs)
-+              strncpy(rootfs, "mangled_fs", 10);
-+
-+}
-+#else
-+static void __init mangle_bootargs(char *command_line)
-+{
-+}
-+#endif
-+
- /*
-  * We need to store the untouched command line for future reference.
-  * We also need to store the touched command line since the parameter
-@@ -506,6 +529,7 @@ asmlinkage __visible void __init start_k
-       pr_notice("%s", linux_banner);
-       setup_arch(&command_line);
-       mm_init_cpumask(&init_mm);
-+      mangle_bootargs(command_line);
-       setup_command_line(command_line);
-       setup_nr_cpu_ids();
-       setup_per_cpu_areas();
index 457e767c05a5e35a5e7188dbb50249671e91d961..49e44870262d05d4f4432ac8bff68aa0cdbb3e70 100644 (file)
@@ -15,7 +15,6 @@ CPU_SUBTYPE:=neon
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/imx6/patches-4.19/100-bootargs.patch b/target/linux/imx6/patches-4.19/100-bootargs.patch
deleted file mode 100644 (file)
index caf2d2a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/boot/dts/imx6dl-wandboard.dts
-+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
-@@ -15,4 +15,8 @@
-       memory@10000000 {
-               reg = <0x10000000 0x40000000>;
-       };
-+
-+      chosen {
-+              bootargs = "console=ttymxc0,115200";
-+      };
- };
diff --git a/target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch b/target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch
deleted file mode 100644 (file)
index bae9df1..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-arm: dts: apalis-ixora: Add status LEDs aliases
-
-Signed-off-by: Petr Å tetiar <ynezz@true.cz>
-
---- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
-+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
-@@ -60,6 +60,10 @@
-               i2c2 = &i2c2;
-               rtc0 = &rtc_i2c;
-               rtc1 = &snvs_rtc;
-+              led-boot = &led_boot;
-+              led-failsafe = &led_failsafe;
-+              led-running = &led_running;
-+              led-upgrade = &led_upgrade;
-       };
-       chosen {
-@@ -127,22 +131,22 @@
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_leds_ixora>;
--              led4-green {
-+              led_running: led4-green {
-                       label = "LED_4_GREEN";
-                       gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
-               };
--              led4-red {
-+              led_upgrade: led4-red {
-                       label = "LED_4_RED";
-                       gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
-               };
--              led5-green {
-+              led_boot: led5-green {
-                       label = "LED_5_GREEN";
-                       gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
-               };
--              led5-red {
-+              led_failsafe: led5-red {
-                       label = "LED_5_RED";
-                       gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
-               };
---- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
-+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
-@@ -61,6 +61,10 @@
-               i2c2 = &i2c2;
-               rtc0 = &rtc_i2c;
-               rtc1 = &snvs_rtc;
-+              led-boot = &led_boot;
-+              led-failsafe = &led_failsafe;
-+              led-running = &led_running;
-+              led-upgrade = &led_upgrade;
-       };
-       chosen {
-@@ -128,22 +132,22 @@
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_leds_ixora>;
--              led4-green {
-+              led_running: led4-green {
-                       label = "LED_4_GREEN";
--                      gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-+                      gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
-               };
--              led4-red {
-+              led_upgrade: led4-red {
-                       label = "LED_4_RED";
--                      gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
-+                      gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
-               };
--              led5-green {
-+              led_boot: led5-green {
-                       label = "LED_5_GREEN";
-                       gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
-               };
--              led5-red {
-+              led_failsafe: led5-red {
-                       label = "LED_5_RED";
-                       gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
-               };
diff --git a/target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch b/target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch
deleted file mode 100644 (file)
index da9de29..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-arm: dts: apalis-ixora: Add switch3 as reset button
-
-Signed-off-by: Petr Å tetiar <ynezz@true.cz>
-
---- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
-+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
-@@ -74,7 +74,7 @@
-       gpio-keys {
-               compatible = "gpio-keys";
-               pinctrl-names = "default";
--              pinctrl-0 = <&pinctrl_gpio_keys>;
-+              pinctrl-0 = <&pinctrl_gpio_keys &pinctrl_switch3_ixora>;
-               wakeup {
-                       label = "Wake-Up";
-@@ -83,6 +83,13 @@
-                       debounce-interval = <10>;
-                       wakeup-source;
-               };
-+
-+              reset {
-+                      label = "reset";
-+                      gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
-+                      linux,code = <KEY_RESTART>;
-+                      debounce-interval = <10>;
-+              };
-       };
-       lcd_display: disp0 {
-@@ -296,4 +303,10 @@
-                       MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
-               >;
-       };
-+
-+      pinctrl_switch3_ixora: switch3ixora {
-+              fsl,pins = <
-+                      MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x1b0b0
-+              >;
-+      };
- };
---- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
-+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
-@@ -73,7 +73,7 @@
-       gpio-keys {
-               compatible = "gpio-keys";
-               pinctrl-names = "default";
--              pinctrl-0 = <&pinctrl_gpio_keys>;
-+              pinctrl-0 = <&pinctrl_gpio_keys &pinctrl_switch3_ixora>;
-               wakeup {
-                       label = "Wake-Up";
-@@ -82,6 +82,13 @@
-                       debounce-interval = <10>;
-                       wakeup-source;
-               };
-+
-+              reset {
-+                      label = "reset";
-+                      gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
-+                      linux,code = <KEY_RESTART>;
-+                      debounce-interval = <10>;
-+              };
-       };
-       lcd_display: disp0 {
-@@ -297,4 +304,10 @@
-                       MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
-               >;
-       };
-+
-+      pinctrl_switch3_ixora: switch3ixora {
-+              fsl,pins = <
-+                      MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x1b0b0
-+              >;
-+      };
- };
index 2785b73ed1583fa8cab13c1e072012c23b72392a..ab7b174e4000063e585d53368d48174663b52014 100644 (file)
@@ -10,7 +10,6 @@ MAINTAINER:=John Crispin <john@phrozen.org>
 
 # TODO: drop kmod-usb-dwc3-of-simple when migrating to 4.19
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 KERNELNAME:=zImage Image dtbs
 
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts
deleted file mode 100644 (file)
index 33c44a8..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2017, Sven Eckelmann <sven.eckelmann@openmesh.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "OpenMesh A42";
-       compatible = "openmesh,a42";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 59 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               red {
-                       label = "a42:red:status";
-                       gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "default-off";
-               };
-
-               power: green {
-                       label = "a42:green:status";
-                       gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               blue {
-                       label = "a42:blue:status";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "default-off";
-               };
-       };
-
-       watchdog {
-               compatible = "linux,wdt-gpio";
-               gpios = <&tlmm 5 GPIO_ACTIVE_LOW>;
-               hw_algo = "toggle";
-               /* hw_margin_ms is actually 300s but driver limits it to 60s */
-               hw_margin_ms = <60000>;
-               always-running;
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pin {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pin_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-               /* partitions are passed via bootloader */
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&gmac0 {
-       qcom,phy_mdio_addr = <4>;
-       qcom,poll_required = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,forced_duplex = <1>;
-       vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-       qcom,phy_mdio_addr = <3>;
-       qcom,poll_required = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,forced_duplex = <1>;
-       vlan_tag = <1 0x10>;
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "OM-A42";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "OM-A42";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts
deleted file mode 100644 (file)
index e21c40c..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "ALFA Network AP120C-AC";
-       compatible = "alfa-network,ap120c-ac";
-
-       aliases {
-               led-boot = &status;
-               led-failsafe = &status;
-               led-running = &status;
-               led-upgrade = &status;
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               status: status {
-                       label = "ap120c-ac:blue:status";
-                       gpios = <&tlmm 5 GPIO_ACTIVE_LOW>;
-                       default-state = "keep";
-               };
-
-               wan {
-                       label = "ap120c-ac:amber:wan";
-                       gpios = <&qca8075 19 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan2g {
-                       label = "ap120c-ac:green:wlan2g";
-                       gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
-               wlan5g {
-                       label = "ap120c-ac:red:wlan5g";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy1tpt";
-               };
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               counter@4a1000 {
-                       compatible = "qcom,qca-gcnt";
-                       reg = <0x4a1000 0x4>;
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               phys = <&usb3_hs_phy>;
-                               phy-names = "usb2-phy";
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               qca8075: ess-switch@c000000 {
-                       status = "okay";
-
-                       switch_lan_bmp = <0x10>;
-                       switch_wan_bmp = <0x20>;
-
-                       #gpio-cells = <2>;
-                       gpio-controller;
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_i2c3 {
-       status = "okay";
-
-       pinctrl-0 = <&i2c0_pins>;
-       pinctrl-names = "default";
-
-       tpm@29 {
-               compatible = "atmel,at97sc3204t";
-               reg = <0x29>;
-       };
-};
-
-&blsp1_spi1 {
-       status = "okay";
-
-       pinctrl-0 = <&spi0_pins>;
-       pinctrl-names = "default";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
-                  <&tlmm  4 GPIO_ACTIVE_HIGH>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-
-                       partition@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-
-                       partition@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-
-                       partition@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition@e0000 {
-                               label = "APPSBLENV";
-                               reg = <0x000e0000 0x00010000>;
-                       };
-
-                       partition@f0000 {
-                               label = "APPSBL";
-                               reg = <0x000f0000 0x00080000>;
-                               read-only;
-                       };
-
-                       partition@170000 {
-                               label = "ART";
-                               reg = <0x00170000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition@180000 {
-                               label = "priv_data1";
-                               reg = <0x00180000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition@190000 {
-                               label = "priv_data2";
-                               reg = <0x00190000 0x00010000>;
-                               read-only;
-                       };
-               };
-       };
-
-       nand@1 {
-               compatible = "spi-nand";
-               reg = <1>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "rootfs1";
-                               reg = <0x00000000 0x04000000>;
-                       };
-
-                       partition@4000000 {
-                               label = "rootfs2";
-                               reg = <0x04000000 0x04000000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       status = "okay";
-
-       pinctrl-0 = <&serial0_pins>;
-       pinctrl-names = "default";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&gmac0 {
-       qcom,forced_duplex = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,phy_mdio_addr = <3>;
-       qcom,poll_required = <1>;
-       vlan_tag = <1 0x10>;
-};
-
-&gmac1 {
-       qcom,forced_duplex = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,phy_mdio_addr = <4>;
-       qcom,poll_required = <1>;
-       vlan_tag = <2 0x20>;
-};
-
-&tlmm {
-       i2c0_pins: i2c0_pinmux {
-               mux_i2c {
-                       function = "blsp_i2c0";
-                       pins = "gpio58", "gpio59";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       mdio_pins: mdio_pinmux {
-               mux_mdio {
-                       pins = "gpio53";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-
-               mux_mdc {
-                       pins = "gpio52";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
-       serial0_pins: serial0_pinmux {
-               mux_uart {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi0_pins: spi0_pinmux {
-               mux_spi {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54", "gpio4";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "ALFA-Network-AP120C-AC";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts
deleted file mode 100644 (file)
index 2f9a890..0000000
+++ /dev/null
@@ -1,277 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "Linksys EA6350v3";
-       compatible = "linksys,ea6350v3";
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 0 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power: status {
-                       label = "EA6350v3:green:status";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "linksys-ea6350v3";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "linksys-ea6350v3";
-};
-
-
-&blsp_dma {
-       status = "okay";
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               mux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54", "gpio59";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp1_spi1 { /* BLSP1 QUP1 */
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
-                  <&tlmm 59 GPIO_ACTIVE_HIGH>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       SBL1@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       MBIB@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       QSEE@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       CDT@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       APPSBLENV@d0000 {
-                               label = "APPSBLENV";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       APPSBL@e0000 {
-                               label = "APPSBL"; /* uboot */
-                               reg = <0x000e0000 0x00080000>;
-                               read-only;
-                       };
-                       ART@160000 {
-                               label = "ART";
-                               reg = <0x00160000 0x00010000>;
-                               read-only;
-                       };
-                       u_env@170000 {
-                               label = "u_env";
-                               reg = <0x00170000 0x00020000>;
-                       };
-                       s_env@190000 {
-                               label = "s_env";
-                               reg = <0x00190000 0x00020000>;
-                       };
-                       devinfo@1b0000 {
-                               label = "devinfo";
-                               reg = <0x001b0000 0x00010000>;
-                       };
-                       /* 0x001c0000 - 0x00200000 unused */
-               };
-       };
-
-       flash@1 {
-               status = "okay";
-               compatible = "spi-nand";
-               reg = <1>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       kernel@0 {
-                               label = "kernel";
-                               reg = <0x00000000 0x02800000>;
-                       };
-                       rootfs@300000 {
-                               label = "rootfs";
-                               reg = <0x00300000 0x02500000>;
-                       };
-                       alt_kernel@2800000 {
-                               label = "alt_kernel";
-                               reg = <0x02800000 0x02800000>;
-                       };
-                       alt_rootfs@2b00000 {
-                               label = "alt_rootfs";
-                               reg = <0x02b00000 0x02500000>;
-                       };
-                       sysdiag@5000000 {
-                               label = "sysdiag";
-                               reg = <0x05000000 0x00100000>;
-                       };
-                       syscfg@5100000 {
-                               label = "syscfg";
-                               reg = <0x05100000 0x02F00000>;
-                       };
-                       /* 0x00000000 - 0x08000000: 128 MiB */
-               };
-       };
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
deleted file mode 100644 (file)
index 32fded4..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "EnGenius EAP1300";
-       compatible = "engenius,eap1300";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 18 GPIO_ACTIVE_HIGH>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power: orange {
-                       label = "eap1300:orange:power";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
-               };
-
-               lan {
-                       label = "eap1300:blue:lan";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
-               };
-
-               mesh {
-                       label = "eap1300:blue:mesh";
-                       gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan2g {
-                       label = "eap1300:blue:wlan2g";
-                       gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan5g {
-                       label = "eap1300:yellow:wlan5g";
-                       gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pin {
-                       function = "blsp_spi0";
-                       pins = "gpio54", "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pin_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       m25p80@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition1@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition2@60000 {
-                               label = "0:QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition3@c0000 {
-                               label = "0:CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition4@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition6@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0x000f0000 0x00090000>;
-                               read-only;
-                       };
-                       partition7@180000 {
-                               label = "0:ART";
-                               reg = <0x00180000 0x00010000>;
-                               read-only;
-                       };
-                       partition8@190000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x190000 0x1dc0000>;
-                       };
-                       partition9@1f50000 {
-                               label = "u-boot-env";
-                               reg = <0x01f50000 0x00010000>;
-                       };
-                       partition10@1f60000 {
-                               label = "userconfig";
-                               reg = <0x01f60000 0x000a0000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&gmac0 {
-       vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-       vlan_tag = <1 0x10>;
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts
deleted file mode 100644 (file)
index 8636b18..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "EnGenius ENS620EXT";
-       compatible = "engenius,ens620ext";
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>;
-       };
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-
-               /*
-                * Disable the broken restart as a workaround for the buggy
-                * 3.0.0/3.0.1 U-boots that ship with the device.
-                * Note: The watchdog is now used to restart this device.
-                */
-               restart@4ab000 {
-                       status = "disabled";
-               };
-       };
-
-       buttons {
-               compatible = "gpio-keys";
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power: power {
-                       label = "ens620ext:amber:power";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
-               };
-
-               lan1 {
-                       label = "ens620ext:green:lan1";
-                       gpios = <&tlmm 1 GPIO_ACTIVE_LOW>;
-               };
-
-               lan2 {
-                       label = "ens620ext:green:lan2";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan2G {
-                       label = "ens620ext:green:wlan2G";
-                       gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan5G {
-                       label = "ens620ext:green:wlan5G";
-                       gpios = <&tlmm 0 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               mux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp1_spi1 { /* BLSP1 QUP1 */
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       flash@0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <50000000>;
-               m25p,fast-read;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "APPSBLENV"; /* uboot env*/
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "APPSBL"; /* uboot */
-                               reg = <0x000f0000 0x00090000>;
-                               read-only;
-                       };
-                       partition@180000 {
-                               label = "ART";
-                               reg = <0x00180000 0x00010000>;
-                               read-only;
-                       };
-                       partition@190000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x00190000 0x14d0000>;
-                       };
-                       partition@1660000 {
-                               label = "failsafe";
-                               reg = <0x01660000 0x008F0000>;
-                               read-only;
-                       };
-                       partition@1f50000 {
-                               label = "u-boot-env";
-                               reg = <0x01f50000 0x00010000>;
-                               read-only;
-                       };
-                       partition@1f60000 {
-                               label = "userconfig";
-                               reg = <0x01f60000 0x000a0000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "EnGenius-ENS620EXT";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "EnGenius-ENS620EXT";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts
deleted file mode 100644 (file)
index 2b93dcb..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2018, David Bauer <mail@david-bauer.net>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4018-ex61x0v2.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Netgear EX6100v2";
-       compatible = "netgear,ex6100v2";
-};
-
-&wifi0 {
-       qcom,ath10k-calibration-variant = "Netgear-EX6100v2";
-};
-
-&wifi1 {
-       qcom,ath10k-calibration-variant = "Netgear-EX6100v2";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts
deleted file mode 100644 (file)
index f1c44c1..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2018, David Bauer <mail@david-bauer.net>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4018-ex61x0v2.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Netgear EX6150v2";
-       compatible = "netgear,ex6150v2";
-};
-
-&wifi0 {
-       qcom,ath10k-calibration-variant = "Netgear-EX6150v2";
-};
-
-&wifi1 {
-       qcom,ath10k-calibration-variant = "Netgear-EX6150v2";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
deleted file mode 100644 (file)
index ca514e2..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2018, David Bauer <mail@david-bauer.net>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "Netgear EX61X0v2";
-       compatible = "netgear,ex61x0v2";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-                       qcom,num_gmac = <1>;
-               };
-       };
-
-       aliases {
-               led-boot = &power_amber;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 0 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       led_spi {
-               compatible = "spi-gpio";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               gpio-sck = <&tlmm 5 GPIO_ACTIVE_HIGH>;
-               gpio-mosi = <&tlmm 4 GPIO_ACTIVE_HIGH>;
-               num-chipselects = <0>;
-
-               led_gpio: led_gpio@0 {
-                       compatible = "fairchild,74hc595";
-                       reg = <0>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       registers-number = <1>;
-                       spi-max-frequency = <1000000>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power_amber: power_amber {
-                       label = "ex61x0v2:amber:power";
-                       gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
-               };
-
-               power_green: power_green {
-                       label = "ex61x0v2:green:power";
-                       gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
-               };
-
-               right {
-                       label = "ex61x0v2:blue:right";
-                       gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
-               };
-
-               left {
-                       label = "ex61x0v2:blue:left";
-                       gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
-               };
-
-               client_green {
-                       label = "ex61x0v2:green:client";
-                       gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
-               };
-
-               client_red {
-                       label = "ex61x0v2:red:client";
-                       gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
-               };
-
-               router_green {
-                       label = "ex61x0v2:green:router";
-                       gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
-               };
-
-               router_red {
-                       label = "ex61x0v2:red:router";
-                       gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
-               };
-
-               wps {
-                       label = "ex61x0v2:green:wps";
-                       gpios = <&tlmm 1 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pin {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pin_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       mx25l12805d@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-
-                       partition1@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-
-                       partition2@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-
-                       partition3@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition4@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition5@E0000 {
-                               label = "APPSBLENV";
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition6@F0000 {
-                               label = "APPSBL";
-                               reg = <0x000f0000 0x00080000>;
-                               read-only;
-                       };
-
-                       partition7@170000 {
-                               label = "ART";
-                               reg = <0x00170000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition8@180000 {
-                               label = "config";
-                               reg = <0x00180000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition9@190000 {
-                               label = "pot";
-                               reg = <0x00190000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition10@1a0000 {
-                               label = "dnidata";
-                               reg = <0x001a0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition11@1b0000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x001b0000 0x00e10000>;
-                       };
-
-                       partition12@fc0000 {
-                               label = "language";
-                               reg = <0x00fc0000 0x00040000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-};
-
-&wifi1 {
-       status = "okay";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
deleted file mode 100644 (file)
index f9508cc..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "AVM FRITZ!Box 4040";
-       compatible = "avm,fritzbox-4040";
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &flash;
-               led-running = &power;
-               led-upgrade = &flash;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               qca8075: ess-switch@c000000 {
-                       status = "okay";
-
-                       #gpio-cells = <2>;
-                       gpio-controller;
-
-                       enable-usb-power {
-                               gpio-hog;
-                               line-name = "enable USB3 power";
-                               gpios = <7 GPIO_ACTIVE_HIGH>;
-                               output-high;
-                       };
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RFKILL>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       switch-leds {
-               compatible = "gpio-leds";
-
-               wlan {
-                       label = "fritz4040:green:wlan";
-                       gpios = <&qca8075 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               panic: info_red {
-                       label = "fritz4040:red:info";
-                       gpios = <&qca8075 3 GPIO_ACTIVE_HIGH>;
-                       panic-indicator;
-               };
-
-               wan {
-                       label = "fritz4040:green:wan";
-                       gpios = <&qca8075 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               power: power {
-                       label = "fritz4040:green:power";
-                       gpios = <&qca8075 11 GPIO_ACTIVE_HIGH>;
-               };
-
-               lan {
-                       label = "fritz4040:green:lan";
-                       gpios = <&qca8075 13 GPIO_ACTIVE_HIGH>;
-               };
-
-               flash: info_amber {
-                       label = "fritz4040:amber:info";
-                       gpios = <&qca8075 15 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               mux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 { /* BLSP1 QUP1 */
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-               status = "okay";
-               m25p,fast-read;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition1@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition2@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition3@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition4@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@e0000 {
-                               label = "APPSBLENV"; /* uboot env - empty */
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition6@f0000 {
-                               label = "urlader"; /* APPSBL */
-                               reg = <0x000f0000 0x0002dc000>;
-                               read-only;
-                       };
-                       partition7@11dc00 {
-                               /* make a backup of this partition! */
-                               label = "urlader_config";
-                               reg = <0x0011dc00 0x00002400>;
-                               read-only;
-                       };
-                       partition8@120000 {
-                               label = "tffs1";
-                               reg = <0x00120000 0x00080000>;
-                               read-only;
-                       };
-                       partition9@1a0000 {
-                               label = "tffs2";
-                               reg = <0x001a0000 0x00080000>;
-                               read-only;
-                       };
-                       partition10@220000 {
-                               label = "uboot";
-                               reg = <0x00220000 0x00080000>;
-                               read-only;
-                       };
-                       partition11@2A0000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x002a0000 0x01c60000>;
-                       };
-                       partition12@1f00000 {
-                               label = "jffs2";
-                               reg = <0x01f00000 0x00100000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
deleted file mode 100644 (file)
index 9730f10..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2018, Robert Marko <robimarko@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "8devices Jalapeno";
-       compatible = "8dev,jalapeno";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               counter@4a1000 {
-                       compatible = "qcom,qca-gcnt";
-                       reg = <0x4a1000 0x4>;
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-                       switch_lan_bmp = <0x10>; /* lan port bitmap */
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-};
-
-&tlmm {
-       mdio_pins: mdio_pinmux {
-               pinmux_1 {
-                       pins = "gpio53";
-                       function = "mdio";
-               };
-               pinmux_2 {
-                       pins = "gpio52";
-                       function = "mdc";
-               };
-               pinconf {
-                       pins = "gpio52", "gpio53";
-                       bias-pull-up;
-               };
-       };
-
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pin {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-               pin_cs {
-                       function = "gpio";
-                       pins = "gpio54", "gpio59";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>, <&tlmm 59 GPIO_ACTIVE_HIGH>;
-       status = "okay";
-
-       m25p80@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition1@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition2@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition3@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition4@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@e0000 {
-                               label = "APPSBLENV"; /* uboot env*/
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@f0000 {
-                               label = "APPSBL"; /* uboot */
-                               reg = <0x000f0000 0x00080000>;
-                               read-only;
-                       };
-                       partition5@170000 {
-                               label = "ART";
-                               reg = <0x00170000 0x00010000>;
-                               read-only;
-                       };
-               };
-       };
-
-       spi-nand@1 {
-               status = "okay";
-               compatible = "spi-nand";
-               reg = <1>;
-               spi-max-frequency = <24000000>;
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "ubi";
-                               reg = <0x00000000 0x08000000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&gmac0 {
-       qcom,poll_required = <1>;
-       qcom,poll_required_dynamic = <1>;
-       qcom,phy_mdio_addr = <3>;
-       vlan_tag = <1 0x10>;
-};
-
-&gmac1 {
-       qcom,poll_required = <1>;
-       qcom,poll_required_dynamic = <1>;
-       qcom,phy_mdio_addr = <4>;
-       vlan_tag = <2 0x20>;
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "8devices-Jalapeno";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "8devices-Jalapeno";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
deleted file mode 100644 (file)
index a8c144f..0000000
+++ /dev/null
@@ -1,337 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/input/linux-event-codes.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "ZyXEL NBG6617";
-       compatible = "zyxel,nbg6617";
-
-       chosen {
-               /*
-                * the vendor u-boot adds root and mtdparts cmdline parameters
-                * which we don't want... but we have to overwrite them or else
-                * the kernel will take them at face value.
-                */
-               bootargs-append = " mtdparts= root=31:13";
-       };
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
-                       linux,code = <KEY_RFKILL>;
-                       linux,input-type = <EV_SW>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 4 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               pinctrl-0 = <&led_pins>;
-               pinctrl-names = "default";
-
-               power: power {
-                       label = "nbg6617:green:power";
-                       gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-               };
-
-               usb {
-                       label = "nbg6617:green:usb";
-                       gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
-                       trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>;
-                       linux,default-trigger = "usbport";
-               };
-
-               wlan2G {
-                       label = "nbg6617:green:wlan2G";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan5G {
-                       label = "nbg6617:green:wlan5G";
-                       gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               wps {
-                       label = "nbg6617:green:wps";
-                       gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-       spi_0_pins: spi_0_pinmux {
-               mux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-low;
-               };
-       };
-       led_pins: led_pinmux {
-               mux {
-                       pins = "gpio0", "gpio1", "gpio3", "gpio5", "gpio58";
-                       drive-strength = <0x8>;
-                       bias-disable;
-                       output-low;
-               };
-       };
-};
-
-&blsp1_spi1 { /* BLSP1 QUP1 */
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       mx25l25635f@0 {
-               compatible = "mx25l25635f", "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-               status = "okay";
-               m25p,fast-read;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition1@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition2@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition3@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition4@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@e0000 {
-                               label = "APPSBL"; /* u-boot */
-                               reg = <0x000e0000 0x00080000>;
-                               /* U-Boot Standalone App "zloader" is located at 0x64000 */
-                               read-only;
-                       };
-                       partition6@160000 {
-                               label = "APPSBLENV"; /* u-boot env */
-                               reg = <0x00160000 0x00010000>;
-                       };
-                       partition7@170000 {
-                               /* make a backup of this partition! */
-                               label = "ART";
-                               reg = <0x00170000 0x00010000>;
-                               read-only;
-                       };
-                       partition8@180000 {
-                               label = "kernel";
-                               reg = <0x00180000 0x00400000>;
-                       };
-                       partition9@580000 {
-                               label = "dualflag";
-                               reg = <0x00580000 0x00010000>;
-                               read-only;
-                       };
-                       partition10@590000 {
-                               label = "header";
-                               reg = <0x00590000 0x00010000>;
-                       };
-                       partition11@5a0000 {
-                               label = "romd";
-                               reg = <0x005a0000 0x00100000>;
-                               read-only;
-                       };
-                       partition12@6a0000 {
-                               label = "not_root_data";
-                               /*
-                                * for some strange reason, someone at ZyXEL
-                                * had the "great" idea to put the rootfs_data
-                                * in front of rootfs... Don't do that!
-                                * As a result this one, full MebiByte remains
-                                * unused.
-                                */
-                               reg = <0x006a0000 0x00100000>;
-                       };
-                       partition13@7a0000 {
-                               label = "rootfs";
-                               reg = <0x007a0000 0x01860000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "ZyXEL-NBG6617";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "ZyXEL-NBG6617";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
deleted file mode 100644 (file)
index 26c086e..0000000
+++ /dev/null
@@ -1,325 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "ASUS RT-AC58U";
-       compatible = "asus,rt-ac58u";
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x8000000>;
-       };
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       chosen {
-               bootargs-append = " ubi.mtd=UBI_DEV";
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 4 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power: status {
-                       label = "rt-ac58u:blue:status";
-                       gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-               };
-
-               wan {
-                       label = "rt-ac58u:blue:wan";
-                       gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan2G {
-                       label = "rt-ac58u:blue:wlan2G";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
-               };
-
-               wan5G {
-                       label = "rt-ac58u:blue:wlan5G";
-                       gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               usb {
-                       label = "rt-ac58u:blue:usb";
-                       gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
-                       trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>;
-                       linux,default-trigger = "usbport";
-               };
-
-               lan {
-                       label = "rt-ac58u:blue:lan";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               mux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54", "gpio59";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp1_spi1 { /* BLSP1 QUP1 */
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
-                  <&tlmm 59 GPIO_ACTIVE_HIGH>;
-
-       flash@0 {
-               /*
-                * U-boot looks for "n25q128a11" node,
-                * if we don't have it, it will spit out the following warning:
-                * "ipq: fdt fixup unable to find compatible node".
-                */
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               linux,modalias = "m25p80", "mx25l1606e", "n25q128a11";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "APPSBLENV"; /* uboot env*/
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "APPSBL"; /* uboot */
-                               reg = <0x000f0000 0x00080000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "ART";
-                               reg = <0x00170000 0x00010000>;
-                               read-only;
-                       };
-                       /* 0x00180000 - 0x00200000 unused */
-               };
-       };
-
-       spi-nand@1 {
-               compatible = "spi-nand";
-               reg = <1>;
-               spi-max-frequency = <24000000>;
-
-               /*
-                * U-boot looks for "spinand,mt29f" node,
-                * if we don't have it, it will spit out the following warning:
-                * "ipq: fdt fixup unable to find compatible node".
-                */
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               /*
-                                * TODO: change to label = "ubi" once we drop 4.14.
-                                *       also drop the bootargs-append and all the
-                                *       userspace CI_UBIPART="UBI_DEV" remains.
-                                */
-                               label = "UBI_DEV";
-                               reg = <0x00000000 0x08000000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "RT-AC58U";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "RT-AC58U";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
deleted file mode 100644 (file)
index 5932638..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2018, David Bauer <mail@david-bauer.net>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "ZyXEL WRE6606";
-       compatible = "zyxel,wre6606";
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       chosen {
-               bootargs-append = " mtdparts=";
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-                       qcom,num_gmac = <1>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               wps {
-                       label = "wre6606:green:wps";
-                       gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan5g_green {
-                       label = "wre6606:green:wlan5g";
-                       gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-               };
-
-               power: power {
-                       label = "wre6606:green:power";
-                       gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan5g_red {
-                       label = "wre6606:red:wlan5g";
-                       gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan2g_red {
-                       label = "wre6606:red:wlan2g";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan2g_green {
-                       label = "wre6606:green:wlan2g";
-                       gpios = <&tlmm 59 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pin {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pin_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       mx25l12805d@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-
-                       partition1@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-
-                       partition2@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-
-                       partition3@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition4@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition5@E0000 {
-                               label = "APPSBLENV";
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition6@F0000 {
-                               label = "APPSBL";
-                               reg = <0x000f0000 0x00080000>;
-                               read-only;
-                       };
-
-                       partition7@170000 {
-                               label = "ART";
-                               reg = <0x00170000 0x00010000>;
-                               read-only;
-                       };
-
-                       partition8@180000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x00180000 0x00ce0000>;
-                       };
-
-                       partition9@e60000 {
-                               label = "manufacture";
-                               reg = <0x00e60000 0x00050000>;
-                               read-only;
-                       };
-
-                       partition10@eb0000 {
-                               label = "storage";
-                               reg = <0x00eb0000 0x00150000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "ZyXEL-WRE6606";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "ZyXEL-WRE6606";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts
deleted file mode 100644 (file)
index 25bbd6b..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2017-2018, Sven Eckelmann <sven.eckelmann@openmesh.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "OpenMesh A62";
-       compatible = "openmesh,a62";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       switch_lan_bmp = <0x10>;
-                       switch_wan_bmp = <0x20>;
-
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART >;
-               };
-       };
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               red {
-                       label = "a62:red:status";
-                       gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "default-off";
-               };
-
-               power: green {
-                       label = "a62:green:status";
-                       gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
-               };
-
-               blue {
-                       label = "a62:blue:status";
-                       gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "default-off";
-               };
-       };
-
-       watchdog {
-               compatible = "linux,wdt-gpio";
-               gpios = <&tlmm 59 GPIO_ACTIVE_LOW>;
-               hw_algo = "toggle";
-               /* hw_margin_ms is actually 300s but driver limits it to 60s */
-               hw_margin_ms = <60000>;
-               always-running;
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pin {
-                       function = "blsp_spi0";
-                       pins = "gpio13", "gpio14", "gpio15";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pin_cs {
-                       function = "gpio";
-                       pins = "gpio12";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-
-       enable-usb-power {
-               gpio-hog;
-               gpios = <58 GPIO_ACTIVE_HIGH>;
-               output-low;
-               line-name = "enable USB2 power";
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
-
-       m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-               /* partitions are passed via bootloader */
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&gmac0 {
-       qcom,phy_mdio_addr = <3>;
-       qcom,poll_required = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,forced_duplex = <1>;
-       vlan_tag = <1 0x10>;
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&pcie0 {
-       status = "okay";
-       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-                       qcom,ath10k-calibration-variant = "OM-A62";
-                       ieee80211-freq-limit = <5170000 5350000>;
-               };
-       };
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "OM-A62";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "OM-A62";
-       ieee80211-freq-limit = <5470000 5875000>;
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts
deleted file mode 100644 (file)
index 47202d2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019-ap.dk04.1.dtsi"
-
-/ {
-       model = "Qualcomm Technologies, Inc. IPQ40xx/AP-DK04.1-C1";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
deleted file mode 100644 (file)
index 9801354..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-       model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK04.1";
-       compatible = "qcom,ipq4019";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               pinctrl@1000000 {
-                       serial_0_pins: serial_pinmux {
-                               mux {
-                                       pins = "gpio16", "gpio17";
-                                       function = "blsp_uart0";
-                                       bias-disable;
-                               };
-                       };
-
-                       serial_1_pins: serial1_pinmux {
-                               mux {
-                                       pins = "gpio8", "gpio9";
-                                       function = "blsp_uart1";
-                                       bias-disable;
-                               };
-                       };
-
-                       spi_0_pins: spi_0_pinmux {
-                               pinmux {
-                                       function = "blsp_spi0";
-                                       pins = "gpio13", "gpio14", "gpio15";
-                               };
-                               pinmux_cs {
-                                       function = "gpio";
-                                       pins = "gpio12";
-                               };
-                               pinconf {
-                                       pins = "gpio13", "gpio14", "gpio15";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                               pinconf_cs {
-                                       pins = "gpio12";
-                                       drive-strength = <2>;
-                                       bias-disable;
-                                       output-high;
-                               };
-                       };
-
-                       i2c_0_pins: i2c_0_pinmux {
-                               pinmux {
-                                       function = "blsp_i2c0";
-                                       pins = "gpio10", "gpio11";
-                               };
-                               pinconf {
-                                       pins = "gpio10", "gpio11";
-                                       drive-strength = <16>;
-                                       bias-disable;
-                               };
-                       };
-
-                       nand_pins: nand_pins {
-
-                               pullups {
-                                       pins = "gpio52", "gpio53", "gpio58",
-                                               "gpio59";
-                                       function = "qpic";
-                                       bias-pull-up;
-                               };
-
-                               pulldowns {
-                                       pins = "gpio54", "gpio55", "gpio56",
-                                               "gpio57", "gpio60", "gpio61",
-                                               "gpio62", "gpio63", "gpio64",
-                                               "gpio65", "gpio66", "gpio67",
-                                               "gpio68", "gpio69";
-                                       function = "qpic";
-                                       bias-pull-down;
-                               };
-                       };
-               };
-
-               blsp_dma: dma@7884000 {
-                       status = "okay";
-               };
-
-               spi0: spi@78b5000 {
-                       pinctrl-0 = <&spi_0_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-                       cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
-
-                       mx25l25635e@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               reg = <0>;
-                               compatible = "mx25l25635e";
-                               spi-max-frequency = <24000000>;
-                       };
-               };
-
-               i2c0: i2c@78b7000 { /* BLSP1 QUP2 */
-                       pinctrl-0 = <&i2c_0_pins>;
-                       pinctrl-names = "default";
-
-                       status = "okay";
-               };
-
-               serial@78af000 {
-                       pinctrl-0 = <&serial_0_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               serial@78b0000 {
-                       pinctrl-0 = <&serial_1_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               usb3_ss_phy: ssphy@9a000 {
-                       status = "okay";
-               };
-
-               usb3_hs_phy: hsphy@a6000 {
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-               };
-
-               usb2_hs_phy: hsphy@a8000 {
-                       status = "okay";
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               cryptobam: dma@8e04000 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               qpic_bam: dma@7984000 {
-                       status = "okay";
-               };
-
-               nand: qpic-nand@79b0000 {
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-       };
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts
deleted file mode 100644 (file)
index b04a61d..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "AVM FRITZ!Box 7530";
-       compatible = "avm,fritzbox-7530";
-
-       aliases {
-               led-boot = &power_green;
-               led-failsafe = &info_red;
-               led-running = &power_green;
-               led-upgrade = &info_green;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-                       qcom,num_gmac = <1>;
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&tlmm 42 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RFKILL>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 41 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-
-               dect {
-                       label = "dect";
-                       gpios = <&tlmm 43 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_PHONE>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               info_red: info_red {
-                       label = "fritzbox-7530:red:info";
-                       gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
-               };
-
-               info_green: info {
-                       label = "fritzbox-7530:green:info";
-                       gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan {
-                       label = "fritzbox-7530:green:wlan";
-                       gpios = <&tlmm 34 GPIO_ACTIVE_LOW>;
-               };
-
-               fon {
-                       label = "fritzbox-7530:green:fon";
-                       gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
-               };
-
-               power_green: power {
-                       label = "fritzbox-7530:green:power";
-                       gpios = <&tlmm 39 GPIO_ACTIVE_LOW>;
-               };
-
-               wps {
-                       label = "fritzbox-7530:green:wps";
-                       gpios = <&tlmm 45 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&tlmm {
-       serial_0_pins: serial_pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               pulldowns {
-                       pins = "gpio54", "gpio55", "gpio56",
-                               "gpio57", "gpio60", "gpio61",
-                               "gpio62", "gpio63", "gpio64",
-                               "gpio65", "gpio66", "gpio67",
-                               "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-
-       usb-power {
-               line-name = "enable USB3 power";
-               gpios = <49 GPIO_ACTIVE_HIGH>;
-               gpio-hog;
-               output-high;
-       };
-};
-
-&nand {
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "SBL1";
-                               reg = <0x000000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@80000 {
-                               label = "MIBIB";
-                               reg = <0x080000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "QSEE";
-                               reg = <0x100000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@180000 {
-                               label = "CDT";
-                               reg = <0x180000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@1c0000 {
-                               label = "QSEE_B";
-                               reg = <0x1c0000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@240000 {
-                               label = "urlader0";
-                               reg = <0x240000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@280000 {
-                               label = "urlader1";
-                               reg = <0x280000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@2c0000 {
-                               label = "nand-tffs";
-                               reg = <0x2c0000 0x840000>;
-                               read-only;
-                       };
-
-                       partition@b00000 {
-                               /* 'kernel1' in AVM firmware */
-                               label = "uboot0";
-                               reg = <0xb00000 0x400000>;
-                       };
-
-                       partition@f00000 {
-                               /* 'kernel2' in AVM firmware */
-                               label = "uboot1";
-                               reg = <0xf00000 0x400000>;
-                       };
-
-                       partition@1300000 {
-                               label = "ubi";
-                               reg = <0x1300000 0x6d00000>;
-                       };
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-7530";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-7530";
-};
-
-&pcie0 {
-       status = "okay";
-
-       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               dsl@1,0 {
-                       compatible = "intel,vrx518";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-               };
-       };
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts
deleted file mode 100644 (file)
index 6914917..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "AVM FRITZ!Repeater 3000";
-       compatible = "avm,fritzrepeater-3000";
-
-       aliases {
-               led-boot = &power_led;
-               led-failsafe = &power_led;
-               led-running = &power_led;
-               led-upgrade = &power_led;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-
-                       switch_lan_bmp = <0x10>;
-                       switch_wan_bmp = <0x20>;
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       key {
-               compatible = "gpio-keys";
-
-               connect {
-                       label = "Connect";
-                       gpios = <&tlmm 10 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               connect_red {
-                       label = "fritzwlan-3000:red:connect";
-                       gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
-               };
-
-               connect_green {
-                       label = "fritzwlan-3000:green:connect";
-                       gpios = <&tlmm 31 GPIO_ACTIVE_LOW>;
-               };
-
-               connect_blue {
-                       label = "fritzwlan-3000:blue:connect";
-                       gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
-               };
-
-               power_led: power {
-                       label = "fritzwlan-3000:green:power";
-                       gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&tlmm {
-       serial_0_pins: serial_pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               pulldowns {
-                       pins = "gpio54", "gpio55", "gpio56",
-                               "gpio57", "gpio60", "gpio61",
-                               "gpio62", "gpio63", "gpio64",
-                               "gpio65", "gpio66", "gpio67",
-                               "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
-&nand {
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "SBL1";
-                               reg = <0x000000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@80000 {
-                               label = "MIBIB";
-                               reg = <0x080000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "QSEE";
-                               reg = <0x100000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@180000 {
-                               label = "CDT";
-                               reg = <0x180000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@1c0000 {
-                               label = "QSEE_B";
-                               reg = <0x1c0000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@240000 {
-                               label = "urlader0";
-                               reg = <0x240000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@280000 {
-                               label = "urlader1";
-                               reg = <0x280000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@2c0000 {
-                               label = "nand-tffs";
-                               reg = <0x2c0000 0x840000>;
-                               read-only;
-                       };
-
-                       partition@b00000 {
-                               /* 'kernel1' in AVM firmware */
-                               label = "uboot0";
-                               reg = <0xb00000 0x400000>;
-                       };
-
-                       partition@f00000 {
-                               /* 'kernel2' in AVM firmware */
-                               label = "uboot1";
-                               reg = <0xf00000 0x400000>;
-                       };
-
-                       partition@1300000 {
-                               label = "ubi";
-                               reg = <0x1300000 0x6d00000>;
-                       };
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       /* BDFs are identical for the FRITZ!Box 7530 and the FRITZ!Repeater 3000 */
-       qcom,ath10k-calibration-variant = "AVM-FRITZRepeater-3000";
-};
-
-&wifi1 {
-       status = "okay";
-       ieee80211-freq-limit = <5170000 5350000>;
-       /* BDFs are identical for the FRITZ!Box 7530 and the FRITZ!Repeater 3000 */
-       qcom,ath10k-calibration-variant = "AVM-FRITZRepeater-3000";
-};
-
-&pcie0 {
-       status = "okay";
-
-       perst-gpio = <&tlmm 35 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       /* QCA9984 */
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-                       ieee80211-freq-limit = <5470000 5875000>;
-                       /* Uses the reference BDF */
-               };
-       };
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts
deleted file mode 100644 (file)
index cfc3037..0000000
+++ /dev/null
@@ -1,399 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/*
- * Device Tree Source for Linksys EA8300 (Dallas)
- *
- * Copyright (C) 2019 Jeff Kletsky
- *
- */
-
-/dts-v1/;
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "Linksys EA8300 (Dallas)";
-       compatible = "linksys,ea8300", "qcom,ipq4019";
-
-
-       aliases {
-               led-boot = &led_wps_amber;
-               led-failsafe = &led_wps;
-               led-running = &led_linksys;
-               led-upgrade = &led_world;
-               serial0 = &blsp1_uart1;
-       };
-
-
-       leds {
-               compatible = "gpio-leds";
-
-               // Retain node names from running OEM on EA8300
-
-               // Front panel LEDs, top to bottom
-
-               led_plug: diag {
-                       label = "ea8300:amber:plug";
-                       gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_world: internet {
-                       label = "ea8300:amber:world";
-                       gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_wps: wps {
-                       label = "ea8300:white:wps";
-                       gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_wps_amber: wps_amber {
-                       label = "ea8300:amber:wps";
-                       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
-                       panic-indicator;
-               };
-
-               led_linksys: pwr {
-                       label = "ea8300:white:linksys";
-                       gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
-               };
-
-               // On back panel, above USB socket
-
-               led_usb: usb {
-                       label = "ea8300:green:usb";
-                       gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&usb3_port1>, <&usb3_port2>,
-                                         <&usb2_port1>;
-                       linux,default-trigger = "usbport";
-               };
-       };
-
-
-       keys {
-               compatible = "gpio-keys";
-
-               button@0 {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
-               };
-
-               button@1 {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-
-       //
-       // OEM U-Boot provides either
-       // init=/sbin/init rootfstype=ubifs ubi.mtd=11,2048 \
-       //                 root=ubi0:ubifs rootwait rw
-       // or the same with ubi.mtd=13,2048
-       //
-
-       chosen {
-               bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro";
-       };
-
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>;
-       };
-
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-};
-
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       status = "okay";
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&nand {
-       status = "okay";
-
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "sbl1";
-                               reg = <0x0 0x100000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "mibib";
-                               reg = <0x100000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@200000 {
-                               label = "qsee";
-                               reg = <0x200000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@300000 {
-                               label = "cdt";
-                               reg = <0x300000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@380000 {
-                               label = "appsblenv";
-                               reg = <0x380000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@400000 {
-                               label = "ART";
-                               reg = <0x400000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@480000 {
-                               label = "appsbl";
-                               reg = <0x480000 0x200000>;
-                               read-only;
-                       };
-
-                       partition@680000 {
-                               label = "u_env";
-                               reg = <0x680000 0x80000>;
-                               // writable -- U-Boot environment
-                       };
-
-                       partition@700000 {
-                               label = "s_env";
-                               reg = <0x700000 0x40000>;
-                               // writable -- Boot counter records
-                       };
-
-                       partition@740000 {
-                               label = "devinfo";
-                               reg = <0x740000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@780000 {
-                               label = "kernel";
-                               reg = <0x780000 0x5800000>;
-                       };
-
-                       partition@a80000 {
-                               label = "rootfs";
-                               reg = <0xa80000 0x5500000>;
-                       };
-
-                       partition@5f80000 {
-                               label = "alt_kernel";
-                               reg = <0x5f80000 0x5800000>;
-                       };
-
-                       partition@6280000 {
-                               label = "alt_rootfs";
-                               reg = <0x6280000 0x5500000>;
-                       };
-
-                       partition@b780000 {
-                               label = "sysdiag";
-                               reg = <0xb780000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@b880000 {
-                               label = "syscfg";
-                               reg = <0xb880000 0x4680000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&pcie0 {
-       status = "okay";
-
-       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-               };
-       };
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       serial_0_pins: serial0-pinmux {
-               pins = "gpio16", "gpio17";
-               function = "blsp_uart0";
-               bias-disable;
-       };
-
-       nand_pins: nand_pins {
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               // gpio61 controls led_usb
-
-               pulldowns {
-                       pins =  "gpio55", "gpio56", "gpio57",
-                               "gpio60", "gpio62", "gpio63",
-                               "gpio64", "gpio65", "gpio66",
-                               "gpio67", "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
-
-&wifi1 {
-       status = "okay";
-       ieee80211-freq-limit = <5170000 5330000>;
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
-
-&wifi2 {
-       status = "okay";
-       ieee80211-freq-limit = <5490000 5835000>;
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts
deleted file mode 100644 (file)
index a063f8e..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-/dts-v1/;
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "ASUS Lyra MAP-AC2200";
-       compatible = "asus,map-ac2200";
-
-       aliases {
-               led-boot = &led_blue0;
-               led-failsafe = &led_red0;
-               led-running = &led_blue0;
-               led-upgrade = &led_red0;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 34 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-};
-
-&nand {
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "SBL1";
-                               reg = <0x0 0x80000>;
-                               read-only;
-                       };
-
-                       partition@80000 {
-                               label = "MIBIB";
-                               reg = <0x80000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "QSEE";
-                               reg = <0x100000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@200000 {
-                               label = "CDT";
-                               reg = <0x200000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@280000 {
-                               label = "APPSBL";
-                               reg = <0x280000 0x140000>;
-                               read-only;
-                       };
-
-                       partition@3c0000 {
-                               label = "APPSBLENV";
-                               reg = <0x3c0000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@400000 {
-                               label = "ubi";
-                               reg = <0x400000 0x7c00000>;
-                       };
-               };
-       };
-};
-
-&tlmm {
-       i2c_0_pins: i2c_0_pinmux {
-               pinmux {
-                       function = "blsp_i2c0";
-                       pins = "gpio20", "gpio21";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               pullups {
-                       pins =  "gpio52", "gpio53", "gpio58",
-                               "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               pulldowns {
-                       pins =  "gpio54", "gpio55", "gpio56",
-                               "gpio57", "gpio60", "gpio61",
-                               "gpio62", "gpio63", "gpio64",
-                               "gpio65", "gpio66", "gpio67",
-                               "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "ASUS-MAP-AC2200";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "ASUS-MAP-AC2200";
-       ieee80211-freq-limit = <5470000 5875000>;
-};
-
-&pcie0 {
-       status = "okay";
-       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-                       qcom,ath10k-calibration-variant = "ASUS-MAP-AC2200";
-                       ieee80211-freq-limit = <5170000 5350000>;
-               };
-       };
-};
-
-&usb2_hs_phy {
-       /* Bluetooth module attached via USB */
-       status = "okay";
-};
-
-&blsp1_i2c3 {
-       pinctrl-0 = <&i2c_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       led-controller@32 {
-               /* 9-channel RGB LED controller */
-               compatible = "national,lp5523";
-               reg = <0x32>;
-               clock-mode = [01];
-
-               led_blue0: blue0 {
-                       chan-name = "blue0";
-                       label = "map-ac2200:blue:chan0";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               blue1 {
-                       chan-name = "blue1";
-                       label = "map-ac2200:blue:chan1";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               blue2 {
-                       chan-name = "blue2";
-                       label = "map-ac2200:blue:chan2";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               led_green0: green0 {
-                       chan-name = "green0";
-                       label = "map-ac2200:green:chan0";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               green1 {
-                       chan-name = "green1";
-                       label = "map-ac2200:green:chan1";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               green2 {
-                       chan-name = "green2";
-                       label = "map-ac2200:green:chan2";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               led_red0: red0 {
-                       chan-name = "red0";
-                       label = "map-ac2200:red:chan0";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               red1 {
-                       chan-name = "red1";
-                       label = "map-ac2200:red:chan1";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-
-               red2 {
-                       chan-name = "red2";
-                       label = "map-ac2200:red:chan2";
-                       led-cur = [fa];
-                       max-cur = [ff];
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts
deleted file mode 100644 (file)
index ab0ec76..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019-qxwlan-e2600ac.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Qxwlan E2600AC c1";
-       compatible = "qxwlan,e2600ac-c1";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-
-       flash@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "0:QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "0:CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "0:ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-                       partition@180000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x180000 0x1e80000>;
-                       };
-               };
-       };
-};
-
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts
deleted file mode 100644 (file)
index 1c6e859..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019-qxwlan-e2600ac.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Qxwlan E2600AC c2";
-       compatible = "qxwlan,e2600ac-c2";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-
-       flash@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "0:QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "0:CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "0:ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&nand {
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "ubi";
-                               reg = <0x00000000 0x04000000>;
-                       };
-               };
-       };
-};
-
-&tlmm {
-       nand_pins: nand-pins {
-
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               pulldowns {
-                       pins = "gpio54", "gpio55", "gpio56",
-                               "gpio57", "gpio60", "gpio61",
-                               "gpio62", "gpio63", "gpio64",
-                               "gpio65", "gpio66", "gpio67",
-                               "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi
deleted file mode 100644 (file)
index f4af2ba..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-
-       model = "Qxwlan E2600AC";
-       compatible = "qcom,ipq4019";
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>; /* 256MB */
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               serial@78af000 {
-                       pinctrl-0 = <&serial_0_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               serial@78b0000 {
-                       pinctrl-0 = <&serial_1_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               i2c@78b7000 { /* BLSP1 QUP2 */
-                       pinctrl-0 = <&i2c_0_pins>;
-                       pinctrl-names = "default";
-
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-
-               leds {
-                       compatible = "gpio-leds";
-
-                       led1 {
-                               label = "e2600ac:green:wlan0";
-                               gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led2 {
-                               label = "e2600ac:green:wlan1";
-                               gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led3 {
-                               label = "e2600ac:green:usb";
-                               gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
-                               trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>;
-                               linux,default-trigger = "usbport";
-                       };
-
-                       led4 {
-                               label = "e2600ac:green:ctrl1";
-                               gpios = <&tlmm 51 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led5 {
-                               label = "e2600ac:green:ctrl2";
-                               gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led6 {
-                               label = "e2600ac:green:ctrl3";
-                               gpios = <&tlmm 31 GPIO_ACTIVE_LOW>;
-                       };
-               };
-
-               keys {
-                       compatible = "gpio-keys";
-
-                       reset {
-                               label = "reset";
-                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                               linux,code = <KEY_RESTART>;
-                       };
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       i2c_0_pins: i2c-0-pinmux {
-               mux {
-                       pins = "gpio20", "gpio21";
-                       function = "blsp_i2c0";
-                       bias-disable;
-               };
-       };
-
-       mdio_pins: mdio_pinmux {
-               mux_1 {
-                       pins = "gpio6";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-               mux_2 {
-                       pins = "gpio7";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
-       serial_0_pins: serial0-pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       serial_1_pins: serial1_pinmux {
-               mux {
-                       pins = "gpio8", "gpio9";
-                       function = "blsp_uart1";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pinmux {
-                       function = "blsp_spi0";
-                       pins = "gpio13", "gpio14", "gpio15";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pinmux_cs {
-                       function = "gpio";
-                       pins = "gpio12";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
deleted file mode 100644 (file)
index cf8540c..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- * Copyright (c) 2017, Christian Mehlis <christian@m3hlis.de>
- * Copyright (c) 2017-2018, Sven Eckelmann <sven.eckelmann@openmesh.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "Compex WPJ428";
-       compatible = "compex,wpj428";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       switch_lan_bmp = <0x10>;
-                       switch_wan_bmp = <0x20>;
-
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       aliases {
-               led-boot = &status;
-               led-failsafe = &status;
-               led-upgrade = &status;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               status: rss4 {
-                       label = "wpj428:green:rss4";
-                       gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               rss3 {
-                       label = "wpj428:green:rss3";
-                       gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       beeper: beeper {
-               compatible = "gpio-beeper";
-               gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pin {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pin_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       m25p80@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "0:SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition1@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition2@60000 {
-                               label = "0:QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition3@c0000 {
-                               label = "0:CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition4@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@e0000 {
-                               label = "0:APPSBLENV"; /* uboot env*/
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@f0000 {
-                               label = "0:APPSBL"; /* uboot */
-                               reg = <0x000f0000 0x00080000>;
-                               read-only;
-                       };
-                       partition5@170000 {
-                               label = "0:ART";
-                               reg = <0x00170000 0x00010000>;
-                               read-only;
-                       };
-                       partition6@180000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x00180000 0x01e80000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&gmac0 {
-       qcom,phy_mdio_addr = <4>;
-       qcom,poll_required = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,forced_duplex = <1>;
-       vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-       qcom,phy_mdio_addr = <3>;
-       qcom,poll_required = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,forced_duplex = <1>;
-       vlan_tag = <1 0x10>;
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-};
-
-&wifi1 {
-       status = "okay";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
deleted file mode 100644 (file)
index b32eb29..0000000
+++ /dev/null
@@ -1,280 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "GL.iNet GL-B1300";
-       compatible = "glinet,gl-b1300";
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-                       switch_lan_bmp = <0x18>;
-                       switch_wan_bmp = <0x20>;
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 5 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power: power {
-                       label = "gl-b1300:green:power";
-                       gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>;
-                       default-state = "on";
-               };
-
-               mesh {
-                       label = "gl-b1300:green:mesh";
-                       gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-               };
-
-               wlan {
-                       label = "gl-b1300:green:wlan";
-                       gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       mx25l25635f@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       SBL1@0 {
-                               label = "SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-
-                       MIBIB@40000 {
-                               label = "MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-
-                       QSEE@60000 {
-                               label = "QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-
-                       CDT@c0000 {
-                               label = "CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-
-                       DDRPARAMS@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-
-                       APPSBLENV@e0000 {
-                               label = "APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-
-                       APPSBL@f0000 {
-                               label = "APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-
-                       ART@170000 {
-                               label = "ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-
-                       firmware@180000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x180000 0x1e80000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pinmux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-               };
-               pinmux_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-               };
-               pinconf {
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pinconf_cs {
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "GL-B1300";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "GL-B1300";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts
deleted file mode 100644 (file)
index 5003572..0000000
+++ /dev/null
@@ -1,400 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source for Meraki MR33 (Stinkbug)
- *
- * Copyright (C) 2017 Chris Blake <chrisrblake93@gmail.com>
- * Copyright (C) 2017 Christian Lamparter <chunkeey@googlemail.com>
- *
- * Based on Cisco Meraki DTS from GPL release r25-linux-3.14-20170427
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without
- * any warranty of any kind, whether express or implied.
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "Meraki MR33 Access Point";
-       compatible = "meraki,mr33";
-
-       aliases {
-               led-boot = &status_green;
-               led-failsafe = &status_red;
-               led-running = &status_green;
-               led-upgrade = &power_orange;
-       };
-
-       /* Do we really need this defined? */
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-               };
-
-               /* It is a 56-bit counter that supplies the count to the ARM arch
-                  timers and without upstream driver */
-               counter@4a1000 {
-                       compatible = "qcom,qca-gcnt";
-                       reg = <0x4a1000 0x4>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII_RGMII5>;
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               serial@78b0000 {
-                       pinctrl-0 = <&serial_1_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-
-                       bluetooth {
-                               compatible = "ti,cc2650";
-                               enable-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-                       switch_lan_bmp = <0x0>; /* lan port bitmap */
-                       switch_wan_bmp = <0x10>; /* wan port bitmap */
-               };
-
-               edma@c080000 {
-                       qcom,single-phy;
-                       qcom,num_gmac = <1>;
-                       phy-mode = "rgmii-rxid";
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power_orange: power {
-                       label = "mr33:orange:power";
-                       gpios = <&tlmm 49 GPIO_ACTIVE_LOW>;
-                       panic-indicator;
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&gmac0 {
-       qcom,phy_mdio_addr = <1>;
-       qcom,poll_required = <1>;
-       vlan_tag = <0 0x20>;
-};
-
-&blsp1_i2c3 {
-       pinctrl-0 = <&i2c_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       at24@50 {
-               compatible = "atmel,24c64";
-               pagesize = <32>;
-               reg = <0x50>;
-               read-only; /* This holds our MAC & Meraki board-data */
-       };
-};
-
-&blsp1_i2c4 {
-       pinctrl-0 = <&i2c_1_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       led-controller@30 {
-               compatible = "ti,lp5562";
-               reg = <0x30>;
-               clock-mode = /bits/8 <2>;
-               enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
-
-               /* RGB led */
-               status_red: chan0 {
-                       chan-name = "mr33:red:status";
-                       led-cur = /bits/ 8 <0x20>;
-                       max-cur = /bits/ 8 <0x60>;
-               };
-
-               status_green: chan1 {
-                       chan-name = "mr33:green:status";
-                       led-cur = /bits/ 8 <0x20>;
-                       max-cur = /bits/ 8 <0x60>;
-               };
-
-               chan2 {
-                       chan-name = "mr33:blue:status";
-                       led-cur = /bits/ 8 <0x20>;
-                       max-cur = /bits/ 8 <0x60>;
-               };
-
-               chan3 {
-                       chan-name = "mr33:white:status";
-                       led-cur = /bits/ 8 <0x20>;
-                       max-cur = /bits/ 8 <0x60>;
-               };
-       };
-};
-
-&nand {
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "sbl1";
-                               reg = <0x00000000 0x00100000>;
-                               read-only;
-                       };
-                       partition@100000 {
-                               label = "mibib";
-                               reg = <0x00100000 0x00100000>;
-                               read-only;
-                       };
-                       partition@200000 {
-                               label = "bootconfig";
-                               reg = <0x00200000 0x00100000>;
-                               read-only;
-                       };
-                       partition@300000 {
-                               label = "qsee";
-                               reg = <0x00300000 0x00100000>;
-                               read-only;
-                       };
-                       partition@400000 {
-                               label = "qsee_alt";
-                               reg = <0x00400000 0x00100000>;
-                               read-only;
-                       };
-                       partition@500000 {
-                               label = "cdt";
-                               reg = <0x00500000 0x00080000>;
-                               read-only;
-                       };
-                       partition@580000 {
-                               label = "cdt_alt";
-                               reg = <0x00580000 0x00080000>;
-                               read-only;
-                       };
-                       partition@600000 {
-                               label = "ddrparams";
-                               reg = <0x00600000 0x00080000>;
-                               read-only;
-                       };
-                       partition@700000 {
-                               label = "u-boot";
-                               reg = <0x00700000 0x00200000>;
-                               read-only;
-                       };
-                       partition@900000 {
-                               label = "u-boot-backup";
-                               reg = <0x00900000 0x00200000>;
-                               read-only;
-                       };
-                       partition@b00000 {
-                               label = "ART";
-                               reg = <0x00b00000 0x00080000>;
-                               read-only;
-                       };
-                       partition@c00000 {
-                               label = "ubi";
-                               reg = <0x00c00000 0x07000000>;
-                               /*
-                                * Do not try to allocate the remaining
-                                * 4 MiB to this ubi partition. It will
-                                * confuse the u-boot and it might not
-                                * find the kernel partition anymore.
-                                */
-                       };
-               };
-       };
-};
-
-&pcie0 {
-       status = "okay";
-       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-               };
-       };
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       /*
-        * GPIO43 should be 0/1 whenever the unit is
-        * powered through PoE or AC-Adapter.
-        * That said, playing with this seems to
-        * reset the AP.
-        */
-
-       mdio_pins: mdio_pinmux {
-               mux_1 {
-                       pins = "gpio6";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-               mux_2 {
-                       pins = "gpio7";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
-       serial_0_pins: serial_pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       serial_1_pins: serial1_pinmux {
-               mux {
-                       /* We use the i2c-0 pins for serial_1 */
-                       pins = "gpio8", "gpio9";
-                       function = "blsp_uart1";
-                       bias-disable;
-               };
-       };
-
-       i2c_0_pins: i2c_0_pinmux {
-               pinmux {
-                       function = "blsp_i2c0";
-                       pins = "gpio20", "gpio21";
-               };
-               pinconf {
-                       pins = "gpio20", "gpio21";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       i2c_1_pins: i2c_1_pinmux {
-               pinmux {
-                       function = "blsp_i2c1";
-                       pins = "gpio34", "gpio35";
-               };
-               pinconf {
-                       pins = "gpio34", "gpio35";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               /*
-                * There are 18 pins. 15 pins are common between LCD and NAND.
-                * The QPIC controller arbitrates between LCD and NAND. Of the
-                * remaining 4, 2 are for NAND and 2 are for LCD exclusively.
-                *
-                * The meraki source hints that the bluetooth module claims
-                * pin 52 as well. But sadly, there's no data whenever this
-                * is a NAND or LCD exclusive pin or not.
-                */
-
-               pullups {
-                       pins = "gpio52", "gpio53", "gpio58",
-                               "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               pulldowns {
-                       pins = "gpio54", "gpio55", "gpio56",
-                               "gpio57", "gpio60", "gpio61",
-                               "gpio62", "gpio63", "gpio64",
-                               "gpio65", "gpio66", "gpio67",
-                               "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Meraki-MR33";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Meraki-MR33";
-};
diff --git a/target/linux/ipq40xx/patches-4.19/070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch b/target/linux/ipq40xx/patches-4.19/070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch
deleted file mode 100644 (file)
index d0b520f..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 61a3bd10082b0e861b4e1bc451a92e20181a52f5 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 23 Jul 2018 16:17:35 +0200
-Subject: [PATCH] soc: qcom: spm: add SCM probe dependency
-
-Check for SCM availability before attempting to use SPM. SPM probe will
-fail otherwise.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Andy Gross <andy.gross@linaro.org>
----
- drivers/soc/qcom/spm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/soc/qcom/spm.c
-+++ b/drivers/soc/qcom/spm.c
-@@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(stru
-       cpumask_t mask;
-       bool use_scm_power_down = false;
-+      if (!qcom_scm_is_available())
-+              return -EPROBE_DEFER;
-+
-       for (i = 0; ; i++) {
-               state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
-               if (!state_node)
diff --git a/target/linux/ipq40xx/patches-4.19/071-01-v4.20-ARM-dts-qcom-ipq4019-use-v2-of-the-kpss-bringup-mech.patch b/target/linux/ipq40xx/patches-4.19/071-01-v4.20-ARM-dts-qcom-ipq4019-use-v2-of-the-kpss-bringup-mech.patch
deleted file mode 100644 (file)
index b1d69ca..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From 233c77d4f1d12e4337fba1146d5197f4c0f9107d Mon Sep 17 00:00:00 2001
-From: Matthew McClintock <mmcclint@codeaurora.org>
-Date: Wed, 25 Jul 2018 10:37:45 +0200
-Subject: [PATCH] ARM: dts: qcom: ipq4019: use v2 of the kpss bringup mechanism
-
-v1 was the incorrect choice here and sometimes the board
-would not come up properly.
-
-Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Andy Gross <andy.gross@linaro.org>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 25 +++++++++++++++++--------
- 1 file changed, 17 insertions(+), 8 deletions(-)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -52,7 +52,8 @@
-               cpu@0 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a7";
--                      enable-method = "qcom,kpss-acc-v1";
-+                      enable-method = "qcom,kpss-acc-v2";
-+                      next-level-cache = <&L2>;
-                       qcom,acc = <&acc0>;
-                       qcom,saw = <&saw0>;
-                       reg = <0x0>;
-@@ -71,7 +72,8 @@
-               cpu@1 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a7";
--                      enable-method = "qcom,kpss-acc-v1";
-+                      enable-method = "qcom,kpss-acc-v2";
-+                      next-level-cache = <&L2>;
-                       qcom,acc = <&acc1>;
-                       qcom,saw = <&saw1>;
-                       reg = <0x1>;
-@@ -90,7 +92,8 @@
-               cpu@2 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a7";
--                      enable-method = "qcom,kpss-acc-v1";
-+                      enable-method = "qcom,kpss-acc-v2";
-+                      next-level-cache = <&L2>;
-                       qcom,acc = <&acc2>;
-                       qcom,saw = <&saw2>;
-                       reg = <0x2>;
-@@ -109,7 +112,8 @@
-               cpu@3 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a7";
--                      enable-method = "qcom,kpss-acc-v1";
-+                      enable-method = "qcom,kpss-acc-v2";
-+                      next-level-cache = <&L2>;
-                       qcom,acc = <&acc3>;
-                       qcom,saw = <&saw3>;
-                       reg = <0x3>;
-@@ -124,6 +128,11 @@
-                       >;
-                       clock-latency = <256000>;
-               };
-+
-+              L2: l2-cache {
-+                      compatible = "cache";
-+                      cache-level = <2>;
-+              };
-       };
-       pmu {
-@@ -292,22 +301,22 @@
-               };
-                 acc0: clock-controller@b088000 {
--                        compatible = "qcom,kpss-acc-v1";
-+                        compatible = "qcom,kpss-acc-v2";
-                         reg = <0x0b088000 0x1000>, <0xb008000 0x1000>;
-                 };
-                 acc1: clock-controller@b098000 {
--                        compatible = "qcom,kpss-acc-v1";
-+                        compatible = "qcom,kpss-acc-v2";
-                         reg = <0x0b098000 0x1000>, <0xb008000 0x1000>;
-                 };
-                 acc2: clock-controller@b0a8000 {
--                        compatible = "qcom,kpss-acc-v1";
-+                        compatible = "qcom,kpss-acc-v2";
-                         reg = <0x0b0a8000 0x1000>, <0xb008000 0x1000>;
-                 };
-                 acc3: clock-controller@b0b8000 {
--                        compatible = "qcom,kpss-acc-v1";
-+                        compatible = "qcom,kpss-acc-v2";
-                         reg = <0x0b0b8000 0x1000>, <0xb008000 0x1000>;
-                 };
diff --git a/target/linux/ipq40xx/patches-4.19/071-02-ipq40xx-Fix-booting-secondary-cores.patch b/target/linux/ipq40xx/patches-4.19/071-02-ipq40xx-Fix-booting-secondary-cores.patch
deleted file mode 100644 (file)
index d37a8cb..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8a4540321e8bcf7a5b485c332a2e78f3501c78ed Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Thu, 29 Nov 2018 22:29:36 +0100
-Subject: [PATCH] ipq40xx: Fix booting secondary cores
-
-Add the second part of old 071-qcom-ipq4019-use-v2-of-the-kpss-bringup-mechanism.patch
-We dont modify the patch itself as its upstream and this change is not.
-
-Originally added by Mantas Pucka Mantas Pucka <mantas@8devices.com>
-
-Signed-off-by: Robert Marko <robimarko@gmail.com>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -132,6 +132,7 @@
-               L2: l2-cache {
-                       compatible = "cache";
-                       cache-level = <2>;
-+                      qcom,saw = <&saw_l2>;
-               };
-       };
-@@ -344,6 +345,12 @@
-                         regulator;
-                 };
-+              saw_l2: regulator@b012000 {
-+                      compatible = "qcom,saw2";
-+                      reg = <0xb012000 0x1000>;
-+                      regulator;
-+              };
-+
-               blsp1_uart1: serial@78af000 {
-                       compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
-                       reg = <0x78af000 0x200>;
diff --git a/target/linux/ipq40xx/patches-4.19/072-v4.20-ARM-dts-qcom-ipq4019-add-cpu-operating-points-for-cp.patch b/target/linux/ipq40xx/patches-4.19/072-v4.20-ARM-dts-qcom-ipq4019-add-cpu-operating-points-for-cp.patch
deleted file mode 100644 (file)
index 3035461..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From bcb9ab4c2917e92114d2f4c2b1da97cdf15b471b Mon Sep 17 00:00:00 2001
-From: Matthew McClintock <mmcclint@codeaurora.org>
-Date: Wed, 25 Jul 2018 10:37:46 +0200
-Subject: [PATCH] ARM: dts: qcom: ipq4019: add cpu operating points for cpufreq
- support
-
-This adds some operating points for cpu frequeny scaling
-
-Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Andy Gross <andy.gross@linaro.org>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 54 ++++++++++++++---------------
- 1 file changed, 26 insertions(+), 28 deletions(-)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -59,14 +59,8 @@
-                       reg = <0x0>;
-                       clocks = <&gcc GCC_APPS_CLK_SRC>;
-                       clock-frequency = <0>;
--                      operating-points = <
--                              /* kHz  uV (fixed) */
--                              48000   1100000
--                              200000  1100000
--                              500000  1100000
--                              716000  1100000
--                      >;
-                       clock-latency = <256000>;
-+                      operating-points-v2 = <&cpu0_opp_table>;
-               };
-               cpu@1 {
-@@ -79,14 +73,8 @@
-                       reg = <0x1>;
-                       clocks = <&gcc GCC_APPS_CLK_SRC>;
-                       clock-frequency = <0>;
--                      operating-points = <
--                              /* kHz  uV (fixed) */
--                              48000   1100000
--                              200000  1100000
--                              500000  1100000
--                              666000  1100000
--                      >;
-                       clock-latency = <256000>;
-+                      operating-points-v2 = <&cpu0_opp_table>;
-               };
-               cpu@2 {
-@@ -99,14 +87,8 @@
-                       reg = <0x2>;
-                       clocks = <&gcc GCC_APPS_CLK_SRC>;
-                       clock-frequency = <0>;
--                      operating-points = <
--                              /* kHz  uV (fixed) */
--                              48000   1100000
--                              200000  1100000
--                              500000  1100000
--                              666000  1100000
--                      >;
-                       clock-latency = <256000>;
-+                      operating-points-v2 = <&cpu0_opp_table>;
-               };
-               cpu@3 {
-@@ -119,14 +101,8 @@
-                       reg = <0x3>;
-                       clocks = <&gcc GCC_APPS_CLK_SRC>;
-                       clock-frequency = <0>;
--                      operating-points = <
--                              /* kHz  uV (fixed) */
--                              48000   1100000
--                              200000  1100000
--                              500000  1100000
--                              666000  1100000
--                      >;
-                       clock-latency = <256000>;
-+                      operating-points-v2 = <&cpu0_opp_table>;
-               };
-               L2: l2-cache {
-@@ -136,6 +112,28 @@
-               };
-       };
-+      cpu0_opp_table: opp_table0 {
-+              compatible = "operating-points-v2";
-+              opp-shared;
-+
-+              opp-48000000 {
-+                      opp-hz = /bits/ 64 <48000000>;
-+                      clock-latency-ns = <256000>;
-+              };
-+              opp-200000000 {
-+                      opp-hz = /bits/ 64 <200000000>;
-+                      clock-latency-ns = <256000>;
-+              };
-+              opp-500000000 {
-+                      opp-hz = /bits/ 64 <500000000>;
-+                      clock-latency-ns = <256000>;
-+              };
-+              opp-716000000 {
-+                      opp-hz = /bits/ 64 <716000000>;
-+                      clock-latency-ns = <256000>;
-+              };
-+      };
-+
-       pmu {
-               compatible = "arm,cortex-a7-pmu";
-               interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
diff --git a/target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch b/target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch
deleted file mode 100644 (file)
index 7573e48..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From bd73a3dd257fb838bd456a18eeee0ef0224b7a40 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Wed, 25 Jul 2018 10:37:47 +0200
-Subject: [PATCH] ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value
-
-while compiling an ipq4019 target, dtc will complain:
-regulator@b089000 unit address format error, expected "2089000"
-
-The saw0 regulator reg value seems to be
-copied and pasted from qcom-ipq8064.dtsi.
-
-This patch fixes the reg value to match that of the
-unit address which in turn silences the warning.
-(There is no driver for qcom,saw2 right now.
-So this went unnoticed)
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Andy Gross <andy.gross@linaro.org>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -321,7 +321,7 @@
-                 saw0: regulator@b089000 {
-                         compatible = "qcom,saw2";
--                        reg = <0x02089000 0x1000>, <0x0b009000 0x1000>;
-+                      reg = <0x0b089000 0x1000>, <0x0b009000 0x1000>;
-                         regulator;
-                 };
diff --git a/target/linux/ipq40xx/patches-4.19/074-ARM-qcom-Add-IPQ4019-SoC-support.patch b/target/linux/ipq40xx/patches-4.19/074-ARM-qcom-Add-IPQ4019-SoC-support.patch
deleted file mode 100644 (file)
index 76fcdc6..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 89b43d59ec8c9cda588555eb1f2754dd19ef5144 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 22 Jul 2018 12:07:57 +0200
-Subject: [PATCH 8/8] ARM: qcom: Add IPQ4019 SoC support
-
-Add support for the Qualcomm Atheros IPQ4019 SoC.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/arm/Makefile          | 1 +
- arch/arm/mach-qcom/Kconfig | 5 +++++
- 2 files changed, 6 insertions(+)
-
---- a/arch/arm/Makefile
-+++ b/arch/arm/Makefile
-@@ -150,6 +150,7 @@ textofs-$(CONFIG_ARCH_MSM8X60) := 0x0020
- textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
- textofs-$(CONFIG_ARCH_MESON) := 0x00208000
- textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
-+textofs-$(CONFIG_ARCH_IPQ40XX) := 0x00208000
- # Machine directory name.  This list is sorted alphanumerically
- # by CONFIG_* macro name.
---- a/arch/arm/mach-qcom/Kconfig
-+++ b/arch/arm/mach-qcom/Kconfig
-@@ -27,4 +27,9 @@ config ARCH_MDM9615
-       bool "Enable support for MDM9615"
-       select CLKSRC_QCOM
-+config ARCH_IPQ40XX
-+      bool "Enable support for IPQ40XX"
-+      select CLKSRC_QCOM
-+      select HAVE_ARM_ARCH_TIMER
-+
- endif
diff --git a/target/linux/ipq40xx/patches-4.19/075-dt-bindings-phy-qcom-ipq4019-usb-add-binding-documen.patch b/target/linux/ipq40xx/patches-4.19/075-dt-bindings-phy-qcom-ipq4019-usb-add-binding-documen.patch
deleted file mode 100644 (file)
index e7407bc..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5f01733dc755dfadfa51b7b3c6c160e632fc6002 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 24 Jul 2018 15:09:36 +0200
-Subject: [PATCH 1/3] dt-bindings: phy-qcom-ipq4019-usb: add binding document
-
-This patch adds the binding documentation for the HS/SS USB PHY found
-inside Qualcom Dakota SoCs.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- .../bindings/phy/phy-qcom-ipq4019-usb.txt           | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/phy/phy-qcom-ipq4019-usb.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/phy/phy-qcom-ipq4019-usb.txt
-@@ -0,0 +1,21 @@
-+Qualcom Dakota HS/SS USB PHY
-+
-+Required properties:
-+ - compatible: "qcom,usb-ss-ipq4019-phy",
-+             "qcom,usb-hs-ipq4019-phy"
-+ - reg: offset and length of the registers
-+ - #phy-cells: should be 0
-+ - resets: the reset controllers as listed below
-+ - reset-names: the names of the reset controllers
-+      "por_rst" - the POR reset line for SS and HS phys
-+      "srif_rst" - the SRIF reset line for HS phys
-+Example:
-+
-+hsphy@a8000 {
-+      compatible = "qcom,usb-hs-ipq4019-phy";
-+      phy-cells = <0>;
-+      reg = <0xa8000 0x40>;
-+      resets = <&gcc USB2_HSPHY_POR_ARES>,
-+               <&gcc USB2_HSPHY_S_ARES>;
-+      reset-names = "por_rst", "srif_rst";
-+};
diff --git a/target/linux/ipq40xx/patches-4.19/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch b/target/linux/ipq40xx/patches-4.19/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch
deleted file mode 100644 (file)
index e7e7a1f..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-From 633f0e08498aebfdb932bd71319b4cb136709499 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 24 Jul 2018 14:45:49 +0200
-Subject: [PATCH 2/3] phy: qcom-ipq4019-usb: add driver for QCOM/IPQ4019
-
-Add a driver to setup the USB phy on Qualcom Dakota SoCs.
-The driver sets up HS and SS phys. In case of HS some magic values need to
-be written to magic offsets. These were taken from the SDK driver.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/phy/qualcomm/Kconfig                |   7 ++
- drivers/phy/qualcomm/Makefile               |   1 +
- drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c | 188 ++++++++++++++++++++++++++++
- 3 files changed, 196 insertions(+)
- create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c
-
---- a/drivers/phy/qualcomm/Kconfig
-+++ b/drivers/phy/qualcomm/Kconfig
-@@ -17,6 +17,13 @@ config PHY_QCOM_APQ8064_SATA
-       depends on OF
-       select GENERIC_PHY
-+config PHY_QCOM_IPQ4019_USB
-+      tristate "Qualcomm IPQ4019 USB PHY module"
-+      depends on OF && ARCH_QCOM
-+      select GENERIC_PHY
-+      help
-+        Support for the USB PHY on QCOM IPQ4019/Dakota chipsets.
-+
- config PHY_QCOM_IPQ806X_SATA
-       tristate "Qualcomm IPQ806x SATA SerDes/PHY driver"
-       depends on ARCH_QCOM
---- /dev/null
-+++ b/drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c
-@@ -0,0 +1,188 @@
-+/*
-+ * Copyright (C) 2018 John Crispin <john@phrozen.org>
-+ *
-+ * Based on code from
-+ * Allwinner Technology Co., Ltd. <www.allwinnertech.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.
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/of_platform.h>
-+#include <linux/phy/phy.h>
-+#include <linux/platform_device.h>
-+#include <linux/reset.h>
-+
-+/*
-+ * Magic registers copied from the SDK driver code
-+ */
-+#define PHY_CTRL0_ADDR        0x000
-+#define PHY_CTRL1_ADDR        0x004
-+#define PHY_CTRL2_ADDR        0x008
-+#define PHY_CTRL3_ADDR        0x00C
-+#define PHY_CTRL4_ADDR        0x010
-+#define PHY_MISC_ADDR 0x024
-+#define PHY_IPG_ADDR  0x030
-+
-+#define PHY_CTRL0_VAL 0xA4600015
-+#define PHY_CTRL1_VAL 0x09500000
-+#define PHY_CTRL2_VAL 0x00058180
-+#define PHY_CTRL3_VAL 0x6DB6DCD6
-+#define PHY_CTRL4_VAL 0x836DB6DB
-+#define PHY_MISC_VAL  0x3803FB0C
-+#define PHY_IPG_VAL   0x47323232
-+
-+struct ipq4019_usb_phy {
-+      struct device           *dev;
-+      struct phy              *phy;
-+      void __iomem            *base;
-+      struct reset_control    *por_rst;
-+      struct reset_control    *srif_rst;
-+};
-+
-+static int ipq4019_ss_phy_power_off(struct phy *_phy)
-+{
-+      struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
-+
-+      reset_control_assert(phy->por_rst);
-+      msleep(10);
-+
-+      return 0;
-+}
-+
-+static int ipq4019_ss_phy_power_on(struct phy *_phy)
-+{
-+      struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
-+
-+      ipq4019_ss_phy_power_off(_phy);
-+
-+      reset_control_deassert(phy->por_rst);
-+
-+      return 0;
-+}
-+
-+static struct phy_ops ipq4019_usb_ss_phy_ops = {
-+      .power_on       = ipq4019_ss_phy_power_on,
-+      .power_off      = ipq4019_ss_phy_power_off,
-+};
-+
-+static int ipq4019_hs_phy_power_off(struct phy *_phy)
-+{
-+      struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
-+
-+      reset_control_assert(phy->por_rst);
-+      msleep(10);
-+
-+      reset_control_assert(phy->srif_rst);
-+      msleep(10);
-+
-+      return 0;
-+}
-+
-+static int ipq4019_hs_phy_power_on(struct phy *_phy)
-+{
-+      struct ipq4019_usb_phy *phy = phy_get_drvdata(_phy);
-+
-+      ipq4019_hs_phy_power_off(_phy);
-+
-+      reset_control_deassert(phy->srif_rst);
-+      msleep(10);
-+
-+      writel(PHY_CTRL0_VAL, phy->base + PHY_CTRL0_ADDR);
-+      writel(PHY_CTRL1_VAL, phy->base + PHY_CTRL1_ADDR);
-+      writel(PHY_CTRL2_VAL, phy->base + PHY_CTRL2_ADDR);
-+      writel(PHY_CTRL3_VAL, phy->base + PHY_CTRL3_ADDR);
-+      writel(PHY_CTRL4_VAL, phy->base + PHY_CTRL4_ADDR);
-+      writel(PHY_MISC_VAL, phy->base + PHY_MISC_ADDR);
-+      writel(PHY_IPG_VAL, phy->base + PHY_IPG_ADDR);
-+      msleep(10);
-+
-+      reset_control_deassert(phy->por_rst);
-+
-+      return 0;
-+}
-+
-+static struct phy_ops ipq4019_usb_hs_phy_ops = {
-+      .power_on       = ipq4019_hs_phy_power_on,
-+      .power_off      = ipq4019_hs_phy_power_off,
-+};
-+
-+static const struct of_device_id ipq4019_usb_phy_of_match[] = {
-+      { .compatible = "qcom,usb-hs-ipq4019-phy", .data = &ipq4019_usb_hs_phy_ops},
-+      { .compatible = "qcom,usb-ss-ipq4019-phy", .data = &ipq4019_usb_ss_phy_ops},
-+      { },
-+};
-+MODULE_DEVICE_TABLE(of, ipq4019_usb_phy_of_match);
-+
-+static int ipq4019_usb_phy_probe(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      struct resource *res;
-+      struct phy_provider *phy_provider;
-+      struct ipq4019_usb_phy *phy;
-+      const struct of_device_id *match;
-+
-+      match = of_match_device(ipq4019_usb_phy_of_match, &pdev->dev);
-+      if (!match)
-+              return -ENODEV;
-+
-+      phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);
-+      if (!phy)
-+              return -ENOMEM;
-+
-+      phy->dev = &pdev->dev;
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      phy->base = devm_ioremap_resource(&pdev->dev, res);
-+      if (IS_ERR(phy->base)) {
-+              dev_err(dev, "failed to remap register memory\n");
-+              return PTR_ERR(phy->base);
-+      }
-+
-+      phy->por_rst = devm_reset_control_get(phy->dev, "por_rst");
-+      if (IS_ERR(phy->por_rst)) {
-+              if (PTR_ERR(phy->por_rst) != -EPROBE_DEFER)
-+                      dev_err(dev, "POR reset is missing\n");
-+              return PTR_ERR(phy->por_rst);
-+      }
-+
-+      phy->srif_rst = devm_reset_control_get_optional(phy->dev, "srif_rst");
-+      if (IS_ERR(phy->srif_rst))
-+              return PTR_ERR(phy->srif_rst);
-+
-+      phy->phy = devm_phy_create(dev, NULL, match->data);
-+      if (IS_ERR(phy->phy)) {
-+              dev_err(dev, "failed to create PHY\n");
-+              return PTR_ERR(phy->phy);
-+      }
-+      phy_set_drvdata(phy->phy, phy);
-+
-+      phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
-+
-+      return PTR_ERR_OR_ZERO(phy_provider);
-+}
-+
-+static struct platform_driver ipq4019_usb_phy_driver = {
-+      .probe  = ipq4019_usb_phy_probe,
-+      .driver = {
-+              .of_match_table = ipq4019_usb_phy_of_match,
-+              .name  = "ipq4019-usb-phy",
-+      }
-+};
-+module_platform_driver(ipq4019_usb_phy_driver);
-+
-+MODULE_DESCRIPTION("QCOM/IPQ4019 USB phy driver");
-+MODULE_AUTHOR("John Crispin <john@phrozen.org>");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/phy/qualcomm/Makefile
-+++ b/drivers/phy/qualcomm/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- obj-$(CONFIG_PHY_ATH79_USB)           += phy-ath79-usb.o
- obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)   += phy-qcom-apq8064-sata.o
-+obj-$(CONFIG_PHY_QCOM_IPQ4019_USB)    += phy-qcom-ipq4019-usb.o
- obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)   += phy-qcom-ipq806x-sata.o
- obj-$(CONFIG_PHY_QCOM_QMP)            += phy-qcom-qmp.o
- obj-$(CONFIG_PHY_QCOM_QUSB2)          += phy-qcom-qusb2.o
diff --git a/target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch b/target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch
deleted file mode 100644 (file)
index ff6fb4b..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-From 1fc7d5523e21ed140fed43c4dde011a3b6d9ba08 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 24 Jul 2018 14:47:55 +0200
-Subject: [PATCH 3/3] qcom: ipq4019: add USB devicetree nodes
-
-This patch makes USB work on the Dakota EVB.
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 20 ++++++++
- arch/arm/boot/dts/qcom-ipq4019.dtsi           | 74 +++++++++++++++++++++++++++
- 2 files changed, 94 insertions(+)
-
---- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
-@@ -109,5 +109,25 @@
-               wifi@a800000 {
-                       status = "ok";
-               };
-+
-+              usb3_ss_phy: ssphy@9a000 {
-+                      status = "ok";
-+              };
-+
-+              usb3_hs_phy: hsphy@a6000 {
-+                      status = "ok";
-+              };
-+
-+              usb3: usb3@8af8800 {
-+                      status = "ok";
-+              };
-+
-+              usb2_hs_phy: hsphy@a8000 {
-+                      status = "ok";
-+              };
-+
-+              usb2: usb2@60f8800 {
-+                      status = "ok";
-+              };
-       };
- };
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -564,5 +564,79 @@
-                                         "legacy";
-                       status = "disabled";
-               };
-+
-+              usb3_ss_phy: ssphy@9a000 {
-+                      compatible = "qcom,usb-ss-ipq4019-phy";
-+                      #phy-cells = <0>;
-+                      reg = <0x9a000 0x800>;
-+                      reg-names = "phy_base";
-+                      resets = <&gcc USB3_UNIPHY_PHY_ARES>;
-+                      reset-names = "por_rst";
-+                      status = "disabled";
-+              };
-+
-+              usb3_hs_phy: hsphy@a6000 {
-+                      compatible = "qcom,usb-hs-ipq4019-phy";
-+                      #phy-cells = <0>;
-+                      reg = <0xa6000 0x40>;
-+                      reg-names = "phy_base";
-+                      resets = <&gcc USB3_HSPHY_POR_ARES>, <&gcc USB3_HSPHY_S_ARES>;
-+                      reset-names = "por_rst", "srif_rst";
-+                      status = "disabled";
-+              };
-+
-+              usb3@8af8800 {
-+                      compatible = "qcom,dwc3";
-+                      reg = <0x8af8800 0x100>;
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+                      clocks = <&gcc GCC_USB3_MASTER_CLK>,
-+                               <&gcc GCC_USB3_SLEEP_CLK>,
-+                               <&gcc GCC_USB3_MOCK_UTMI_CLK>;
-+                      clock-names = "master", "sleep", "mock_utmi";
-+                      ranges;
-+                      status = "disabled";
-+
-+                      dwc3@8a00000 {
-+                              compatible = "snps,dwc3";
-+                              reg = <0x8a00000 0xf8000>;
-+                              interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
-+                              phys = <&usb3_hs_phy>, <&usb3_ss_phy>;
-+                              phy-names = "usb2-phy", "usb3-phy";
-+                              dr_mode = "host";
-+                      };
-+              };
-+
-+              usb2_hs_phy: hsphy@a8000 {
-+                      compatible = "qcom,usb-hs-ipq4019-phy";
-+                      #phy-cells = <0>;
-+                      reg = <0xa8000 0x40>;
-+                      reg-names = "phy_base";
-+                      resets = <&gcc USB2_HSPHY_POR_ARES>, <&gcc USB2_HSPHY_S_ARES>;
-+                      reset-names = "por_rst", "srif_rst";
-+                      status = "disabled";
-+              };
-+
-+              usb2@60f8800 {
-+                      compatible = "qcom,dwc3";
-+                      reg = <0x60f8800 0x100>;
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+                      clocks = <&gcc GCC_USB2_MASTER_CLK>,
-+                               <&gcc GCC_USB2_SLEEP_CLK>,
-+                               <&gcc GCC_USB2_MOCK_UTMI_CLK>;
-+                      clock-names = "master", "sleep", "mock_utmi";
-+                      ranges;
-+                      status = "disabled";
-+
-+                      dwc3@6000000 {
-+                              compatible = "snps,dwc3";
-+                              reg = <0x6000000 0xf8000>;
-+                              interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
-+                              phys = <&usb2_hs_phy>;
-+                              phy-names = "usb2-phy";
-+                              dr_mode = "host";
-+                      };
-+              };
-       };
- };
diff --git a/target/linux/ipq40xx/patches-4.19/079-v4.20-ARM-dts-qcom-ipq4019-fix-PCI-range.patch b/target/linux/ipq40xx/patches-4.19/079-v4.20-ARM-dts-qcom-ipq4019-fix-PCI-range.patch
deleted file mode 100644 (file)
index 6bfea2a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From da89f500cb55fb3f19c4b399b46d8add0abbd4d6 Mon Sep 17 00:00:00 2001
-From: Mathias Kresin <dev@kresin.me>
-Date: Wed, 25 Jul 2018 10:37:48 +0200
-Subject: [PATCH] ARM: dts: qcom: ipq4019: fix PCI range
-
-The PCI range is invalid and PCI attached devices doen't work.
-
-Signed-off-by: Mathias Kresin <dev@kresin.me>
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Andy Gross <andy.gross@linaro.org>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -401,7 +401,7 @@
-                       #size-cells = <2>;
-                       ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000
--                                0x82000000 0 0x48000000 0x48000000 0 0x10000000>;
-+                                0x82000000 0 0x40300000 0x40300000 0 0x400000>;
-                       interrupts = <GIC_SPI 141 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "msi";
diff --git a/target/linux/ipq40xx/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch b/target/linux/ipq40xx/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch
deleted file mode 100644 (file)
index 67522f5..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From patchwork Mon May 21 20:57:38 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v5,3/4] ARM: dts: qcom: add gpio-ranges property
-X-Patchwork-Submitter: Christian Lamparter <chunkeey@gmail.com>
-X-Patchwork-Id: 917856
-Message-Id: <0ae3376606a89bcdf3fe753a5c967f7103699e09.1526935804.git.chunkeey@gmail.com>
-To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
- linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org
-Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
- Linus Walleij <linus.walleij@linaro.org>,
- Stephen Boyd <sboyd@kernel.org>, David Brown <david.brown@linaro.org>,
- Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
- Andy Gross <andy.gross@linaro.org>,
- Sven Eckelmann <sven.eckelmann@openmesh.com>
-Date: Mon, 21 May 2018 22:57:38 +0200
-From: Christian Lamparter <chunkeey@gmail.com>
-List-Id: <linux-gpio.vger.kernel.org>
-
-This patch adds the gpio-ranges property to almost all of
-the Qualcomm ARM platforms that utilize the pinctrl-msm
-framework.
-
-The gpio-ranges property is part of the gpiolib subsystem.
-As a result, the binding text is available in section
-"2.1 gpio- and pin-controller interaction" of
-Documentation/devicetree/bindings/gpio/gpio.txt
-
-For more information please see the patch titled:
-"pinctrl: msm: fix gpio-hog related boot issues" from
-this series.
-
-Reported-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Tested-by: Sven Eckelmann <sven.eckelmann@openmesh.com> [ipq4019]
-Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
----
-To help with git bisect, the DT update patch has been intentionally
-placed after the "pinctrl: msm: fix gpio-hog related boot issues".
-Otherwise - if the order was reveresed - and bisect decides to split
-between these two patches, the gpiochip_add_pin_ranges() function
-will be executed twice with the same parameters for the same pinctrl.
----
- arch/arm/boot/dts/qcom-apq8064.dtsi   | 1 +
- arch/arm/boot/dts/qcom-apq8084.dtsi   | 1 +
- arch/arm/boot/dts/qcom-ipq4019.dtsi   | 1 +
- arch/arm/boot/dts/qcom-ipq8064.dtsi   | 1 +
- arch/arm/boot/dts/qcom-mdm9615.dtsi   | 1 +
- arch/arm/boot/dts/qcom-msm8660.dtsi   | 1 +
- arch/arm/boot/dts/qcom-msm8960.dtsi   | 1 +
- arch/arm/boot/dts/qcom-msm8974.dtsi   | 1 +
- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
- arch/arm64/boot/dts/qcom/msm8916.dtsi | 1 +
- arch/arm64/boot/dts/qcom/msm8992.dtsi | 1 +
- arch/arm64/boot/dts/qcom/msm8994.dtsi | 1 +
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 1 +
- 13 files changed, 14 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -202,6 +202,7 @@
-                       compatible = "qcom,ipq4019-pinctrl";
-                       reg = <0x01000000 0x300000>;
-                       gpio-controller;
-+                      gpio-ranges = <&tlmm 0 0 100>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
diff --git a/target/linux/ipq40xx/patches-4.19/081-clk-fix-apss-cpu-overclocking.patch b/target/linux/ipq40xx/patches-4.19/081-clk-fix-apss-cpu-overclocking.patch
deleted file mode 100644 (file)
index de99792..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-From f2b87dc1028b710ec8ce25808b9d21f92b376184 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@googlemail.com>
-Date: Sun, 11 Mar 2018 14:41:31 +0100
-Subject: [PATCH 2/2] clk: fix apss cpu overclocking
-
-There's an interaction issue between the clk changes:"
-clk: qcom: ipq4019: Add the apss cpu pll divider clock node
-clk: qcom: ipq4019: remove fixed clocks and add pll clocks
-" and the cpufreq-dt.
-
-cpufreq-dt is now spamming the kernel-log with the following:
-
-[ 1099.190658] cpu cpu0: dev_pm_opp_set_rate: failed to find current OPP
-for freq 761142857 (-34)
-
-This only happens on certain devices like the Compex WPJ428
-and AVM FritzBox!4040. However, other devices like the Asus
-RT-AC58U and Meraki MR33 work just fine.
-
-The issue stem from the fact that all higher CPU-Clocks
-are achieved by switching the clock-parent to the P_DDRPLLAPSS
-(ddrpllapss). Which is set by Qualcomm's proprietary bootcode
-as part of the DDR calibration.
-
-For example, the FB4040 uses 256 MiB Nanya NT5CC128M16IP clocked
-at round 533 MHz (ddrpllsdcc = 190285714 Hz).
-
-whereas the 128 MiB Nanya NT5CC64M16GP-DI in the ASUS RT-AC58U is
-clocked at a slightly higher 537 MHz ( ddrpllsdcc = 192000000 Hz).
-
-This patch attempts to fix the issue by modifying
-clk_cpu_div_round_rate(), clk_cpu_div_set_rate(), clk_cpu_div_recalc_rate()
-to use a new qcom_find_freq_close() function, which returns the closest
-matching frequency, instead of the next higher. This way, the SoC in
-the FB4040 (with its max clock speed of 710.4 MHz) will no longer
-try to overclock to 761 MHz.
-
-Fixes: d83dcacea18 ("clk: qcom: ipq4019: Add the apss cpu pll divider clock node")
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: John Crispin <john@phrozen.org>
----
- drivers/clk/qcom/gcc-ipq4019.c | 34 +++++++++++++++++++++++++++++++---
- 1 file changed, 31 insertions(+), 3 deletions(-)
-
---- a/drivers/clk/qcom/gcc-ipq4019.c
-+++ b/drivers/clk/qcom/gcc-ipq4019.c
-@@ -1251,6 +1251,29 @@ static const struct clk_fepll_vco gcc_fe
-       .reg = 0x2f020,
- };
-+
-+const struct freq_tbl *qcom_find_freq_close(const struct freq_tbl *f,
-+                                           unsigned long rate)
-+{
-+      const struct freq_tbl *last = NULL;
-+
-+      for ( ; f->freq; f++) {
-+              if (rate == f->freq)
-+                      return f;
-+
-+              if (f->freq > rate) {
-+                      if (!last ||
-+                         (f->freq - rate) < (rate - last->freq))
-+                              return f;
-+                      else
-+                              return last;
-+              }
-+              last = f;
-+      }
-+
-+      return last;
-+}
-+
- /*
-  * Round rate function for APSS CPU PLL Clock divider.
-  * It looks up the frequency table and returns the next higher frequency
-@@ -1263,7 +1286,7 @@ static long clk_cpu_div_round_rate(struc
-       struct clk_hw *p_hw;
-       const struct freq_tbl *f;
--      f = qcom_find_freq(pll->freq_tbl, rate);
-+      f = qcom_find_freq_close(pll->freq_tbl, rate);
-       if (!f)
-               return -EINVAL;
-@@ -1286,7 +1309,7 @@ static int clk_cpu_div_set_rate(struct c
-       u32 mask;
-       int ret;
--      f = qcom_find_freq(pll->freq_tbl, rate);
-+      f = qcom_find_freq_close(pll->freq_tbl, rate);
-       if (!f)
-               return -EINVAL;
-@@ -1313,6 +1336,7 @@ static unsigned long
- clk_cpu_div_recalc_rate(struct clk_hw *hw,
-                       unsigned long parent_rate)
- {
-+      const struct freq_tbl *f;
-       struct clk_fepll *pll = to_clk_fepll(hw);
-       u32 cdiv, pre_div;
-       u64 rate;
-@@ -1333,7 +1357,11 @@ clk_cpu_div_recalc_rate(struct clk_hw *h
-       rate = clk_fepll_vco_calc_rate(pll, parent_rate) * 2;
-       do_div(rate, pre_div);
--      return rate;
-+      f = qcom_find_freq_close(pll->freq_tbl, rate);
-+      if (!f)
-+              return rate;
-+
-+      return f->freq;
- };
- static const struct clk_ops clk_regmap_cpu_div_ops = {
diff --git a/target/linux/ipq40xx/patches-4.19/082-v4.20-mtd-spinand-winbond-Add-support-for-W25N01GV.patch b/target/linux/ipq40xx/patches-4.19/082-v4.20-mtd-spinand-winbond-Add-support-for-W25N01GV.patch
deleted file mode 100644 (file)
index 22bd985..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 342fc01bfd6d717602c71d96d3ef40a36e45e060 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Fri, 5 Oct 2018 09:02:50 +0200
-Subject: [PATCH] mtd: spinand: winbond: Add support for W25N01GV
-
-W25N01GV is a single die version of the already supported
-W25M02GV with half the capacity. Everything else is the
-same so introduce support for W25N01GV.
-
-Signed-off-by: Robert Marko <robimarko@gmail.com>
----
- drivers/mtd/nand/spi/winbond.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/mtd/nand/spi/winbond.c
-+++ b/drivers/mtd/nand/spi/winbond.c
-@@ -84,6 +84,14 @@ static const struct spinand_info winbond
-                    0,
-                    SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),
-                    SPINAND_SELECT_TARGET(w25m02gv_select_target)),
-+      SPINAND_INFO("W25N01GV", 0xAA,
-+                   NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1),
-+                   NAND_ECCREQ(1, 512),
-+                   SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
-+                                            &write_cache_variants,
-+                                            &update_cache_variants),
-+                   0,
-+                   SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),
- };
- /**
diff --git a/target/linux/ipq40xx/patches-4.19/083-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.patch b/target/linux/ipq40xx/patches-4.19/083-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.patch
deleted file mode 100644 (file)
index acea3fb..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Mon, 25 Feb 2019 20:14:19 +0100
-Subject: [PATCH] ARM: dts: qcom: ipq4019: enlarge PCIe BAR range
-
-David Bauer reported that the VDSL modem (attached via PCIe)
-on his AVM Fritz!Box 7530 was complaining about not having
-enough space in the BAR. A closer inspection of the old
-qcom-ipq40xx.dtsi pulled from the GL-iNet repository listed:
-
-| qcom,pcie@80000 {
-|      compatible = "qcom,msm_pcie";
-|      reg = <0x80000 0x2000>,
-|            <0x99000 0x800>,
-|            <0x40000000 0xf1d>,
-|            <0x40000f20 0xa8>,
-|            <0x40100000 0x1000>,
-|            <0x40200000 0x100000>,
-|            <0x40300000 0xd00000>;
-|      reg-names = "parf", "phy", "dm_core", "elbi",
-|                      "conf", "io", "bars";
-
-Matching the reg-names with the listed reg leads to
-<0xd00000> as the size for the "bars".
-
-BugLink: https://www.mail-archive.com/openwrt-devel@lists.openwrt.org/msg45212.html
-Reported-by: David Bauer <mail@david-bauer.net>
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
----
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -401,8 +401,8 @@
-                       #address-cells = <3>;
-                       #size-cells = <2>;
--                      ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000
--                                0x82000000 0 0x40300000 0x40300000 0 0x400000>;
-+                      ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>,
-+                               <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>;
-                       interrupts = <GIC_SPI 141 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "msi";
diff --git a/target/linux/ipq40xx/patches-4.19/084-ARM-dts-qcom-ipq4019-Fix-MSI-IRQ-type.patch b/target/linux/ipq40xx/patches-4.19/084-ARM-dts-qcom-ipq4019-Fix-MSI-IRQ-type.patch
deleted file mode 100644 (file)
index 7864ef7..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Niklas Cassel <niklas.cassel@linaro.org>
-Subject: [PATCH] ARM: dts: qcom: ipq4019: Fix MSI IRQ type
-Date: Thu, 24 Jan 2019 14:00:47 +0100
-
-The databook clearly states that the MSI IRQ (msi_ctrl_int) is a level
-triggered interrupt.
-
-The msi_ctrl_int will be high for as long as any MSI status bit is set,
-thus the IRQ type should be set to IRQ_TYPE_LEVEL_HIGH, causing the
-IRQ handler to keep getting called, as long as any MSI status bit is set.
-
-A git grep shows that ipq4019 is the only SoC using snps,dw-pcie that has
-configured this IRQ incorrectly.
-
-Not having the correct IRQ type defined will cause us to lose interrupts,
-which in turn causes timeouts in the PCIe endpoint drivers.
-
-Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
-Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
----
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -404,7 +404,7 @@
-                       ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>,
-                                <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>;
--                      interrupts = <GIC_SPI 141 IRQ_TYPE_EDGE_RISING>;
-+                      interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "msi";
-                       #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 0x7>;
diff --git a/target/linux/ipq40xx/patches-4.19/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch b/target/linux/ipq40xx/patches-4.19/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
deleted file mode 100644 (file)
index bcc6f65..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1092,6 +1092,7 @@ static const struct flash_info spi_nor_i
-       { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
-       { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
-       { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+      { "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
-       { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
-       { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
-       { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
-@@ -1274,11 +1275,12 @@ static const struct flash_info spi_nor_i
-       { },
- };
--static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
-+static const struct flash_info *spi_nor_read_id(struct spi_nor *nor,
-+                                              const char *name)
- {
-       int                     tmp;
-       u8                      id[SPI_NOR_MAX_ID_LEN];
--      const struct flash_info *info;
-+      const struct flash_info *info, *first_match = NULL;
-       tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
-       if (tmp < 0) {
-@@ -1289,10 +1291,16 @@ static const struct flash_info *spi_nor_
-       for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
-               info = &spi_nor_ids[tmp];
-               if (info->id_len) {
--                      if (!memcmp(info->id, id, info->id_len))
--                              return &spi_nor_ids[tmp];
-+                      if (!memcmp(info->id, id, info->id_len)) {
-+                              if (!name || !strcmp(name, info->name))
-+                                      return info;
-+                              if (!first_match)
-+                                      first_match = info;
-+                      }
-               }
-       }
-+      if (first_match)
-+              return first_match;
-       dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
-               id[0], id[1], id[2]);
-       return ERR_PTR(-ENODEV);
-@@ -2826,7 +2834,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-               info = spi_nor_match_id(name);
-       /* Try to auto-detect if chip name wasn't specified or not found */
-       if (!info)
--              info = spi_nor_read_id(nor);
-+              info = spi_nor_read_id(nor, NULL);
-       if (IS_ERR_OR_NULL(info))
-               return -ENOENT;
-@@ -2837,7 +2845,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-       if (name && info->id_len) {
-               const struct flash_info *jinfo;
--              jinfo = spi_nor_read_id(nor);
-+              jinfo = spi_nor_read_id(nor, name);
-               if (IS_ERR(jinfo)) {
-                       return PTR_ERR(jinfo);
-               } else if (jinfo != info) {
diff --git a/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio-and-phy.patch b/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio-and-phy.patch
deleted file mode 100644 (file)
index bad8b79..0000000
+++ /dev/null
@@ -1,2690 +0,0 @@
-From 5a71a2005a2e1e6bbe36f00386c495ad6626beb2 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@googlemail.com>
-Date: Thu, 19 Jan 2017 01:59:43 +0100
-Subject: [PATCH 30/38] NET: add qualcomm mdio and PHY
-
----
- drivers/net/phy/Kconfig  | 14 ++++++++++++++
- drivers/net/phy/Makefile |  2 ++
- 2 files changed, 16 insertions(+)
-
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -519,6 +519,20 @@ config XILINX_GMII2RGMII
-         the Reduced Gigabit Media Independent Interface(RGMII) between
-         Ethernet physical media devices and the Gigabit Ethernet controller.
-+config MDIO_IPQ40XX
-+      tristate "Qualcomm Atheros ipq40xx MDIO interface"
-+      depends on HAS_IOMEM && OF
-+      ---help---
-+        This driver supports the MDIO interface found in Qualcomm
-+        Atheros ipq40xx Soc chip.
-+
-+config AR40XX_PHY
-+      tristate "Driver for Qualcomm Atheros IPQ40XX switches"
-+      depends on HAS_IOMEM && OF
-+      select SWCONFIG
-+      ---help---
-+         This is the driver for Qualcomm Atheros IPQ40XX ESS switches.
-+
- endif # PHYLIB
- config MICREL_KS8995MA
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -48,6 +48,7 @@ obj-$(CONFIG_MDIO_CAVIUM)    += mdio-cavium
- obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
- obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
- obj-$(CONFIG_MDIO_I2C)                += mdio-i2c.o
-+obj-$(CONFIG_MDIO_IPQ40XX)    += mdio-ipq40xx.o
- obj-$(CONFIG_MDIO_MOXART)     += mdio-moxart.o
- obj-$(CONFIG_MDIO_MSCC_MIIM)  += mdio-mscc-miim.o
- obj-$(CONFIG_MDIO_OCTEON)     += mdio-octeon.o
-@@ -61,6 +62,7 @@ obj-y                                += $(sfp-obj-y) $(sfp-obj-m)
- obj-$(CONFIG_AMD_PHY)         += amd.o
- obj-$(CONFIG_AQUANTIA_PHY)    += aquantia.o
-+obj-$(CONFIG_AR40XX_PHY)      += ar40xx.o
- obj-$(CONFIG_ASIX_PHY)                += asix.o
- obj-$(CONFIG_AT803X_PHY)      += at803x.o
- obj-$(CONFIG_BCM63XX_PHY)     += bcm63xx.o
---- /dev/null
-+++ b/drivers/net/phy/ar40xx.c
-@@ -0,0 +1,2090 @@
-+/*
-+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/list.h>
-+#include <linux/bitops.h>
-+#include <linux/switch.h>
-+#include <linux/delay.h>
-+#include <linux/phy.h>
-+#include <linux/clk.h>
-+#include <linux/reset.h>
-+#include <linux/lockdep.h>
-+#include <linux/workqueue.h>
-+#include <linux/of_device.h>
-+#include <linux/of_address.h>
-+#include <linux/mdio.h>
-+#include <linux/gpio.h>
-+
-+#include "ar40xx.h"
-+
-+static struct ar40xx_priv *ar40xx_priv;
-+
-+#define MIB_DESC(_s , _o, _n) \
-+      {                       \
-+              .size = (_s),   \
-+              .offset = (_o), \
-+              .name = (_n),   \
-+      }
-+
-+static const struct ar40xx_mib_desc ar40xx_mibs[] = {
-+      MIB_DESC(1, AR40XX_STATS_RXBROAD, "RxBroad"),
-+      MIB_DESC(1, AR40XX_STATS_RXPAUSE, "RxPause"),
-+      MIB_DESC(1, AR40XX_STATS_RXMULTI, "RxMulti"),
-+      MIB_DESC(1, AR40XX_STATS_RXFCSERR, "RxFcsErr"),
-+      MIB_DESC(1, AR40XX_STATS_RXALIGNERR, "RxAlignErr"),
-+      MIB_DESC(1, AR40XX_STATS_RXRUNT, "RxRunt"),
-+      MIB_DESC(1, AR40XX_STATS_RXFRAGMENT, "RxFragment"),
-+      MIB_DESC(1, AR40XX_STATS_RX64BYTE, "Rx64Byte"),
-+      MIB_DESC(1, AR40XX_STATS_RX128BYTE, "Rx128Byte"),
-+      MIB_DESC(1, AR40XX_STATS_RX256BYTE, "Rx256Byte"),
-+      MIB_DESC(1, AR40XX_STATS_RX512BYTE, "Rx512Byte"),
-+      MIB_DESC(1, AR40XX_STATS_RX1024BYTE, "Rx1024Byte"),
-+      MIB_DESC(1, AR40XX_STATS_RX1518BYTE, "Rx1518Byte"),
-+      MIB_DESC(1, AR40XX_STATS_RXMAXBYTE, "RxMaxByte"),
-+      MIB_DESC(1, AR40XX_STATS_RXTOOLONG, "RxTooLong"),
-+      MIB_DESC(2, AR40XX_STATS_RXGOODBYTE, "RxGoodByte"),
-+      MIB_DESC(2, AR40XX_STATS_RXBADBYTE, "RxBadByte"),
-+      MIB_DESC(1, AR40XX_STATS_RXOVERFLOW, "RxOverFlow"),
-+      MIB_DESC(1, AR40XX_STATS_FILTERED, "Filtered"),
-+      MIB_DESC(1, AR40XX_STATS_TXBROAD, "TxBroad"),
-+      MIB_DESC(1, AR40XX_STATS_TXPAUSE, "TxPause"),
-+      MIB_DESC(1, AR40XX_STATS_TXMULTI, "TxMulti"),
-+      MIB_DESC(1, AR40XX_STATS_TXUNDERRUN, "TxUnderRun"),
-+      MIB_DESC(1, AR40XX_STATS_TX64BYTE, "Tx64Byte"),
-+      MIB_DESC(1, AR40XX_STATS_TX128BYTE, "Tx128Byte"),
-+      MIB_DESC(1, AR40XX_STATS_TX256BYTE, "Tx256Byte"),
-+      MIB_DESC(1, AR40XX_STATS_TX512BYTE, "Tx512Byte"),
-+      MIB_DESC(1, AR40XX_STATS_TX1024BYTE, "Tx1024Byte"),
-+      MIB_DESC(1, AR40XX_STATS_TX1518BYTE, "Tx1518Byte"),
-+      MIB_DESC(1, AR40XX_STATS_TXMAXBYTE, "TxMaxByte"),
-+      MIB_DESC(1, AR40XX_STATS_TXOVERSIZE, "TxOverSize"),
-+      MIB_DESC(2, AR40XX_STATS_TXBYTE, "TxByte"),
-+      MIB_DESC(1, AR40XX_STATS_TXCOLLISION, "TxCollision"),
-+      MIB_DESC(1, AR40XX_STATS_TXABORTCOL, "TxAbortCol"),
-+      MIB_DESC(1, AR40XX_STATS_TXMULTICOL, "TxMultiCol"),
-+      MIB_DESC(1, AR40XX_STATS_TXSINGLECOL, "TxSingleCol"),
-+      MIB_DESC(1, AR40XX_STATS_TXEXCDEFER, "TxExcDefer"),
-+      MIB_DESC(1, AR40XX_STATS_TXDEFER, "TxDefer"),
-+      MIB_DESC(1, AR40XX_STATS_TXLATECOL, "TxLateCol"),
-+};
-+
-+static u32
-+ar40xx_read(struct ar40xx_priv *priv, int reg)
-+{
-+      return readl(priv->hw_addr + reg);
-+}
-+
-+static u32
-+ar40xx_psgmii_read(struct ar40xx_priv *priv, int reg)
-+{
-+      return readl(priv->psgmii_hw_addr + reg);
-+}
-+
-+static void
-+ar40xx_write(struct ar40xx_priv *priv, int reg, u32 val)
-+{
-+      writel(val, priv->hw_addr + reg);
-+}
-+
-+static u32
-+ar40xx_rmw(struct ar40xx_priv *priv, int reg, u32 mask, u32 val)
-+{
-+      u32 ret;
-+
-+      ret = ar40xx_read(priv, reg);
-+      ret &= ~mask;
-+      ret |= val;
-+      ar40xx_write(priv, reg, ret);
-+      return ret;
-+}
-+
-+static void
-+ar40xx_psgmii_write(struct ar40xx_priv *priv, int reg, u32 val)
-+{
-+      writel(val, priv->psgmii_hw_addr + reg);
-+}
-+
-+static void
-+ar40xx_phy_dbg_write(struct ar40xx_priv *priv, int phy_addr,
-+                   u16 dbg_addr, u16 dbg_data)
-+{
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      mutex_lock(&bus->mdio_lock);
-+      bus->write(bus, phy_addr, AR40XX_MII_ATH_DBG_ADDR, dbg_addr);
-+      bus->write(bus, phy_addr, AR40XX_MII_ATH_DBG_DATA, dbg_data);
-+      mutex_unlock(&bus->mdio_lock);
-+}
-+
-+static void
-+ar40xx_phy_dbg_read(struct ar40xx_priv *priv, int phy_addr,
-+                  u16 dbg_addr, u16 *dbg_data)
-+{
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      mutex_lock(&bus->mdio_lock);
-+      bus->write(bus, phy_addr, AR40XX_MII_ATH_DBG_ADDR, dbg_addr);
-+      *dbg_data = bus->read(bus, phy_addr, AR40XX_MII_ATH_DBG_DATA);
-+      mutex_unlock(&bus->mdio_lock);
-+}
-+
-+static void
-+ar40xx_phy_mmd_write(struct ar40xx_priv *priv, u32 phy_id,
-+                   u16 mmd_num, u16 reg_id, u16 reg_val)
-+{
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      mutex_lock(&bus->mdio_lock);
-+      bus->write(bus, phy_id,
-+                      AR40XX_MII_ATH_MMD_ADDR, mmd_num);
-+      bus->write(bus, phy_id,
-+                      AR40XX_MII_ATH_MMD_DATA, reg_id);
-+      bus->write(bus, phy_id,
-+                      AR40XX_MII_ATH_MMD_ADDR,
-+                      0x4000 | mmd_num);
-+      bus->write(bus, phy_id,
-+              AR40XX_MII_ATH_MMD_DATA, reg_val);
-+      mutex_unlock(&bus->mdio_lock);
-+}
-+
-+static u16
-+ar40xx_phy_mmd_read(struct ar40xx_priv *priv, u32 phy_id,
-+                  u16 mmd_num, u16 reg_id)
-+{
-+      u16 value;
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      mutex_lock(&bus->mdio_lock);
-+      bus->write(bus, phy_id,
-+                      AR40XX_MII_ATH_MMD_ADDR, mmd_num);
-+      bus->write(bus, phy_id,
-+                      AR40XX_MII_ATH_MMD_DATA, reg_id);
-+      bus->write(bus, phy_id,
-+                      AR40XX_MII_ATH_MMD_ADDR,
-+                      0x4000 | mmd_num);
-+      value = bus->read(bus, phy_id, AR40XX_MII_ATH_MMD_DATA);
-+      mutex_unlock(&bus->mdio_lock);
-+      return value;
-+}
-+
-+/* Start of swconfig support */
-+
-+static void
-+ar40xx_phy_poll_reset(struct ar40xx_priv *priv)
-+{
-+      u32 i, in_reset, retries = 500;
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      /* Assume RESET was recently issued to some or all of the phys */
-+      in_reset = GENMASK(AR40XX_NUM_PHYS - 1, 0);
-+
-+      while (retries--) {
-+              /* 1ms should be plenty of time.
-+               * 802.3 spec allows for a max wait time of 500ms
-+               */
-+              usleep_range(1000, 2000);
-+
-+              for (i = 0; i < AR40XX_NUM_PHYS; i++) {
-+                      int val;
-+
-+                      /* skip devices which have completed reset */
-+                      if (!(in_reset & BIT(i)))
-+                              continue;
-+
-+                      val = mdiobus_read(bus, i, MII_BMCR);
-+                      if (val < 0)
-+                              continue;
-+
-+                      /* mark when phy is no longer in reset state */
-+                      if (!(val & BMCR_RESET))
-+                              in_reset &= ~BIT(i);
-+              }
-+
-+              if (!in_reset)
-+                      return;
-+      }
-+
-+      dev_warn(&bus->dev, "Failed to reset all phys! (in_reset: 0x%x)\n",
-+               in_reset);
-+}
-+
-+static void
-+ar40xx_phy_init(struct ar40xx_priv *priv)
-+{
-+      int i;
-+      struct mii_bus *bus;
-+      u16 val;
-+
-+      bus = priv->mii_bus;
-+      for (i = 0; i < AR40XX_NUM_PORTS - 1; i++) {
-+              ar40xx_phy_dbg_read(priv, i, AR40XX_PHY_DEBUG_0, &val);
-+              val &= ~AR40XX_PHY_MANU_CTRL_EN;
-+              ar40xx_phy_dbg_write(priv, i, AR40XX_PHY_DEBUG_0, val);
-+              mdiobus_write(bus, i,
-+                            MII_ADVERTISE, ADVERTISE_ALL |
-+                            ADVERTISE_PAUSE_CAP |
-+                            ADVERTISE_PAUSE_ASYM);
-+              mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
-+              mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-+      }
-+
-+      ar40xx_phy_poll_reset(priv);
-+}
-+
-+static void
-+ar40xx_port_phy_linkdown(struct ar40xx_priv *priv)
-+{
-+      struct mii_bus *bus;
-+      int i;
-+      u16 val;
-+
-+      bus = priv->mii_bus;
-+      for (i = 0; i < AR40XX_NUM_PORTS - 1; i++) {
-+              mdiobus_write(bus, i, MII_CTRL1000, 0);
-+              mdiobus_write(bus, i, MII_ADVERTISE, 0);
-+              mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-+              ar40xx_phy_dbg_read(priv, i, AR40XX_PHY_DEBUG_0, &val);
-+              val |= AR40XX_PHY_MANU_CTRL_EN;
-+              ar40xx_phy_dbg_write(priv, i, AR40XX_PHY_DEBUG_0, val);
-+              /* disable transmit */
-+              ar40xx_phy_dbg_read(priv, i, AR40XX_PHY_DEBUG_2, &val);
-+              val &= 0xf00f;
-+              ar40xx_phy_dbg_write(priv, i, AR40XX_PHY_DEBUG_2, val);
-+      }
-+}
-+
-+static void
-+ar40xx_set_mirror_regs(struct ar40xx_priv *priv)
-+{
-+      int port;
-+
-+      /* reset all mirror registers */
-+      ar40xx_rmw(priv, AR40XX_REG_FWD_CTRL0,
-+                 AR40XX_FWD_CTRL0_MIRROR_PORT,
-+                 (0xF << AR40XX_FWD_CTRL0_MIRROR_PORT_S));
-+      for (port = 0; port < AR40XX_NUM_PORTS; port++) {
-+              ar40xx_rmw(priv, AR40XX_REG_PORT_LOOKUP(port),
-+                         AR40XX_PORT_LOOKUP_ING_MIRROR_EN, 0);
-+
-+              ar40xx_rmw(priv, AR40XX_REG_PORT_HOL_CTRL1(port),
-+                         AR40XX_PORT_HOL_CTRL1_EG_MIRROR_EN, 0);
-+      }
-+
-+      /* now enable mirroring if necessary */
-+      if (priv->source_port >= AR40XX_NUM_PORTS ||
-+          priv->monitor_port >= AR40XX_NUM_PORTS ||
-+          priv->source_port == priv->monitor_port) {
-+              return;
-+      }
-+
-+      ar40xx_rmw(priv, AR40XX_REG_FWD_CTRL0,
-+                 AR40XX_FWD_CTRL0_MIRROR_PORT,
-+                 (priv->monitor_port << AR40XX_FWD_CTRL0_MIRROR_PORT_S));
-+
-+      if (priv->mirror_rx)
-+              ar40xx_rmw(priv, AR40XX_REG_PORT_LOOKUP(priv->source_port), 0,
-+                         AR40XX_PORT_LOOKUP_ING_MIRROR_EN);
-+
-+      if (priv->mirror_tx)
-+              ar40xx_rmw(priv, AR40XX_REG_PORT_HOL_CTRL1(priv->source_port),
-+                         0, AR40XX_PORT_HOL_CTRL1_EG_MIRROR_EN);
-+}
-+
-+static int
-+ar40xx_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      u8 ports = priv->vlan_table[val->port_vlan];
-+      int i;
-+
-+      val->len = 0;
-+      for (i = 0; i < dev->ports; i++) {
-+              struct switch_port *p;
-+
-+              if (!(ports & BIT(i)))
-+                      continue;
-+
-+              p = &val->value.ports[val->len++];
-+              p->id = i;
-+              if ((priv->vlan_tagged & BIT(i)) ||
-+                  (priv->pvid[i] != val->port_vlan))
-+                      p->flags = BIT(SWITCH_PORT_FLAG_TAGGED);
-+              else
-+                      p->flags = 0;
-+      }
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      u8 *vt = &priv->vlan_table[val->port_vlan];
-+      int i;
-+
-+      *vt = 0;
-+      for (i = 0; i < val->len; i++) {
-+              struct switch_port *p = &val->value.ports[i];
-+
-+              if (p->flags & BIT(SWITCH_PORT_FLAG_TAGGED)) {
-+                      if (val->port_vlan == priv->pvid[p->id])
-+                              priv->vlan_tagged |= BIT(p->id);
-+              } else {
-+                      priv->vlan_tagged &= ~BIT(p->id);
-+                      priv->pvid[p->id] = val->port_vlan;
-+              }
-+
-+              *vt |= BIT(p->id);
-+      }
-+      return 0;
-+}
-+
-+static int
-+ar40xx_reg_wait(struct ar40xx_priv *priv, u32 reg, u32 mask, u32 val,
-+              unsigned timeout)
-+{
-+      int i;
-+
-+      for (i = 0; i < timeout; i++) {
-+              u32 t;
-+
-+              t = ar40xx_read(priv, reg);
-+              if ((t & mask) == val)
-+                      return 0;
-+
-+              usleep_range(1000, 2000);
-+      }
-+
-+      return -ETIMEDOUT;
-+}
-+
-+static int
-+ar40xx_mib_op(struct ar40xx_priv *priv, u32 op)
-+{
-+      int ret;
-+
-+      lockdep_assert_held(&priv->mib_lock);
-+
-+      /* Capture the hardware statistics for all ports */
-+      ar40xx_rmw(priv, AR40XX_REG_MIB_FUNC,
-+                 AR40XX_MIB_FUNC, (op << AR40XX_MIB_FUNC_S));
-+
-+      /* Wait for the capturing to complete. */
-+      ret = ar40xx_reg_wait(priv, AR40XX_REG_MIB_FUNC,
-+                            AR40XX_MIB_BUSY, 0, 10);
-+
-+      return ret;
-+}
-+
-+static void
-+ar40xx_mib_fetch_port_stat(struct ar40xx_priv *priv, int port, bool flush)
-+{
-+      unsigned int base;
-+      u64 *mib_stats;
-+      int i;
-+      u32 num_mibs = ARRAY_SIZE(ar40xx_mibs);
-+
-+      WARN_ON(port >= priv->dev.ports);
-+
-+      lockdep_assert_held(&priv->mib_lock);
-+
-+      base = AR40XX_REG_PORT_STATS_START +
-+             AR40XX_REG_PORT_STATS_LEN * port;
-+
-+      mib_stats = &priv->mib_stats[port * num_mibs];
-+      if (flush) {
-+              u32 len;
-+
-+              len = num_mibs * sizeof(*mib_stats);
-+              memset(mib_stats, 0, len);
-+              return;
-+      }
-+      for (i = 0; i < num_mibs; i++) {
-+              const struct ar40xx_mib_desc *mib;
-+              u64 t;
-+
-+              mib = &ar40xx_mibs[i];
-+              t = ar40xx_read(priv, base + mib->offset);
-+              if (mib->size == 2) {
-+                      u64 hi;
-+
-+                      hi = ar40xx_read(priv, base + mib->offset + 4);
-+                      t |= hi << 32;
-+              }
-+
-+              mib_stats[i] += t;
-+      }
-+}
-+
-+static int
-+ar40xx_mib_capture(struct ar40xx_priv *priv)
-+{
-+      return ar40xx_mib_op(priv, AR40XX_MIB_FUNC_CAPTURE);
-+}
-+
-+static int
-+ar40xx_mib_flush(struct ar40xx_priv *priv)
-+{
-+      return ar40xx_mib_op(priv, AR40XX_MIB_FUNC_FLUSH);
-+}
-+
-+static int
-+ar40xx_sw_set_reset_mibs(struct switch_dev *dev,
-+                       const struct switch_attr *attr,
-+                       struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      unsigned int len;
-+      int ret;
-+      u32 num_mibs = ARRAY_SIZE(ar40xx_mibs);
-+
-+      mutex_lock(&priv->mib_lock);
-+
-+      len = priv->dev.ports * num_mibs * sizeof(*priv->mib_stats);
-+      memset(priv->mib_stats, 0, len);
-+      ret = ar40xx_mib_flush(priv);
-+
-+      mutex_unlock(&priv->mib_lock);
-+      return ret;
-+}
-+
-+static int
-+ar40xx_sw_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-+                 struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      priv->vlan = !!val->value.i;
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-+                 struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      val->value.i = priv->vlan;
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_mirror_rx_enable(struct switch_dev *dev,
-+                             const struct switch_attr *attr,
-+                             struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      priv->mirror_rx = !!val->value.i;
-+      ar40xx_set_mirror_regs(priv);
-+      mutex_unlock(&priv->reg_mutex);
-+
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_get_mirror_rx_enable(struct switch_dev *dev,
-+                             const struct switch_attr *attr,
-+                             struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      val->value.i = priv->mirror_rx;
-+      mutex_unlock(&priv->reg_mutex);
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_mirror_tx_enable(struct switch_dev *dev,
-+                             const struct switch_attr *attr,
-+                             struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      priv->mirror_tx = !!val->value.i;
-+      ar40xx_set_mirror_regs(priv);
-+      mutex_unlock(&priv->reg_mutex);
-+
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_get_mirror_tx_enable(struct switch_dev *dev,
-+                             const struct switch_attr *attr,
-+                             struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      val->value.i = priv->mirror_tx;
-+      mutex_unlock(&priv->reg_mutex);
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_mirror_monitor_port(struct switch_dev *dev,
-+                                const struct switch_attr *attr,
-+                                struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      priv->monitor_port = val->value.i;
-+      ar40xx_set_mirror_regs(priv);
-+      mutex_unlock(&priv->reg_mutex);
-+
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_get_mirror_monitor_port(struct switch_dev *dev,
-+                                const struct switch_attr *attr,
-+                                struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      val->value.i = priv->monitor_port;
-+      mutex_unlock(&priv->reg_mutex);
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_mirror_source_port(struct switch_dev *dev,
-+                               const struct switch_attr *attr,
-+                               struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      priv->source_port = val->value.i;
-+      ar40xx_set_mirror_regs(priv);
-+      mutex_unlock(&priv->reg_mutex);
-+
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_get_mirror_source_port(struct switch_dev *dev,
-+                               const struct switch_attr *attr,
-+                               struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      mutex_lock(&priv->reg_mutex);
-+      val->value.i = priv->source_port;
-+      mutex_unlock(&priv->reg_mutex);
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_linkdown(struct switch_dev *dev,
-+                     const struct switch_attr *attr,
-+                     struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      if (val->value.i == 1)
-+              ar40xx_port_phy_linkdown(priv);
-+      else
-+              ar40xx_phy_init(priv);
-+
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_port_reset_mib(struct switch_dev *dev,
-+                           const struct switch_attr *attr,
-+                           struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      int port;
-+      int ret;
-+
-+      port = val->port_vlan;
-+      if (port >= dev->ports)
-+              return -EINVAL;
-+
-+      mutex_lock(&priv->mib_lock);
-+      ret = ar40xx_mib_capture(priv);
-+      if (ret)
-+              goto unlock;
-+
-+      ar40xx_mib_fetch_port_stat(priv, port, true);
-+
-+unlock:
-+      mutex_unlock(&priv->mib_lock);
-+      return ret;
-+}
-+
-+static int
-+ar40xx_sw_get_port_mib(struct switch_dev *dev,
-+                     const struct switch_attr *attr,
-+                     struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      u64 *mib_stats;
-+      int port;
-+      int ret;
-+      char *buf = priv->buf;
-+      int i, len = 0;
-+      u32 num_mibs = ARRAY_SIZE(ar40xx_mibs);
-+
-+      port = val->port_vlan;
-+      if (port >= dev->ports)
-+              return -EINVAL;
-+
-+      mutex_lock(&priv->mib_lock);
-+      ret = ar40xx_mib_capture(priv);
-+      if (ret)
-+              goto unlock;
-+
-+      ar40xx_mib_fetch_port_stat(priv, port, false);
-+
-+      len += snprintf(buf + len, sizeof(priv->buf) - len,
-+                      "Port %d MIB counters\n",
-+                      port);
-+
-+      mib_stats = &priv->mib_stats[port * num_mibs];
-+      for (i = 0; i < num_mibs; i++)
-+              len += snprintf(buf + len, sizeof(priv->buf) - len,
-+                              "%-12s: %llu\n",
-+                              ar40xx_mibs[i].name,
-+                              mib_stats[i]);
-+
-+      val->value.s = buf;
-+      val->len = len;
-+
-+unlock:
-+      mutex_unlock(&priv->mib_lock);
-+      return ret;
-+}
-+
-+static int
-+ar40xx_sw_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
-+                struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      priv->vlan_id[val->port_vlan] = val->value.i;
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
-+                struct switch_val *val)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      val->value.i = priv->vlan_id[val->port_vlan];
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_get_pvid(struct switch_dev *dev, int port, int *vlan)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      *vlan = priv->pvid[port];
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_set_pvid(struct switch_dev *dev, int port, int vlan)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      /* make sure no invalid PVIDs get set */
-+      if (vlan >= dev->vlans)
-+              return -EINVAL;
-+
-+      priv->pvid[port] = vlan;
-+      return 0;
-+}
-+
-+static void
-+ar40xx_read_port_link(struct ar40xx_priv *priv, int port,
-+                    struct switch_port_link *link)
-+{
-+      u32 status;
-+      u32 speed;
-+
-+      memset(link, 0, sizeof(*link));
-+
-+      status = ar40xx_read(priv, AR40XX_REG_PORT_STATUS(port));
-+
-+      link->aneg = !!(status & AR40XX_PORT_AUTO_LINK_EN);
-+      if (link->aneg || (port != AR40XX_PORT_CPU))
-+              link->link = !!(status & AR40XX_PORT_STATUS_LINK_UP);
-+      else
-+              link->link = true;
-+
-+      if (!link->link)
-+              return;
-+
-+      link->duplex = !!(status & AR40XX_PORT_DUPLEX);
-+      link->tx_flow = !!(status & AR40XX_PORT_STATUS_TXFLOW);
-+      link->rx_flow = !!(status & AR40XX_PORT_STATUS_RXFLOW);
-+
-+      speed = (status & AR40XX_PORT_SPEED) >>
-+               AR40XX_PORT_STATUS_SPEED_S;
-+
-+      switch (speed) {
-+      case AR40XX_PORT_SPEED_10M:
-+              link->speed = SWITCH_PORT_SPEED_10;
-+              break;
-+      case AR40XX_PORT_SPEED_100M:
-+              link->speed = SWITCH_PORT_SPEED_100;
-+              break;
-+      case AR40XX_PORT_SPEED_1000M:
-+              link->speed = SWITCH_PORT_SPEED_1000;
-+              break;
-+      default:
-+              link->speed = SWITCH_PORT_SPEED_UNKNOWN;
-+              break;
-+      }
-+}
-+
-+static int
-+ar40xx_sw_get_port_link(struct switch_dev *dev, int port,
-+                      struct switch_port_link *link)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+
-+      ar40xx_read_port_link(priv, port, link);
-+      return 0;
-+}
-+
-+static const struct switch_attr ar40xx_sw_attr_globals[] = {
-+      {
-+              .type = SWITCH_TYPE_INT,
-+              .name = "enable_vlan",
-+              .description = "Enable VLAN mode",
-+              .set = ar40xx_sw_set_vlan,
-+              .get = ar40xx_sw_get_vlan,
-+              .max = 1
-+      },
-+      {
-+              .type = SWITCH_TYPE_NOVAL,
-+              .name = "reset_mibs",
-+              .description = "Reset all MIB counters",
-+              .set = ar40xx_sw_set_reset_mibs,
-+      },
-+      {
-+              .type = SWITCH_TYPE_INT,
-+              .name = "enable_mirror_rx",
-+              .description = "Enable mirroring of RX packets",
-+              .set = ar40xx_sw_set_mirror_rx_enable,
-+              .get = ar40xx_sw_get_mirror_rx_enable,
-+              .max = 1
-+      },
-+      {
-+              .type = SWITCH_TYPE_INT,
-+              .name = "enable_mirror_tx",
-+              .description = "Enable mirroring of TX packets",
-+              .set = ar40xx_sw_set_mirror_tx_enable,
-+              .get = ar40xx_sw_get_mirror_tx_enable,
-+              .max = 1
-+      },
-+      {
-+              .type = SWITCH_TYPE_INT,
-+              .name = "mirror_monitor_port",
-+              .description = "Mirror monitor port",
-+              .set = ar40xx_sw_set_mirror_monitor_port,
-+              .get = ar40xx_sw_get_mirror_monitor_port,
-+              .max = AR40XX_NUM_PORTS - 1
-+      },
-+      {
-+              .type = SWITCH_TYPE_INT,
-+              .name = "mirror_source_port",
-+              .description = "Mirror source port",
-+              .set = ar40xx_sw_set_mirror_source_port,
-+              .get = ar40xx_sw_get_mirror_source_port,
-+              .max = AR40XX_NUM_PORTS - 1
-+      },
-+      {
-+              .type = SWITCH_TYPE_INT,
-+              .name = "linkdown",
-+              .description = "Link down all the PHYs",
-+              .set = ar40xx_sw_set_linkdown,
-+              .max = 1
-+      },
-+};
-+
-+static const struct switch_attr ar40xx_sw_attr_port[] = {
-+      {
-+              .type = SWITCH_TYPE_NOVAL,
-+              .name = "reset_mib",
-+              .description = "Reset single port MIB counters",
-+              .set = ar40xx_sw_set_port_reset_mib,
-+      },
-+      {
-+              .type = SWITCH_TYPE_STRING,
-+              .name = "mib",
-+              .description = "Get port's MIB counters",
-+              .set = NULL,
-+              .get = ar40xx_sw_get_port_mib,
-+      },
-+};
-+
-+const struct switch_attr ar40xx_sw_attr_vlan[] = {
-+      {
-+              .type = SWITCH_TYPE_INT,
-+              .name = "vid",
-+              .description = "VLAN ID (0-4094)",
-+              .set = ar40xx_sw_set_vid,
-+              .get = ar40xx_sw_get_vid,
-+              .max = 4094,
-+      },
-+};
-+
-+/* End of swconfig support */
-+
-+static int
-+ar40xx_wait_bit(struct ar40xx_priv *priv, int reg, u32 mask, u32 val)
-+{
-+      int timeout = 20;
-+      u32 t;
-+
-+      while (1) {
-+              t = ar40xx_read(priv, reg);
-+              if ((t & mask) == val)
-+                      return 0;
-+
-+              if (timeout-- <= 0)
-+                      break;
-+
-+              usleep_range(10, 20);
-+      }
-+
-+      pr_err("ar40xx: timeout for reg %08x: %08x & %08x != %08x\n",
-+             (unsigned int)reg, t, mask, val);
-+      return -ETIMEDOUT;
-+}
-+
-+static int
-+ar40xx_atu_flush(struct ar40xx_priv *priv)
-+{
-+      int ret;
-+
-+      ret = ar40xx_wait_bit(priv, AR40XX_REG_ATU_FUNC,
-+                            AR40XX_ATU_FUNC_BUSY, 0);
-+      if (!ret)
-+              ar40xx_write(priv, AR40XX_REG_ATU_FUNC,
-+                           AR40XX_ATU_FUNC_OP_FLUSH |
-+                           AR40XX_ATU_FUNC_BUSY);
-+
-+      return ret;
-+}
-+
-+static void
-+ar40xx_ess_reset(struct ar40xx_priv *priv)
-+{
-+      reset_control_assert(priv->ess_rst);
-+      mdelay(10);
-+      reset_control_deassert(priv->ess_rst);
-+      /* Waiting for all inner tables init done.
-+        * It cost 5~10ms.
-+        */
-+      mdelay(10);
-+
-+      pr_info("ESS reset ok!\n");
-+}
-+
-+/* Start of psgmii self test */
-+
-+static void
-+ar40xx_malibu_psgmii_ess_reset(struct ar40xx_priv *priv)
-+{
-+      u32 n;
-+      struct mii_bus *bus = priv->mii_bus;
-+      /* reset phy psgmii */
-+      /* fix phy psgmii RX 20bit */
-+      mdiobus_write(bus, 5, 0x0, 0x005b);
-+      /* reset phy psgmii */
-+      mdiobus_write(bus, 5, 0x0, 0x001b);
-+      /* release reset phy psgmii */
-+      mdiobus_write(bus, 5, 0x0, 0x005b);
-+
-+      for (n = 0; n < AR40XX_PSGMII_CALB_NUM; n++) {
-+              u16 status;
-+
-+              status = ar40xx_phy_mmd_read(priv, 5, 1, 0x28);
-+              if (status & BIT(0))
-+                      break;
-+              /* Polling interval to check PSGMII PLL in malibu is ready
-+                * the worst time is 8.67ms
-+                * for 25MHz reference clock
-+                * [512+(128+2048)*49]*80ns+100us
-+                */
-+              mdelay(2);
-+      }
-+
-+      /*check malibu psgmii calibration done end..*/
-+
-+      /*freeze phy psgmii RX CDR*/
-+      mdiobus_write(bus, 5, 0x1a, 0x2230);
-+
-+      ar40xx_ess_reset(priv);
-+
-+      /*check psgmii calibration done start*/
-+      for (n = 0; n < AR40XX_PSGMII_CALB_NUM; n++) {
-+              u32 status;
-+
-+              status = ar40xx_psgmii_read(priv, 0xa0);
-+              if (status & BIT(0))
-+                      break;
-+              /* Polling interval to check PSGMII PLL in ESS is ready */
-+              mdelay(2);
-+      }
-+
-+      /* check dakota psgmii calibration done end..*/
-+
-+      /* relesae phy psgmii RX CDR */
-+      mdiobus_write(bus, 5, 0x1a, 0x3230);
-+      /* release phy psgmii RX 20bit */
-+      mdiobus_write(bus, 5, 0x0, 0x005f);
-+}
-+
-+static void
-+ar40xx_psgmii_single_phy_testing(struct ar40xx_priv *priv, int phy)
-+{
-+      int j;
-+      u32 tx_ok, tx_error;
-+      u32 rx_ok, rx_error;
-+      u32 tx_ok_high16;
-+      u32 rx_ok_high16;
-+      u32 tx_all_ok, rx_all_ok;
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      mdiobus_write(bus, phy, 0x0, 0x9000);
-+      mdiobus_write(bus, phy, 0x0, 0x4140);
-+
-+      for (j = 0; j < AR40XX_PSGMII_CALB_NUM; j++) {
-+              u16 status;
-+
-+              status = mdiobus_read(bus, phy, 0x11);
-+              if (status & AR40XX_PHY_SPEC_STATUS_LINK)
-+                      break;
-+              /* the polling interval to check if the PHY link up or not
-+                * maxwait_timer: 750 ms +/-10 ms
-+                * minwait_timer : 1 us +/- 0.1us
-+                * time resides in minwait_timer ~ maxwait_timer
-+                * see IEEE 802.3 section 40.4.5.2
-+                */
-+              mdelay(8);
-+      }
-+
-+      /* enable check */
-+      ar40xx_phy_mmd_write(priv, phy, 7, 0x8029, 0x0000);
-+      ar40xx_phy_mmd_write(priv, phy, 7, 0x8029, 0x0003);
-+
-+      /* start traffic */
-+      ar40xx_phy_mmd_write(priv, phy, 7, 0x8020, 0xa000);
-+      /* wait for all traffic end
-+        * 4096(pkt num)*1524(size)*8ns(125MHz)=49.9ms
-+        */
-+      mdelay(50);
-+
-+      /* check counter */
-+      tx_ok = ar40xx_phy_mmd_read(priv, phy, 7, 0x802e);
-+      tx_ok_high16 = ar40xx_phy_mmd_read(priv, phy, 7, 0x802d);
-+      tx_error = ar40xx_phy_mmd_read(priv, phy, 7, 0x802f);
-+      rx_ok = ar40xx_phy_mmd_read(priv, phy, 7, 0x802b);
-+      rx_ok_high16 = ar40xx_phy_mmd_read(priv, phy, 7, 0x802a);
-+      rx_error = ar40xx_phy_mmd_read(priv, phy, 7, 0x802c);
-+      tx_all_ok = tx_ok + (tx_ok_high16 << 16);
-+      rx_all_ok = rx_ok + (rx_ok_high16 << 16);
-+      if (tx_all_ok == 0x1000 && tx_error == 0) {
-+              /* success */
-+              priv->phy_t_status &= (~BIT(phy));
-+      } else {
-+              pr_info("PHY %d single test PSGMII issue happen!\n", phy);
-+              priv->phy_t_status |= BIT(phy);
-+      }
-+
-+      mdiobus_write(bus, phy, 0x0, 0x1840);
-+}
-+
-+static void
-+ar40xx_psgmii_all_phy_testing(struct ar40xx_priv *priv)
-+{
-+      int phy, j;
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      mdiobus_write(bus, 0x1f, 0x0, 0x9000);
-+      mdiobus_write(bus, 0x1f, 0x0, 0x4140);
-+
-+      for (j = 0; j < AR40XX_PSGMII_CALB_NUM; j++) {
-+              for (phy = 0; phy < AR40XX_NUM_PORTS - 1; phy++) {
-+                      u16 status;
-+
-+                      status = mdiobus_read(bus, phy, 0x11);
-+                      if (!(status & BIT(10)))
-+                              break;
-+              }
-+
-+              if (phy >= (AR40XX_NUM_PORTS - 1))
-+                      break;
-+              /* The polling interva to check if the PHY link up or not */
-+              mdelay(8);
-+      }
-+      /* enable check */
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8029, 0x0000);
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8029, 0x0003);
-+
-+      /* start traffic */
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8020, 0xa000);
-+      /* wait for all traffic end
-+        * 4096(pkt num)*1524(size)*8ns(125MHz)=49.9ms
-+        */
-+      mdelay(50);
-+
-+      for (phy = 0; phy < AR40XX_NUM_PORTS - 1; phy++) {
-+              u32 tx_ok, tx_error;
-+              u32 rx_ok, rx_error;
-+              u32 tx_ok_high16;
-+              u32 rx_ok_high16;
-+              u32 tx_all_ok, rx_all_ok;
-+
-+              /* check counter */
-+              tx_ok = ar40xx_phy_mmd_read(priv, phy, 7, 0x802e);
-+              tx_ok_high16 = ar40xx_phy_mmd_read(priv, phy, 7, 0x802d);
-+              tx_error = ar40xx_phy_mmd_read(priv, phy, 7, 0x802f);
-+              rx_ok = ar40xx_phy_mmd_read(priv, phy, 7, 0x802b);
-+              rx_ok_high16 = ar40xx_phy_mmd_read(priv, phy, 7, 0x802a);
-+              rx_error = ar40xx_phy_mmd_read(priv, phy, 7, 0x802c);
-+              tx_all_ok = tx_ok + (tx_ok_high16<<16);
-+              rx_all_ok = rx_ok + (rx_ok_high16<<16);
-+              if (tx_all_ok == 0x1000 && tx_error == 0) {
-+                      /* success */
-+                      priv->phy_t_status &= ~BIT(phy + 8);
-+              } else {
-+                      pr_info("PHY%d test see issue!\n", phy);
-+                      priv->phy_t_status |= BIT(phy + 8);
-+              }
-+      }
-+
-+      pr_debug("PHY all test 0x%x \r\n", priv->phy_t_status);
-+}
-+
-+void
-+ar40xx_psgmii_self_test(struct ar40xx_priv *priv)
-+{
-+      u32 i, phy;
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      ar40xx_malibu_psgmii_ess_reset(priv);
-+
-+      /* switch to access MII reg for copper */
-+      mdiobus_write(bus, 4, 0x1f, 0x8500);
-+      for (phy = 0; phy < AR40XX_NUM_PORTS - 1; phy++) {
-+              /*enable phy mdio broadcast write*/
-+              ar40xx_phy_mmd_write(priv, phy, 7, 0x8028, 0x801f);
-+      }
-+      /* force no link by power down */
-+      mdiobus_write(bus, 0x1f, 0x0, 0x1840);
-+      /*packet number*/
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8021, 0x1000);
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8062, 0x05e0);
-+
-+      /*fix mdi status */
-+      mdiobus_write(bus, 0x1f, 0x10, 0x6800);
-+      for (i = 0; i < AR40XX_PSGMII_CALB_NUM; i++) {
-+              priv->phy_t_status = 0;
-+
-+              for (phy = 0; phy < AR40XX_NUM_PORTS - 1; phy++) {
-+                      ar40xx_rmw(priv, AR40XX_REG_PORT_LOOKUP(phy + 1),
-+                              AR40XX_PORT_LOOKUP_LOOPBACK,
-+                              AR40XX_PORT_LOOKUP_LOOPBACK);
-+              }
-+
-+              for (phy = 0; phy < AR40XX_NUM_PORTS - 1; phy++)
-+                      ar40xx_psgmii_single_phy_testing(priv, phy);
-+
-+              ar40xx_psgmii_all_phy_testing(priv);
-+
-+              if (priv->phy_t_status)
-+                      ar40xx_malibu_psgmii_ess_reset(priv);
-+              else
-+                      break;
-+      }
-+
-+      if (i >= AR40XX_PSGMII_CALB_NUM)
-+              pr_info("PSGMII cannot recover\n");
-+      else
-+              pr_debug("PSGMII recovered after %d times reset\n", i);
-+
-+      /* configuration recover */
-+      /* packet number */
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8021, 0x0);
-+      /* disable check */
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8029, 0x0);
-+      /* disable traffic */
-+      ar40xx_phy_mmd_write(priv, 0x1f, 7, 0x8020, 0x0);
-+}
-+
-+void
-+ar40xx_psgmii_self_test_clean(struct ar40xx_priv *priv)
-+{
-+      int phy;
-+      struct mii_bus *bus = priv->mii_bus;
-+
-+      /* disable phy internal loopback */
-+      mdiobus_write(bus, 0x1f, 0x10, 0x6860);
-+      mdiobus_write(bus, 0x1f, 0x0, 0x9040);
-+
-+      for (phy = 0; phy < AR40XX_NUM_PORTS - 1; phy++) {
-+              /* disable mac loop back */
-+              ar40xx_rmw(priv, AR40XX_REG_PORT_LOOKUP(phy + 1),
-+                              AR40XX_PORT_LOOKUP_LOOPBACK, 0);
-+              /* disable phy mdio broadcast write */
-+              ar40xx_phy_mmd_write(priv, phy, 7, 0x8028, 0x001f);
-+      }
-+
-+      /* clear fdb entry */
-+      ar40xx_atu_flush(priv);
-+}
-+
-+/* End of psgmii self test */
-+
-+static void
-+ar40xx_mac_mode_init(struct ar40xx_priv *priv, u32 mode)
-+{
-+      if (mode == PORT_WRAPPER_PSGMII) {
-+              ar40xx_psgmii_write(priv, AR40XX_PSGMII_MODE_CONTROL, 0x2200);
-+              ar40xx_psgmii_write(priv, AR40XX_PSGMIIPHY_TX_CONTROL, 0x8380);
-+      }
-+}
-+
-+static
-+int ar40xx_cpuport_setup(struct ar40xx_priv *priv)
-+{
-+      u32 t;
-+
-+      t = AR40XX_PORT_STATUS_TXFLOW |
-+           AR40XX_PORT_STATUS_RXFLOW |
-+           AR40XX_PORT_TXHALF_FLOW |
-+           AR40XX_PORT_DUPLEX |
-+           AR40XX_PORT_SPEED_1000M;
-+      ar40xx_write(priv, AR40XX_REG_PORT_STATUS(0), t);
-+      usleep_range(10, 20);
-+
-+      t |= AR40XX_PORT_TX_EN |
-+             AR40XX_PORT_RX_EN;
-+      ar40xx_write(priv, AR40XX_REG_PORT_STATUS(0), t);
-+
-+      return 0;
-+}
-+
-+static void
-+ar40xx_init_port(struct ar40xx_priv *priv, int port)
-+{
-+      u32 t;
-+
-+      ar40xx_rmw(priv, AR40XX_REG_PORT_STATUS(port),
-+                      AR40XX_PORT_AUTO_LINK_EN, 0);
-+
-+      ar40xx_write(priv, AR40XX_REG_PORT_HEADER(port), 0);
-+
-+      ar40xx_write(priv, AR40XX_REG_PORT_VLAN0(port), 0);
-+
-+      t = AR40XX_PORT_VLAN1_OUT_MODE_UNTOUCH << AR40XX_PORT_VLAN1_OUT_MODE_S;
-+      ar40xx_write(priv, AR40XX_REG_PORT_VLAN1(port), t);
-+
-+      t = AR40XX_PORT_LOOKUP_LEARN;
-+      t |= AR40XX_PORT_STATE_FORWARD << AR40XX_PORT_LOOKUP_STATE_S;
-+      ar40xx_write(priv, AR40XX_REG_PORT_LOOKUP(port), t);
-+}
-+
-+void
-+ar40xx_init_globals(struct ar40xx_priv *priv)
-+{
-+      u32 t;
-+
-+      /* enable CPU port and disable mirror port */
-+      t = AR40XX_FWD_CTRL0_CPU_PORT_EN |
-+          AR40XX_FWD_CTRL0_MIRROR_PORT;
-+      ar40xx_write(priv, AR40XX_REG_FWD_CTRL0, t);
-+
-+      /* forward multicast and broadcast frames to CPU */
-+      t = (AR40XX_PORTS_ALL << AR40XX_FWD_CTRL1_UC_FLOOD_S) |
-+          (AR40XX_PORTS_ALL << AR40XX_FWD_CTRL1_MC_FLOOD_S) |
-+          (AR40XX_PORTS_ALL << AR40XX_FWD_CTRL1_BC_FLOOD_S);
-+      ar40xx_write(priv, AR40XX_REG_FWD_CTRL1, t);
-+
-+      /* enable jumbo frames */
-+      ar40xx_rmw(priv, AR40XX_REG_MAX_FRAME_SIZE,
-+                 AR40XX_MAX_FRAME_SIZE_MTU, 9018 + 8 + 2);
-+
-+      /* Enable MIB counters */
-+      ar40xx_rmw(priv, AR40XX_REG_MODULE_EN, 0,
-+                 AR40XX_MODULE_EN_MIB);
-+
-+      /* Disable AZ */
-+      ar40xx_write(priv, AR40XX_REG_EEE_CTRL, 0);
-+
-+      /* set flowctrl thershold for cpu port */
-+      t = (AR40XX_PORT0_FC_THRESH_ON_DFLT << 16) |
-+            AR40XX_PORT0_FC_THRESH_OFF_DFLT;
-+      ar40xx_write(priv, AR40XX_REG_PORT_FLOWCTRL_THRESH(0), t);
-+}
-+
-+static void
-+ar40xx_malibu_init(struct ar40xx_priv *priv)
-+{
-+      int i;
-+      struct mii_bus *bus;
-+      u16 val;
-+
-+      bus = priv->mii_bus;
-+
-+      /* war to enable AZ transmitting ability */
-+      ar40xx_phy_mmd_write(priv, AR40XX_PSGMII_ID, 1,
-+                           AR40XX_MALIBU_PSGMII_MODE_CTRL,
-+                           AR40XX_MALIBU_PHY_PSGMII_MODE_CTRL_ADJUST_VAL);
-+      for (i = 0; i < AR40XX_NUM_PORTS - 1; i++) {
-+              /* change malibu control_dac */
-+              val = ar40xx_phy_mmd_read(priv, i, 7,
-+                                        AR40XX_MALIBU_PHY_MMD7_DAC_CTRL);
-+              val &= ~AR40XX_MALIBU_DAC_CTRL_MASK;
-+              val |= AR40XX_MALIBU_DAC_CTRL_VALUE;
-+              ar40xx_phy_mmd_write(priv, i, 7,
-+                                   AR40XX_MALIBU_PHY_MMD7_DAC_CTRL, val);
-+              if (i == AR40XX_MALIBU_PHY_LAST_ADDR) {
-+                      /* to avoid goes into hibernation */
-+                      val = ar40xx_phy_mmd_read(priv, i, 3,
-+                                                AR40XX_MALIBU_PHY_RLP_CTRL);
-+                      val &= (~(1<<1));
-+                      ar40xx_phy_mmd_write(priv, i, 3,
-+                                           AR40XX_MALIBU_PHY_RLP_CTRL, val);
-+              }
-+      }
-+
-+      /* adjust psgmii serdes tx amp */
-+      mdiobus_write(bus, AR40XX_PSGMII_ID, AR40XX_PSGMII_TX_DRIVER_1_CTRL,
-+                    AR40XX_MALIBU_PHY_PSGMII_REDUCE_SERDES_TX_AMP);
-+}
-+
-+static int
-+ar40xx_hw_init(struct ar40xx_priv *priv)
-+{
-+      u32 i;
-+
-+      ar40xx_ess_reset(priv);
-+
-+      if (priv->mii_bus)
-+              ar40xx_malibu_init(priv);
-+      else
-+              return -1;
-+
-+      ar40xx_psgmii_self_test(priv);
-+      ar40xx_psgmii_self_test_clean(priv);
-+
-+      ar40xx_mac_mode_init(priv, priv->mac_mode);
-+
-+      for (i = 0; i < priv->dev.ports; i++)
-+              ar40xx_init_port(priv, i);
-+
-+      ar40xx_init_globals(priv);
-+
-+      return 0;
-+}
-+
-+/* Start of qm error WAR */
-+
-+static
-+int ar40xx_force_1g_full(struct ar40xx_priv *priv, u32 port_id)
-+{
-+      u32 reg;
-+
-+      if (port_id < 0 || port_id > 6)
-+              return -1;
-+
-+      reg = AR40XX_REG_PORT_STATUS(port_id);
-+      return ar40xx_rmw(priv, reg, AR40XX_PORT_SPEED,
-+                      (AR40XX_PORT_SPEED_1000M | AR40XX_PORT_DUPLEX));
-+}
-+
-+static
-+int ar40xx_get_qm_status(struct ar40xx_priv *priv,
-+                       u32 port_id, u32 *qm_buffer_err)
-+{
-+      u32 reg;
-+      u32 qm_val;
-+
-+      if (port_id < 1 || port_id > 5) {
-+              *qm_buffer_err = 0;
-+              return -1;
-+      }
-+
-+      if (port_id < 4) {
-+              reg = AR40XX_REG_QM_PORT0_3_QNUM;
-+              ar40xx_write(priv, AR40XX_REG_QM_DEBUG_ADDR, reg);
-+              qm_val = ar40xx_read(priv, AR40XX_REG_QM_DEBUG_VALUE);
-+              /* every 8 bits for each port */
-+              *qm_buffer_err = (qm_val >> (port_id * 8)) & 0xFF;
-+      } else {
-+              reg = AR40XX_REG_QM_PORT4_6_QNUM;
-+              ar40xx_write(priv, AR40XX_REG_QM_DEBUG_ADDR, reg);
-+              qm_val = ar40xx_read(priv, AR40XX_REG_QM_DEBUG_VALUE);
-+              /* every 8 bits for each port */
-+              *qm_buffer_err = (qm_val >> ((port_id-4) * 8)) & 0xFF;
-+      }
-+
-+      return 0;
-+}
-+
-+static void
-+ar40xx_sw_mac_polling_task(struct ar40xx_priv *priv)
-+{
-+      static int task_count;
-+      u32 i;
-+      u32 reg, value;
-+      u32 link, speed, duplex;
-+      u32 qm_buffer_err;
-+      u16 port_phy_status[AR40XX_NUM_PORTS];
-+      static u32 qm_err_cnt[AR40XX_NUM_PORTS] = {0, 0, 0, 0, 0, 0};
-+      static u32 link_cnt[AR40XX_NUM_PORTS] = {0, 0, 0, 0, 0, 0};
-+      struct mii_bus *bus = NULL;
-+
-+      if (!priv || !priv->mii_bus)
-+              return;
-+
-+      bus = priv->mii_bus;
-+
-+      ++task_count;
-+
-+      for (i = 1; i < AR40XX_NUM_PORTS; ++i) {
-+              port_phy_status[i] =
-+                      mdiobus_read(bus, i-1, AR40XX_PHY_SPEC_STATUS);
-+              speed = link = duplex = port_phy_status[i];
-+              speed &= AR40XX_PHY_SPEC_STATUS_SPEED;
-+              speed >>= 14;
-+              link &= AR40XX_PHY_SPEC_STATUS_LINK;
-+              link >>= 10;
-+              duplex &= AR40XX_PHY_SPEC_STATUS_DUPLEX;
-+              duplex >>= 13;
-+
-+              if (link != priv->ar40xx_port_old_link[i]) {
-+                      ++link_cnt[i];
-+                      /* Up --> Down */
-+                      if ((priv->ar40xx_port_old_link[i] ==
-+                                      AR40XX_PORT_LINK_UP) &&
-+                          (link == AR40XX_PORT_LINK_DOWN)) {
-+                              /* LINK_EN disable(MAC force mode)*/
-+                              reg = AR40XX_REG_PORT_STATUS(i);
-+                              ar40xx_rmw(priv, reg,
-+                                              AR40XX_PORT_AUTO_LINK_EN, 0);
-+
-+                              /* Check queue buffer */
-+                              qm_err_cnt[i] = 0;
-+                              ar40xx_get_qm_status(priv, i, &qm_buffer_err);
-+                              if (qm_buffer_err) {
-+                                      priv->ar40xx_port_qm_buf[i] =
-+                                              AR40XX_QM_NOT_EMPTY;
-+                              } else {
-+                                      u16 phy_val = 0;
-+
-+                                      priv->ar40xx_port_qm_buf[i] =
-+                                              AR40XX_QM_EMPTY;
-+                                      ar40xx_force_1g_full(priv, i);
-+                                      /* Ref:QCA8337 Datasheet,Clearing
-+                                       * MENU_CTRL_EN prevents phy to
-+                                       * stuck in 100BT mode when
-+                                       * bringing up the link
-+                                       */
-+                                      ar40xx_phy_dbg_read(priv, i-1,
-+                                                          AR40XX_PHY_DEBUG_0,
-+                                                          &phy_val);
-+                                      phy_val &= (~AR40XX_PHY_MANU_CTRL_EN);
-+                                      ar40xx_phy_dbg_write(priv, i-1,
-+                                                           AR40XX_PHY_DEBUG_0,
-+                                                           phy_val);
-+                              }
-+                              priv->ar40xx_port_old_link[i] = link;
-+                      } else if ((priv->ar40xx_port_old_link[i] ==
-+                                              AR40XX_PORT_LINK_DOWN) &&
-+                                      (link == AR40XX_PORT_LINK_UP)) {
-+                              /* Down --> Up */
-+                              if (priv->port_link_up[i] < 1) {
-+                                      ++priv->port_link_up[i];
-+                              } else {
-+                                      /* Change port status */
-+                                      reg = AR40XX_REG_PORT_STATUS(i);
-+                                      value = ar40xx_read(priv, reg);
-+                                      priv->port_link_up[i] = 0;
-+
-+                                      value &= ~(AR40XX_PORT_DUPLEX |
-+                                                 AR40XX_PORT_SPEED);
-+                                      value |= speed | (duplex ? BIT(6) : 0);
-+                                      ar40xx_write(priv, reg, value);
-+                                      /* clock switch need such time
-+                                       * to avoid glitch
-+                                       */
-+                                      usleep_range(100, 200);
-+
-+                                      value |= AR40XX_PORT_AUTO_LINK_EN;
-+                                      ar40xx_write(priv, reg, value);
-+                                      /* HW need such time to make sure link
-+                                       * stable before enable MAC
-+                                       */
-+                                      usleep_range(100, 200);
-+
-+                                      if (speed == AR40XX_PORT_SPEED_100M) {
-+                                              u16 phy_val = 0;
-+                                              /* Enable @100M, if down to 10M
-+                                               * clock will change smoothly
-+                                               */
-+                                              ar40xx_phy_dbg_read(priv, i-1,
-+                                                                  0,
-+                                                                  &phy_val);
-+                                              phy_val |=
-+                                                      AR40XX_PHY_MANU_CTRL_EN;
-+                                              ar40xx_phy_dbg_write(priv, i-1,
-+                                                                   0,
-+                                                                   phy_val);
-+                                      }
-+                                      priv->ar40xx_port_old_link[i] = link;
-+                              }
-+                      }
-+              }
-+
-+              if (priv->ar40xx_port_qm_buf[i] == AR40XX_QM_NOT_EMPTY) {
-+                      /* Check QM */
-+                      ar40xx_get_qm_status(priv, i, &qm_buffer_err);
-+                      if (qm_buffer_err) {
-+                              ++qm_err_cnt[i];
-+                      } else {
-+                              priv->ar40xx_port_qm_buf[i] =
-+                                              AR40XX_QM_EMPTY;
-+                              qm_err_cnt[i] = 0;
-+                              ar40xx_force_1g_full(priv, i);
-+                      }
-+              }
-+      }
-+}
-+
-+static void
-+ar40xx_qm_err_check_work_task(struct work_struct *work)
-+{
-+      struct ar40xx_priv *priv = container_of(work, struct ar40xx_priv,
-+                                      qm_dwork.work);
-+
-+      mutex_lock(&priv->qm_lock);
-+
-+      ar40xx_sw_mac_polling_task(priv);
-+
-+      mutex_unlock(&priv->qm_lock);
-+
-+      schedule_delayed_work(&priv->qm_dwork,
-+                            msecs_to_jiffies(AR40XX_QM_WORK_DELAY));
-+}
-+
-+static int
-+ar40xx_qm_err_check_work_start(struct ar40xx_priv *priv)
-+{
-+      mutex_init(&priv->qm_lock);
-+
-+      INIT_DELAYED_WORK(&priv->qm_dwork, ar40xx_qm_err_check_work_task);
-+
-+      schedule_delayed_work(&priv->qm_dwork,
-+                            msecs_to_jiffies(AR40XX_QM_WORK_DELAY));
-+
-+      return 0;
-+}
-+
-+/* End of qm error WAR */
-+
-+static int
-+ar40xx_vlan_init(struct ar40xx_priv *priv)
-+{
-+      int port;
-+      unsigned long bmp;
-+
-+      /* By default Enable VLAN */
-+      priv->vlan = 1;
-+      priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp;
-+      priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp;
-+      priv->vlan_tagged = priv->cpu_bmp;
-+      bmp = priv->lan_bmp;
-+      for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
-+                      priv->pvid[port] = AR40XX_LAN_VLAN;
-+
-+      bmp = priv->wan_bmp;
-+      for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
-+                      priv->pvid[port] = AR40XX_WAN_VLAN;
-+
-+      return 0;
-+}
-+
-+static void
-+ar40xx_mib_work_func(struct work_struct *work)
-+{
-+      struct ar40xx_priv *priv;
-+      int err;
-+
-+      priv = container_of(work, struct ar40xx_priv, mib_work.work);
-+
-+      mutex_lock(&priv->mib_lock);
-+
-+      err = ar40xx_mib_capture(priv);
-+      if (err)
-+              goto next_port;
-+
-+      ar40xx_mib_fetch_port_stat(priv, priv->mib_next_port, false);
-+
-+next_port:
-+      priv->mib_next_port++;
-+      if (priv->mib_next_port >= priv->dev.ports)
-+              priv->mib_next_port = 0;
-+
-+      mutex_unlock(&priv->mib_lock);
-+
-+      schedule_delayed_work(&priv->mib_work,
-+                            msecs_to_jiffies(AR40XX_MIB_WORK_DELAY));
-+}
-+
-+static void
-+ar40xx_setup_port(struct ar40xx_priv *priv, int port, u32 members)
-+{
-+      u32 t;
-+      u32 egress, ingress;
-+      u32 pvid = priv->vlan_id[priv->pvid[port]];
-+
-+      if (priv->vlan) {
-+              egress = AR40XX_PORT_VLAN1_OUT_MODE_UNMOD;
-+              ingress = AR40XX_IN_SECURE;
-+      } else {
-+              egress = AR40XX_PORT_VLAN1_OUT_MODE_UNTOUCH;
-+              ingress = AR40XX_IN_PORT_ONLY;
-+      }
-+
-+      t = pvid << AR40XX_PORT_VLAN0_DEF_SVID_S;
-+      t |= pvid << AR40XX_PORT_VLAN0_DEF_CVID_S;
-+      ar40xx_write(priv, AR40XX_REG_PORT_VLAN0(port), t);
-+
-+      t = AR40XX_PORT_VLAN1_PORT_VLAN_PROP;
-+      t |= egress << AR40XX_PORT_VLAN1_OUT_MODE_S;
-+      ar40xx_write(priv, AR40XX_REG_PORT_VLAN1(port), t);
-+
-+      t = members;
-+      t |= AR40XX_PORT_LOOKUP_LEARN;
-+      t |= ingress << AR40XX_PORT_LOOKUP_IN_MODE_S;
-+      t |= AR40XX_PORT_STATE_FORWARD << AR40XX_PORT_LOOKUP_STATE_S;
-+      ar40xx_write(priv, AR40XX_REG_PORT_LOOKUP(port), t);
-+}
-+
-+static void
-+ar40xx_vtu_op(struct ar40xx_priv *priv, u32 op, u32 val)
-+{
-+      if (ar40xx_wait_bit(priv, AR40XX_REG_VTU_FUNC1,
-+                          AR40XX_VTU_FUNC1_BUSY, 0))
-+              return;
-+
-+      if ((op & AR40XX_VTU_FUNC1_OP) == AR40XX_VTU_FUNC1_OP_LOAD)
-+              ar40xx_write(priv, AR40XX_REG_VTU_FUNC0, val);
-+
-+      op |= AR40XX_VTU_FUNC1_BUSY;
-+      ar40xx_write(priv, AR40XX_REG_VTU_FUNC1, op);
-+}
-+
-+static void
-+ar40xx_vtu_load_vlan(struct ar40xx_priv *priv, u32 vid, u32 port_mask)
-+{
-+      u32 op;
-+      u32 val;
-+      int i;
-+
-+      op = AR40XX_VTU_FUNC1_OP_LOAD | (vid << AR40XX_VTU_FUNC1_VID_S);
-+      val = AR40XX_VTU_FUNC0_VALID | AR40XX_VTU_FUNC0_IVL;
-+      for (i = 0; i < AR40XX_NUM_PORTS; i++) {
-+              u32 mode;
-+
-+              if ((port_mask & BIT(i)) == 0)
-+                      mode = AR40XX_VTU_FUNC0_EG_MODE_NOT;
-+              else if (priv->vlan == 0)
-+                      mode = AR40XX_VTU_FUNC0_EG_MODE_KEEP;
-+              else if ((priv->vlan_tagged & BIT(i)) ||
-+                       (priv->vlan_id[priv->pvid[i]] != vid))
-+                      mode = AR40XX_VTU_FUNC0_EG_MODE_TAG;
-+              else
-+                      mode = AR40XX_VTU_FUNC0_EG_MODE_UNTAG;
-+
-+              val |= mode << AR40XX_VTU_FUNC0_EG_MODE_S(i);
-+      }
-+      ar40xx_vtu_op(priv, op, val);
-+}
-+
-+static void
-+ar40xx_vtu_flush(struct ar40xx_priv *priv)
-+{
-+      ar40xx_vtu_op(priv, AR40XX_VTU_FUNC1_OP_FLUSH, 0);
-+}
-+
-+static int
-+ar40xx_sw_hw_apply(struct switch_dev *dev)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      u8 portmask[AR40XX_NUM_PORTS];
-+      int i, j;
-+
-+      mutex_lock(&priv->reg_mutex);
-+      /* flush all vlan entries */
-+      ar40xx_vtu_flush(priv);
-+
-+      memset(portmask, 0, sizeof(portmask));
-+      if (priv->vlan) {
-+              for (j = 0; j < AR40XX_MAX_VLANS; j++) {
-+                      u8 vp = priv->vlan_table[j];
-+
-+                      if (!vp)
-+                              continue;
-+
-+                      for (i = 0; i < dev->ports; i++) {
-+                              u8 mask = BIT(i);
-+
-+                              if (vp & mask)
-+                                      portmask[i] |= vp & ~mask;
-+                      }
-+
-+                      ar40xx_vtu_load_vlan(priv, priv->vlan_id[j],
-+                                           priv->vlan_table[j]);
-+              }
-+      } else {
-+              /* 8021q vlan disabled */
-+              for (i = 0; i < dev->ports; i++) {
-+                      if (i == AR40XX_PORT_CPU)
-+                              continue;
-+
-+                      portmask[i] = BIT(AR40XX_PORT_CPU);
-+                      portmask[AR40XX_PORT_CPU] |= BIT(i);
-+              }
-+      }
-+
-+      /* update the port destination mask registers and tag settings */
-+      for (i = 0; i < dev->ports; i++)
-+              ar40xx_setup_port(priv, i, portmask[i]);
-+
-+      ar40xx_set_mirror_regs(priv);
-+
-+      mutex_unlock(&priv->reg_mutex);
-+      return 0;
-+}
-+
-+static int
-+ar40xx_sw_reset_switch(struct switch_dev *dev)
-+{
-+      struct ar40xx_priv *priv = swdev_to_ar40xx(dev);
-+      int i, rv;
-+
-+      mutex_lock(&priv->reg_mutex);
-+      memset(&priv->vlan, 0, sizeof(struct ar40xx_priv) -
-+              offsetof(struct ar40xx_priv, vlan));
-+
-+      for (i = 0; i < AR40XX_MAX_VLANS; i++)
-+              priv->vlan_id[i] = i;
-+
-+      ar40xx_vlan_init(priv);
-+
-+      priv->mirror_rx = false;
-+      priv->mirror_tx = false;
-+      priv->source_port = 0;
-+      priv->monitor_port = 0;
-+
-+      mutex_unlock(&priv->reg_mutex);
-+
-+      rv = ar40xx_sw_hw_apply(dev);
-+      return rv;
-+}
-+
-+static int
-+ar40xx_start(struct ar40xx_priv *priv)
-+{
-+      int ret;
-+
-+      ret = ar40xx_hw_init(priv);
-+      if (ret)
-+              return ret;
-+
-+      ret = ar40xx_sw_reset_switch(&priv->dev);
-+      if (ret)
-+              return ret;
-+
-+      /* at last, setup cpu port */
-+      ret = ar40xx_cpuport_setup(priv);
-+      if (ret)
-+              return ret;
-+
-+      schedule_delayed_work(&priv->mib_work,
-+                            msecs_to_jiffies(AR40XX_MIB_WORK_DELAY));
-+
-+      ar40xx_qm_err_check_work_start(priv);
-+
-+      return 0;
-+}
-+
-+static const struct switch_dev_ops ar40xx_sw_ops = {
-+      .attr_global = {
-+              .attr = ar40xx_sw_attr_globals,
-+              .n_attr = ARRAY_SIZE(ar40xx_sw_attr_globals),
-+      },
-+      .attr_port = {
-+              .attr = ar40xx_sw_attr_port,
-+              .n_attr = ARRAY_SIZE(ar40xx_sw_attr_port),
-+      },
-+      .attr_vlan = {
-+              .attr = ar40xx_sw_attr_vlan,
-+              .n_attr = ARRAY_SIZE(ar40xx_sw_attr_vlan),
-+      },
-+      .get_port_pvid = ar40xx_sw_get_pvid,
-+      .set_port_pvid = ar40xx_sw_set_pvid,
-+      .get_vlan_ports = ar40xx_sw_get_ports,
-+      .set_vlan_ports = ar40xx_sw_set_ports,
-+      .apply_config = ar40xx_sw_hw_apply,
-+      .reset_switch = ar40xx_sw_reset_switch,
-+      .get_port_link = ar40xx_sw_get_port_link,
-+};
-+
-+/* Start of phy driver support */
-+
-+static const u32 ar40xx_phy_ids[] = {
-+      0x004dd0b1,
-+      0x004dd0b2, /* AR40xx */
-+};
-+
-+static bool
-+ar40xx_phy_match(u32 phy_id)
-+{
-+      int i;
-+
-+      for (i = 0; i < ARRAY_SIZE(ar40xx_phy_ids); i++)
-+              if (phy_id == ar40xx_phy_ids[i])
-+                      return true;
-+
-+      return false;
-+}
-+
-+static bool
-+is_ar40xx_phy(struct mii_bus *bus)
-+{
-+      unsigned i;
-+
-+      for (i = 0; i < 4; i++) {
-+              u32 phy_id;
-+
-+              phy_id = mdiobus_read(bus, i, MII_PHYSID1) << 16;
-+              phy_id |= mdiobus_read(bus, i, MII_PHYSID2);
-+              if (!ar40xx_phy_match(phy_id))
-+                      return false;
-+      }
-+
-+      return true;
-+}
-+
-+static int
-+ar40xx_phy_probe(struct phy_device *phydev)
-+{
-+      if (!is_ar40xx_phy(phydev->mdio.bus))
-+              return -ENODEV;
-+
-+      ar40xx_priv->mii_bus = phydev->mdio.bus;
-+      phydev->priv = ar40xx_priv;
-+      if (phydev->mdio.addr == 0)
-+              ar40xx_priv->phy = phydev;
-+
-+      phydev->supported |= SUPPORTED_1000baseT_Full;
-+      phydev->advertising |= ADVERTISED_1000baseT_Full;
-+      return 0;
-+}
-+
-+static void
-+ar40xx_phy_remove(struct phy_device *phydev)
-+{
-+      ar40xx_priv->mii_bus = NULL;
-+      phydev->priv = NULL;
-+}
-+
-+static int
-+ar40xx_phy_config_init(struct phy_device *phydev)
-+{
-+      return 0;
-+}
-+
-+static int
-+ar40xx_phy_read_status(struct phy_device *phydev)
-+{
-+      if (phydev->mdio.addr != 0)
-+              return genphy_read_status(phydev);
-+
-+      return 0;
-+}
-+
-+static int
-+ar40xx_phy_config_aneg(struct phy_device *phydev)
-+{
-+      if (phydev->mdio.addr == 0)
-+              return 0;
-+
-+      return genphy_config_aneg(phydev);
-+}
-+
-+static struct phy_driver ar40xx_phy_driver = {
-+      .phy_id         = 0x004d0000,
-+      .name           = "QCA Malibu",
-+      .phy_id_mask    = 0xffff0000,
-+      .features       = PHY_BASIC_FEATURES,
-+      .probe          = ar40xx_phy_probe,
-+      .remove         = ar40xx_phy_remove,
-+      .config_init    = ar40xx_phy_config_init,
-+      .config_aneg    = ar40xx_phy_config_aneg,
-+      .read_status    = ar40xx_phy_read_status,
-+};
-+
-+static uint16_t ar40xx_gpio_get_phy(unsigned int offset)
-+{
-+      return offset / 4;
-+}
-+
-+static uint16_t ar40xx_gpio_get_reg(unsigned int offset)
-+{
-+      return 0x8074 + offset % 4;
-+}
-+
-+static void ar40xx_gpio_set(struct gpio_chip *gc, unsigned int offset,
-+                          int value)
-+{
-+      struct ar40xx_priv *priv = gpiochip_get_data(gc);
-+
-+      ar40xx_phy_mmd_write(priv, ar40xx_gpio_get_phy(offset), 0x7,
-+                           ar40xx_gpio_get_reg(offset),
-+                           value ? 0xA000 : 0x8000);
-+}
-+
-+static int ar40xx_gpio_get(struct gpio_chip *gc, unsigned offset)
-+{
-+      struct ar40xx_priv *priv = gpiochip_get_data(gc);
-+
-+      return ar40xx_phy_mmd_read(priv, ar40xx_gpio_get_phy(offset), 0x7,
-+                                 ar40xx_gpio_get_reg(offset)) == 0xA000;
-+}
-+
-+static int ar40xx_gpio_get_dir(struct gpio_chip *gc, unsigned offset)
-+{
-+      return 0; /* only out direction */
-+}
-+
-+static int ar40xx_gpio_dir_out(struct gpio_chip *gc, unsigned offset,
-+                             int value)
-+{
-+      /*
-+       * the direction out value is used to set the initial value.
-+       * support of this function is required by leds-gpio.c
-+       */
-+      ar40xx_gpio_set(gc, offset, value);
-+      return 0;
-+}
-+
-+static void ar40xx_register_gpio(struct device *pdev,
-+                               struct ar40xx_priv *priv,
-+                               struct device_node *switch_node)
-+{
-+      struct gpio_chip *gc;
-+      int err;
-+
-+      gc = devm_kzalloc(pdev, sizeof(*gc), GFP_KERNEL);
-+      if (!gc)
-+              return;
-+
-+      gc->label = "ar40xx_gpio",
-+      gc->base = -1,
-+      gc->ngpio = 5 /* mmd 0 - 4 */ * 4 /* 0x8074 - 0x8077 */,
-+      gc->parent = pdev;
-+      gc->owner = THIS_MODULE;
-+
-+      gc->get_direction = ar40xx_gpio_get_dir;
-+      gc->direction_output = ar40xx_gpio_dir_out;
-+      gc->get = ar40xx_gpio_get;
-+      gc->set = ar40xx_gpio_set;
-+      gc->can_sleep = true;
-+      gc->label = priv->dev.name;
-+      gc->of_node = switch_node;
-+
-+      err = devm_gpiochip_add_data(pdev, gc, priv);
-+      if (err != 0)
-+              dev_err(pdev, "Failed to register gpio %d.\n", err);
-+}
-+
-+/* End of phy driver support */
-+
-+/* Platform driver probe function */
-+
-+static int ar40xx_probe(struct platform_device *pdev)
-+{
-+      struct device_node *switch_node;
-+      struct device_node *psgmii_node;
-+      const __be32 *mac_mode;
-+      struct clk *ess_clk;
-+      struct switch_dev *swdev;
-+      struct ar40xx_priv *priv;
-+      u32 len;
-+      u32 num_mibs;
-+      struct resource psgmii_base = {0};
-+      struct resource switch_base = {0};
-+      int ret;
-+
-+      priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-+      if (!priv)
-+              return -ENOMEM;
-+
-+      platform_set_drvdata(pdev, priv);
-+      ar40xx_priv = priv;
-+
-+      switch_node = of_node_get(pdev->dev.of_node);
-+      if (of_address_to_resource(switch_node, 0, &switch_base) != 0)
-+              return -EIO;
-+
-+      priv->hw_addr = devm_ioremap_resource(&pdev->dev, &switch_base);
-+      if (IS_ERR(priv->hw_addr)) {
-+              dev_err(&pdev->dev, "Failed to ioremap switch_base!\n");
-+              return PTR_ERR(priv->hw_addr);
-+      }
-+
-+      /*psgmii dts get*/
-+      psgmii_node = of_find_node_by_name(NULL, "ess-psgmii");
-+      if (!psgmii_node) {
-+              dev_err(&pdev->dev, "Failed to find ess-psgmii node!\n");
-+              return -EINVAL;
-+      }
-+
-+      if (of_address_to_resource(psgmii_node, 0, &psgmii_base) != 0)
-+              return -EIO;
-+
-+      priv->psgmii_hw_addr = devm_ioremap_resource(&pdev->dev, &psgmii_base);
-+      if (IS_ERR(priv->psgmii_hw_addr)) {
-+              dev_err(&pdev->dev, "psgmii ioremap fail!\n");
-+              return PTR_ERR(priv->psgmii_hw_addr);
-+      }
-+
-+      mac_mode = of_get_property(switch_node, "switch_mac_mode", &len);
-+      if (!mac_mode) {
-+              dev_err(&pdev->dev, "Failed to read switch_mac_mode\n");
-+              return -EINVAL;
-+      }
-+      priv->mac_mode = be32_to_cpup(mac_mode);
-+
-+      ess_clk = of_clk_get_by_name(switch_node, "ess_clk");
-+      if (ess_clk)
-+              clk_prepare_enable(ess_clk);
-+
-+      priv->ess_rst = devm_reset_control_get(&pdev->dev, "ess_rst");
-+      if (IS_ERR(priv->ess_rst)) {
-+              dev_err(&pdev->dev, "Failed to get ess_rst control!\n");
-+              return PTR_ERR(priv->ess_rst);
-+      }
-+
-+      if (of_property_read_u32(switch_node, "switch_cpu_bmp",
-+                               &priv->cpu_bmp) ||
-+          of_property_read_u32(switch_node, "switch_lan_bmp",
-+                               &priv->lan_bmp) ||
-+          of_property_read_u32(switch_node, "switch_wan_bmp",
-+                               &priv->wan_bmp)) {
-+              dev_err(&pdev->dev, "Failed to read port properties\n");
-+              return -EIO;
-+      }
-+
-+      ret = phy_driver_register(&ar40xx_phy_driver, THIS_MODULE);
-+      if (ret) {
-+              dev_err(&pdev->dev, "Failed to register ar40xx phy driver!\n");
-+              return -EIO;
-+      }
-+
-+      mutex_init(&priv->reg_mutex);
-+      mutex_init(&priv->mib_lock);
-+      INIT_DELAYED_WORK(&priv->mib_work, ar40xx_mib_work_func);
-+
-+      /* register switch */
-+      swdev = &priv->dev;
-+
-+      swdev->alias = dev_name(&priv->mii_bus->dev);
-+
-+      swdev->cpu_port = AR40XX_PORT_CPU;
-+      swdev->name = "QCA AR40xx";
-+      swdev->vlans = AR40XX_MAX_VLANS;
-+      swdev->ports = AR40XX_NUM_PORTS;
-+      swdev->ops = &ar40xx_sw_ops;
-+      ret = register_switch(swdev, NULL);
-+      if (ret)
-+              goto err_unregister_phy;
-+
-+      num_mibs = ARRAY_SIZE(ar40xx_mibs);
-+      len = priv->dev.ports * num_mibs *
-+            sizeof(*priv->mib_stats);
-+      priv->mib_stats = devm_kzalloc(&pdev->dev, len, GFP_KERNEL);
-+      if (!priv->mib_stats) {
-+              ret = -ENOMEM;
-+              goto err_unregister_switch;
-+      }
-+
-+      ar40xx_start(priv);
-+
-+      if (of_property_read_bool(switch_node, "gpio-controller"))
-+              ar40xx_register_gpio(&pdev->dev, ar40xx_priv, switch_node);
-+
-+      return 0;
-+
-+err_unregister_switch:
-+      unregister_switch(&priv->dev);
-+err_unregister_phy:
-+      phy_driver_unregister(&ar40xx_phy_driver);
-+      platform_set_drvdata(pdev, NULL);
-+      return ret;
-+}
-+
-+static int ar40xx_remove(struct platform_device *pdev)
-+{
-+      struct ar40xx_priv *priv = platform_get_drvdata(pdev);
-+
-+      cancel_delayed_work_sync(&priv->qm_dwork);
-+      cancel_delayed_work_sync(&priv->mib_work);
-+
-+      unregister_switch(&priv->dev);
-+
-+      phy_driver_unregister(&ar40xx_phy_driver);
-+
-+      return 0;
-+}
-+
-+static const struct of_device_id ar40xx_of_mtable[] = {
-+      {.compatible = "qcom,ess-switch" },
-+      {}
-+};
-+
-+struct platform_driver ar40xx_drv = {
-+      .probe = ar40xx_probe,
-+      .remove = ar40xx_remove,
-+      .driver = {
-+              .name    = "ar40xx",
-+              .of_match_table = ar40xx_of_mtable,
-+      },
-+};
-+
-+module_platform_driver(ar40xx_drv);
-+
-+MODULE_DESCRIPTION("IPQ40XX ESS driver");
-+MODULE_LICENSE("Dual BSD/GPL");
---- /dev/null
-+++ b/drivers/net/phy/ar40xx.h
-@@ -0,0 +1,337 @@
-+/*
-+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+ #ifndef __AR40XX_H
-+#define __AR40XX_H
-+
-+#define AR40XX_MAX_VLANS      128
-+#define AR40XX_NUM_PORTS      6
-+#define AR40XX_NUM_PHYS       5
-+
-+#define BITS(_s, _n)  (((1UL << (_n)) - 1) << _s)
-+
-+struct ar40xx_priv {
-+      struct switch_dev dev;
-+
-+      u8  __iomem      *hw_addr;
-+      u8  __iomem      *psgmii_hw_addr;
-+      u32 mac_mode;
-+      struct reset_control *ess_rst;
-+      u32 cpu_bmp;
-+      u32 lan_bmp;
-+      u32 wan_bmp;
-+
-+      struct mii_bus *mii_bus;
-+      struct phy_device *phy;
-+
-+      /* mutex for qm task */
-+      struct mutex qm_lock;
-+      struct delayed_work qm_dwork;
-+      u32 port_link_up[AR40XX_NUM_PORTS];
-+      u32 ar40xx_port_old_link[AR40XX_NUM_PORTS];
-+      u32 ar40xx_port_qm_buf[AR40XX_NUM_PORTS];
-+
-+      u32 phy_t_status;
-+
-+      /* mutex for switch reg access */
-+      struct mutex reg_mutex;
-+
-+      /* mutex for mib task */
-+      struct mutex mib_lock;
-+      struct delayed_work mib_work;
-+      int mib_next_port;
-+      u64 *mib_stats;
-+
-+      char buf[2048];
-+
-+      /* all fields below will be cleared on reset */
-+      bool vlan;
-+      u16 vlan_id[AR40XX_MAX_VLANS];
-+      u8 vlan_table[AR40XX_MAX_VLANS];
-+      u8 vlan_tagged;
-+      u16 pvid[AR40XX_NUM_PORTS];
-+
-+      /* mirror */
-+      bool mirror_rx;
-+      bool mirror_tx;
-+      int source_port;
-+      int monitor_port;
-+};
-+
-+#define AR40XX_PORT_LINK_UP 1
-+#define AR40XX_PORT_LINK_DOWN 0
-+#define AR40XX_QM_NOT_EMPTY  1
-+#define AR40XX_QM_EMPTY  0
-+
-+#define AR40XX_LAN_VLAN       1
-+#define AR40XX_WAN_VLAN       2
-+
-+enum ar40xx_port_wrapper_cfg {
-+      PORT_WRAPPER_PSGMII = 0,
-+};
-+
-+struct ar40xx_mib_desc {
-+      u32 size;
-+      u32 offset;
-+      const char *name;
-+};
-+
-+#define AR40XX_PORT_CPU       0
-+
-+#define AR40XX_PSGMII_MODE_CONTROL    0x1b4
-+#define   AR40XX_PSGMII_ATHR_CSCO_MODE_25M    BIT(0)
-+
-+#define AR40XX_PSGMIIPHY_TX_CONTROL    0x288
-+
-+#define AR40XX_MII_ATH_MMD_ADDR               0x0d
-+#define AR40XX_MII_ATH_MMD_DATA               0x0e
-+#define AR40XX_MII_ATH_DBG_ADDR               0x1d
-+#define AR40XX_MII_ATH_DBG_DATA               0x1e
-+
-+#define AR40XX_STATS_RXBROAD          0x00
-+#define AR40XX_STATS_RXPAUSE          0x04
-+#define AR40XX_STATS_RXMULTI          0x08
-+#define AR40XX_STATS_RXFCSERR         0x0c
-+#define AR40XX_STATS_RXALIGNERR               0x10
-+#define AR40XX_STATS_RXRUNT           0x14
-+#define AR40XX_STATS_RXFRAGMENT               0x18
-+#define AR40XX_STATS_RX64BYTE         0x1c
-+#define AR40XX_STATS_RX128BYTE                0x20
-+#define AR40XX_STATS_RX256BYTE                0x24
-+#define AR40XX_STATS_RX512BYTE                0x28
-+#define AR40XX_STATS_RX1024BYTE               0x2c
-+#define AR40XX_STATS_RX1518BYTE               0x30
-+#define AR40XX_STATS_RXMAXBYTE                0x34
-+#define AR40XX_STATS_RXTOOLONG                0x38
-+#define AR40XX_STATS_RXGOODBYTE               0x3c
-+#define AR40XX_STATS_RXBADBYTE                0x44
-+#define AR40XX_STATS_RXOVERFLOW               0x4c
-+#define AR40XX_STATS_FILTERED         0x50
-+#define AR40XX_STATS_TXBROAD          0x54
-+#define AR40XX_STATS_TXPAUSE          0x58
-+#define AR40XX_STATS_TXMULTI          0x5c
-+#define AR40XX_STATS_TXUNDERRUN               0x60
-+#define AR40XX_STATS_TX64BYTE         0x64
-+#define AR40XX_STATS_TX128BYTE                0x68
-+#define AR40XX_STATS_TX256BYTE                0x6c
-+#define AR40XX_STATS_TX512BYTE                0x70
-+#define AR40XX_STATS_TX1024BYTE               0x74
-+#define AR40XX_STATS_TX1518BYTE               0x78
-+#define AR40XX_STATS_TXMAXBYTE                0x7c
-+#define AR40XX_STATS_TXOVERSIZE               0x80
-+#define AR40XX_STATS_TXBYTE           0x84
-+#define AR40XX_STATS_TXCOLLISION      0x8c
-+#define AR40XX_STATS_TXABORTCOL               0x90
-+#define AR40XX_STATS_TXMULTICOL               0x94
-+#define AR40XX_STATS_TXSINGLECOL      0x98
-+#define AR40XX_STATS_TXEXCDEFER               0x9c
-+#define AR40XX_STATS_TXDEFER          0xa0
-+#define AR40XX_STATS_TXLATECOL                0xa4
-+
-+#define AR40XX_REG_MODULE_EN                  0x030
-+#define   AR40XX_MODULE_EN_MIB                        BIT(0)
-+
-+#define AR40XX_REG_MIB_FUNC                   0x034
-+#define   AR40XX_MIB_BUSY             BIT(17)
-+#define   AR40XX_MIB_CPU_KEEP                 BIT(20)
-+#define   AR40XX_MIB_FUNC             BITS(24, 3)
-+#define   AR40XX_MIB_FUNC_S           24
-+#define   AR40XX_MIB_FUNC_NO_OP               0x0
-+#define   AR40XX_MIB_FUNC_FLUSH               0x1
-+
-+#define AR40XX_REG_PORT_STATUS(_i)            (0x07c + (_i) * 4)
-+#define   AR40XX_PORT_SPEED                   BITS(0, 2)
-+#define   AR40XX_PORT_STATUS_SPEED_S  0
-+#define   AR40XX_PORT_TX_EN                   BIT(2)
-+#define   AR40XX_PORT_RX_EN                   BIT(3)
-+#define   AR40XX_PORT_STATUS_TXFLOW   BIT(4)
-+#define   AR40XX_PORT_STATUS_RXFLOW   BIT(5)
-+#define   AR40XX_PORT_DUPLEX                  BIT(6)
-+#define   AR40XX_PORT_TXHALF_FLOW             BIT(7)
-+#define   AR40XX_PORT_STATUS_LINK_UP  BIT(8)
-+#define   AR40XX_PORT_AUTO_LINK_EN            BIT(9)
-+#define   AR40XX_PORT_STATUS_FLOW_CONTROL  BIT(12)
-+
-+#define AR40XX_REG_MAX_FRAME_SIZE             0x078
-+#define   AR40XX_MAX_FRAME_SIZE_MTU           BITS(0, 14)
-+
-+#define AR40XX_REG_PORT_HEADER(_i)            (0x09c + (_i) * 4)
-+
-+#define AR40XX_REG_EEE_CTRL                   0x100
-+#define   AR40XX_EEE_CTRL_DISABLE_PHY(_i)     BIT(4 + (_i) * 2)
-+
-+#define AR40XX_REG_PORT_VLAN0(_i)             (0x420 + (_i) * 0x8)
-+#define   AR40XX_PORT_VLAN0_DEF_SVID          BITS(0, 12)
-+#define   AR40XX_PORT_VLAN0_DEF_SVID_S                0
-+#define   AR40XX_PORT_VLAN0_DEF_CVID          BITS(16, 12)
-+#define   AR40XX_PORT_VLAN0_DEF_CVID_S                16
-+
-+#define AR40XX_REG_PORT_VLAN1(_i)             (0x424 + (_i) * 0x8)
-+#define   AR40XX_PORT_VLAN1_PORT_VLAN_PROP    BIT(6)
-+#define   AR40XX_PORT_VLAN1_OUT_MODE          BITS(12, 2)
-+#define   AR40XX_PORT_VLAN1_OUT_MODE_S                12
-+#define   AR40XX_PORT_VLAN1_OUT_MODE_UNMOD    0
-+#define   AR40XX_PORT_VLAN1_OUT_MODE_UNTAG    1
-+#define   AR40XX_PORT_VLAN1_OUT_MODE_TAG              2
-+#define   AR40XX_PORT_VLAN1_OUT_MODE_UNTOUCH  3
-+
-+#define AR40XX_REG_VTU_FUNC0                  0x0610
-+#define   AR40XX_VTU_FUNC0_EG_MODE            BITS(4, 14)
-+#define   AR40XX_VTU_FUNC0_EG_MODE_S(_i)      (4 + (_i) * 2)
-+#define   AR40XX_VTU_FUNC0_EG_MODE_KEEP               0
-+#define   AR40XX_VTU_FUNC0_EG_MODE_UNTAG      1
-+#define   AR40XX_VTU_FUNC0_EG_MODE_TAG                2
-+#define   AR40XX_VTU_FUNC0_EG_MODE_NOT                3
-+#define   AR40XX_VTU_FUNC0_IVL                        BIT(19)
-+#define   AR40XX_VTU_FUNC0_VALID              BIT(20)
-+
-+#define AR40XX_REG_VTU_FUNC1                  0x0614
-+#define   AR40XX_VTU_FUNC1_OP                 BITS(0, 3)
-+#define   AR40XX_VTU_FUNC1_OP_NOOP            0
-+#define   AR40XX_VTU_FUNC1_OP_FLUSH           1
-+#define   AR40XX_VTU_FUNC1_OP_LOAD            2
-+#define   AR40XX_VTU_FUNC1_OP_PURGE           3
-+#define   AR40XX_VTU_FUNC1_OP_REMOVE_PORT     4
-+#define   AR40XX_VTU_FUNC1_OP_GET_NEXT                5
-+#define   AR40XX7_VTU_FUNC1_OP_GET_ONE                6
-+#define   AR40XX_VTU_FUNC1_FULL                       BIT(4)
-+#define   AR40XX_VTU_FUNC1_PORT                       BIT(8, 4)
-+#define   AR40XX_VTU_FUNC1_PORT_S             8
-+#define   AR40XX_VTU_FUNC1_VID                        BIT(16, 12)
-+#define   AR40XX_VTU_FUNC1_VID_S              16
-+#define   AR40XX_VTU_FUNC1_BUSY                       BIT(31)
-+
-+#define AR40XX_REG_FWD_CTRL0                  0x620
-+#define   AR40XX_FWD_CTRL0_CPU_PORT_EN                BIT(10)
-+#define   AR40XX_FWD_CTRL0_MIRROR_PORT                BITS(4, 4)
-+#define   AR40XX_FWD_CTRL0_MIRROR_PORT_S      4
-+
-+#define AR40XX_REG_FWD_CTRL1                  0x624
-+#define   AR40XX_FWD_CTRL1_UC_FLOOD           BITS(0, 7)
-+#define   AR40XX_FWD_CTRL1_UC_FLOOD_S         0
-+#define   AR40XX_FWD_CTRL1_MC_FLOOD           BITS(8, 7)
-+#define   AR40XX_FWD_CTRL1_MC_FLOOD_S         8
-+#define   AR40XX_FWD_CTRL1_BC_FLOOD           BITS(16, 7)
-+#define   AR40XX_FWD_CTRL1_BC_FLOOD_S         16
-+#define   AR40XX_FWD_CTRL1_IGMP                       BITS(24, 7)
-+#define   AR40XX_FWD_CTRL1_IGMP_S             24
-+
-+#define AR40XX_REG_PORT_LOOKUP(_i)            (0x660 + (_i) * 0xc)
-+#define   AR40XX_PORT_LOOKUP_MEMBER           BITS(0, 7)
-+#define   AR40XX_PORT_LOOKUP_IN_MODE          BITS(8, 2)
-+#define   AR40XX_PORT_LOOKUP_IN_MODE_S                8
-+#define   AR40XX_PORT_LOOKUP_STATE            BITS(16, 3)
-+#define   AR40XX_PORT_LOOKUP_STATE_S          16
-+#define   AR40XX_PORT_LOOKUP_LEARN            BIT(20)
-+#define   AR40XX_PORT_LOOKUP_LOOPBACK         BIT(21)
-+#define   AR40XX_PORT_LOOKUP_ING_MIRROR_EN    BIT(25)
-+
-+#define AR40XX_REG_ATU_FUNC                   0x60c
-+#define   AR40XX_ATU_FUNC_OP                  BITS(0, 4)
-+#define   AR40XX_ATU_FUNC_OP_NOOP             0x0
-+#define   AR40XX_ATU_FUNC_OP_FLUSH            0x1
-+#define   AR40XX_ATU_FUNC_OP_LOAD             0x2
-+#define   AR40XX_ATU_FUNC_OP_PURGE            0x3
-+#define   AR40XX_ATU_FUNC_OP_FLUSH_LOCKED     0x4
-+#define   AR40XX_ATU_FUNC_OP_FLUSH_UNICAST    0x5
-+#define   AR40XX_ATU_FUNC_OP_GET_NEXT         0x6
-+#define   AR40XX_ATU_FUNC_OP_SEARCH_MAC               0x7
-+#define   AR40XX_ATU_FUNC_OP_CHANGE_TRUNK     0x8
-+#define   AR40XX_ATU_FUNC_BUSY                        BIT(31)
-+
-+#define AR40XX_REG_QM_DEBUG_ADDR              0x820
-+#define AR40XX_REG_QM_DEBUG_VALUE             0x824
-+#define   AR40XX_REG_QM_PORT0_3_QNUM          0x1d
-+#define   AR40XX_REG_QM_PORT4_6_QNUM          0x1e
-+
-+#define AR40XX_REG_PORT_HOL_CTRL1(_i)         (0x974 + (_i) * 0x8)
-+#define   AR40XX_PORT_HOL_CTRL1_EG_MIRROR_EN  BIT(16)
-+
-+#define AR40XX_REG_PORT_FLOWCTRL_THRESH(_i)   (0x9b0 + (_i) * 0x4)
-+#define   AR40XX_PORT0_FC_THRESH_ON_DFLT      0x60
-+#define   AR40XX_PORT0_FC_THRESH_OFF_DFLT     0x90
-+
-+#define AR40XX_PHY_DEBUG_0   0
-+#define AR40XX_PHY_MANU_CTRL_EN  BIT(12)
-+
-+#define AR40XX_PHY_DEBUG_2   2
-+
-+#define AR40XX_PHY_SPEC_STATUS 0x11
-+#define   AR40XX_PHY_SPEC_STATUS_LINK         BIT(10)
-+#define   AR40XX_PHY_SPEC_STATUS_DUPLEX               BIT(13)
-+#define   AR40XX_PHY_SPEC_STATUS_SPEED                BITS(14, 2)
-+
-+/* port forwarding state */
-+enum {
-+      AR40XX_PORT_STATE_DISABLED = 0,
-+      AR40XX_PORT_STATE_BLOCK = 1,
-+      AR40XX_PORT_STATE_LISTEN = 2,
-+      AR40XX_PORT_STATE_LEARN = 3,
-+      AR40XX_PORT_STATE_FORWARD = 4
-+};
-+
-+/* ingress 802.1q mode */
-+enum {
-+      AR40XX_IN_PORT_ONLY = 0,
-+      AR40XX_IN_PORT_FALLBACK = 1,
-+      AR40XX_IN_VLAN_ONLY = 2,
-+      AR40XX_IN_SECURE = 3
-+};
-+
-+/* egress 802.1q mode */
-+enum {
-+      AR40XX_OUT_KEEP = 0,
-+      AR40XX_OUT_STRIP_VLAN = 1,
-+      AR40XX_OUT_ADD_VLAN = 2
-+};
-+
-+/* port speed */
-+enum {
-+      AR40XX_PORT_SPEED_10M = 0,
-+      AR40XX_PORT_SPEED_100M = 1,
-+      AR40XX_PORT_SPEED_1000M = 2,
-+      AR40XX_PORT_SPEED_ERR = 3,
-+};
-+
-+#define AR40XX_MIB_WORK_DELAY 2000 /* msecs */
-+
-+#define AR40XX_QM_WORK_DELAY    100
-+
-+#define   AR40XX_MIB_FUNC_CAPTURE     0x3
-+
-+#define AR40XX_REG_PORT_STATS_START   0x1000
-+#define AR40XX_REG_PORT_STATS_LEN             0x100
-+
-+#define AR40XX_PORTS_ALL      0x3f
-+
-+#define AR40XX_PSGMII_ID      5
-+#define AR40XX_PSGMII_CALB_NUM        100
-+#define AR40XX_MALIBU_PSGMII_MODE_CTRL        0x6d
-+#define AR40XX_MALIBU_PHY_PSGMII_MODE_CTRL_ADJUST_VAL 0x220c
-+#define AR40XX_MALIBU_PHY_MMD7_DAC_CTRL       0x801a
-+#define AR40XX_MALIBU_DAC_CTRL_MASK   0x380
-+#define AR40XX_MALIBU_DAC_CTRL_VALUE  0x280
-+#define AR40XX_MALIBU_PHY_RLP_CTRL       0x805a
-+#define AR40XX_PSGMII_TX_DRIVER_1_CTRL        0xb
-+#define AR40XX_MALIBU_PHY_PSGMII_REDUCE_SERDES_TX_AMP 0x8a
-+#define AR40XX_MALIBU_PHY_LAST_ADDR   4
-+
-+static inline struct ar40xx_priv *
-+swdev_to_ar40xx(struct switch_dev *swdev)
-+{
-+      return container_of(swdev, struct ar40xx_priv, dev);
-+}
-+
-+#endif
---- /dev/null
-+++ b/drivers/net/phy/mdio-ipq40xx.c
-@@ -0,0 +1,203 @@
-+/*
-+ * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/io.h>
-+#include <linux/of_address.h>
-+#include <linux/of_mdio.h>
-+#include <linux/phy.h>
-+#include <linux/platform_device.h>
-+
-+#define MDIO_CTRL_0_REG               0x40
-+#define MDIO_CTRL_1_REG               0x44
-+#define MDIO_CTRL_2_REG               0x48
-+#define MDIO_CTRL_3_REG               0x4c
-+#define MDIO_CTRL_4_REG               0x50
-+#define MDIO_CTRL_4_ACCESS_BUSY               BIT(16)
-+#define MDIO_CTRL_4_ACCESS_START              BIT(8)
-+#define MDIO_CTRL_4_ACCESS_CODE_READ          0
-+#define MDIO_CTRL_4_ACCESS_CODE_WRITE 1
-+#define CTRL_0_REG_DEFAULT_VALUE      0x150FF
-+
-+#define IPQ40XX_MDIO_RETRY    1000
-+#define IPQ40XX_MDIO_DELAY    10
-+
-+struct ipq40xx_mdio_data {
-+      struct mii_bus  *mii_bus;
-+      void __iomem    *membase;
-+      int             phy_irq[PHY_MAX_ADDR];
-+      struct device   *dev;
-+};
-+
-+static int ipq40xx_mdio_wait_busy(struct ipq40xx_mdio_data *am)
-+{
-+      int i;
-+
-+      for (i = 0; i < IPQ40XX_MDIO_RETRY; i++) {
-+              unsigned int busy;
-+
-+              busy = readl(am->membase + MDIO_CTRL_4_REG) &
-+                      MDIO_CTRL_4_ACCESS_BUSY;
-+              if (!busy)
-+                      return 0;
-+
-+              /* BUSY might take to be cleard by 15~20 times of loop */
-+              udelay(IPQ40XX_MDIO_DELAY);
-+      }
-+
-+      dev_err(am->dev, "%s: MDIO operation timed out\n", am->mii_bus->name);
-+
-+      return -ETIMEDOUT;
-+}
-+
-+static int ipq40xx_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
-+{
-+      struct ipq40xx_mdio_data *am = bus->priv;
-+      int value = 0;
-+      unsigned int cmd = 0;
-+
-+      lockdep_assert_held(&bus->mdio_lock);
-+
-+      if (ipq40xx_mdio_wait_busy(am))
-+              return -ETIMEDOUT;
-+
-+      /* issue the phy address and reg */
-+      writel((mii_id << 8) | regnum, am->membase + MDIO_CTRL_1_REG);
-+
-+      cmd = MDIO_CTRL_4_ACCESS_START|MDIO_CTRL_4_ACCESS_CODE_READ;
-+
-+      /* issue read command */
-+      writel(cmd, am->membase + MDIO_CTRL_4_REG);
-+
-+      /* Wait read complete */
-+      if (ipq40xx_mdio_wait_busy(am))
-+              return -ETIMEDOUT;
-+
-+      /* Read data */
-+      value = readl(am->membase + MDIO_CTRL_3_REG);
-+
-+      return value;
-+}
-+
-+static int ipq40xx_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
-+                          u16 value)
-+{
-+      struct ipq40xx_mdio_data *am = bus->priv;
-+      unsigned int cmd = 0;
-+
-+      lockdep_assert_held(&bus->mdio_lock);
-+
-+      if (ipq40xx_mdio_wait_busy(am))
-+              return -ETIMEDOUT;
-+
-+      /* issue the phy address and reg */
-+      writel((mii_id << 8) | regnum, am->membase + MDIO_CTRL_1_REG);
-+
-+      /* issue write data */
-+      writel(value, am->membase + MDIO_CTRL_2_REG);
-+
-+      cmd = MDIO_CTRL_4_ACCESS_START|MDIO_CTRL_4_ACCESS_CODE_WRITE;
-+      /* issue write command */
-+      writel(cmd, am->membase + MDIO_CTRL_4_REG);
-+
-+      /* Wait write complete */
-+      if (ipq40xx_mdio_wait_busy(am))
-+              return -ETIMEDOUT;
-+
-+      return 0;
-+}
-+
-+static int ipq40xx_mdio_probe(struct platform_device *pdev)
-+{
-+      struct ipq40xx_mdio_data *am;
-+      struct resource *res;
-+      int i;
-+
-+      am = devm_kzalloc(&pdev->dev, sizeof(*am), GFP_KERNEL);
-+      if (!am)
-+              return -ENOMEM;
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!res) {
-+              dev_err(&pdev->dev, "no iomem resource found\n");
-+              return -ENXIO;
-+      }
-+
-+      am->membase = devm_ioremap_resource(&pdev->dev, res);
-+      if (IS_ERR(am->membase)) {
-+              dev_err(&pdev->dev, "unable to ioremap registers\n");
-+              return PTR_ERR(am->membase);
-+      }
-+
-+      am->mii_bus = devm_mdiobus_alloc(&pdev->dev);
-+      if (!am->mii_bus)
-+              return  -ENOMEM;
-+
-+      writel(CTRL_0_REG_DEFAULT_VALUE, am->membase + MDIO_CTRL_0_REG);
-+
-+      am->mii_bus->name = "ipq40xx_mdio";
-+      am->mii_bus->read = ipq40xx_mdio_read;
-+      am->mii_bus->write = ipq40xx_mdio_write;
-+      am->mii_bus->priv = am;
-+      am->mii_bus->parent = &pdev->dev;
-+      snprintf(am->mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(&pdev->dev));
-+
-+      for (i = 0; i < PHY_MAX_ADDR; i++)
-+              am->phy_irq[i] = PHY_POLL;
-+
-+      memcpy(am->mii_bus->irq, am->phy_irq, sizeof(am->phy_irq));
-+      am->dev = &pdev->dev;
-+      platform_set_drvdata(pdev, am);
-+
-+      /* edma_axi_probe() use "am" drvdata.
-+       * ipq40xx_mdio_probe() must be called first.
-+       */
-+      return of_mdiobus_register(am->mii_bus, pdev->dev.of_node);
-+}
-+
-+static int ipq40xx_mdio_remove(struct platform_device *pdev)
-+{
-+      struct ipq40xx_mdio_data *am = platform_get_drvdata(pdev);
-+
-+      mdiobus_unregister(am->mii_bus);
-+      return 0;
-+}
-+
-+static const struct of_device_id ipq40xx_mdio_dt_ids[] = {
-+      { .compatible = "qcom,ipq4019-mdio" },
-+      { }
-+};
-+MODULE_DEVICE_TABLE(of, ipq40xx_mdio_dt_ids);
-+
-+static struct platform_driver ipq40xx_mdio_driver = {
-+      .probe = ipq40xx_mdio_probe,
-+      .remove = ipq40xx_mdio_remove,
-+      .driver = {
-+              .name = "ipq40xx-mdio",
-+              .of_match_table = ipq40xx_mdio_dt_ids,
-+      },
-+};
-+
-+module_platform_driver(ipq40xx_mdio_driver);
-+
-+#define DRV_VERSION     "1.0"
-+
-+MODULE_DESCRIPTION("IPQ40XX MDIO interface driver");
-+MODULE_AUTHOR("Qualcomm Atheros");
-+MODULE_VERSION(DRV_VERSION);
-+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/target/linux/ipq40xx/patches-4.19/701-dts-ipq4019-add-mdio-node.patch b/target/linux/ipq40xx/patches-4.19/701-dts-ipq4019-add-mdio-node.patch
deleted file mode 100644 (file)
index 0e1bb87..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 09ed737593f71bcca08a537a6c15264a1a6add08 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 20 Nov 2016 01:10:33 +0100
-Subject: [PATCH] dts: ipq4019: add mdio node for ethernet
-
-This patch adds the mdio device-tree node.
-This is where the switch is connected to, so it's needed
-for the ethernet interfaces.
-
-Note: The driver isn't anywhere close to be upstream,
-so the info might change.
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -566,6 +566,34 @@
-                       status = "disabled";
-               };
-+              mdio@90000 {
-+                      #address-cells = <1>;
-+                      #size-cells = <0>;
-+                      compatible = "qcom,ipq4019-mdio";
-+                      reg = <0x90000 0x64>;
-+                      status = "disabled";
-+
-+                      ethernet-phy@0 {
-+                              reg = <0>;
-+                      };
-+
-+                      ethernet-phy@1 {
-+                              reg = <1>;
-+                      };
-+
-+                      ethernet-phy@2 {
-+                              reg = <2>;
-+                      };
-+
-+                      ethernet-phy@3 {
-+                              reg = <3>;
-+                      };
-+
-+                      ethernet-phy@4 {
-+                              reg = <4>;
-+                      };
-+              };
-+
-               usb3_ss_phy: ssphy@9a000 {
-                       compatible = "qcom,usb-ss-ipq4019-phy";
-                       #phy-cells = <0>;
diff --git a/target/linux/ipq40xx/patches-4.19/702-dts-ipq4019-add-PHY-switch-nodes.patch b/target/linux/ipq40xx/patches-4.19/702-dts-ipq4019-add-PHY-switch-nodes.patch
deleted file mode 100644 (file)
index 03da6c8..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9deeec35dd3b628b95624e41d4e04acf728991ba Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 20 Nov 2016 02:20:54 +0100
-Subject: [PATCH] dts: ipq4019: add PHY/switch nodes
-
-This patch adds both the "qcom,ess-switch" and "qcom,ess-psgmii"
-nodes which are needed for the ar40xx.c driver to initialize the
-switch.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -594,6 +594,29 @@
-                       };
-               };
-+              ess-switch@c000000 {
-+                      compatible = "qcom,ess-switch";
-+                      reg = <0xc000000 0x80000>;
-+                      switch_access_mode = "local bus";
-+                      resets = <&gcc ESS_RESET>;
-+                      reset-names = "ess_rst";
-+                      clocks = <&gcc GCC_ESS_CLK>;
-+                      clock-names = "ess_clk";
-+                      switch_cpu_bmp = <0x1>;
-+                      switch_lan_bmp = <0x1e>;
-+                      switch_wan_bmp = <0x20>;
-+                      switch_mac_mode = <0>; /* PORT_WRAPPER_PSGMII */
-+                      switch_initvlas = <0x7c 0x54>;
-+                      status = "disabled";
-+              };
-+
-+              ess-psgmii@98000 {
-+                      compatible = "qcom,ess-psgmii";
-+                      reg = <0x98000 0x800>;
-+                      psgmii_access_mode = "local bus";
-+                      status = "disabled";
-+              };
-+
-               usb3_ss_phy: ssphy@9a000 {
-                       compatible = "qcom,usb-ss-ipq4019-phy";
-                       #phy-cells = <0>;
diff --git a/target/linux/ipq40xx/patches-4.19/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch b/target/linux/ipq40xx/patches-4.19/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch
deleted file mode 100644 (file)
index cc7e497..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7c129254adb1093d10a62ed7bf7b956fcc6ffe34 Mon Sep 17 00:00:00 2001
-From: Rakesh Nair <ranair@codeaurora.org>
-Date: Wed, 20 Jul 2016 15:02:01 +0530
-Subject: [PATCH] net: IPQ4019 needs rfs/vlan_tag callbacks in
- netdev_ops
-
-Add callback support to get default vlan tag and register
-receive flow steering filter.
-
-Used by IPQ4019 ess-edma driver.
-
-BUG=chrome-os-partner:33096
-TEST=none
-
-Change-Id: I266070e4a0fbe4a0d9966fe79a71e50ec4f26c75
-Signed-off-by: Rakesh Nair <ranair@codeaurora.org>
-Reviewed-on: https://chromium-review.googlesource.com/362203
-Commit-Ready: Grant Grundler <grundler@chromium.org>
-Tested-by: Grant Grundler <grundler@chromium.org>
-Reviewed-by: Grant Grundler <grundler@chromium.org>
----
- include/linux/netdevice.h | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -739,6 +739,16 @@ struct xps_map {
- #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \
-        - sizeof(struct xps_map)) / sizeof(u16))
-+#ifdef CONFIG_RFS_ACCEL
-+typedef int (*set_rfs_filter_callback_t)(struct net_device *dev,
-+                                     __be32 src,
-+                                     __be32 dst,
-+                                     __be16 sport,
-+                                     __be16 dport,
-+                                     u8 proto,
-+                                     u16 rxq_index,
-+                                     u32 action);
-+#endif
- /*
-  * This structure holds all XPS maps for device.  Maps are indexed by CPU.
-  */
-@@ -1353,6 +1363,9 @@ struct net_device_ops {
-                                                    const struct sk_buff *skb,
-                                                    u16 rxq_index,
-                                                    u32 flow_id);
-+        int                     (*ndo_register_rfs_filter)(struct net_device *dev,
-+                                                              set_rfs_filter_callback_t set_filter);
-+        int                     (*ndo_get_default_vlan_tag)(struct net_device *net);
- #endif
-       int                     (*ndo_add_slave)(struct net_device *dev,
-                                                struct net_device *slave_dev,
diff --git a/target/linux/ipq40xx/patches-4.19/710-net-add-qualcomm-essedma-ethernet-driver.patch b/target/linux/ipq40xx/patches-4.19/710-net-add-qualcomm-essedma-ethernet-driver.patch
deleted file mode 100644 (file)
index 9fe3a1a..0000000
+++ /dev/null
@@ -1,4575 +0,0 @@
-From 12e9319da1adacac92930c899c99f0e1970cac11 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@googlemail.com>
-Date: Thu, 19 Jan 2017 02:01:31 +0100
-Subject: [PATCH 33/38] NET: add qualcomm essedma ethernet driver
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
----
- drivers/net/ethernet/qualcomm/Kconfig  | 9 +++++++++
- drivers/net/ethernet/qualcomm/Makefile | 1 +
- 2 files changed, 10 insertions(+)
-
---- a/drivers/net/ethernet/qualcomm/Kconfig
-+++ b/drivers/net/ethernet/qualcomm/Kconfig
-@@ -61,4 +61,13 @@ config QCOM_EMAC
- source "drivers/net/ethernet/qualcomm/rmnet/Kconfig"
-+config ESSEDMA
-+      tristate "Qualcomm Atheros ESS Edma support"
-+      ---help---
-+        This driver supports ethernet edma adapter.
-+        Say Y to build this driver.
-+
-+        To compile this driver as a module, choose M here. The module
-+        will be called essedma.ko.
-+
- endif # NET_VENDOR_QUALCOMM
---- a/drivers/net/ethernet/qualcomm/Makefile
-+++ b/drivers/net/ethernet/qualcomm/Makefile
-@@ -10,5 +10,6 @@ obj-$(CONFIG_QCA7000_UART) += qcauart.o
- qcauart-objs := qca_uart.o
- obj-y += emac/
-+obj-$(CONFIG_ESSEDMA) += essedma/
- obj-$(CONFIG_RMNET) += rmnet/
---- /dev/null
-+++ b/drivers/net/ethernet/qualcomm/essedma/Makefile
-@@ -0,0 +1,9 @@
-+#
-+## Makefile for the Qualcomm Atheros ethernet edma driver
-+#
-+
-+
-+obj-$(CONFIG_ESSEDMA) += essedma.o
-+
-+essedma-objs := edma_axi.o edma.o edma_ethtool.o
-+
---- /dev/null
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c
-@@ -0,0 +1,2143 @@
-+/*
-+ * Copyright (c) 2014 - 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/if_vlan.h>
-+#include "ess_edma.h"
-+#include "edma.h"
-+
-+extern struct net_device *edma_netdev[EDMA_MAX_PORTID_SUPPORTED];
-+bool edma_stp_rstp;
-+u16 edma_ath_eth_type;
-+
-+/* edma_skb_priority_offset()
-+ *    get edma skb priority
-+ */
-+static unsigned int edma_skb_priority_offset(struct sk_buff *skb)
-+{
-+      return (skb->priority >> 2) & 1;
-+}
-+
-+/* edma_alloc_tx_ring()
-+ *    Allocate Tx descriptors ring
-+ */
-+static int edma_alloc_tx_ring(struct edma_common_info *edma_cinfo,
-+                            struct edma_tx_desc_ring *etdr)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+
-+      /* Initialize ring */
-+      etdr->size = sizeof(struct edma_sw_desc) * etdr->count;
-+      etdr->sw_next_to_fill = 0;
-+      etdr->sw_next_to_clean = 0;
-+
-+      /* Allocate SW descriptors */
-+      etdr->sw_desc = vzalloc(etdr->size);
-+      if (!etdr->sw_desc) {
-+              dev_err(&pdev->dev, "buffer alloc of tx ring failed=%p", etdr);
-+              return -ENOMEM;
-+      }
-+
-+      /* Allocate HW descriptors */
-+      etdr->hw_desc = dma_alloc_coherent(&pdev->dev, etdr->size, &etdr->dma,
-+                                        GFP_KERNEL);
-+      if (!etdr->hw_desc) {
-+              dev_err(&pdev->dev, "descriptor allocation for tx ring failed");
-+              vfree(etdr->sw_desc);
-+              return -ENOMEM;
-+      }
-+
-+      return 0;
-+}
-+
-+/* edma_free_tx_ring()
-+ *    Free tx rings allocated by edma_alloc_tx_rings
-+ */
-+static void edma_free_tx_ring(struct edma_common_info *edma_cinfo,
-+                            struct edma_tx_desc_ring *etdr)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+
-+      if (likely(etdr->dma))
-+              dma_free_coherent(&pdev->dev, etdr->size, etdr->hw_desc,
-+                               etdr->dma);
-+
-+      vfree(etdr->sw_desc);
-+      etdr->sw_desc = NULL;
-+}
-+
-+/* edma_alloc_rx_ring()
-+ *    allocate rx descriptor ring
-+ */
-+static int edma_alloc_rx_ring(struct edma_common_info *edma_cinfo,
-+                           struct edma_rfd_desc_ring *erxd)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+
-+      erxd->size = sizeof(struct edma_sw_desc) * erxd->count;
-+      erxd->sw_next_to_fill = 0;
-+      erxd->sw_next_to_clean = 0;
-+
-+      /* Allocate SW descriptors */
-+      erxd->sw_desc = vzalloc(erxd->size);
-+      if (!erxd->sw_desc)
-+              return -ENOMEM;
-+
-+      /* Alloc HW descriptors */
-+      erxd->hw_desc = dma_alloc_coherent(&pdev->dev, erxd->size, &erxd->dma,
-+                      GFP_KERNEL);
-+      if (!erxd->hw_desc) {
-+              vfree(erxd->sw_desc);
-+              return -ENOMEM;
-+      }
-+
-+      return 0;
-+}
-+
-+/* edma_free_rx_ring()
-+ *    Free rx ring allocated by alloc_rx_ring
-+ */
-+static void edma_free_rx_ring(struct edma_common_info *edma_cinfo,
-+                           struct edma_rfd_desc_ring *rxdr)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+
-+      if (likely(rxdr->dma))
-+              dma_free_coherent(&pdev->dev, rxdr->size, rxdr->hw_desc,
-+                               rxdr->dma);
-+
-+      vfree(rxdr->sw_desc);
-+      rxdr->sw_desc = NULL;
-+}
-+
-+/* edma_configure_tx()
-+ *    Configure transmission control data
-+ */
-+static void edma_configure_tx(struct edma_common_info *edma_cinfo)
-+{
-+      u32 txq_ctrl_data;
-+
-+      txq_ctrl_data = (EDMA_TPD_BURST << EDMA_TXQ_NUM_TPD_BURST_SHIFT);
-+      txq_ctrl_data |= EDMA_TXQ_CTRL_TPD_BURST_EN;
-+      txq_ctrl_data |= (EDMA_TXF_BURST << EDMA_TXQ_TXF_BURST_NUM_SHIFT);
-+      edma_write_reg(EDMA_REG_TXQ_CTRL, txq_ctrl_data);
-+}
-+
-+
-+/* edma_configure_rx()
-+ *    configure reception control data
-+ */
-+static void edma_configure_rx(struct edma_common_info *edma_cinfo)
-+{
-+      struct edma_hw *hw = &edma_cinfo->hw;
-+      u32 rss_type, rx_desc1, rxq_ctrl_data;
-+
-+      /* Set RSS type */
-+      rss_type = hw->rss_type;
-+      edma_write_reg(EDMA_REG_RSS_TYPE, rss_type);
-+
-+      /* Set RFD burst number */
-+      rx_desc1 = (EDMA_RFD_BURST << EDMA_RXQ_RFD_BURST_NUM_SHIFT);
-+
-+      /* Set RFD prefetch threshold */
-+      rx_desc1 |= (EDMA_RFD_THR << EDMA_RXQ_RFD_PF_THRESH_SHIFT);
-+
-+      /* Set RFD in host ring low threshold to generte interrupt */
-+      rx_desc1 |= (EDMA_RFD_LTHR << EDMA_RXQ_RFD_LOW_THRESH_SHIFT);
-+      edma_write_reg(EDMA_REG_RX_DESC1, rx_desc1);
-+
-+      /* Set Rx FIFO threshold to start to DMA data to host */
-+      rxq_ctrl_data = EDMA_FIFO_THRESH_128_BYTE;
-+
-+      /* Set RX remove vlan bit */
-+      rxq_ctrl_data |= EDMA_RXQ_CTRL_RMV_VLAN;
-+
-+      edma_write_reg(EDMA_REG_RXQ_CTRL, rxq_ctrl_data);
-+}
-+
-+/* edma_alloc_rx_buf()
-+ *    does skb allocation for the received packets.
-+ */
-+static int edma_alloc_rx_buf(struct edma_common_info
-+                           *edma_cinfo,
-+                           struct edma_rfd_desc_ring *erdr,
-+                           int cleaned_count, int queue_id)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      struct edma_rx_free_desc *rx_desc;
-+      struct edma_sw_desc *sw_desc;
-+      struct sk_buff *skb;
-+      unsigned int i;
-+      u16 prod_idx, length;
-+      u32 reg_data;
-+
-+      if (cleaned_count > erdr->count) {
-+              dev_err(&pdev->dev, "Incorrect cleaned_count %d",
-+                     cleaned_count);
-+              return -1;
-+      }
-+
-+      i = erdr->sw_next_to_fill;
-+
-+      while (cleaned_count) {
-+              sw_desc = &erdr->sw_desc[i];
-+              length = edma_cinfo->rx_head_buffer_len;
-+
-+              if (sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_REUSE) {
-+                      skb = sw_desc->skb;
-+              } else {
-+                      /* alloc skb */
-+                      skb = netdev_alloc_skb(edma_netdev[0], length);
-+                      if (!skb) {
-+                              /* Better luck next round */
-+                              break;
-+                      }
-+              }
-+
-+              if (edma_cinfo->page_mode) {
-+                      struct page *pg = alloc_page(GFP_ATOMIC);
-+
-+                      if (!pg) {
-+                              dev_kfree_skb_any(skb);
-+                              break;
-+                      }
-+
-+                      sw_desc->dma = dma_map_page(&pdev->dev, pg, 0,
-+                                                 edma_cinfo->rx_page_buffer_len,
-+                                                 DMA_FROM_DEVICE);
-+                      if (dma_mapping_error(&pdev->dev,
-+                                  sw_desc->dma)) {
-+                              __free_page(pg);
-+                              dev_kfree_skb_any(skb);
-+                              break;
-+                      }
-+
-+                      skb_fill_page_desc(skb, 0, pg, 0,
-+                                         edma_cinfo->rx_page_buffer_len);
-+                      sw_desc->flags = EDMA_SW_DESC_FLAG_SKB_FRAG;
-+                      sw_desc->length = edma_cinfo->rx_page_buffer_len;
-+              } else {
-+                      sw_desc->dma = dma_map_single(&pdev->dev, skb->data,
-+                                                   length, DMA_FROM_DEVICE);
-+                      if (dma_mapping_error(&pdev->dev,
-+                         sw_desc->dma)) {
-+                              dev_kfree_skb_any(skb);
-+                              break;
-+                      }
-+
-+                      sw_desc->flags = EDMA_SW_DESC_FLAG_SKB_HEAD;
-+                      sw_desc->length = length;
-+              }
-+
-+              /* Update the buffer info */
-+              sw_desc->skb = skb;
-+              rx_desc = (&((struct edma_rx_free_desc *)(erdr->hw_desc))[i]);
-+              rx_desc->buffer_addr = cpu_to_le64(sw_desc->dma);
-+              if (++i == erdr->count)
-+                      i = 0;
-+              cleaned_count--;
-+      }
-+
-+      erdr->sw_next_to_fill = i;
-+
-+      if (i == 0)
-+              prod_idx = erdr->count - 1;
-+      else
-+              prod_idx = i - 1;
-+
-+      /* Update the producer index */
-+      edma_read_reg(EDMA_REG_RFD_IDX_Q(queue_id), &reg_data);
-+      reg_data &= ~EDMA_RFD_PROD_IDX_BITS;
-+      reg_data |= prod_idx;
-+      edma_write_reg(EDMA_REG_RFD_IDX_Q(queue_id), reg_data);
-+      return cleaned_count;
-+}
-+
-+/* edma_init_desc()
-+ *    update descriptor ring size, buffer and producer/consumer index
-+ */
-+static void edma_init_desc(struct edma_common_info *edma_cinfo)
-+{
-+      struct edma_rfd_desc_ring *rfd_ring;
-+      struct edma_tx_desc_ring *etdr;
-+      int i = 0, j = 0;
-+      u32 data = 0;
-+      u16 hw_cons_idx = 0;
-+
-+      /* Set the base address of every TPD ring. */
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++) {
-+              etdr = edma_cinfo->tpd_ring[i];
-+
-+              /* Update descriptor ring base address */
-+              edma_write_reg(EDMA_REG_TPD_BASE_ADDR_Q(i), (u32)etdr->dma);
-+              edma_read_reg(EDMA_REG_TPD_IDX_Q(i), &data);
-+
-+              /* Calculate hardware consumer index */
-+              hw_cons_idx = (data >> EDMA_TPD_CONS_IDX_SHIFT) & 0xffff;
-+              etdr->sw_next_to_fill = hw_cons_idx;
-+              etdr->sw_next_to_clean = hw_cons_idx;
-+              data &= ~(EDMA_TPD_PROD_IDX_MASK << EDMA_TPD_PROD_IDX_SHIFT);
-+              data |= hw_cons_idx;
-+
-+              /* update producer index */
-+              edma_write_reg(EDMA_REG_TPD_IDX_Q(i), data);
-+
-+              /* update SW consumer index register */
-+              edma_write_reg(EDMA_REG_TX_SW_CONS_IDX_Q(i), hw_cons_idx);
-+
-+              /* Set TPD ring size */
-+              edma_write_reg(EDMA_REG_TPD_RING_SIZE,
-+                             edma_cinfo->tx_ring_count &
-+                                  EDMA_TPD_RING_SIZE_MASK);
-+      }
-+
-+      for (i = 0, j = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              rfd_ring = edma_cinfo->rfd_ring[j];
-+              /* Update Receive Free descriptor ring base address */
-+              edma_write_reg(EDMA_REG_RFD_BASE_ADDR_Q(j),
-+                      (u32)(rfd_ring->dma));
-+              j += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+      }
-+
-+      data = edma_cinfo->rx_head_buffer_len;
-+      if (edma_cinfo->page_mode)
-+              data = edma_cinfo->rx_page_buffer_len;
-+
-+      data &= EDMA_RX_BUF_SIZE_MASK;
-+      data <<= EDMA_RX_BUF_SIZE_SHIFT;
-+
-+      /* Update RFD ring size and RX buffer size */
-+      data |= (edma_cinfo->rx_ring_count & EDMA_RFD_RING_SIZE_MASK)
-+              << EDMA_RFD_RING_SIZE_SHIFT;
-+
-+      edma_write_reg(EDMA_REG_RX_DESC0, data);
-+
-+      /* Disable TX FIFO low watermark and high watermark */
-+      edma_write_reg(EDMA_REG_TXF_WATER_MARK, 0);
-+
-+      /* Load all of base address above */
-+      edma_read_reg(EDMA_REG_TX_SRAM_PART, &data);
-+      data |= 1 << EDMA_LOAD_PTR_SHIFT;
-+      edma_write_reg(EDMA_REG_TX_SRAM_PART, data);
-+}
-+
-+/* edma_receive_checksum
-+ *    Api to check checksum on receive packets
-+ */
-+static void edma_receive_checksum(struct edma_rx_return_desc *rd,
-+                                               struct sk_buff *skb)
-+{
-+      skb_checksum_none_assert(skb);
-+
-+      /* check the RRD IP/L4 checksum bit to see if
-+       * its set, which in turn indicates checksum
-+       * failure.
-+       */
-+      if (rd->rrd6 & EDMA_RRD_CSUM_FAIL_MASK)
-+              return;
-+
-+      skb->ip_summed = CHECKSUM_UNNECESSARY;
-+}
-+
-+/* edma_clean_rfd()
-+ *    clean up rx resourcers on error
-+ */
-+static void edma_clean_rfd(struct edma_rfd_desc_ring *erdr, u16 index)
-+{
-+      struct edma_rx_free_desc *rx_desc;
-+      struct edma_sw_desc *sw_desc;
-+
-+      rx_desc = (&((struct edma_rx_free_desc *)(erdr->hw_desc))[index]);
-+      sw_desc = &erdr->sw_desc[index];
-+      if (sw_desc->skb) {
-+              dev_kfree_skb_any(sw_desc->skb);
-+              sw_desc->skb = NULL;
-+      }
-+
-+      memset(rx_desc, 0, sizeof(struct edma_rx_free_desc));
-+}
-+
-+/* edma_rx_complete_fraglist()
-+ *    Complete Rx processing for fraglist skbs
-+ */
-+static void edma_rx_complete_stp_rstp(struct sk_buff *skb, int port_id, struct edma_rx_return_desc *rd)
-+{
-+      int i;
-+      u32 priority;
-+      u16 port_type;
-+      u8 mac_addr[EDMA_ETH_HDR_LEN];
-+
-+      port_type = (rd->rrd1 >> EDMA_RRD_PORT_TYPE_SHIFT)
-+                              & EDMA_RRD_PORT_TYPE_MASK;
-+      /* if port type is 0x4, then only proceed with
-+       * other stp/rstp calculation
-+       */
-+      if (port_type == EDMA_RX_ATH_HDR_RSTP_PORT_TYPE) {
-+              u8 bpdu_mac[6] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00};
-+
-+              /* calculate the frame priority */
-+              priority = (rd->rrd1 >> EDMA_RRD_PRIORITY_SHIFT)
-+                      & EDMA_RRD_PRIORITY_MASK;
-+
-+              for (i = 0; i < EDMA_ETH_HDR_LEN; i++)
-+                      mac_addr[i] = skb->data[i];
-+
-+              /* Check if destination mac addr is bpdu addr */
-+              if (!memcmp(mac_addr, bpdu_mac, 6)) {
-+                      /* destination mac address is BPDU
-+                       * destination mac address, then add
-+                       * atheros header to the packet.
-+                       */
-+                      u16 athr_hdr = (EDMA_RX_ATH_HDR_VERSION << EDMA_RX_ATH_HDR_VERSION_SHIFT) |
-+                              (priority << EDMA_RX_ATH_HDR_PRIORITY_SHIFT) |
-+                              (EDMA_RX_ATH_HDR_RSTP_PORT_TYPE << EDMA_RX_ATH_PORT_TYPE_SHIFT) | port_id;
-+                      skb_push(skb, 4);
-+                      memcpy(skb->data, mac_addr, EDMA_ETH_HDR_LEN);
-+                      *(uint16_t *)&skb->data[12] = htons(edma_ath_eth_type);
-+                      *(uint16_t *)&skb->data[14] = htons(athr_hdr);
-+              }
-+      }
-+}
-+
-+/*
-+ * edma_rx_complete_fraglist()
-+ *    Complete Rx processing for fraglist skbs
-+ */
-+static int edma_rx_complete_fraglist(struct sk_buff *skb, u16 num_rfds, u16 length, u32 sw_next_to_clean,
-+                                      u16 *cleaned_count, struct edma_rfd_desc_ring *erdr, struct edma_common_info *edma_cinfo)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      struct edma_hw *hw = &edma_cinfo->hw;
-+      struct sk_buff *skb_temp;
-+      struct edma_sw_desc *sw_desc;
-+      int i;
-+      u16 size_remaining;
-+
-+      skb->data_len = 0;
-+      skb->tail += (hw->rx_head_buff_size - 16);
-+      skb->len = skb->truesize = length;
-+      size_remaining = length - (hw->rx_head_buff_size - 16);
-+
-+      /* clean-up all related sw_descs */
-+      for (i = 1; i < num_rfds; i++) {
-+              struct sk_buff *skb_prev;
-+              sw_desc = &erdr->sw_desc[sw_next_to_clean];
-+              skb_temp = sw_desc->skb;
-+
-+              dma_unmap_single(&pdev->dev, sw_desc->dma,
-+                      sw_desc->length, DMA_FROM_DEVICE);
-+
-+              if (size_remaining < hw->rx_head_buff_size)
-+                      skb_put(skb_temp, size_remaining);
-+              else
-+                      skb_put(skb_temp, hw->rx_head_buff_size);
-+
-+              /*
-+               * If we are processing the first rfd, we link
-+               * skb->frag_list to the skb corresponding to the
-+               * first RFD
-+               */
-+              if (i == 1)
-+                      skb_shinfo(skb)->frag_list = skb_temp;
-+              else
-+                      skb_prev->next = skb_temp;
-+              skb_prev = skb_temp;
-+              skb_temp->next = NULL;
-+
-+              skb->data_len += skb_temp->len;
-+              size_remaining -= skb_temp->len;
-+
-+              /* Increment SW index */
-+              sw_next_to_clean = (sw_next_to_clean + 1) & (erdr->count - 1);
-+              (*cleaned_count)++;
-+      }
-+
-+      return sw_next_to_clean;
-+}
-+
-+/* edma_rx_complete_paged()
-+ *    Complete Rx processing for paged skbs
-+ */
-+static int edma_rx_complete_paged(struct sk_buff *skb, u16 num_rfds, u16 length, u32 sw_next_to_clean,
-+                                      u16 *cleaned_count, struct edma_rfd_desc_ring *erdr, struct edma_common_info *edma_cinfo)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      struct sk_buff *skb_temp;
-+      struct edma_sw_desc *sw_desc;
-+      int i;
-+      u16 size_remaining;
-+
-+      skb_frag_t *frag = &skb_shinfo(skb)->frags[0];
-+
-+      /* Setup skbuff fields */
-+      skb->len = length;
-+
-+      if (likely(num_rfds <= 1)) {
-+              skb->data_len = length;
-+              skb->truesize += edma_cinfo->rx_page_buffer_len;
-+              skb_fill_page_desc(skb, 0, skb_frag_page(frag),
-+                              16, length);
-+      } else {
-+              frag->size -= 16;
-+              skb->data_len = frag->size;
-+              skb->truesize += edma_cinfo->rx_page_buffer_len;
-+              size_remaining = length - frag->size;
-+
-+              skb_fill_page_desc(skb, 0, skb_frag_page(frag),
-+                              16, frag->size);
-+
-+              /* clean-up all related sw_descs */
-+              for (i = 1; i < num_rfds; i++) {
-+                      sw_desc = &erdr->sw_desc[sw_next_to_clean];
-+                      skb_temp = sw_desc->skb;
-+                      frag = &skb_shinfo(skb_temp)->frags[0];
-+                      dma_unmap_page(&pdev->dev, sw_desc->dma,
-+                              sw_desc->length, DMA_FROM_DEVICE);
-+
-+                      if (size_remaining < edma_cinfo->rx_page_buffer_len)
-+                              frag->size = size_remaining;
-+
-+                      skb_fill_page_desc(skb, i, skb_frag_page(frag),
-+                                      0, frag->size);
-+
-+                      skb_shinfo(skb_temp)->nr_frags = 0;
-+                      dev_kfree_skb_any(skb_temp);
-+
-+                      skb->data_len += frag->size;
-+                      skb->truesize += edma_cinfo->rx_page_buffer_len;
-+                      size_remaining -= frag->size;
-+
-+                      /* Increment SW index */
-+                      sw_next_to_clean = (sw_next_to_clean + 1) & (erdr->count - 1);
-+                      (*cleaned_count)++;
-+              }
-+      }
-+
-+      return sw_next_to_clean;
-+}
-+
-+/*
-+ * edma_rx_complete()
-+ *    Main api called from the poll function to process rx packets.
-+ */
-+static void edma_rx_complete(struct edma_common_info *edma_cinfo,
-+                          int *work_done, int work_to_do, int queue_id,
-+                          struct napi_struct *napi)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      struct edma_rfd_desc_ring *erdr = edma_cinfo->rfd_ring[queue_id];
-+      struct net_device *netdev;
-+      struct edma_adapter *adapter;
-+      struct edma_sw_desc *sw_desc;
-+      struct sk_buff *skb;
-+      struct edma_rx_return_desc *rd;
-+      u16 hash_type, rrd[8], cleaned_count = 0, length = 0, num_rfds = 1,
-+          sw_next_to_clean, hw_next_to_clean = 0, vlan = 0, ret_count = 0;
-+      u32 data = 0;
-+      u8 *vaddr;
-+      int port_id, i, drop_count = 0;
-+      u32 priority;
-+      u16 count = erdr->count, rfd_avail;
-+      u8 queue_to_rxid[8] = {0, 0, 1, 1, 2, 2, 3, 3};
-+
-+      sw_next_to_clean = erdr->sw_next_to_clean;
-+
-+      edma_read_reg(EDMA_REG_RFD_IDX_Q(queue_id), &data);
-+      hw_next_to_clean = (data >> EDMA_RFD_CONS_IDX_SHIFT) &
-+                         EDMA_RFD_CONS_IDX_MASK;
-+
-+      do {
-+              while (sw_next_to_clean != hw_next_to_clean) {
-+                      if (!work_to_do)
-+                              break;
-+
-+                      sw_desc = &erdr->sw_desc[sw_next_to_clean];
-+                      skb = sw_desc->skb;
-+
-+                      /* Unmap the allocated buffer */
-+                      if (likely(sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_HEAD))
-+                              dma_unmap_single(&pdev->dev, sw_desc->dma,
-+                                              sw_desc->length, DMA_FROM_DEVICE);
-+                      else
-+                              dma_unmap_page(&pdev->dev, sw_desc->dma,
-+                                            sw_desc->length, DMA_FROM_DEVICE);
-+
-+                      /* Get RRD */
-+                      if (edma_cinfo->page_mode) {
-+                              vaddr = kmap_atomic(skb_frag_page(&skb_shinfo(skb)->frags[0]));
-+                              memcpy((uint8_t *)&rrd[0], vaddr, 16);
-+                              rd = (struct edma_rx_return_desc *)rrd;
-+                              kunmap_atomic(vaddr);
-+                      } else {
-+                              rd = (struct edma_rx_return_desc *)skb->data;
-+                      }
-+
-+                      /* Check if RRD is valid */
-+                      if (!(rd->rrd7 & EDMA_RRD_DESC_VALID)) {
-+                              edma_clean_rfd(erdr, sw_next_to_clean);
-+                              sw_next_to_clean = (sw_next_to_clean + 1) &
-+                                                 (erdr->count - 1);
-+                              cleaned_count++;
-+                              continue;
-+                      }
-+
-+                      /* Get the number of RFDs from RRD */
-+                      num_rfds = rd->rrd1 & EDMA_RRD_NUM_RFD_MASK;
-+
-+                      /* Get Rx port ID from switch */
-+                      port_id = (rd->rrd1 >> EDMA_PORT_ID_SHIFT) & EDMA_PORT_ID_MASK;
-+                      if ((!port_id) || (port_id > EDMA_MAX_PORTID_SUPPORTED)) {
-+                              dev_err(&pdev->dev, "Invalid RRD source port bit set");
-+                              for (i = 0; i < num_rfds; i++) {
-+                                      edma_clean_rfd(erdr, sw_next_to_clean);
-+                                      sw_next_to_clean = (sw_next_to_clean + 1) & (erdr->count - 1);
-+                                      cleaned_count++;
-+                              }
-+                              continue;
-+                      }
-+
-+                      /* check if we have a sink for the data we receive.
-+                       * If the interface isn't setup, we have to drop the
-+                       * incoming data for now.
-+                       */
-+                      netdev = edma_cinfo->portid_netdev_lookup_tbl[port_id];
-+                      if (!netdev) {
-+                              edma_clean_rfd(erdr, sw_next_to_clean);
-+                              sw_next_to_clean = (sw_next_to_clean + 1) &
-+                                                 (erdr->count - 1);
-+                              cleaned_count++;
-+                              continue;
-+                      }
-+                      adapter = netdev_priv(netdev);
-+
-+                      /* This code is added to handle a usecase where high
-+                       * priority stream and a low priority stream are
-+                       * received simultaneously on DUT. The problem occurs
-+                       * if one of the  Rx rings is full and the corresponding
-+                       * core is busy with other stuff. This causes ESS CPU
-+                       * port to backpressure all incoming traffic including
-+                       * high priority one. We monitor free descriptor count
-+                       * on each CPU and whenever it reaches threshold (< 80),
-+                       * we drop all low priority traffic and let only high
-+                       * priotiy traffic pass through. We can hence avoid
-+                       * ESS CPU port to send backpressure on high priroity
-+                       * stream.
-+                       */
-+                      priority = (rd->rrd1 >> EDMA_RRD_PRIORITY_SHIFT)
-+                              & EDMA_RRD_PRIORITY_MASK;
-+                      if (likely(!priority && !edma_cinfo->page_mode && (num_rfds <= 1))) {
-+                              rfd_avail = (count + sw_next_to_clean - hw_next_to_clean - 1) & (count - 1);
-+                              if (rfd_avail < EDMA_RFD_AVAIL_THR) {
-+                                      sw_desc->flags = EDMA_SW_DESC_FLAG_SKB_REUSE;
-+                                      sw_next_to_clean = (sw_next_to_clean + 1) & (erdr->count - 1);
-+                                      adapter->stats.rx_dropped++;
-+                                      cleaned_count++;
-+                                      drop_count++;
-+                                      if (drop_count == 3) {
-+                                              work_to_do--;
-+                                              (*work_done)++;
-+                                              drop_count = 0;
-+                                      }
-+                                      if (cleaned_count == EDMA_RX_BUFFER_WRITE) {
-+                                              /* If buffer clean count reaches 16, we replenish HW buffers. */
-+                                              ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
-+                                              edma_write_reg(EDMA_REG_RX_SW_CONS_IDX_Q(queue_id),
-+                                                            sw_next_to_clean);
-+                                              cleaned_count = ret_count;
-+                                      }
-+                                      continue;
-+                              }
-+                      }
-+
-+                      work_to_do--;
-+                      (*work_done)++;
-+
-+                      /* Increment SW index */
-+                      sw_next_to_clean = (sw_next_to_clean + 1) &
-+                                         (erdr->count - 1);
-+
-+                      cleaned_count++;
-+
-+                      /* Get the packet size and allocate buffer */
-+                      length = rd->rrd6 & EDMA_RRD_PKT_SIZE_MASK;
-+
-+                      if (edma_cinfo->page_mode) {
-+                              /* paged skb */
-+                              sw_next_to_clean = edma_rx_complete_paged(skb, num_rfds, length, sw_next_to_clean, &cleaned_count, erdr, edma_cinfo);
-+                              if (!pskb_may_pull(skb, ETH_HLEN)) {
-+                                      dev_kfree_skb_any(skb);
-+                                      continue;
-+                              }
-+                      } else {
-+                              /* single or fraglist skb */
-+
-+                              /* Addition of 16 bytes is required, as in the packet
-+                               * first 16 bytes are rrd descriptors, so actual data
-+                               * starts from an offset of 16.
-+                               */
-+                              skb_reserve(skb, 16);
-+                              if (likely((num_rfds <= 1) || !edma_cinfo->fraglist_mode)) {
-+                                      skb_put(skb, length);
-+                              } else {
-+                                      sw_next_to_clean = edma_rx_complete_fraglist(skb, num_rfds, length, sw_next_to_clean, &cleaned_count, erdr, edma_cinfo);
-+                              }
-+                      }
-+
-+                      if (edma_stp_rstp) {
-+                              edma_rx_complete_stp_rstp(skb, port_id, rd);
-+                      }
-+
-+                      skb->protocol = eth_type_trans(skb, netdev);
-+
-+                      /* Record Rx queue for RFS/RPS and fill flow hash from HW */
-+                      skb_record_rx_queue(skb, queue_to_rxid[queue_id]);
-+                      if (netdev->features & NETIF_F_RXHASH) {
-+                              hash_type = (rd->rrd5 >> EDMA_HASH_TYPE_SHIFT);
-+                              if ((hash_type > EDMA_HASH_TYPE_START) && (hash_type < EDMA_HASH_TYPE_END))
-+                                      skb_set_hash(skb, rd->rrd2, PKT_HASH_TYPE_L4);
-+                      }
-+
-+#ifdef CONFIG_NF_FLOW_COOKIE
-+                      skb->flow_cookie = rd->rrd3 & EDMA_RRD_FLOW_COOKIE_MASK;
-+#endif
-+                      edma_receive_checksum(rd, skb);
-+
-+                      /* Process VLAN HW acceleration indication provided by HW */
-+                      if (unlikely(adapter->default_vlan_tag != rd->rrd4)) {
-+                              vlan = rd->rrd4;
-+                              if (likely(rd->rrd7 & EDMA_RRD_CVLAN))
-+                                      __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
-+                              else if (rd->rrd1 & EDMA_RRD_SVLAN)
-+                                      __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021AD), vlan);
-+                      }
-+
-+                      /* Update rx statistics */
-+                      adapter->stats.rx_packets++;
-+                      adapter->stats.rx_bytes += length;
-+
-+                      /* Check if we reached refill threshold */
-+                      if (cleaned_count == EDMA_RX_BUFFER_WRITE) {
-+                              ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
-+                              edma_write_reg(EDMA_REG_RX_SW_CONS_IDX_Q(queue_id),
-+                                            sw_next_to_clean);
-+                              cleaned_count = ret_count;
-+                      }
-+
-+                      /* At this point skb should go to stack */
-+                      napi_gro_receive(napi, skb);
-+              }
-+
-+              /* Check if we still have NAPI budget */
-+              if (!work_to_do)
-+                      break;
-+
-+              /* Read index once again since we still have NAPI budget */
-+              edma_read_reg(EDMA_REG_RFD_IDX_Q(queue_id), &data);
-+              hw_next_to_clean = (data >> EDMA_RFD_CONS_IDX_SHIFT) &
-+                      EDMA_RFD_CONS_IDX_MASK;
-+      } while (hw_next_to_clean != sw_next_to_clean);
-+
-+      erdr->sw_next_to_clean = sw_next_to_clean;
-+
-+      /* Refill here in case refill threshold wasn't reached */
-+      if (likely(cleaned_count)) {
-+              ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
-+              if (ret_count)
-+                      dev_dbg(&pdev->dev, "Not all buffers was reallocated");
-+              edma_write_reg(EDMA_REG_RX_SW_CONS_IDX_Q(queue_id),
-+                            erdr->sw_next_to_clean);
-+      }
-+}
-+
-+/* edma_delete_rfs_filter()
-+ *    Remove RFS filter from switch
-+ */
-+static int edma_delete_rfs_filter(struct edma_adapter *adapter,
-+                               struct edma_rfs_filter_node *filter_node)
-+{
-+      int res = -1;
-+
-+      struct flow_keys *keys = &filter_node->keys;
-+
-+      if (likely(adapter->set_rfs_rule))
-+              res = (*adapter->set_rfs_rule)(adapter->netdev,
-+                      flow_get_u32_src(keys), flow_get_u32_dst(keys),
-+                      keys->ports.src, keys->ports.dst,
-+                      keys->basic.ip_proto, filter_node->rq_id, 0);
-+
-+      return res;
-+}
-+
-+/* edma_add_rfs_filter()
-+ *    Add RFS filter to switch
-+ */
-+static int edma_add_rfs_filter(struct edma_adapter *adapter,
-+                             struct flow_keys *keys, u16 rq,
-+                             struct edma_rfs_filter_node *filter_node)
-+{
-+      int res = -1;
-+
-+      struct flow_keys *dest_keys = &filter_node->keys;
-+
-+      memcpy(dest_keys, &filter_node->keys, sizeof(*dest_keys));
-+/*
-+      dest_keys->control = keys->control;
-+      dest_keys->basic = keys->basic;
-+      dest_keys->addrs = keys->addrs;
-+      dest_keys->ports = keys->ports;
-+      dest_keys.ip_proto = keys->ip_proto;
-+*/
-+      /* Call callback registered by ESS driver */
-+      if (likely(adapter->set_rfs_rule))
-+              res = (*adapter->set_rfs_rule)(adapter->netdev, flow_get_u32_src(keys),
-+                    flow_get_u32_dst(keys), keys->ports.src, keys->ports.dst,
-+                    keys->basic.ip_proto, rq, 1);
-+
-+      return res;
-+}
-+
-+/* edma_rfs_key_search()
-+ *    Look for existing RFS entry
-+ */
-+static struct edma_rfs_filter_node *edma_rfs_key_search(struct hlist_head *h,
-+                                                     struct flow_keys *key)
-+{
-+      struct edma_rfs_filter_node *p;
-+
-+      hlist_for_each_entry(p, h, node)
-+              if (flow_get_u32_src(&p->keys) == flow_get_u32_src(key) &&
-+                  flow_get_u32_dst(&p->keys) == flow_get_u32_dst(key) &&
-+                  p->keys.ports.src == key->ports.src &&
-+                  p->keys.ports.dst == key->ports.dst &&
-+                  p->keys.basic.ip_proto == key->basic.ip_proto)
-+                      return p;
-+      return NULL;
-+}
-+
-+/* edma_initialise_rfs_flow_table()
-+ *    Initialise EDMA RFS flow table
-+ */
-+static void edma_initialise_rfs_flow_table(struct edma_adapter *adapter)
-+{
-+      int i;
-+
-+      spin_lock_init(&adapter->rfs.rfs_ftab_lock);
-+
-+      /* Initialize EDMA flow hash table */
-+      for (i = 0; i < EDMA_RFS_FLOW_ENTRIES; i++)
-+              INIT_HLIST_HEAD(&adapter->rfs.hlist_head[i]);
-+
-+      adapter->rfs.max_num_filter = EDMA_RFS_FLOW_ENTRIES;
-+      adapter->rfs.filter_available = adapter->rfs.max_num_filter;
-+      adapter->rfs.hashtoclean = 0;
-+
-+      /* Add timer to get periodic RFS updates from OS */
-+      timer_setup(&adapter->rfs.expire_rfs, edma_flow_may_expire, 0);
-+      mod_timer(&adapter->rfs.expire_rfs, jiffies + HZ / 4);
-+}
-+
-+/* edma_free_rfs_flow_table()
-+ *    Free EDMA RFS flow table
-+ */
-+static void edma_free_rfs_flow_table(struct edma_adapter *adapter)
-+{
-+      int i;
-+
-+      /* Remove sync timer */
-+      del_timer_sync(&adapter->rfs.expire_rfs);
-+      spin_lock_bh(&adapter->rfs.rfs_ftab_lock);
-+
-+      /* Free EDMA RFS table entries */
-+      adapter->rfs.filter_available = 0;
-+
-+      /* Clean-up EDMA flow hash table */
-+      for (i = 0; i < EDMA_RFS_FLOW_ENTRIES; i++) {
-+              struct hlist_head *hhead;
-+              struct hlist_node *tmp;
-+              struct edma_rfs_filter_node *filter_node;
-+              int res;
-+
-+              hhead = &adapter->rfs.hlist_head[i];
-+              hlist_for_each_entry_safe(filter_node, tmp, hhead, node) {
-+                      res  = edma_delete_rfs_filter(adapter, filter_node);
-+                      if (res < 0)
-+                              dev_warn(&adapter->netdev->dev,
-+                                      "EDMA going down but RFS entry %d not allowed to be flushed by Switch",
-+                                      filter_node->flow_id);
-+                      hlist_del(&filter_node->node);
-+                      kfree(filter_node);
-+              }
-+      }
-+      spin_unlock_bh(&adapter->rfs.rfs_ftab_lock);
-+}
-+
-+/* edma_tx_unmap_and_free()
-+ *    clean TX buffer
-+ */
-+static inline void edma_tx_unmap_and_free(struct platform_device *pdev,
-+                                       struct edma_sw_desc *sw_desc)
-+{
-+      struct sk_buff *skb = sw_desc->skb;
-+
-+      if (likely((sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_HEAD) ||
-+                      (sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_FRAGLIST)))
-+              /* unmap_single for skb head area */
-+              dma_unmap_single(&pdev->dev, sw_desc->dma,
-+                              sw_desc->length, DMA_TO_DEVICE);
-+      else if (sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_FRAG)
-+              /* unmap page for paged fragments */
-+              dma_unmap_page(&pdev->dev, sw_desc->dma,
-+                            sw_desc->length, DMA_TO_DEVICE);
-+
-+      if (likely(sw_desc->flags & EDMA_SW_DESC_FLAG_LAST))
-+              dev_kfree_skb_any(skb);
-+
-+      sw_desc->flags = 0;
-+}
-+
-+/* edma_tx_complete()
-+ *    Used to clean tx queues and update hardware and consumer index
-+ */
-+static void edma_tx_complete(struct edma_common_info *edma_cinfo, int queue_id)
-+{
-+      struct edma_tx_desc_ring *etdr = edma_cinfo->tpd_ring[queue_id];
-+      struct edma_sw_desc *sw_desc;
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      int i;
-+
-+      u16 sw_next_to_clean = etdr->sw_next_to_clean;
-+      u16 hw_next_to_clean;
-+      u32 data = 0;
-+
-+      edma_read_reg(EDMA_REG_TPD_IDX_Q(queue_id), &data);
-+      hw_next_to_clean = (data >> EDMA_TPD_CONS_IDX_SHIFT) & EDMA_TPD_CONS_IDX_MASK;
-+
-+      /* clean the buffer here */
-+      while (sw_next_to_clean != hw_next_to_clean) {
-+              sw_desc = &etdr->sw_desc[sw_next_to_clean];
-+              edma_tx_unmap_and_free(pdev, sw_desc);
-+              sw_next_to_clean = (sw_next_to_clean + 1) & (etdr->count - 1);
-+      }
-+
-+      etdr->sw_next_to_clean = sw_next_to_clean;
-+
-+      /* update the TPD consumer index register */
-+      edma_write_reg(EDMA_REG_TX_SW_CONS_IDX_Q(queue_id), sw_next_to_clean);
-+
-+      /* Wake the queue if queue is stopped and netdev link is up */
-+      for (i = 0; i < EDMA_MAX_NETDEV_PER_QUEUE && etdr->nq[i] ; i++) {
-+              if (netif_tx_queue_stopped(etdr->nq[i])) {
-+                      if ((etdr->netdev[i]) && netif_carrier_ok(etdr->netdev[i]))
-+                              netif_tx_wake_queue(etdr->nq[i]);
-+              }
-+      }
-+}
-+
-+/* edma_get_tx_buffer()
-+ *    Get sw_desc corresponding to the TPD
-+ */
-+static struct edma_sw_desc *edma_get_tx_buffer(struct edma_common_info *edma_cinfo,
-+                                             struct edma_tx_desc *tpd, int queue_id)
-+{
-+      struct edma_tx_desc_ring *etdr = edma_cinfo->tpd_ring[queue_id];
-+      return &etdr->sw_desc[tpd - (struct edma_tx_desc *)etdr->hw_desc];
-+}
-+
-+/* edma_get_next_tpd()
-+ *    Return a TPD descriptor for transfer
-+ */
-+static struct edma_tx_desc *edma_get_next_tpd(struct edma_common_info *edma_cinfo,
-+                                           int queue_id)
-+{
-+      struct edma_tx_desc_ring *etdr = edma_cinfo->tpd_ring[queue_id];
-+      u16 sw_next_to_fill = etdr->sw_next_to_fill;
-+      struct edma_tx_desc *tpd_desc =
-+              (&((struct edma_tx_desc *)(etdr->hw_desc))[sw_next_to_fill]);
-+
-+      etdr->sw_next_to_fill = (etdr->sw_next_to_fill + 1) & (etdr->count - 1);
-+
-+      return tpd_desc;
-+}
-+
-+/* edma_tpd_available()
-+ *    Check number of free TPDs
-+ */
-+static inline u16 edma_tpd_available(struct edma_common_info *edma_cinfo,
-+                                  int queue_id)
-+{
-+      struct edma_tx_desc_ring *etdr = edma_cinfo->tpd_ring[queue_id];
-+
-+      u16 sw_next_to_fill;
-+      u16 sw_next_to_clean;
-+      u16 count = 0;
-+
-+      sw_next_to_clean = etdr->sw_next_to_clean;
-+      sw_next_to_fill = etdr->sw_next_to_fill;
-+
-+      if (likely(sw_next_to_clean <= sw_next_to_fill))
-+              count = etdr->count;
-+
-+      return count + sw_next_to_clean - sw_next_to_fill - 1;
-+}
-+
-+/* edma_tx_queue_get()
-+ *    Get the starting number of  the queue
-+ */
-+static inline int edma_tx_queue_get(struct edma_adapter *adapter,
-+                                 struct sk_buff *skb, int txq_id)
-+{
-+      /* skb->priority is used as an index to skb priority table
-+       * and based on packet priority, correspong queue is assigned.
-+       */
-+      return adapter->tx_start_offset[txq_id] + edma_skb_priority_offset(skb);
-+}
-+
-+/* edma_tx_update_hw_idx()
-+ *    update the producer index for the ring transmitted
-+ */
-+static void edma_tx_update_hw_idx(struct edma_common_info *edma_cinfo,
-+                               struct sk_buff *skb, int queue_id)
-+{
-+      struct edma_tx_desc_ring *etdr = edma_cinfo->tpd_ring[queue_id];
-+      u32 tpd_idx_data;
-+
-+      /* Read and update the producer index */
-+      edma_read_reg(EDMA_REG_TPD_IDX_Q(queue_id), &tpd_idx_data);
-+      tpd_idx_data &= ~EDMA_TPD_PROD_IDX_BITS;
-+      tpd_idx_data |= (etdr->sw_next_to_fill & EDMA_TPD_PROD_IDX_MASK)
-+              << EDMA_TPD_PROD_IDX_SHIFT;
-+
-+      edma_write_reg(EDMA_REG_TPD_IDX_Q(queue_id), tpd_idx_data);
-+}
-+
-+/* edma_rollback_tx()
-+ *    Function to retrieve tx resources in case of error
-+ */
-+static void edma_rollback_tx(struct edma_adapter *adapter,
-+                          struct edma_tx_desc *start_tpd, int queue_id)
-+{
-+      struct edma_tx_desc_ring *etdr = adapter->edma_cinfo->tpd_ring[queue_id];
-+      struct edma_sw_desc *sw_desc;
-+      struct edma_tx_desc *tpd = NULL;
-+      u16 start_index, index;
-+
-+      start_index = start_tpd - (struct edma_tx_desc *)(etdr->hw_desc);
-+
-+      index = start_index;
-+      while (index != etdr->sw_next_to_fill) {
-+              tpd = (&((struct edma_tx_desc *)(etdr->hw_desc))[index]);
-+              sw_desc = &etdr->sw_desc[index];
-+              edma_tx_unmap_and_free(adapter->pdev, sw_desc);
-+              memset(tpd, 0, sizeof(struct edma_tx_desc));
-+              if (++index == etdr->count)
-+                      index = 0;
-+      }
-+      etdr->sw_next_to_fill = start_index;
-+}
-+
-+/* edma_tx_map_and_fill()
-+ *    gets called from edma_xmit_frame
-+ *
-+ * This is where the dma of the buffer to be transmitted
-+ * gets mapped
-+ */
-+static int edma_tx_map_and_fill(struct edma_common_info *edma_cinfo,
-+                             struct edma_adapter *adapter, struct sk_buff *skb, int queue_id,
-+                             unsigned int flags_transmit, u16 from_cpu, u16 dp_bitmap,
-+                             bool packet_is_rstp, int nr_frags)
-+{
-+      struct edma_sw_desc *sw_desc = NULL;
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      struct edma_tx_desc *tpd = NULL, *start_tpd = NULL;
-+      struct sk_buff *iter_skb;
-+      int i = 0;
-+      u32 word1 = 0, word3 = 0, lso_word1 = 0, svlan_tag = 0;
-+      u16 buf_len, lso_desc_len = 0;
-+
-+      /* It should either be a nr_frags skb or fraglist skb but not both */
-+      BUG_ON(nr_frags && skb_has_frag_list(skb));
-+
-+      if (skb_is_gso(skb)) {
-+              /* TODO: What additional checks need to be performed here */
-+              if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) {
-+                      lso_word1 |= EDMA_TPD_IPV4_EN;
-+                      ip_hdr(skb)->check = 0;
-+                      tcp_hdr(skb)->check = ~csum_tcpudp_magic(ip_hdr(skb)->saddr,
-+                              ip_hdr(skb)->daddr, 0, IPPROTO_TCP, 0);
-+              } else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {
-+                      lso_word1 |= EDMA_TPD_LSO_V2_EN;
-+                      ipv6_hdr(skb)->payload_len = 0;
-+                      tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-+                              &ipv6_hdr(skb)->daddr, 0, IPPROTO_TCP, 0);
-+              } else
-+                      return -EINVAL;
-+
-+              lso_word1 |= EDMA_TPD_LSO_EN | ((skb_shinfo(skb)->gso_size & EDMA_TPD_MSS_MASK) << EDMA_TPD_MSS_SHIFT) |
-+                              (skb_transport_offset(skb) << EDMA_TPD_HDR_SHIFT);
-+      } else if (flags_transmit & EDMA_HW_CHECKSUM) {
-+                      u8 css, cso;
-+                      cso = skb_checksum_start_offset(skb);
-+                      css = cso  + skb->csum_offset;
-+
-+                      word1 |= (EDMA_TPD_CUSTOM_CSUM_EN);
-+                      word1 |= (cso >> 1) << EDMA_TPD_HDR_SHIFT;
-+                      word1 |= ((css >> 1) << EDMA_TPD_CUSTOM_CSUM_SHIFT);
-+      }
-+
-+      if (skb->protocol == htons(ETH_P_PPP_SES))
-+              word1 |= EDMA_TPD_PPPOE_EN;
-+
-+      if (flags_transmit & EDMA_VLAN_TX_TAG_INSERT_FLAG) {
-+              switch(skb->vlan_proto) {
-+              case htons(ETH_P_8021Q):
-+                      word3 |= (1 << EDMA_TX_INS_CVLAN);
-+                      word3 |= skb_vlan_tag_get(skb) << EDMA_TX_CVLAN_TAG_SHIFT;
-+                      break;
-+              case htons(ETH_P_8021AD):
-+                      word1 |= (1 << EDMA_TX_INS_SVLAN);
-+                      svlan_tag = skb_vlan_tag_get(skb) << EDMA_TX_SVLAN_TAG_SHIFT;
-+                      break;
-+              default:
-+                      dev_err(&pdev->dev, "no ctag or stag present\n");
-+                      goto vlan_tag_error;
-+              }
-+      } else if (flags_transmit & EDMA_VLAN_TX_TAG_INSERT_DEFAULT_FLAG) {
-+              word3 |= (1 << EDMA_TX_INS_CVLAN);
-+              word3 |= (adapter->default_vlan_tag) << EDMA_TX_CVLAN_TAG_SHIFT;
-+      }
-+
-+      if (packet_is_rstp) {
-+              word3 |= dp_bitmap << EDMA_TPD_PORT_BITMAP_SHIFT;
-+              word3 |= from_cpu << EDMA_TPD_FROM_CPU_SHIFT;
-+      } else {
-+              word3 |= adapter->dp_bitmap << EDMA_TPD_PORT_BITMAP_SHIFT;
-+      }
-+
-+      buf_len = skb_headlen(skb);
-+
-+      if (lso_word1) {
-+              if (lso_word1 & EDMA_TPD_LSO_V2_EN) {
-+
-+                      /* IPv6 LSOv2 descriptor */
-+                      start_tpd = tpd = edma_get_next_tpd(edma_cinfo, queue_id);
-+                      sw_desc = edma_get_tx_buffer(edma_cinfo, tpd, queue_id);
-+                      sw_desc->flags |= EDMA_SW_DESC_FLAG_SKB_NONE;
-+
-+                      /* LSOv2 descriptor overrides addr field to pass length */
-+                      tpd->addr = cpu_to_le16(skb->len);
-+                      tpd->svlan_tag = svlan_tag;
-+                      tpd->word1 = word1 | lso_word1;
-+                      tpd->word3 = word3;
-+              }
-+
-+              tpd = edma_get_next_tpd(edma_cinfo, queue_id);
-+              if (!start_tpd)
-+                      start_tpd = tpd;
-+              sw_desc = edma_get_tx_buffer(edma_cinfo, tpd, queue_id);
-+
-+              /* The last buffer info contain the skb address,
-+               * so skb will be freed after unmap
-+               */
-+              sw_desc->length = lso_desc_len;
-+              sw_desc->flags |= EDMA_SW_DESC_FLAG_SKB_HEAD;
-+
-+              sw_desc->dma = dma_map_single(&adapter->pdev->dev,
-+                                      skb->data, buf_len, DMA_TO_DEVICE);
-+              if (dma_mapping_error(&pdev->dev, sw_desc->dma))
-+                      goto dma_error;
-+
-+              tpd->addr = cpu_to_le32(sw_desc->dma);
-+              tpd->len  = cpu_to_le16(buf_len);
-+
-+              tpd->svlan_tag = svlan_tag;
-+              tpd->word1 = word1 | lso_word1;
-+              tpd->word3 = word3;
-+
-+              /* The last buffer info contain the skb address,
-+               * so it will be freed after unmap
-+               */
-+              sw_desc->length = lso_desc_len;
-+              sw_desc->flags |= EDMA_SW_DESC_FLAG_SKB_HEAD;
-+
-+              buf_len = 0;
-+      }
-+
-+      if (likely(buf_len)) {
-+
-+              /* TODO Do not dequeue descriptor if there is a potential error */
-+              tpd = edma_get_next_tpd(edma_cinfo, queue_id);
-+
-+              if (!start_tpd)
-+                      start_tpd = tpd;
-+
-+              sw_desc = edma_get_tx_buffer(edma_cinfo, tpd, queue_id);
-+
-+              /* The last buffer info contain the skb address,
-+               * so it will be free after unmap
-+               */
-+              sw_desc->length = buf_len;
-+              sw_desc->flags |= EDMA_SW_DESC_FLAG_SKB_HEAD;
-+              sw_desc->dma = dma_map_single(&adapter->pdev->dev,
-+                      skb->data, buf_len, DMA_TO_DEVICE);
-+              if (dma_mapping_error(&pdev->dev, sw_desc->dma))
-+                      goto dma_error;
-+
-+              tpd->addr = cpu_to_le32(sw_desc->dma);
-+              tpd->len  = cpu_to_le16(buf_len);
-+
-+              tpd->svlan_tag = svlan_tag;
-+              tpd->word1 = word1 | lso_word1;
-+              tpd->word3 = word3;
-+      }
-+
-+      /* Walk through all paged fragments */
-+      while (nr_frags--) {
-+              skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-+              buf_len = skb_frag_size(frag);
-+              tpd = edma_get_next_tpd(edma_cinfo, queue_id);
-+              sw_desc = edma_get_tx_buffer(edma_cinfo, tpd, queue_id);
-+              sw_desc->length = buf_len;
-+              sw_desc->flags |= EDMA_SW_DESC_FLAG_SKB_FRAG;
-+
-+              sw_desc->dma = skb_frag_dma_map(&pdev->dev, frag, 0, buf_len, DMA_TO_DEVICE);
-+
-+              if (dma_mapping_error(NULL, sw_desc->dma))
-+                      goto dma_error;
-+
-+              tpd->addr = cpu_to_le32(sw_desc->dma);
-+              tpd->len  = cpu_to_le16(buf_len);
-+
-+              tpd->svlan_tag = svlan_tag;
-+              tpd->word1 = word1 | lso_word1;
-+              tpd->word3 = word3;
-+              i++;
-+      }
-+
-+      /* Walk through all fraglist skbs */
-+      skb_walk_frags(skb, iter_skb) {
-+              buf_len = iter_skb->len;
-+              tpd = edma_get_next_tpd(edma_cinfo, queue_id);
-+              sw_desc = edma_get_tx_buffer(edma_cinfo, tpd, queue_id);
-+              sw_desc->length = buf_len;
-+              sw_desc->dma =  dma_map_single(&adapter->pdev->dev,
-+                              iter_skb->data, buf_len, DMA_TO_DEVICE);
-+
-+              if (dma_mapping_error(NULL, sw_desc->dma))
-+                      goto dma_error;
-+
-+              tpd->addr = cpu_to_le32(sw_desc->dma);
-+              tpd->len  = cpu_to_le16(buf_len);
-+              tpd->svlan_tag = svlan_tag;
-+              tpd->word1 = word1 | lso_word1;
-+              tpd->word3 = word3;
-+              sw_desc->flags |= EDMA_SW_DESC_FLAG_SKB_FRAGLIST;
-+      }
-+
-+      if (tpd)
-+              tpd->word1 |= 1 << EDMA_TPD_EOP_SHIFT;
-+
-+      sw_desc->skb = skb;
-+      sw_desc->flags |= EDMA_SW_DESC_FLAG_LAST;
-+
-+      return 0;
-+
-+dma_error:
-+      edma_rollback_tx(adapter, start_tpd, queue_id);
-+      dev_err(&pdev->dev, "TX DMA map failed\n");
-+vlan_tag_error:
-+      return -ENOMEM;
-+}
-+
-+/* edma_check_link()
-+ *    check Link status
-+ */
-+static int edma_check_link(struct edma_adapter *adapter)
-+{
-+      struct phy_device *phydev = adapter->phydev;
-+
-+      if (!(adapter->poll_required))
-+              return __EDMA_LINKUP;
-+
-+      if (phydev->link)
-+              return __EDMA_LINKUP;
-+
-+      return __EDMA_LINKDOWN;
-+}
-+
-+/* edma_adjust_link()
-+ *    check for edma link status
-+ */
-+void edma_adjust_link(struct net_device *netdev)
-+{
-+      int status;
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+      struct phy_device *phydev = adapter->phydev;
-+
-+      if (!test_bit(__EDMA_UP, &adapter->state_flags))
-+              return;
-+
-+      status = edma_check_link(adapter);
-+
-+      if (status == __EDMA_LINKUP && adapter->link_state == __EDMA_LINKDOWN) {
-+              dev_info(&adapter->pdev->dev, "%s: GMAC Link is up with phy_speed=%d\n", netdev->name, phydev->speed);
-+              adapter->link_state = __EDMA_LINKUP;
-+              netif_carrier_on(netdev);
-+              if (netif_running(netdev))
-+                      netif_tx_wake_all_queues(netdev);
-+      } else if (status == __EDMA_LINKDOWN && adapter->link_state == __EDMA_LINKUP) {
-+              dev_info(&adapter->pdev->dev, "%s: GMAC Link is down\n", netdev->name);
-+              adapter->link_state = __EDMA_LINKDOWN;
-+              netif_carrier_off(netdev);
-+              netif_tx_stop_all_queues(netdev);
-+      }
-+}
-+
-+/* edma_get_stats()
-+ *    Statistics api used to retreive the tx/rx statistics
-+ */
-+struct net_device_stats *edma_get_stats(struct net_device *netdev)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+
-+      return &adapter->stats;
-+}
-+
-+/* edma_xmit()
-+ *    Main api to be called by the core for packet transmission
-+ */
-+netdev_tx_t edma_xmit(struct sk_buff *skb,
-+                   struct net_device *net_dev)
-+{
-+      struct edma_adapter *adapter = netdev_priv(net_dev);
-+      struct edma_common_info *edma_cinfo = adapter->edma_cinfo;
-+      struct edma_tx_desc_ring *etdr;
-+      u16 from_cpu, dp_bitmap, txq_id;
-+      int ret, nr_frags = 0, num_tpds_needed = 1, queue_id;
-+      unsigned int flags_transmit = 0;
-+      bool packet_is_rstp = false;
-+      struct netdev_queue *nq = NULL;
-+
-+      if (skb_shinfo(skb)->nr_frags) {
-+              nr_frags = skb_shinfo(skb)->nr_frags;
-+              num_tpds_needed += nr_frags;
-+      } else if (skb_has_frag_list(skb)) {
-+              struct sk_buff *iter_skb;
-+
-+              skb_walk_frags(skb, iter_skb)
-+                      num_tpds_needed++;
-+      }
-+
-+      if (num_tpds_needed > EDMA_MAX_SKB_FRAGS) {
-+              dev_err(&net_dev->dev,
-+                      "skb received with fragments %d which is more than %lu",
-+                      num_tpds_needed, EDMA_MAX_SKB_FRAGS);
-+              dev_kfree_skb_any(skb);
-+              adapter->stats.tx_errors++;
-+              return NETDEV_TX_OK;
-+      }
-+
-+      if (edma_stp_rstp) {
-+              u16 ath_hdr, ath_eth_type;
-+              u8 mac_addr[EDMA_ETH_HDR_LEN];
-+              ath_eth_type = ntohs(*(uint16_t *)&skb->data[12]);
-+              if (ath_eth_type == edma_ath_eth_type) {
-+                      packet_is_rstp = true;
-+                      ath_hdr = htons(*(uint16_t *)&skb->data[14]);
-+                      dp_bitmap = ath_hdr & EDMA_TX_ATH_HDR_PORT_BITMAP_MASK;
-+                      from_cpu = (ath_hdr & EDMA_TX_ATH_HDR_FROM_CPU_MASK) >> EDMA_TX_ATH_HDR_FROM_CPU_SHIFT;
-+                      memcpy(mac_addr, skb->data, EDMA_ETH_HDR_LEN);
-+
-+                      skb_pull(skb, 4);
-+
-+                      memcpy(skb->data, mac_addr, EDMA_ETH_HDR_LEN);
-+              }
-+      }
-+
-+      /* this will be one of the 4 TX queues exposed to linux kernel */
-+      txq_id = skb_get_queue_mapping(skb);
-+      queue_id = edma_tx_queue_get(adapter, skb, txq_id);
-+      etdr = edma_cinfo->tpd_ring[queue_id];
-+      nq = netdev_get_tx_queue(net_dev, txq_id);
-+
-+      local_bh_disable();
-+      /* Tx is not handled in bottom half context. Hence, we need to protect
-+       * Tx from tasks and bottom half
-+       */
-+
-+      if (num_tpds_needed > edma_tpd_available(edma_cinfo, queue_id)) {
-+              /* not enough descriptor, just stop queue */
-+              netif_tx_stop_queue(nq);
-+              local_bh_enable();
-+              dev_dbg(&net_dev->dev, "Not enough descriptors available");
-+              edma_cinfo->edma_ethstats.tx_desc_error++;
-+              return NETDEV_TX_BUSY;
-+      }
-+
-+      /* Check and mark VLAN tag offload */
-+      if (skb_vlan_tag_present(skb))
-+              flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_FLAG;
-+      else if (adapter->default_vlan_tag)
-+              flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_DEFAULT_FLAG;
-+
-+      /* Check and mark checksum offload */
-+      if (likely(skb->ip_summed == CHECKSUM_PARTIAL))
-+              flags_transmit |= EDMA_HW_CHECKSUM;
-+
-+      /* Map and fill descriptor for Tx */
-+      ret = edma_tx_map_and_fill(edma_cinfo, adapter, skb, queue_id,
-+              flags_transmit, from_cpu, dp_bitmap, packet_is_rstp, nr_frags);
-+      if (ret) {
-+              dev_kfree_skb_any(skb);
-+              adapter->stats.tx_errors++;
-+              goto netdev_okay;
-+      }
-+
-+      /* Update SW producer index */
-+      edma_tx_update_hw_idx(edma_cinfo, skb, queue_id);
-+
-+      /* update tx statistics */
-+      adapter->stats.tx_packets++;
-+      adapter->stats.tx_bytes += skb->len;
-+
-+netdev_okay:
-+      local_bh_enable();
-+      return NETDEV_TX_OK;
-+}
-+
-+/*
-+ * edma_flow_may_expire()
-+ *    Timer function called periodically to delete the node
-+ */
-+void edma_flow_may_expire(struct timer_list *t)
-+{
-+      struct edma_rfs_flow_table *table = from_timer(table, t, expire_rfs);
-+      struct edma_adapter *adapter =
-+              container_of(table, typeof(*adapter), rfs);
-+      int j;
-+
-+      spin_lock_bh(&adapter->rfs.rfs_ftab_lock);
-+      for (j = 0; j < EDMA_RFS_EXPIRE_COUNT_PER_CALL; j++) {
-+              struct hlist_head *hhead;
-+              struct hlist_node *tmp;
-+              struct edma_rfs_filter_node *n;
-+              bool res;
-+
-+              hhead = &adapter->rfs.hlist_head[adapter->rfs.hashtoclean++];
-+              hlist_for_each_entry_safe(n, tmp, hhead, node) {
-+                      res = rps_may_expire_flow(adapter->netdev, n->rq_id,
-+                                      n->flow_id, n->filter_id);
-+                      if (res) {
-+                              int ret;
-+                              ret = edma_delete_rfs_filter(adapter, n);
-+                              if (ret < 0)
-+                                      dev_dbg(&adapter->netdev->dev,
-+                                                      "RFS entry %d not allowed to be flushed by Switch",
-+                                                      n->flow_id);
-+                              else {
-+                                      hlist_del(&n->node);
-+                                      kfree(n);
-+                                      adapter->rfs.filter_available++;
-+                              }
-+                      }
-+              }
-+      }
-+
-+      adapter->rfs.hashtoclean = adapter->rfs.hashtoclean & (EDMA_RFS_FLOW_ENTRIES - 1);
-+      spin_unlock_bh(&adapter->rfs.rfs_ftab_lock);
-+      mod_timer(&adapter->rfs.expire_rfs, jiffies + HZ / 4);
-+}
-+
-+/* edma_rx_flow_steer()
-+ *    Called by core to to steer the flow to CPU
-+ */
-+int edma_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
-+                     u16 rxq, u32 flow_id)
-+{
-+      struct flow_keys keys;
-+      struct edma_rfs_filter_node *filter_node;
-+      struct edma_adapter *adapter = netdev_priv(dev);
-+      u16 hash_tblid;
-+      int res;
-+
-+      if (skb->protocol == htons(ETH_P_IPV6)) {
-+              dev_err(&adapter->pdev->dev, "IPv6 not supported\n");
-+              res = -EINVAL;
-+              goto no_protocol_err;
-+      }
-+
-+      /* Dissect flow parameters
-+       * We only support IPv4 + TCP/UDP
-+       */
-+      res = skb_flow_dissect_flow_keys(skb, &keys, 0);
-+      if (!((keys.basic.ip_proto == IPPROTO_TCP) || (keys.basic.ip_proto == IPPROTO_UDP))) {
-+              res = -EPROTONOSUPPORT;
-+              goto no_protocol_err;
-+      }
-+
-+      /* Check if table entry exists */
-+      hash_tblid = skb_get_hash_raw(skb) & EDMA_RFS_FLOW_ENTRIES_MASK;
-+
-+      spin_lock_bh(&adapter->rfs.rfs_ftab_lock);
-+      filter_node = edma_rfs_key_search(&adapter->rfs.hlist_head[hash_tblid], &keys);
-+
-+      if (filter_node) {
-+              if (rxq == filter_node->rq_id) {
-+                      res = -EEXIST;
-+                      goto out;
-+              } else {
-+                      res = edma_delete_rfs_filter(adapter, filter_node);
-+                      if (res < 0)
-+                              dev_warn(&adapter->netdev->dev,
-+                                              "Cannot steer flow %d to different queue",
-+                                              filter_node->flow_id);
-+                      else {
-+                              adapter->rfs.filter_available++;
-+                              res = edma_add_rfs_filter(adapter, &keys, rxq, filter_node);
-+                              if (res < 0) {
-+                                      dev_warn(&adapter->netdev->dev,
-+                                                      "Cannot steer flow %d to different queue",
-+                                                      filter_node->flow_id);
-+                              } else {
-+                                      adapter->rfs.filter_available--;
-+                                      filter_node->rq_id = rxq;
-+                                      filter_node->filter_id = res;
-+                              }
-+                      }
-+              }
-+      } else {
-+              if (adapter->rfs.filter_available == 0) {
-+                      res = -EBUSY;
-+                      goto out;
-+              }
-+
-+              filter_node = kmalloc(sizeof(*filter_node), GFP_ATOMIC);
-+              if (!filter_node) {
-+                      res = -ENOMEM;
-+                      goto out;
-+              }
-+
-+              res = edma_add_rfs_filter(adapter, &keys, rxq, filter_node);
-+              if (res < 0) {
-+                      kfree(filter_node);
-+                      goto out;
-+              }
-+
-+              adapter->rfs.filter_available--;
-+              filter_node->rq_id = rxq;
-+              filter_node->filter_id = res;
-+              filter_node->flow_id = flow_id;
-+              filter_node->keys = keys;
-+              INIT_HLIST_NODE(&filter_node->node);
-+              hlist_add_head(&filter_node->node, &adapter->rfs.hlist_head[hash_tblid]);
-+      }
-+
-+out:
-+      spin_unlock_bh(&adapter->rfs.rfs_ftab_lock);
-+no_protocol_err:
-+      return res;
-+}
-+
-+/* edma_register_rfs_filter()
-+ *    Add RFS filter callback
-+ */
-+int edma_register_rfs_filter(struct net_device *netdev,
-+                          set_rfs_filter_callback_t set_filter)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+
-+      spin_lock_bh(&adapter->rfs.rfs_ftab_lock);
-+
-+      if (adapter->set_rfs_rule) {
-+              spin_unlock_bh(&adapter->rfs.rfs_ftab_lock);
-+              return -1;
-+      }
-+
-+      adapter->set_rfs_rule = set_filter;
-+      spin_unlock_bh(&adapter->rfs.rfs_ftab_lock);
-+
-+      return 0;
-+}
-+
-+/* edma_alloc_tx_rings()
-+ *    Allocate rx rings
-+ */
-+int edma_alloc_tx_rings(struct edma_common_info *edma_cinfo)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      int i, err = 0;
-+
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++) {
-+              err = edma_alloc_tx_ring(edma_cinfo, edma_cinfo->tpd_ring[i]);
-+              if (err) {
-+                      dev_err(&pdev->dev, "Tx Queue alloc %u failed\n", i);
-+                      return err;
-+              }
-+      }
-+
-+      return 0;
-+}
-+
-+/* edma_free_tx_rings()
-+ *    Free tx rings
-+ */
-+void edma_free_tx_rings(struct edma_common_info *edma_cinfo)
-+{
-+      int i;
-+
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++)
-+              edma_free_tx_ring(edma_cinfo, edma_cinfo->tpd_ring[i]);
-+}
-+
-+/* edma_free_tx_resources()
-+ *    Free buffers associated with tx rings
-+ */
-+void edma_free_tx_resources(struct edma_common_info *edma_cinfo)
-+{
-+      struct edma_tx_desc_ring *etdr;
-+      struct edma_sw_desc *sw_desc;
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      int i, j;
-+
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++) {
-+              etdr = edma_cinfo->tpd_ring[i];
-+              for (j = 0; j < EDMA_TX_RING_SIZE; j++) {
-+                      sw_desc = &etdr->sw_desc[j];
-+                      if (sw_desc->flags & (EDMA_SW_DESC_FLAG_SKB_HEAD |
-+                              EDMA_SW_DESC_FLAG_SKB_FRAG | EDMA_SW_DESC_FLAG_SKB_FRAGLIST))
-+                              edma_tx_unmap_and_free(pdev, sw_desc);
-+              }
-+      }
-+}
-+
-+/* edma_alloc_rx_rings()
-+ *    Allocate rx rings
-+ */
-+int edma_alloc_rx_rings(struct edma_common_info *edma_cinfo)
-+{
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      int i, j, err = 0;
-+
-+      for (i = 0, j = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              err = edma_alloc_rx_ring(edma_cinfo, edma_cinfo->rfd_ring[j]);
-+              if (err) {
-+                      dev_err(&pdev->dev, "Rx Queue alloc%u failed\n", i);
-+                      return err;
-+              }
-+              j += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+      }
-+
-+      return 0;
-+}
-+
-+/* edma_free_rx_rings()
-+ *    free rx rings
-+ */
-+void edma_free_rx_rings(struct edma_common_info *edma_cinfo)
-+{
-+      int i, j;
-+
-+      for (i = 0, j = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              edma_free_rx_ring(edma_cinfo, edma_cinfo->rfd_ring[j]);
-+              j += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+      }
-+}
-+
-+/* edma_free_queues()
-+ *    Free the queues allocaated
-+ */
-+void edma_free_queues(struct edma_common_info *edma_cinfo)
-+{
-+      int i , j;
-+
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++) {
-+              if (edma_cinfo->tpd_ring[i])
-+                      kfree(edma_cinfo->tpd_ring[i]);
-+              edma_cinfo->tpd_ring[i] = NULL;
-+      }
-+
-+      for (i = 0, j = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              if (edma_cinfo->rfd_ring[j])
-+                      kfree(edma_cinfo->rfd_ring[j]);
-+              edma_cinfo->rfd_ring[j] = NULL;
-+              j += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+      }
-+
-+      edma_cinfo->num_rx_queues = 0;
-+      edma_cinfo->num_tx_queues = 0;
-+
-+      return;
-+}
-+
-+/* edma_free_rx_resources()
-+ *    Free buffers associated with tx rings
-+ */
-+void edma_free_rx_resources(struct edma_common_info *edma_cinfo)
-+{
-+        struct edma_rfd_desc_ring *erdr;
-+      struct edma_sw_desc *sw_desc;
-+      struct platform_device *pdev = edma_cinfo->pdev;
-+      int i, j, k;
-+
-+      for (i = 0, k = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              erdr = edma_cinfo->rfd_ring[k];
-+              for (j = 0; j < EDMA_RX_RING_SIZE; j++) {
-+                      sw_desc = &erdr->sw_desc[j];
-+                      if (likely(sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_HEAD)) {
-+                              dma_unmap_single(&pdev->dev, sw_desc->dma,
-+                                      sw_desc->length, DMA_FROM_DEVICE);
-+                              edma_clean_rfd(erdr, j);
-+                      } else if ((sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_FRAG)) {
-+                              dma_unmap_page(&pdev->dev, sw_desc->dma,
-+                                      sw_desc->length, DMA_FROM_DEVICE);
-+                              edma_clean_rfd(erdr, j);
-+                      }
-+              }
-+              k += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+
-+      }
-+}
-+
-+/* edma_alloc_queues_tx()
-+ *    Allocate memory for all rings
-+ */
-+int edma_alloc_queues_tx(struct edma_common_info *edma_cinfo)
-+{
-+      int i;
-+
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++) {
-+              struct edma_tx_desc_ring *etdr;
-+              etdr = kzalloc(sizeof(struct edma_tx_desc_ring), GFP_KERNEL);
-+              if (!etdr)
-+                      goto err;
-+              etdr->count = edma_cinfo->tx_ring_count;
-+              edma_cinfo->tpd_ring[i] = etdr;
-+      }
-+
-+      return 0;
-+err:
-+      edma_free_queues(edma_cinfo);
-+      return -1;
-+}
-+
-+/* edma_alloc_queues_rx()
-+ *    Allocate memory for all rings
-+ */
-+int edma_alloc_queues_rx(struct edma_common_info *edma_cinfo)
-+{
-+      int i, j;
-+
-+      for (i = 0, j = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              struct edma_rfd_desc_ring *rfd_ring;
-+              rfd_ring = kzalloc(sizeof(struct edma_rfd_desc_ring),
-+                              GFP_KERNEL);
-+              if (!rfd_ring)
-+                      goto err;
-+              rfd_ring->count = edma_cinfo->rx_ring_count;
-+              edma_cinfo->rfd_ring[j] = rfd_ring;
-+              j += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+      }
-+      return 0;
-+err:
-+      edma_free_queues(edma_cinfo);
-+      return -1;
-+}
-+
-+/* edma_clear_irq_status()
-+ *    Clear interrupt status
-+ */
-+void edma_clear_irq_status()
-+{
-+      edma_write_reg(EDMA_REG_RX_ISR, 0xff);
-+      edma_write_reg(EDMA_REG_TX_ISR, 0xffff);
-+      edma_write_reg(EDMA_REG_MISC_ISR, 0x1fff);
-+      edma_write_reg(EDMA_REG_WOL_ISR, 0x1);
-+};
-+
-+/* edma_configure()
-+ *    Configure skb, edma interrupts and control register.
-+ */
-+int edma_configure(struct edma_common_info *edma_cinfo)
-+{
-+      struct edma_hw *hw = &edma_cinfo->hw;
-+      u32 intr_modrt_data;
-+      u32 intr_ctrl_data = 0;
-+      int i, j, ret_count;
-+
-+      edma_read_reg(EDMA_REG_INTR_CTRL, &intr_ctrl_data);
-+      intr_ctrl_data &= ~(1 << EDMA_INTR_SW_IDX_W_TYP_SHIFT);
-+      intr_ctrl_data |= hw->intr_sw_idx_w << EDMA_INTR_SW_IDX_W_TYP_SHIFT;
-+      edma_write_reg(EDMA_REG_INTR_CTRL, intr_ctrl_data);
-+
-+      edma_clear_irq_status();
-+
-+      /* Clear any WOL status */
-+      edma_write_reg(EDMA_REG_WOL_CTRL, 0);
-+      intr_modrt_data = (EDMA_TX_IMT << EDMA_IRQ_MODRT_TX_TIMER_SHIFT);
-+      intr_modrt_data |= (EDMA_RX_IMT << EDMA_IRQ_MODRT_RX_TIMER_SHIFT);
-+      edma_write_reg(EDMA_REG_IRQ_MODRT_TIMER_INIT, intr_modrt_data);
-+      edma_configure_tx(edma_cinfo);
-+      edma_configure_rx(edma_cinfo);
-+
-+      /* Allocate the RX buffer */
-+      for (i = 0, j = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              struct edma_rfd_desc_ring *ring = edma_cinfo->rfd_ring[j];
-+              ret_count = edma_alloc_rx_buf(edma_cinfo, ring, ring->count, j);
-+              if (ret_count) {
-+                      dev_dbg(&edma_cinfo->pdev->dev, "not all rx buffers allocated\n");
-+              }
-+              j += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+      }
-+
-+      /* Configure descriptor Ring */
-+      edma_init_desc(edma_cinfo);
-+      return 0;
-+}
-+
-+/* edma_irq_enable()
-+ *    Enable default interrupt generation settings
-+ */
-+void edma_irq_enable(struct edma_common_info *edma_cinfo)
-+{
-+      struct edma_hw *hw = &edma_cinfo->hw;
-+      int i, j;
-+
-+      edma_write_reg(EDMA_REG_RX_ISR, 0xff);
-+      for (i = 0, j = 0; i < edma_cinfo->num_rx_queues; i++) {
-+              edma_write_reg(EDMA_REG_RX_INT_MASK_Q(j), hw->rx_intr_mask);
-+              j += ((edma_cinfo->num_rx_queues == 4) ? 2 : 1);
-+      }
-+      edma_write_reg(EDMA_REG_TX_ISR, 0xffff);
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++)
-+              edma_write_reg(EDMA_REG_TX_INT_MASK_Q(i), hw->tx_intr_mask);
-+}
-+
-+/* edma_irq_disable()
-+ *    Disable Interrupt
-+ */
-+void edma_irq_disable(struct edma_common_info *edma_cinfo)
-+{
-+      int i;
-+
-+      for (i = 0; i < EDMA_MAX_RECEIVE_QUEUE; i++)
-+              edma_write_reg(EDMA_REG_RX_INT_MASK_Q(i), 0x0);
-+
-+      for (i = 0; i < EDMA_MAX_TRANSMIT_QUEUE; i++)
-+              edma_write_reg(EDMA_REG_TX_INT_MASK_Q(i), 0x0);
-+      edma_write_reg(EDMA_REG_MISC_IMR, 0);
-+      edma_write_reg(EDMA_REG_WOL_IMR, 0);
-+}
-+
-+/* edma_free_irqs()
-+ *    Free All IRQs
-+ */
-+void edma_free_irqs(struct edma_adapter *adapter)
-+{
-+      struct edma_common_info *edma_cinfo = adapter->edma_cinfo;
-+      int i, j;
-+      int k = ((edma_cinfo->num_rx_queues == 4) ? 1 : 2);
-+
-+      for (i = 0; i < CONFIG_NR_CPUS; i++) {
-+              for (j = edma_cinfo->edma_percpu_info[i].tx_start; j < (edma_cinfo->edma_percpu_info[i].tx_start + 4); j++)
-+                      free_irq(edma_cinfo->tx_irq[j], &edma_cinfo->edma_percpu_info[i]);
-+
-+              for (j = edma_cinfo->edma_percpu_info[i].rx_start; j < (edma_cinfo->edma_percpu_info[i].rx_start + k); j++)
-+                      free_irq(edma_cinfo->rx_irq[j], &edma_cinfo->edma_percpu_info[i]);
-+      }
-+}
-+
-+/* edma_enable_rx_ctrl()
-+ *    Enable RX queue control
-+ */
-+void edma_enable_rx_ctrl(struct edma_hw *hw)
-+{
-+      u32 data;
-+
-+      edma_read_reg(EDMA_REG_RXQ_CTRL, &data);
-+      data |= EDMA_RXQ_CTRL_EN;
-+      edma_write_reg(EDMA_REG_RXQ_CTRL, data);
-+}
-+
-+
-+/* edma_enable_tx_ctrl()
-+ *    Enable TX queue control
-+ */
-+void edma_enable_tx_ctrl(struct edma_hw *hw)
-+{
-+      u32 data;
-+
-+      edma_read_reg(EDMA_REG_TXQ_CTRL, &data);
-+      data |= EDMA_TXQ_CTRL_TXQ_EN;
-+      edma_write_reg(EDMA_REG_TXQ_CTRL, data);
-+}
-+
-+/* edma_stop_rx_tx()
-+ *    Disable RX/TQ Queue control
-+ */
-+void edma_stop_rx_tx(struct edma_hw *hw)
-+{
-+      u32 data;
-+
-+      edma_read_reg(EDMA_REG_RXQ_CTRL, &data);
-+      data &= ~EDMA_RXQ_CTRL_EN;
-+      edma_write_reg(EDMA_REG_RXQ_CTRL, data);
-+      edma_read_reg(EDMA_REG_TXQ_CTRL, &data);
-+      data &= ~EDMA_TXQ_CTRL_TXQ_EN;
-+      edma_write_reg(EDMA_REG_TXQ_CTRL, data);
-+}
-+
-+/* edma_reset()
-+ *    Reset the EDMA
-+ */
-+int edma_reset(struct edma_common_info *edma_cinfo)
-+{
-+      struct edma_hw *hw = &edma_cinfo->hw;
-+
-+      edma_irq_disable(edma_cinfo);
-+
-+      edma_clear_irq_status();
-+
-+      edma_stop_rx_tx(hw);
-+
-+      return 0;
-+}
-+
-+/* edma_fill_netdev()
-+ *    Fill netdev for each etdr
-+ */
-+int edma_fill_netdev(struct edma_common_info *edma_cinfo, int queue_id,
-+                  int dev, int txq_id)
-+{
-+      struct edma_tx_desc_ring *etdr;
-+      int i = 0;
-+
-+      etdr = edma_cinfo->tpd_ring[queue_id];
-+
-+      while (etdr->netdev[i])
-+              i++;
-+
-+      if (i >= EDMA_MAX_NETDEV_PER_QUEUE)
-+              return -1;
-+
-+      /* Populate the netdev associated with the tpd ring */
-+      etdr->netdev[i] = edma_netdev[dev];
-+      etdr->nq[i] = netdev_get_tx_queue(edma_netdev[dev], txq_id);
-+
-+      return 0;
-+}
-+
-+/* edma_set_mac()
-+ *    Change the Ethernet Address of the NIC
-+ */
-+int edma_set_mac_addr(struct net_device *netdev, void *p)
-+{
-+      struct sockaddr *addr = p;
-+
-+      if (!is_valid_ether_addr(addr->sa_data))
-+              return -EINVAL;
-+
-+      if (netif_running(netdev))
-+              return -EBUSY;
-+
-+      memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-+      return 0;
-+}
-+
-+/* edma_set_stp_rstp()
-+ *    set stp/rstp
-+ */
-+void edma_set_stp_rstp(bool rstp)
-+{
-+      edma_stp_rstp = rstp;
-+}
-+
-+/* edma_assign_ath_hdr_type()
-+ *    assign atheros header eth type
-+ */
-+void edma_assign_ath_hdr_type(int eth_type)
-+{
-+      edma_ath_eth_type = eth_type & EDMA_ETH_TYPE_MASK;
-+}
-+
-+/* edma_get_default_vlan_tag()
-+ *    Used by other modules to get the default vlan tag
-+ */
-+int edma_get_default_vlan_tag(struct net_device *netdev)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+
-+      if (adapter->default_vlan_tag)
-+              return adapter->default_vlan_tag;
-+
-+      return 0;
-+}
-+
-+/* edma_open()
-+ *    gets called when netdevice is up, start the queue.
-+ */
-+int edma_open(struct net_device *netdev)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+      struct platform_device *pdev = adapter->edma_cinfo->pdev;
-+
-+      netif_tx_start_all_queues(netdev);
-+      edma_initialise_rfs_flow_table(adapter);
-+      set_bit(__EDMA_UP, &adapter->state_flags);
-+
-+      /* if Link polling is enabled, in our case enabled for WAN, then
-+       * do a phy start, else always set link as UP
-+       */
-+      if (adapter->poll_required) {
-+              if (!IS_ERR(adapter->phydev)) {
-+                      phy_start(adapter->phydev);
-+                      phy_start_aneg(adapter->phydev);
-+                      adapter->link_state = __EDMA_LINKDOWN;
-+              } else {
-+                      dev_dbg(&pdev->dev, "Invalid PHY device for a link polled interface\n");
-+              }
-+      } else {
-+              adapter->link_state = __EDMA_LINKUP;
-+              netif_carrier_on(netdev);
-+      }
-+
-+      return 0;
-+}
-+
-+
-+/* edma_close()
-+ *    gets called when netdevice is down, stops the queue.
-+ */
-+int edma_close(struct net_device *netdev)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+
-+      edma_free_rfs_flow_table(adapter);
-+      netif_carrier_off(netdev);
-+      netif_tx_stop_all_queues(netdev);
-+
-+      if (adapter->poll_required) {
-+              if (!IS_ERR(adapter->phydev))
-+                      phy_stop(adapter->phydev);
-+      }
-+
-+      adapter->link_state = __EDMA_LINKDOWN;
-+
-+      /* Set GMAC state to UP before link state is checked
-+       */
-+      clear_bit(__EDMA_UP, &adapter->state_flags);
-+
-+      return 0;
-+}
-+
-+/* edma_poll
-+ *    polling function that gets called when the napi gets scheduled.
-+ *
-+ * Main sequence of task performed in this api
-+ * is clear irq status -> clear_tx_irq -> clean_rx_irq->
-+ * enable interrupts.
-+ */
-+int edma_poll(struct napi_struct *napi, int budget)
-+{
-+      struct edma_per_cpu_queues_info *edma_percpu_info = container_of(napi,
-+              struct edma_per_cpu_queues_info, napi);
-+      struct edma_common_info *edma_cinfo = edma_percpu_info->edma_cinfo;
-+      u32 reg_data;
-+      u32 shadow_rx_status, shadow_tx_status;
-+      int queue_id;
-+      int i, work_done = 0;
-+
-+      /* Store the Rx/Tx status by ANDing it with
-+       * appropriate CPU RX?TX mask
-+       */
-+      edma_read_reg(EDMA_REG_RX_ISR, &reg_data);
-+      edma_percpu_info->rx_status |= reg_data & edma_percpu_info->rx_mask;
-+      shadow_rx_status = edma_percpu_info->rx_status;
-+      edma_read_reg(EDMA_REG_TX_ISR, &reg_data);
-+      edma_percpu_info->tx_status |= reg_data & edma_percpu_info->tx_mask;
-+      shadow_tx_status = edma_percpu_info->tx_status;
-+
-+      /* Every core will have a start, which will be computed
-+       * in probe and stored in edma_percpu_info->tx_start variable.
-+       * We will shift the status bit by tx_start to obtain
-+       * status bits for the core on which the current processing
-+       * is happening. Since, there are 4 tx queues per core,
-+       * we will run the loop till we get the correct queue to clear.
-+       */
-+      while (edma_percpu_info->tx_status) {
-+              queue_id = ffs(edma_percpu_info->tx_status) - 1;
-+              edma_tx_complete(edma_cinfo, queue_id);
-+              edma_percpu_info->tx_status &= ~(1 << queue_id);
-+      }
-+
-+      /* Every core will have a start, which will be computed
-+       * in probe and stored in edma_percpu_info->tx_start variable.
-+       * We will shift the status bit by tx_start to obtain
-+       * status bits for the core on which the current processing
-+       * is happening. Since, there are 4 tx queues per core, we
-+       * will run the loop till we get the correct queue to clear.
-+       */
-+      while (edma_percpu_info->rx_status) {
-+              queue_id = ffs(edma_percpu_info->rx_status) - 1;
-+              edma_rx_complete(edma_cinfo, &work_done,
-+                              budget, queue_id, napi);
-+
-+              if (likely(work_done < budget))
-+                      edma_percpu_info->rx_status &= ~(1 << queue_id);
-+              else
-+                      break;
-+      }
-+
-+      /* Clear the status register, to avoid the interrupts to
-+       * reoccur.This clearing of interrupt status register is
-+       * done here as writing to status register only takes place
-+       * once the  producer/consumer index has been updated to
-+       * reflect that the packet transmission/reception went fine.
-+       */
-+      edma_write_reg(EDMA_REG_RX_ISR, shadow_rx_status);
-+      edma_write_reg(EDMA_REG_TX_ISR, shadow_tx_status);
-+
-+      /* If budget not fully consumed, exit the polling mode */
-+      if (likely(work_done < budget)) {
-+              napi_complete(napi);
-+
-+              /* re-enable the interrupts */
-+              for (i = 0; i < edma_cinfo->num_rxq_per_core; i++)
-+                      edma_write_reg(EDMA_REG_RX_INT_MASK_Q(edma_percpu_info->rx_start + i), 0x1);
-+              for (i = 0; i < edma_cinfo->num_txq_per_core; i++)
-+                      edma_write_reg(EDMA_REG_TX_INT_MASK_Q(edma_percpu_info->tx_start + i), 0x1);
-+      }
-+
-+      return work_done;
-+}
-+
-+/* edma interrupt()
-+ *    interrupt handler
-+ */
-+irqreturn_t edma_interrupt(int irq, void *dev)
-+{
-+      struct edma_per_cpu_queues_info *edma_percpu_info = (struct edma_per_cpu_queues_info *) dev;
-+      struct edma_common_info *edma_cinfo = edma_percpu_info->edma_cinfo;
-+      int i;
-+
-+      /* Unmask the TX/RX interrupt register */
-+      for (i = 0; i < edma_cinfo->num_rxq_per_core; i++)
-+              edma_write_reg(EDMA_REG_RX_INT_MASK_Q(edma_percpu_info->rx_start + i), 0x0);
-+
-+      for (i = 0; i < edma_cinfo->num_txq_per_core; i++)
-+              edma_write_reg(EDMA_REG_TX_INT_MASK_Q(edma_percpu_info->tx_start + i), 0x0);
-+
-+      napi_schedule(&edma_percpu_info->napi);
-+
-+      return IRQ_HANDLED;
-+}
---- /dev/null
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma.h
-@@ -0,0 +1,447 @@
-+/*
-+ * Copyright (c) 2014 - 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _EDMA_H_
-+#define _EDMA_H_
-+
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/io.h>
-+#include <linux/vmalloc.h>
-+#include <linux/pagemap.h>
-+#include <linux/smp.h>
-+#include <linux/platform_device.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/kernel.h>
-+#include <linux/device.h>
-+#include <linux/sysctl.h>
-+#include <linux/phy.h>
-+#include <linux/of_net.h>
-+#include <net/checksum.h>
-+#include <net/ip6_checksum.h>
-+#include <asm-generic/bug.h>
-+#include "ess_edma.h"
-+
-+#define EDMA_CPU_CORES_SUPPORTED 4
-+#define EDMA_MAX_PORTID_SUPPORTED 5
-+#define EDMA_MAX_VLAN_SUPPORTED  EDMA_MAX_PORTID_SUPPORTED
-+#define EDMA_MAX_PORTID_BITMAP_INDEX (EDMA_MAX_PORTID_SUPPORTED + 1)
-+#define EDMA_MAX_PORTID_BITMAP_SUPPORTED 0x1f /* 0001_1111 = 0x1f */
-+#define EDMA_MAX_NETDEV_PER_QUEUE 4 /* 3 Netdev per queue, 1 space for indexing */
-+
-+#define EDMA_MAX_RECEIVE_QUEUE 8
-+#define EDMA_MAX_TRANSMIT_QUEUE 16
-+
-+/* WAN/LAN adapter number */
-+#define EDMA_WAN 0
-+#define EDMA_LAN 1
-+
-+/* VLAN tag */
-+#define EDMA_LAN_DEFAULT_VLAN 1
-+#define EDMA_WAN_DEFAULT_VLAN 2
-+
-+#define EDMA_DEFAULT_GROUP1_VLAN 1
-+#define EDMA_DEFAULT_GROUP2_VLAN 2
-+#define EDMA_DEFAULT_GROUP3_VLAN 3
-+#define EDMA_DEFAULT_GROUP4_VLAN 4
-+#define EDMA_DEFAULT_GROUP5_VLAN 5
-+
-+/* Queues exposed to linux kernel */
-+#define EDMA_NETDEV_TX_QUEUE 4
-+#define EDMA_NETDEV_RX_QUEUE 4
-+
-+/* Number of queues per core */
-+#define EDMA_NUM_TXQ_PER_CORE 4
-+#define EDMA_NUM_RXQ_PER_CORE 2
-+
-+#define EDMA_TPD_EOP_SHIFT 31
-+
-+#define EDMA_PORT_ID_SHIFT 12
-+#define EDMA_PORT_ID_MASK 0x7
-+
-+/* tpd word 3 bit 18-28 */
-+#define EDMA_TPD_PORT_BITMAP_SHIFT 18
-+
-+#define EDMA_TPD_FROM_CPU_SHIFT 25
-+
-+#define EDMA_FROM_CPU_MASK 0x80
-+#define EDMA_SKB_PRIORITY_MASK 0x38
-+
-+/* TX/RX descriptor ring count */
-+/* should be a power of 2 */
-+#define EDMA_RX_RING_SIZE 128
-+#define EDMA_TX_RING_SIZE 128
-+
-+/* Flags used in paged/non paged mode */
-+#define EDMA_RX_HEAD_BUFF_SIZE_JUMBO 256
-+#define EDMA_RX_HEAD_BUFF_SIZE 1540
-+
-+/* MAX frame size supported by switch */
-+#define EDMA_MAX_JUMBO_FRAME_SIZE 9216
-+
-+/* Configurations */
-+#define EDMA_INTR_CLEAR_TYPE 0
-+#define EDMA_INTR_SW_IDX_W_TYPE 0
-+#define EDMA_FIFO_THRESH_TYPE 0
-+#define EDMA_RSS_TYPE 0
-+#define EDMA_RX_IMT 0x0020
-+#define EDMA_TX_IMT 0x0050
-+#define EDMA_TPD_BURST 5
-+#define EDMA_TXF_BURST 0x100
-+#define EDMA_RFD_BURST 8
-+#define EDMA_RFD_THR 16
-+#define EDMA_RFD_LTHR 0
-+
-+/* RX/TX per CPU based mask/shift */
-+#define EDMA_TX_PER_CPU_MASK 0xF
-+#define EDMA_RX_PER_CPU_MASK 0x3
-+#define EDMA_TX_PER_CPU_MASK_SHIFT 0x2
-+#define EDMA_RX_PER_CPU_MASK_SHIFT 0x1
-+#define EDMA_TX_CPU_START_SHIFT 0x2
-+#define EDMA_RX_CPU_START_SHIFT 0x1
-+
-+/* FLags used in transmit direction */
-+#define EDMA_HW_CHECKSUM 0x00000001
-+#define EDMA_VLAN_TX_TAG_INSERT_FLAG 0x00000002
-+#define EDMA_VLAN_TX_TAG_INSERT_DEFAULT_FLAG 0x00000004
-+
-+#define EDMA_SW_DESC_FLAG_LAST 0x1
-+#define EDMA_SW_DESC_FLAG_SKB_HEAD 0x2
-+#define EDMA_SW_DESC_FLAG_SKB_FRAG 0x4
-+#define EDMA_SW_DESC_FLAG_SKB_FRAGLIST 0x8
-+#define EDMA_SW_DESC_FLAG_SKB_NONE 0x10
-+#define EDMA_SW_DESC_FLAG_SKB_REUSE 0x20
-+
-+
-+#define EDMA_MAX_SKB_FRAGS (MAX_SKB_FRAGS + 1)
-+
-+/* Ethtool specific list of EDMA supported features */
-+#define EDMA_SUPPORTED_FEATURES (SUPPORTED_10baseT_Half \
-+                                      | SUPPORTED_10baseT_Full \
-+                                      | SUPPORTED_100baseT_Half \
-+                                      | SUPPORTED_100baseT_Full \
-+                                      | SUPPORTED_1000baseT_Full)
-+
-+/* Recevie side atheros Header */
-+#define EDMA_RX_ATH_HDR_VERSION 0x2
-+#define EDMA_RX_ATH_HDR_VERSION_SHIFT 14
-+#define EDMA_RX_ATH_HDR_PRIORITY_SHIFT 11
-+#define EDMA_RX_ATH_PORT_TYPE_SHIFT 6
-+#define EDMA_RX_ATH_HDR_RSTP_PORT_TYPE 0x4
-+
-+/* Transmit side atheros Header */
-+#define EDMA_TX_ATH_HDR_PORT_BITMAP_MASK 0x7F
-+#define EDMA_TX_ATH_HDR_FROM_CPU_MASK 0x80
-+#define EDMA_TX_ATH_HDR_FROM_CPU_SHIFT 7
-+
-+#define EDMA_TXQ_START_CORE0 8
-+#define EDMA_TXQ_START_CORE1 12
-+#define EDMA_TXQ_START_CORE2 0
-+#define EDMA_TXQ_START_CORE3 4
-+
-+#define EDMA_TXQ_IRQ_MASK_CORE0 0x0F00
-+#define EDMA_TXQ_IRQ_MASK_CORE1 0xF000
-+#define EDMA_TXQ_IRQ_MASK_CORE2 0x000F
-+#define EDMA_TXQ_IRQ_MASK_CORE3 0x00F0
-+
-+#define EDMA_ETH_HDR_LEN 12
-+#define EDMA_ETH_TYPE_MASK 0xFFFF
-+
-+#define EDMA_RX_BUFFER_WRITE 16
-+#define EDMA_RFD_AVAIL_THR 80
-+
-+#define EDMA_GMAC_NO_MDIO_PHY PHY_MAX_ADDR
-+
-+extern int ssdk_rfs_ipct_rule_set(__be32 ip_src, __be32 ip_dst,
-+                                __be16 sport, __be16 dport,
-+                                uint8_t proto, u16 loadbalance, bool action);
-+struct edma_ethtool_statistics {
-+      u32 tx_q0_pkt;
-+      u32 tx_q1_pkt;
-+      u32 tx_q2_pkt;
-+      u32 tx_q3_pkt;
-+      u32 tx_q4_pkt;
-+      u32 tx_q5_pkt;
-+      u32 tx_q6_pkt;
-+      u32 tx_q7_pkt;
-+      u32 tx_q8_pkt;
-+      u32 tx_q9_pkt;
-+      u32 tx_q10_pkt;
-+      u32 tx_q11_pkt;
-+      u32 tx_q12_pkt;
-+      u32 tx_q13_pkt;
-+      u32 tx_q14_pkt;
-+      u32 tx_q15_pkt;
-+      u32 tx_q0_byte;
-+      u32 tx_q1_byte;
-+      u32 tx_q2_byte;
-+      u32 tx_q3_byte;
-+      u32 tx_q4_byte;
-+      u32 tx_q5_byte;
-+      u32 tx_q6_byte;
-+      u32 tx_q7_byte;
-+      u32 tx_q8_byte;
-+      u32 tx_q9_byte;
-+      u32 tx_q10_byte;
-+      u32 tx_q11_byte;
-+      u32 tx_q12_byte;
-+      u32 tx_q13_byte;
-+      u32 tx_q14_byte;
-+      u32 tx_q15_byte;
-+      u32 rx_q0_pkt;
-+      u32 rx_q1_pkt;
-+      u32 rx_q2_pkt;
-+      u32 rx_q3_pkt;
-+      u32 rx_q4_pkt;
-+      u32 rx_q5_pkt;
-+      u32 rx_q6_pkt;
-+      u32 rx_q7_pkt;
-+      u32 rx_q0_byte;
-+      u32 rx_q1_byte;
-+      u32 rx_q2_byte;
-+      u32 rx_q3_byte;
-+      u32 rx_q4_byte;
-+      u32 rx_q5_byte;
-+      u32 rx_q6_byte;
-+      u32 rx_q7_byte;
-+      u32 tx_desc_error;
-+};
-+
-+struct edma_mdio_data {
-+      struct mii_bus  *mii_bus;
-+      void __iomem    *membase;
-+      int phy_irq[PHY_MAX_ADDR];
-+};
-+
-+/* EDMA LINK state */
-+enum edma_link_state {
-+      __EDMA_LINKUP, /* Indicate link is UP */
-+      __EDMA_LINKDOWN /* Indicate link is down */
-+};
-+
-+/* EDMA GMAC state */
-+enum edma_gmac_state {
-+      __EDMA_UP /* use to indicate GMAC is up */
-+};
-+
-+/* edma transmit descriptor */
-+struct edma_tx_desc {
-+      __le16  len; /* full packet including CRC */
-+      __le16  svlan_tag; /* vlan tag */
-+      __le32  word1; /* byte 4-7 */
-+      __le32  addr; /* address of buffer */
-+      __le32  word3; /* byte 12 */
-+};
-+
-+/* edma receive return descriptor */
-+struct edma_rx_return_desc {
-+      u16 rrd0;
-+      u16 rrd1;
-+      u16 rrd2;
-+      u16 rrd3;
-+      u16 rrd4;
-+      u16 rrd5;
-+      u16 rrd6;
-+      u16 rrd7;
-+};
-+
-+/* RFD descriptor */
-+struct edma_rx_free_desc {
-+      __le32  buffer_addr; /* buffer address */
-+};
-+
-+/* edma hw specific data */
-+struct edma_hw {
-+      u32  __iomem *hw_addr; /* inner register address */
-+      struct edma_adapter *adapter; /* netdevice adapter */
-+      u32 rx_intr_mask; /*rx interrupt mask */
-+      u32 tx_intr_mask; /* tx interrupt nask */
-+      u32 misc_intr_mask; /* misc interrupt mask */
-+      u32 wol_intr_mask; /* wake on lan interrupt mask */
-+      bool intr_clear_type; /* interrupt clear */
-+      bool intr_sw_idx_w; /* interrupt software index */
-+      u32 rx_head_buff_size; /* Rx buffer size */
-+      u8 rss_type; /* rss protocol type */
-+};
-+
-+/* edma_sw_desc stores software descriptor
-+ * SW descriptor has 1:1 map with HW descriptor
-+ */
-+struct edma_sw_desc {
-+      struct sk_buff *skb;
-+      dma_addr_t dma; /* dma address */
-+      u16 length; /* Tx/Rx buffer length */
-+      u32 flags;
-+};
-+
-+/* per core related information */
-+struct edma_per_cpu_queues_info {
-+      struct napi_struct napi; /* napi associated with the core */
-+      u32 tx_mask; /* tx interrupt mask */
-+      u32 rx_mask; /* rx interrupt mask */
-+      u32 tx_status; /* tx interrupt status */
-+      u32 rx_status; /* rx interrupt status */
-+      u32 tx_start; /* tx queue start */
-+      u32 rx_start; /* rx queue start */
-+      struct edma_common_info *edma_cinfo; /* edma common info */
-+};
-+
-+/* edma specific common info */
-+struct edma_common_info {
-+      struct edma_tx_desc_ring *tpd_ring[16]; /* 16 Tx queues */
-+      struct edma_rfd_desc_ring *rfd_ring[8]; /* 8 Rx queues */
-+      struct platform_device *pdev; /* device structure */
-+      struct net_device *netdev[EDMA_MAX_PORTID_SUPPORTED];
-+      struct net_device *portid_netdev_lookup_tbl[EDMA_MAX_PORTID_BITMAP_INDEX];
-+      struct ctl_table_header *edma_ctl_table_hdr;
-+      int num_gmac;
-+      struct edma_ethtool_statistics edma_ethstats; /* ethtool stats */
-+      int num_rx_queues; /* number of rx queue */
-+      u32 num_tx_queues; /* number of tx queue */
-+      u32 tx_irq[16]; /* number of tx irq */
-+      u32 rx_irq[8]; /* number of rx irq */
-+      u32 from_cpu; /* from CPU TPD field */
-+      u32 num_rxq_per_core; /* Rx queues per core */
-+      u32 num_txq_per_core; /* Tx queues per core */
-+      u16 tx_ring_count; /* Tx ring count */
-+      u16 rx_ring_count; /* Rx ring*/
-+      u16 rx_head_buffer_len; /* rx buffer length */
-+      u16 rx_page_buffer_len; /* rx buffer length */
-+      u32 page_mode; /* Jumbo frame supported flag */
-+      u32 fraglist_mode; /* fraglist supported flag */
-+      struct edma_hw hw; /* edma hw specific structure */
-+      struct edma_per_cpu_queues_info edma_percpu_info[CONFIG_NR_CPUS]; /* per cpu information */
-+      spinlock_t stats_lock; /* protect edma stats area for updation */
-+      struct timer_list edma_stats_timer;
-+};
-+
-+/* transimit packet descriptor (tpd) ring */
-+struct edma_tx_desc_ring {
-+      struct netdev_queue *nq[EDMA_MAX_NETDEV_PER_QUEUE]; /* Linux queue index */
-+      struct net_device *netdev[EDMA_MAX_NETDEV_PER_QUEUE];
-+                      /* Array of netdevs associated with the tpd ring */
-+      void *hw_desc; /* descriptor ring virtual address */
-+      struct edma_sw_desc *sw_desc; /* buffer associated with ring */
-+      int netdev_bmp; /* Bitmap for per-ring netdevs */
-+      u32 size; /* descriptor ring length in bytes */
-+      u16 count; /* number of descriptors in the ring */
-+      dma_addr_t dma; /* descriptor ring physical address */
-+      u16 sw_next_to_fill; /* next Tx descriptor to fill */
-+      u16 sw_next_to_clean; /* next Tx descriptor to clean */
-+};
-+
-+/* receive free descriptor (rfd) ring */
-+struct edma_rfd_desc_ring {
-+      void *hw_desc; /* descriptor ring virtual address */
-+      struct edma_sw_desc *sw_desc; /* buffer associated with ring */
-+      u16 size; /* bytes allocated to sw_desc */
-+      u16 count; /* number of descriptors in the ring */
-+      dma_addr_t dma; /* descriptor ring physical address */
-+      u16 sw_next_to_fill; /* next descriptor to fill */
-+      u16 sw_next_to_clean; /* next descriptor to clean */
-+};
-+
-+/* edma_rfs_flter_node - rfs filter node in hash table */
-+struct edma_rfs_filter_node {
-+      struct flow_keys keys;
-+      u32 flow_id; /* flow_id of filter provided by kernel */
-+      u16 filter_id; /* filter id of filter returned by adaptor */
-+      u16 rq_id; /* desired rq index */
-+      struct hlist_node node; /* edma rfs list node */
-+};
-+
-+/* edma_rfs_flow_tbl - rfs flow table */
-+struct edma_rfs_flow_table {
-+      u16 max_num_filter; /* Maximum number of filters edma supports */
-+      u16 hashtoclean; /* hash table index to clean next */
-+      int filter_available; /* Number of free filters available */
-+      struct hlist_head hlist_head[EDMA_RFS_FLOW_ENTRIES];
-+      spinlock_t rfs_ftab_lock;
-+      struct timer_list expire_rfs; /* timer function for edma_rps_may_expire_flow */
-+};
-+
-+/* EDMA net device structure */
-+struct edma_adapter {
-+      struct net_device *netdev; /* netdevice */
-+      struct platform_device *pdev; /* platform device */
-+      struct edma_common_info *edma_cinfo; /* edma common info */
-+      struct phy_device *phydev; /* Phy device */
-+      struct edma_rfs_flow_table rfs; /* edma rfs flow table */
-+      struct net_device_stats stats; /* netdev statistics */
-+      set_rfs_filter_callback_t set_rfs_rule;
-+      u32 flags;/* status flags */
-+      unsigned long state_flags; /* GMAC up/down flags */
-+      u32 forced_speed; /* link force speed */
-+      u32 forced_duplex; /* link force duplex */
-+      u32 link_state; /* phy link state */
-+      u32 phy_mdio_addr; /* PHY device address on MII interface */
-+      u32 poll_required; /* check if link polling is required */
-+      u32 tx_start_offset[CONFIG_NR_CPUS]; /* tx queue start */
-+      u32 default_vlan_tag; /* vlan tag */
-+      u32 dp_bitmap;
-+      uint8_t phy_id[MII_BUS_ID_SIZE + 3];
-+};
-+
-+int edma_alloc_queues_tx(struct edma_common_info *edma_cinfo);
-+int edma_alloc_queues_rx(struct edma_common_info *edma_cinfo);
-+int edma_open(struct net_device *netdev);
-+int edma_close(struct net_device *netdev);
-+void edma_free_tx_resources(struct edma_common_info *edma_c_info);
-+void edma_free_rx_resources(struct edma_common_info *edma_c_info);
-+int edma_alloc_tx_rings(struct edma_common_info *edma_cinfo);
-+int edma_alloc_rx_rings(struct edma_common_info *edma_cinfo);
-+void edma_free_tx_rings(struct edma_common_info *edma_cinfo);
-+void edma_free_rx_rings(struct edma_common_info *edma_cinfo);
-+void edma_free_queues(struct edma_common_info *edma_cinfo);
-+void edma_irq_disable(struct edma_common_info *edma_cinfo);
-+int edma_reset(struct edma_common_info *edma_cinfo);
-+int edma_poll(struct napi_struct *napi, int budget);
-+netdev_tx_t edma_xmit(struct sk_buff *skb,
-+              struct net_device *netdev);
-+int edma_configure(struct edma_common_info *edma_cinfo);
-+void edma_irq_enable(struct edma_common_info *edma_cinfo);
-+void edma_enable_tx_ctrl(struct edma_hw *hw);
-+void edma_enable_rx_ctrl(struct edma_hw *hw);
-+void edma_stop_rx_tx(struct edma_hw *hw);
-+void edma_free_irqs(struct edma_adapter *adapter);
-+irqreturn_t edma_interrupt(int irq, void *dev);
-+void edma_write_reg(u16 reg_addr, u32 reg_value);
-+void edma_read_reg(u16 reg_addr, volatile u32 *reg_value);
-+struct net_device_stats *edma_get_stats(struct net_device *netdev);
-+int edma_set_mac_addr(struct net_device *netdev, void *p);
-+int edma_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
-+              u16 rxq, u32 flow_id);
-+int edma_register_rfs_filter(struct net_device *netdev,
-+              set_rfs_filter_callback_t set_filter);
-+void edma_flow_may_expire(struct timer_list *t);
-+void edma_set_ethtool_ops(struct net_device *netdev);
-+void edma_set_stp_rstp(bool tag);
-+void edma_assign_ath_hdr_type(int tag);
-+int edma_get_default_vlan_tag(struct net_device *netdev);
-+void edma_adjust_link(struct net_device *netdev);
-+int edma_fill_netdev(struct edma_common_info *edma_cinfo, int qid, int num, int txq_id);
-+void edma_read_append_stats(struct edma_common_info *edma_cinfo);
-+void edma_change_tx_coalesce(int usecs);
-+void edma_change_rx_coalesce(int usecs);
-+void edma_get_tx_rx_coalesce(u32 *reg_val);
-+void edma_clear_irq_status(void);
-+#endif /* _EDMA_H_ */
---- /dev/null
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
-@@ -0,0 +1,1216 @@
-+/*
-+ * Copyright (c) 2014 - 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <linux/cpu_rmap.h>
-+#include <linux/of.h>
-+#include <linux/of_net.h>
-+#include <linux/timer.h>
-+#include "edma.h"
-+#include "ess_edma.h"
-+
-+/* Weight round robin and virtual QID mask */
-+#define EDMA_WRR_VID_SCTL_MASK 0xffff
-+
-+/* Weight round robin and virtual QID shift */
-+#define EDMA_WRR_VID_SCTL_SHIFT 16
-+
-+char edma_axi_driver_name[] = "ess_edma";
-+static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |
-+      NETIF_MSG_LINK | NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP;
-+
-+static u32 edma_hw_addr;
-+
-+char edma_tx_irq[16][64];
-+char edma_rx_irq[8][64];
-+struct net_device *edma_netdev[EDMA_MAX_PORTID_SUPPORTED];
-+static u16 tx_start[4] = {EDMA_TXQ_START_CORE0, EDMA_TXQ_START_CORE1,
-+                      EDMA_TXQ_START_CORE2, EDMA_TXQ_START_CORE3};
-+static u32 tx_mask[4] = {EDMA_TXQ_IRQ_MASK_CORE0, EDMA_TXQ_IRQ_MASK_CORE1,
-+                      EDMA_TXQ_IRQ_MASK_CORE2, EDMA_TXQ_IRQ_MASK_CORE3};
-+
-+static u32 edma_default_ltag  __read_mostly = EDMA_LAN_DEFAULT_VLAN;
-+static u32 edma_default_wtag  __read_mostly = EDMA_WAN_DEFAULT_VLAN;
-+static u32 edma_default_group1_vtag  __read_mostly = EDMA_DEFAULT_GROUP1_VLAN;
-+static u32 edma_default_group2_vtag  __read_mostly = EDMA_DEFAULT_GROUP2_VLAN;
-+static u32 edma_default_group3_vtag  __read_mostly = EDMA_DEFAULT_GROUP3_VLAN;
-+static u32 edma_default_group4_vtag  __read_mostly = EDMA_DEFAULT_GROUP4_VLAN;
-+static u32 edma_default_group5_vtag  __read_mostly = EDMA_DEFAULT_GROUP5_VLAN;
-+static u32 edma_rss_idt_val = EDMA_RSS_IDT_VALUE;
-+static u32 edma_rss_idt_idx;
-+
-+static int edma_weight_assigned_to_q __read_mostly;
-+static int edma_queue_to_virtual_q __read_mostly;
-+static bool edma_enable_rstp  __read_mostly;
-+static int edma_athr_hdr_eth_type __read_mostly;
-+
-+static int page_mode;
-+module_param(page_mode, int, 0);
-+MODULE_PARM_DESC(page_mode, "enable page mode");
-+
-+static int overwrite_mode;
-+module_param(overwrite_mode, int, 0);
-+MODULE_PARM_DESC(overwrite_mode, "overwrite default page_mode setting");
-+
-+static int jumbo_mru = EDMA_RX_HEAD_BUFF_SIZE;
-+module_param(jumbo_mru, int, 0);
-+MODULE_PARM_DESC(jumbo_mru, "enable fraglist support");
-+
-+static int num_rxq = 4;
-+module_param(num_rxq, int, 0);
-+MODULE_PARM_DESC(num_rxq, "change the number of rx queues");
-+
-+void edma_write_reg(u16 reg_addr, u32 reg_value)
-+{
-+      writel(reg_value, ((void __iomem *)(edma_hw_addr + reg_addr)));
-+}
-+
-+void edma_read_reg(u16 reg_addr, volatile u32 *reg_value)
-+{
-+      *reg_value = readl((void __iomem *)(edma_hw_addr + reg_addr));
-+}
-+
-+/* edma_change_tx_coalesce()
-+ *    change tx interrupt moderation timer
-+ */
-+void edma_change_tx_coalesce(int usecs)
-+{
-+      u32 reg_value;
-+
-+      /* Here, we right shift the value from the user by 1, this is
-+       * done because IMT resolution timer is 2usecs. 1 count
-+       * of this register corresponds to 2 usecs.
-+       */
-+      edma_read_reg(EDMA_REG_IRQ_MODRT_TIMER_INIT, &reg_value);
-+      reg_value = ((reg_value & 0xffff) | ((usecs >> 1) << 16));
-+      edma_write_reg(EDMA_REG_IRQ_MODRT_TIMER_INIT, reg_value);
-+}
-+
-+/* edma_change_rx_coalesce()
-+ *    change rx interrupt moderation timer
-+ */
-+void edma_change_rx_coalesce(int usecs)
-+{
-+      u32 reg_value;
-+
-+      /* Here, we right shift the value from the user by 1, this is
-+       * done because IMT resolution timer is 2usecs. 1 count
-+       * of this register corresponds to 2 usecs.
-+       */
-+      edma_read_reg(EDMA_REG_IRQ_MODRT_TIMER_INIT, &reg_value);
-+      reg_value = ((reg_value & 0xffff0000) | (usecs >> 1));
-+      edma_write_reg(EDMA_REG_IRQ_MODRT_TIMER_INIT, reg_value);
-+}
-+
-+/* edma_get_tx_rx_coalesce()
-+ *    Get tx/rx interrupt moderation value
-+ */
-+void edma_get_tx_rx_coalesce(u32 *reg_val)
-+{
-+      edma_read_reg(EDMA_REG_IRQ_MODRT_TIMER_INIT, reg_val);
-+}
-+
-+void edma_read_append_stats(struct edma_common_info *edma_cinfo)
-+{
-+      uint32_t *p;
-+      int i;
-+      u32 stat;
-+
-+      spin_lock(&edma_cinfo->stats_lock);
-+      p = (uint32_t *)&(edma_cinfo->edma_ethstats);
-+
-+      for (i = 0; i < EDMA_MAX_TRANSMIT_QUEUE; i++) {
-+              edma_read_reg(EDMA_REG_TX_STAT_PKT_Q(i), &stat);
-+              *p += stat;
-+              p++;
-+      }
-+
-+      for (i = 0; i < EDMA_MAX_TRANSMIT_QUEUE; i++) {
-+              edma_read_reg(EDMA_REG_TX_STAT_BYTE_Q(i), &stat);
-+              *p += stat;
-+              p++;
-+      }
-+
-+      for (i = 0; i < EDMA_MAX_RECEIVE_QUEUE; i++) {
-+              edma_read_reg(EDMA_REG_RX_STAT_PKT_Q(i), &stat);
-+              *p += stat;
-+              p++;
-+      }
-+
-+      for (i = 0; i < EDMA_MAX_RECEIVE_QUEUE; i++) {
-+              edma_read_reg(EDMA_REG_RX_STAT_BYTE_Q(i), &stat);
-+              *p += stat;
-+              p++;
-+      }
-+
-+      spin_unlock(&edma_cinfo->stats_lock);
-+}
-+
-+static void edma_statistics_timer(struct timer_list *t)
-+{
-+      struct edma_common_info *edma_cinfo =
-+              from_timer(edma_cinfo, t, edma_stats_timer);
-+
-+      edma_read_append_stats(edma_cinfo);
-+
-+      mod_timer(&edma_cinfo->edma_stats_timer, jiffies + 1*HZ);
-+}
-+
-+static int edma_enable_stp_rstp(struct ctl_table *table, int write,
-+                              void __user *buffer, size_t *lenp,
-+                              loff_t *ppos)
-+{
-+      int ret;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+      if (write)
-+              edma_set_stp_rstp(edma_enable_rstp);
-+
-+      return ret;
-+}
-+
-+static int edma_ath_hdr_eth_type(struct ctl_table *table, int write,
-+                               void __user *buffer, size_t *lenp,
-+                               loff_t *ppos)
-+{
-+      int ret;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+      if (write)
-+              edma_assign_ath_hdr_type(edma_athr_hdr_eth_type);
-+
-+      return ret;
-+}
-+
-+static int edma_change_default_lan_vlan(struct ctl_table *table, int write,
-+                                      void __user *buffer, size_t *lenp,
-+                                      loff_t *ppos)
-+{
-+      struct edma_adapter *adapter;
-+      int ret;
-+
-+      if (!edma_netdev[1]) {
-+              pr_err("Netdevice for default_lan does not exist\n");
-+              return -1;
-+      }
-+
-+      adapter = netdev_priv(edma_netdev[1]);
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+
-+      if (write)
-+              adapter->default_vlan_tag = edma_default_ltag;
-+
-+      return ret;
-+}
-+
-+static int edma_change_default_wan_vlan(struct ctl_table *table, int write,
-+                                      void __user *buffer, size_t *lenp,
-+                                      loff_t *ppos)
-+{
-+      struct edma_adapter *adapter;
-+      int ret;
-+
-+      if (!edma_netdev[0]) {
-+              pr_err("Netdevice for default_wan does not exist\n");
-+              return -1;
-+      }
-+
-+      adapter = netdev_priv(edma_netdev[0]);
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+
-+      if (write)
-+              adapter->default_vlan_tag = edma_default_wtag;
-+
-+      return ret;
-+}
-+
-+static int edma_change_group1_vtag(struct ctl_table *table, int write,
-+                                 void __user *buffer, size_t *lenp,
-+                                 loff_t *ppos)
-+{
-+      struct edma_adapter *adapter;
-+      struct edma_common_info *edma_cinfo;
-+      int ret;
-+
-+      if (!edma_netdev[0]) {
-+              pr_err("Netdevice for Group 1 does not exist\n");
-+              return -1;
-+      }
-+
-+      adapter = netdev_priv(edma_netdev[0]);
-+      edma_cinfo = adapter->edma_cinfo;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+
-+      if (write)
-+              adapter->default_vlan_tag = edma_default_group1_vtag;
-+
-+      return ret;
-+}
-+
-+static int edma_change_group2_vtag(struct ctl_table *table, int write,
-+                                 void __user *buffer, size_t *lenp,
-+                                 loff_t *ppos)
-+{
-+      struct edma_adapter *adapter;
-+      struct edma_common_info *edma_cinfo;
-+      int ret;
-+
-+      if (!edma_netdev[1]) {
-+              pr_err("Netdevice for Group 2 does not exist\n");
-+              return -1;
-+      }
-+
-+      adapter = netdev_priv(edma_netdev[1]);
-+      edma_cinfo = adapter->edma_cinfo;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+
-+      if (write)
-+              adapter->default_vlan_tag = edma_default_group2_vtag;
-+
-+      return ret;
-+}
-+
-+static int edma_change_group3_vtag(struct ctl_table *table, int write,
-+                                 void __user *buffer, size_t *lenp,
-+                                 loff_t *ppos)
-+{
-+      struct edma_adapter *adapter;
-+      struct edma_common_info *edma_cinfo;
-+      int ret;
-+
-+      if (!edma_netdev[2]) {
-+              pr_err("Netdevice for Group 3 does not exist\n");
-+              return -1;
-+      }
-+
-+      adapter = netdev_priv(edma_netdev[2]);
-+      edma_cinfo = adapter->edma_cinfo;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+
-+      if (write)
-+              adapter->default_vlan_tag = edma_default_group3_vtag;
-+
-+      return ret;
-+}
-+
-+static int edma_change_group4_vtag(struct ctl_table *table, int write,
-+                                 void __user *buffer, size_t *lenp,
-+                                 loff_t *ppos)
-+{
-+      struct edma_adapter *adapter;
-+      struct edma_common_info *edma_cinfo;
-+      int ret;
-+
-+      if (!edma_netdev[3]) {
-+              pr_err("Netdevice for Group 4 does not exist\n");
-+              return -1;
-+      }
-+
-+      adapter = netdev_priv(edma_netdev[3]);
-+      edma_cinfo = adapter->edma_cinfo;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+
-+      if (write)
-+              adapter->default_vlan_tag = edma_default_group4_vtag;
-+
-+      return ret;
-+}
-+
-+static int edma_change_group5_vtag(struct ctl_table *table, int write,
-+                                 void __user *buffer, size_t *lenp,
-+                                 loff_t *ppos)
-+{
-+      struct edma_adapter *adapter;
-+      struct edma_common_info *edma_cinfo;
-+      int ret;
-+
-+      if (!edma_netdev[4]) {
-+              pr_err("Netdevice for Group 5 does not exist\n");
-+              return -1;
-+      }
-+
-+      adapter = netdev_priv(edma_netdev[4]);
-+      edma_cinfo = adapter->edma_cinfo;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+
-+      if (write)
-+              adapter->default_vlan_tag = edma_default_group5_vtag;
-+
-+      return ret;
-+}
-+
-+static int edma_set_rss_idt_value(struct ctl_table *table, int write,
-+                                void __user *buffer, size_t *lenp,
-+                                loff_t *ppos)
-+{
-+      int ret;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+      if (write && !ret)
-+              edma_write_reg(EDMA_REG_RSS_IDT(edma_rss_idt_idx),
-+                             edma_rss_idt_val);
-+      return ret;
-+}
-+
-+static int edma_set_rss_idt_idx(struct ctl_table *table, int write,
-+                              void __user *buffer, size_t *lenp,
-+                              loff_t *ppos)
-+{
-+      int ret;
-+      u32 old_value = edma_rss_idt_idx;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+      if (!write || ret)
-+              return ret;
-+
-+      if (edma_rss_idt_idx >= EDMA_NUM_IDT) {
-+              pr_err("Invalid RSS indirection table index %d\n",
-+                     edma_rss_idt_idx);
-+              edma_rss_idt_idx = old_value;
-+              return -EINVAL;
-+      }
-+      return ret;
-+}
-+
-+static int edma_weight_assigned_to_queues(struct ctl_table *table, int write,
-+                                        void __user *buffer, size_t *lenp,
-+                                        loff_t *ppos)
-+{
-+      int ret, queue_id, weight;
-+      u32 reg_data, data, reg_addr;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+      if (write) {
-+              queue_id = edma_weight_assigned_to_q & EDMA_WRR_VID_SCTL_MASK;
-+              if (queue_id < 0 || queue_id > 15) {
-+                      pr_err("queue_id not within desired range\n");
-+                      return -EINVAL;
-+              }
-+
-+              weight = edma_weight_assigned_to_q >> EDMA_WRR_VID_SCTL_SHIFT;
-+              if (weight < 0 || weight > 0xF) {
-+                      pr_err("queue_id not within desired range\n");
-+                      return -EINVAL;
-+              }
-+
-+              data = weight << EDMA_WRR_SHIFT(queue_id);
-+
-+              reg_addr = EDMA_REG_WRR_CTRL_Q0_Q3 + (queue_id & ~0x3);
-+              edma_read_reg(reg_addr, &reg_data);
-+              reg_data &= ~(1 << EDMA_WRR_SHIFT(queue_id));
-+              edma_write_reg(reg_addr, data | reg_data);
-+      }
-+
-+      return ret;
-+}
-+
-+static int edma_queue_to_virtual_queue_map(struct ctl_table *table, int write,
-+                                         void __user *buffer, size_t *lenp,
-+                                         loff_t *ppos)
-+{
-+      int ret, queue_id, virtual_qid;
-+      u32 reg_data, data, reg_addr;
-+
-+      ret = proc_dointvec(table, write, buffer, lenp, ppos);
-+      if (write) {
-+              queue_id = edma_queue_to_virtual_q & EDMA_WRR_VID_SCTL_MASK;
-+              if (queue_id < 0 || queue_id > 15) {
-+                      pr_err("queue_id not within desired range\n");
-+                      return -EINVAL;
-+              }
-+
-+              virtual_qid = edma_queue_to_virtual_q >>
-+                      EDMA_WRR_VID_SCTL_SHIFT;
-+              if (virtual_qid < 0 || virtual_qid > 8) {
-+                      pr_err("queue_id not within desired range\n");
-+                      return -EINVAL;
-+              }
-+
-+              data = virtual_qid << EDMA_VQ_ID_SHIFT(queue_id);
-+
-+              reg_addr = EDMA_REG_VQ_CTRL0 + (queue_id & ~0x3);
-+              edma_read_reg(reg_addr, &reg_data);
-+              reg_data &= ~(1 << EDMA_VQ_ID_SHIFT(queue_id));
-+              edma_write_reg(reg_addr, data | reg_data);
-+      }
-+
-+      return ret;
-+}
-+
-+static struct ctl_table edma_table[] = {
-+      {
-+              .procname       = "default_lan_tag",
-+              .data           = &edma_default_ltag,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_change_default_lan_vlan
-+      },
-+      {
-+              .procname       = "default_wan_tag",
-+              .data           = &edma_default_wtag,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_change_default_wan_vlan
-+      },
-+      {
-+              .procname       = "weight_assigned_to_queues",
-+              .data           = &edma_weight_assigned_to_q,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_weight_assigned_to_queues
-+      },
-+      {
-+              .procname       = "queue_to_virtual_queue_map",
-+              .data           = &edma_queue_to_virtual_q,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_queue_to_virtual_queue_map
-+      },
-+      {
-+              .procname       = "enable_stp_rstp",
-+              .data           = &edma_enable_rstp,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_enable_stp_rstp
-+      },
-+      {
-+              .procname       = "athr_hdr_eth_type",
-+              .data           = &edma_athr_hdr_eth_type,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_ath_hdr_eth_type
-+      },
-+      {
-+              .procname       = "default_group1_vlan_tag",
-+              .data           = &edma_default_group1_vtag,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_change_group1_vtag
-+      },
-+      {
-+              .procname       = "default_group2_vlan_tag",
-+              .data           = &edma_default_group2_vtag,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_change_group2_vtag
-+      },
-+      {
-+              .procname       = "default_group3_vlan_tag",
-+              .data           = &edma_default_group3_vtag,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_change_group3_vtag
-+      },
-+      {
-+              .procname       = "default_group4_vlan_tag",
-+              .data           = &edma_default_group4_vtag,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_change_group4_vtag
-+      },
-+      {
-+              .procname       = "default_group5_vlan_tag",
-+              .data           = &edma_default_group5_vtag,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_change_group5_vtag
-+      },
-+      {
-+              .procname       = "edma_rss_idt_value",
-+              .data           = &edma_rss_idt_val,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_set_rss_idt_value
-+      },
-+      {
-+              .procname       = "edma_rss_idt_idx",
-+              .data           = &edma_rss_idt_idx,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0644,
-+              .proc_handler   = edma_set_rss_idt_idx
-+      },
-+      {}
-+};
-+
-+/* edma_axi_netdev_ops
-+ *    Describe the operations supported by registered netdevices
-+ *
-+ * static const struct net_device_ops edma_axi_netdev_ops = {
-+ *    .ndo_open               = edma_open,
-+ *    .ndo_stop               = edma_close,
-+ *    .ndo_start_xmit         = edma_xmit_frame,
-+ *    .ndo_set_mac_address    = edma_set_mac_addr,
-+ * }
-+ */
-+static const struct net_device_ops edma_axi_netdev_ops = {
-+      .ndo_open               = edma_open,
-+      .ndo_stop               = edma_close,
-+      .ndo_start_xmit         = edma_xmit,
-+      .ndo_set_mac_address    = edma_set_mac_addr,
-+#ifdef CONFIG_RFS_ACCEL
-+      .ndo_rx_flow_steer      = edma_rx_flow_steer,
-+      .ndo_register_rfs_filter = edma_register_rfs_filter,
-+      .ndo_get_default_vlan_tag = edma_get_default_vlan_tag,
-+#endif
-+      .ndo_get_stats          = edma_get_stats,
-+};
-+
-+/* edma_axi_probe()
-+ *    Initialise an adapter identified by a platform_device structure.
-+ *
-+ * The OS initialization, configuring of the adapter private structure,
-+ * and a hardware reset occur in the probe.
-+ */
-+static int edma_axi_probe(struct platform_device *pdev)
-+{
-+      struct edma_common_info *edma_cinfo;
-+      struct edma_hw *hw;
-+      struct edma_adapter *adapter[EDMA_MAX_PORTID_SUPPORTED];
-+      struct resource *res;
-+      struct device_node *np = pdev->dev.of_node;
-+      struct device_node *pnp;
-+      struct device_node *mdio_node = NULL;
-+      struct platform_device *mdio_plat = NULL;
-+      struct mii_bus *miibus = NULL;
-+      struct edma_mdio_data *mdio_data = NULL;
-+      int i, j, k, err = 0;
-+      int portid_bmp;
-+      int idx = 0, idx_mac = 0;
-+
-+      if (CONFIG_NR_CPUS != EDMA_CPU_CORES_SUPPORTED) {
-+              dev_err(&pdev->dev, "Invalid CPU Cores\n");
-+              return -EINVAL;
-+      }
-+
-+      if ((num_rxq != 4) && (num_rxq != 8)) {
-+              dev_err(&pdev->dev, "Invalid RX queue, edma probe failed\n");
-+              return -EINVAL;
-+      }
-+      edma_cinfo = kzalloc(sizeof(struct edma_common_info), GFP_KERNEL);
-+      if (!edma_cinfo) {
-+              err = -ENOMEM;
-+              goto err_alloc;
-+      }
-+
-+      edma_cinfo->pdev = pdev;
-+
-+      of_property_read_u32(np, "qcom,num_gmac", &edma_cinfo->num_gmac);
-+      if (edma_cinfo->num_gmac > EDMA_MAX_PORTID_SUPPORTED) {
-+              pr_err("Invalid DTSI Entry for qcom,num_gmac\n");
-+              err = -EINVAL;
-+              goto err_cinfo;
-+      }
-+
-+      /* Initialize the netdev array before allocation
-+       * to avoid double free
-+       */
-+      for (i = 0 ; i < edma_cinfo->num_gmac ; i++)
-+              edma_netdev[i] = NULL;
-+
-+      for (i = 0 ; i < edma_cinfo->num_gmac ; i++) {
-+              edma_netdev[i] = alloc_etherdev_mqs(sizeof(struct edma_adapter),
-+                      EDMA_NETDEV_TX_QUEUE, EDMA_NETDEV_RX_QUEUE);
-+
-+              if (!edma_netdev[i]) {
-+                      dev_err(&pdev->dev,
-+                              "net device alloc fails for index=%d\n", i);
-+                      err = -ENODEV;
-+                      goto err_ioremap;
-+              }
-+
-+              SET_NETDEV_DEV(edma_netdev[i], &pdev->dev);
-+              platform_set_drvdata(pdev, edma_netdev[i]);
-+              edma_cinfo->netdev[i] = edma_netdev[i];
-+      }
-+
-+      /* Fill ring details */
-+      edma_cinfo->num_tx_queues = EDMA_MAX_TRANSMIT_QUEUE;
-+      edma_cinfo->num_txq_per_core = (EDMA_MAX_TRANSMIT_QUEUE / 4);
-+      edma_cinfo->tx_ring_count = EDMA_TX_RING_SIZE;
-+
-+      /* Update num rx queues based on module parameter */
-+      edma_cinfo->num_rx_queues = num_rxq;
-+      edma_cinfo->num_rxq_per_core = ((num_rxq == 4) ? 1 : 2);
-+
-+      edma_cinfo->rx_ring_count = EDMA_RX_RING_SIZE;
-+
-+      hw = &edma_cinfo->hw;
-+
-+      /* Fill HW defaults */
-+      hw->tx_intr_mask = EDMA_TX_IMR_NORMAL_MASK;
-+      hw->rx_intr_mask = EDMA_RX_IMR_NORMAL_MASK;
-+
-+      of_property_read_u32(np, "qcom,page-mode", &edma_cinfo->page_mode);
-+      of_property_read_u32(np, "qcom,rx_head_buf_size",
-+                           &hw->rx_head_buff_size);
-+
-+      if (overwrite_mode) {
-+              dev_info(&pdev->dev, "page mode overwritten");
-+              edma_cinfo->page_mode = page_mode;
-+      }
-+
-+      if (jumbo_mru)
-+              edma_cinfo->fraglist_mode = 1;
-+
-+      if (edma_cinfo->page_mode)
-+              hw->rx_head_buff_size = EDMA_RX_HEAD_BUFF_SIZE_JUMBO;
-+      else if (edma_cinfo->fraglist_mode)
-+              hw->rx_head_buff_size = jumbo_mru;
-+      else if (!hw->rx_head_buff_size)
-+              hw->rx_head_buff_size = EDMA_RX_HEAD_BUFF_SIZE;
-+
-+      hw->misc_intr_mask = 0;
-+      hw->wol_intr_mask = 0;
-+
-+      hw->intr_clear_type = EDMA_INTR_CLEAR_TYPE;
-+      hw->intr_sw_idx_w = EDMA_INTR_SW_IDX_W_TYPE;
-+
-+      /* configure RSS type to the different protocol that can be
-+       * supported
-+       */
-+      hw->rss_type = EDMA_RSS_TYPE_IPV4TCP | EDMA_RSS_TYPE_IPV6_TCP |
-+              EDMA_RSS_TYPE_IPV4_UDP | EDMA_RSS_TYPE_IPV6UDP |
-+              EDMA_RSS_TYPE_IPV4 | EDMA_RSS_TYPE_IPV6;
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+
-+      edma_cinfo->hw.hw_addr = devm_ioremap_resource(&pdev->dev, res);
-+      if (IS_ERR(edma_cinfo->hw.hw_addr)) {
-+              err = PTR_ERR(edma_cinfo->hw.hw_addr);
-+              goto err_ioremap;
-+      }
-+
-+      edma_hw_addr = (u32)edma_cinfo->hw.hw_addr;
-+
-+      /* Parse tx queue interrupt number from device tree */
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++)
-+              edma_cinfo->tx_irq[i] = platform_get_irq(pdev, i);
-+
-+      /* Parse rx queue interrupt number from device tree
-+       * Here we are setting j to point to the point where we
-+       * left tx interrupt parsing(i.e 16) and run run the loop
-+       * from 0 to 7 to parse rx interrupt number.
-+       */
-+      for (i = 0, j = edma_cinfo->num_tx_queues, k = 0;
-+                      i < edma_cinfo->num_rx_queues; i++) {
-+              edma_cinfo->rx_irq[k] = platform_get_irq(pdev, j);
-+              k += ((num_rxq == 4) ?  2 : 1);
-+              j += ((num_rxq == 4) ?  2 : 1);
-+      }
-+
-+      edma_cinfo->rx_head_buffer_len = edma_cinfo->hw.rx_head_buff_size;
-+      edma_cinfo->rx_page_buffer_len = PAGE_SIZE;
-+
-+      err = edma_alloc_queues_tx(edma_cinfo);
-+      if (err) {
-+              dev_err(&pdev->dev, "Allocation of TX queue failed\n");
-+              goto err_tx_qinit;
-+      }
-+
-+      err = edma_alloc_queues_rx(edma_cinfo);
-+      if (err) {
-+              dev_err(&pdev->dev, "Allocation of RX queue failed\n");
-+              goto err_rx_qinit;
-+      }
-+
-+      err = edma_alloc_tx_rings(edma_cinfo);
-+      if (err) {
-+              dev_err(&pdev->dev, "Allocation of TX resources failed\n");
-+              goto err_tx_rinit;
-+      }
-+
-+      err = edma_alloc_rx_rings(edma_cinfo);
-+      if (err) {
-+              dev_err(&pdev->dev, "Allocation of RX resources failed\n");
-+              goto err_rx_rinit;
-+      }
-+
-+      /* Initialize netdev and netdev bitmap for transmit descriptor rings */
-+      for (i = 0; i < edma_cinfo->num_tx_queues; i++) {
-+              struct edma_tx_desc_ring *etdr =  edma_cinfo->tpd_ring[i];
-+              int j;
-+
-+              etdr->netdev_bmp = 0;
-+              for (j = 0; j < EDMA_MAX_NETDEV_PER_QUEUE; j++) {
-+                      etdr->netdev[j] = NULL;
-+                      etdr->nq[j] = NULL;
-+              }
-+      }
-+
-+      if (of_property_read_bool(np, "qcom,mdio_supported")) {
-+              mdio_node = of_find_compatible_node(NULL, NULL,
-+                                                  "qcom,ipq4019-mdio");
-+              if (!mdio_node) {
-+                      dev_err(&pdev->dev, "cannot find mdio node by phandle");
-+                      err = -EIO;
-+                      goto err_mdiobus_init_fail;
-+              }
-+
-+              mdio_plat = of_find_device_by_node(mdio_node);
-+              if (!mdio_plat) {
-+                      dev_err(&pdev->dev,
-+                              "cannot find platform device from mdio node");
-+                      of_node_put(mdio_node);
-+                      err = -EIO;
-+                      goto err_mdiobus_init_fail;
-+              }
-+
-+              mdio_data = dev_get_drvdata(&mdio_plat->dev);
-+              if (!mdio_data) {
-+                      dev_err(&pdev->dev,
-+                              "cannot get mii bus reference from device data");
-+                      of_node_put(mdio_node);
-+                      err = -EIO;
-+                      goto err_mdiobus_init_fail;
-+              }
-+
-+              miibus = mdio_data->mii_bus;
-+      }
-+
-+      for_each_available_child_of_node(np, pnp) {
-+              const char *mac_addr;
-+
-+              /* this check is needed if parent and daughter dts have
-+               * different number of gmac nodes
-+               */
-+              if (idx_mac == edma_cinfo->num_gmac) {
-+                      of_node_put(np);
-+                      break;
-+              }
-+
-+              mac_addr = of_get_mac_address(pnp);
-+              if (mac_addr)
-+                      memcpy(edma_netdev[idx_mac]->dev_addr, mac_addr, ETH_ALEN);
-+
-+              idx_mac++;
-+      }
-+
-+      /* Populate the adapter structure register the netdevice */
-+      for (i = 0; i < edma_cinfo->num_gmac; i++) {
-+              int k, m;
-+
-+              adapter[i] = netdev_priv(edma_netdev[i]);
-+              adapter[i]->netdev = edma_netdev[i];
-+              adapter[i]->pdev = pdev;
-+              for (j = 0; j < CONFIG_NR_CPUS; j++) {
-+                      m = i % 2;
-+                      adapter[i]->tx_start_offset[j] =
-+                              ((j << EDMA_TX_CPU_START_SHIFT) + (m << 1));
-+                      /* Share the queues with available net-devices.
-+                       * For instance , with 5 net-devices
-+                       * eth0/eth2/eth4 will share q0,q1,q4,q5,q8,q9,q12,q13
-+                       * and eth1/eth3 will get the remaining.
-+                       */
-+                      for (k = adapter[i]->tx_start_offset[j]; k <
-+                           (adapter[i]->tx_start_offset[j] + 2); k++) {
-+                              if (edma_fill_netdev(edma_cinfo, k, i, j)) {
-+                                      pr_err("Netdev overflow Error\n");
-+                                      goto err_register;
-+                              }
-+                      }
-+              }
-+
-+              adapter[i]->edma_cinfo = edma_cinfo;
-+              edma_netdev[i]->netdev_ops = &edma_axi_netdev_ops;
-+              edma_netdev[i]->max_mtu = 9000;
-+              edma_netdev[i]->features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM
-+                                    | NETIF_F_HW_VLAN_CTAG_TX
-+                                    | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_SG |
-+                                    NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GRO;
-+              edma_netdev[i]->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM |
-+                              NETIF_F_HW_VLAN_CTAG_RX
-+                              | NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
-+                              NETIF_F_GRO;
-+              edma_netdev[i]->vlan_features = NETIF_F_HW_CSUM | NETIF_F_SG |
-+                                         NETIF_F_TSO | NETIF_F_TSO6 |
-+                                         NETIF_F_GRO;
-+              edma_netdev[i]->wanted_features = NETIF_F_HW_CSUM | NETIF_F_SG |
-+                                           NETIF_F_TSO | NETIF_F_TSO6 |
-+                                           NETIF_F_GRO;
-+
-+#ifdef CONFIG_RFS_ACCEL
-+              edma_netdev[i]->features |=  NETIF_F_RXHASH | NETIF_F_NTUPLE;
-+              edma_netdev[i]->hw_features |=  NETIF_F_RXHASH | NETIF_F_NTUPLE;
-+              edma_netdev[i]->vlan_features |= NETIF_F_RXHASH | NETIF_F_NTUPLE;
-+              edma_netdev[i]->wanted_features |= NETIF_F_RXHASH | NETIF_F_NTUPLE;
-+#endif
-+              edma_set_ethtool_ops(edma_netdev[i]);
-+
-+              /* This just fill in some default MAC address
-+               */
-+              if (!is_valid_ether_addr(edma_netdev[i]->dev_addr)) {
-+                      random_ether_addr(edma_netdev[i]->dev_addr);
-+                      pr_info("EDMA using MAC@ - using");
-+                      pr_info("%02x:%02x:%02x:%02x:%02x:%02x\n",
-+                      *(edma_netdev[i]->dev_addr),
-+                      *(edma_netdev[i]->dev_addr + 1),
-+                      *(edma_netdev[i]->dev_addr + 2),
-+                      *(edma_netdev[i]->dev_addr + 3),
-+                      *(edma_netdev[i]->dev_addr + 4),
-+                      *(edma_netdev[i]->dev_addr + 5));
-+              }
-+
-+              err = register_netdev(edma_netdev[i]);
-+              if (err)
-+                      goto err_register;
-+
-+              /* carrier off reporting is important to
-+               * ethtool even BEFORE open
-+               */
-+              netif_carrier_off(edma_netdev[i]);
-+
-+              /* Allocate reverse irq cpu mapping structure for
-+              * receive queues
-+              */
-+#ifdef CONFIG_RFS_ACCEL
-+              edma_netdev[i]->rx_cpu_rmap =
-+                      alloc_irq_cpu_rmap(EDMA_NETDEV_RX_QUEUE);
-+              if (!edma_netdev[i]->rx_cpu_rmap) {
-+                      err = -ENOMEM;
-+                      goto err_rmap_alloc_fail;
-+              }
-+#endif
-+      }
-+
-+      for (i = 0; i < EDMA_MAX_PORTID_BITMAP_INDEX; i++)
-+              edma_cinfo->portid_netdev_lookup_tbl[i] = NULL;
-+
-+      for_each_available_child_of_node(np, pnp) {
-+              const uint32_t *vlan_tag = NULL;
-+              int len;
-+
-+              /* this check is needed if parent and daughter dts have
-+               * different number of gmac nodes
-+               */
-+              if (idx == edma_cinfo->num_gmac)
-+                      break;
-+
-+              /* Populate port-id to netdev lookup table */
-+              vlan_tag = of_get_property(pnp, "vlan_tag", &len);
-+              if (!vlan_tag) {
-+                      pr_err("Vlan tag parsing Failed.\n");
-+                      goto err_rmap_alloc_fail;
-+              }
-+
-+              adapter[idx]->default_vlan_tag = of_read_number(vlan_tag, 1);
-+              vlan_tag++;
-+              portid_bmp = of_read_number(vlan_tag, 1);
-+              adapter[idx]->dp_bitmap = portid_bmp;
-+
-+              portid_bmp = portid_bmp >> 1; /* We ignore CPU Port bit 0 */
-+              while (portid_bmp) {
-+                      int port_bit = ffs(portid_bmp);
-+
-+                      if (port_bit > EDMA_MAX_PORTID_SUPPORTED)
-+                              goto err_rmap_alloc_fail;
-+                      edma_cinfo->portid_netdev_lookup_tbl[port_bit] =
-+                              edma_netdev[idx];
-+                      portid_bmp &= ~(1 << (port_bit - 1));
-+              }
-+
-+              if (!of_property_read_u32(pnp, "qcom,poll_required",
-+                                        &adapter[idx]->poll_required)) {
-+                      if (adapter[idx]->poll_required) {
-+                              of_property_read_u32(pnp, "qcom,phy_mdio_addr",
-+                                                   &adapter[idx]->phy_mdio_addr);
-+                              of_property_read_u32(pnp, "qcom,forced_speed",
-+                                                   &adapter[idx]->forced_speed);
-+                              of_property_read_u32(pnp, "qcom,forced_duplex",
-+                                                   &adapter[idx]->forced_duplex);
-+
-+                              /* create a phyid using MDIO bus id
-+                               * and MDIO bus address
-+                               */
-+                              snprintf(adapter[idx]->phy_id,
-+                                       MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
-+                                       miibus->id,
-+                                       adapter[idx]->phy_mdio_addr);
-+                      }
-+              } else {
-+                      adapter[idx]->poll_required = 0;
-+                      adapter[idx]->forced_speed = SPEED_1000;
-+                      adapter[idx]->forced_duplex = DUPLEX_FULL;
-+              }
-+
-+              idx++;
-+      }
-+
-+      edma_cinfo->edma_ctl_table_hdr = register_net_sysctl(&init_net,
-+                                                           "net/edma",
-+                                                           edma_table);
-+      if (!edma_cinfo->edma_ctl_table_hdr) {
-+              dev_err(&pdev->dev, "edma sysctl table hdr not registered\n");
-+              goto err_unregister_sysctl_tbl;
-+      }
-+
-+      /* Disable all 16 Tx and 8 rx irqs */
-+      edma_irq_disable(edma_cinfo);
-+
-+      err = edma_reset(edma_cinfo);
-+      if (err) {
-+              err = -EIO;
-+              goto err_reset;
-+      }
-+
-+      /* populate per_core_info, do a napi_Add, request 16 TX irqs,
-+       * 8 RX irqs, do a napi enable
-+       */
-+      for (i = 0; i < CONFIG_NR_CPUS; i++) {
-+              u8 rx_start;
-+
-+              edma_cinfo->edma_percpu_info[i].napi.state = 0;
-+
-+              netif_napi_add(edma_netdev[0],
-+                             &edma_cinfo->edma_percpu_info[i].napi,
-+                             edma_poll, 64);
-+              napi_enable(&edma_cinfo->edma_percpu_info[i].napi);
-+              edma_cinfo->edma_percpu_info[i].tx_mask = tx_mask[i];
-+              edma_cinfo->edma_percpu_info[i].rx_mask = EDMA_RX_PER_CPU_MASK
-+                              << (i << EDMA_RX_PER_CPU_MASK_SHIFT);
-+              edma_cinfo->edma_percpu_info[i].tx_start = tx_start[i];
-+              edma_cinfo->edma_percpu_info[i].rx_start =
-+                      i << EDMA_RX_CPU_START_SHIFT;
-+              rx_start = i << EDMA_RX_CPU_START_SHIFT;
-+              edma_cinfo->edma_percpu_info[i].tx_status = 0;
-+              edma_cinfo->edma_percpu_info[i].rx_status = 0;
-+              edma_cinfo->edma_percpu_info[i].edma_cinfo = edma_cinfo;
-+
-+              /* Request irq per core */
-+              for (j = edma_cinfo->edma_percpu_info[i].tx_start;
-+                   j < tx_start[i] + 4; j++) {
-+                      sprintf(&edma_tx_irq[j][0], "edma_eth_tx%d", j);
-+                      err = request_irq(edma_cinfo->tx_irq[j],
-+                                        edma_interrupt,
-+                                        0,
-+                                        &edma_tx_irq[j][0],
-+                                        &edma_cinfo->edma_percpu_info[i]);
-+                      if (err)
-+                              goto err_reset;
-+              }
-+
-+              for (j = edma_cinfo->edma_percpu_info[i].rx_start;
-+                   j < (rx_start +
-+                   ((edma_cinfo->num_rx_queues == 4) ? 1 : 2));
-+                   j++) {
-+                      sprintf(&edma_rx_irq[j][0], "edma_eth_rx%d", j);
-+                      err = request_irq(edma_cinfo->rx_irq[j],
-+                                        edma_interrupt,
-+                                        0,
-+                                        &edma_rx_irq[j][0],
-+                                        &edma_cinfo->edma_percpu_info[i]);
-+                      if (err)
-+                              goto err_reset;
-+              }
-+
-+#ifdef CONFIG_RFS_ACCEL
-+              for (j = edma_cinfo->edma_percpu_info[i].rx_start;
-+                   j < rx_start + 2; j += 2) {
-+                      err = irq_cpu_rmap_add(edma_netdev[0]->rx_cpu_rmap,
-+                                             edma_cinfo->rx_irq[j]);
-+                      if (err)
-+                              goto err_rmap_add_fail;
-+              }
-+#endif
-+      }
-+
-+      /* Used to clear interrupt status, allocate rx buffer,
-+       * configure edma descriptors registers
-+       */
-+      err = edma_configure(edma_cinfo);
-+      if (err) {
-+              err = -EIO;
-+              goto err_configure;
-+      }
-+
-+      /* Configure RSS indirection table.
-+       * 128 hash will be configured in the following
-+       * pattern: hash{0,1,2,3} = {Q0,Q2,Q4,Q6} respectively
-+       * and so on
-+       */
-+      for (i = 0; i < EDMA_NUM_IDT; i++)
-+              edma_write_reg(EDMA_REG_RSS_IDT(i), EDMA_RSS_IDT_VALUE);
-+
-+      /* Configure load balance mapping table.
-+       * 4 table entry will be configured according to the
-+       * following pattern: load_balance{0,1,2,3} = {Q0,Q1,Q3,Q4}
-+       * respectively.
-+       */
-+      edma_write_reg(EDMA_REG_LB_RING, EDMA_LB_REG_VALUE);
-+
-+      /* Configure Virtual queue for Tx rings
-+       * User can also change this value runtime through
-+       * a sysctl
-+       */
-+      edma_write_reg(EDMA_REG_VQ_CTRL0, EDMA_VQ_REG_VALUE);
-+      edma_write_reg(EDMA_REG_VQ_CTRL1, EDMA_VQ_REG_VALUE);
-+
-+      /* Configure Max AXI Burst write size to 128 bytes*/
-+      edma_write_reg(EDMA_REG_AXIW_CTRL_MAXWRSIZE,
-+                     EDMA_AXIW_MAXWRSIZE_VALUE);
-+
-+      /* Enable All 16 tx and 8 rx irq mask */
-+      edma_irq_enable(edma_cinfo);
-+      edma_enable_tx_ctrl(&edma_cinfo->hw);
-+      edma_enable_rx_ctrl(&edma_cinfo->hw);
-+
-+      for (i = 0; i < edma_cinfo->num_gmac; i++) {
-+              if (adapter[i]->poll_required) {
-+                      adapter[i]->phydev =
-+                              phy_connect(edma_netdev[i],
-+                                          (const char *)adapter[i]->phy_id,
-+                                          &edma_adjust_link,
-+                                          PHY_INTERFACE_MODE_SGMII);
-+                      if (IS_ERR(adapter[i]->phydev)) {
-+                              dev_dbg(&pdev->dev, "PHY attach FAIL");
-+                              err = -EIO;
-+                              goto edma_phy_attach_fail;
-+                      } else {
-+                              adapter[i]->phydev->advertising |=
-+                                      ADVERTISED_Pause |
-+                                      ADVERTISED_Asym_Pause;
-+                              adapter[i]->phydev->supported |=
-+                                      SUPPORTED_Pause |
-+                                      SUPPORTED_Asym_Pause;
-+                      }
-+              } else {
-+                      adapter[i]->phydev = NULL;
-+              }
-+      }
-+
-+      spin_lock_init(&edma_cinfo->stats_lock);
-+
-+      timer_setup(&edma_cinfo->edma_stats_timer, edma_statistics_timer, 0);
-+      mod_timer(&edma_cinfo->edma_stats_timer, jiffies + 1*HZ);
-+
-+      return 0;
-+
-+edma_phy_attach_fail:
-+      miibus = NULL;
-+err_configure:
-+#ifdef CONFIG_RFS_ACCEL
-+      for (i = 0; i < edma_cinfo->num_gmac; i++) {
-+              free_irq_cpu_rmap(adapter[i]->netdev->rx_cpu_rmap);
-+              adapter[i]->netdev->rx_cpu_rmap = NULL;
-+      }
-+#endif
-+err_rmap_add_fail:
-+      edma_free_irqs(adapter[0]);
-+      for (i = 0; i < CONFIG_NR_CPUS; i++)
-+              napi_disable(&edma_cinfo->edma_percpu_info[i].napi);
-+err_reset:
-+err_unregister_sysctl_tbl:
-+err_rmap_alloc_fail:
-+      for (i = 0; i < edma_cinfo->num_gmac; i++)
-+              unregister_netdev(edma_netdev[i]);
-+err_register:
-+err_mdiobus_init_fail:
-+      edma_free_rx_rings(edma_cinfo);
-+err_rx_rinit:
-+      edma_free_tx_rings(edma_cinfo);
-+err_tx_rinit:
-+      edma_free_queues(edma_cinfo);
-+err_rx_qinit:
-+err_tx_qinit:
-+      iounmap(edma_cinfo->hw.hw_addr);
-+err_ioremap:
-+      for (i = 0; i < edma_cinfo->num_gmac; i++) {
-+              if (edma_netdev[i])
-+                      free_netdev(edma_netdev[i]);
-+      }
-+err_cinfo:
-+      kfree(edma_cinfo);
-+err_alloc:
-+      return err;
-+}
-+
-+/* edma_axi_remove()
-+ *    Device Removal Routine
-+ *
-+ * edma_axi_remove is called by the platform subsystem to alert the driver
-+ * that it should release a platform device.
-+ */
-+static int edma_axi_remove(struct platform_device *pdev)
-+{
-+      struct edma_adapter *adapter = netdev_priv(edma_netdev[0]);
-+      struct edma_common_info *edma_cinfo = adapter->edma_cinfo;
-+      struct edma_hw *hw = &edma_cinfo->hw;
-+      int i;
-+
-+      for (i = 0; i < edma_cinfo->num_gmac; i++)
-+              unregister_netdev(edma_netdev[i]);
-+
-+      edma_stop_rx_tx(hw);
-+      for (i = 0; i < CONFIG_NR_CPUS; i++)
-+              napi_disable(&edma_cinfo->edma_percpu_info[i].napi);
-+
-+      edma_irq_disable(edma_cinfo);
-+      edma_write_reg(EDMA_REG_RX_ISR, 0xff);
-+      edma_write_reg(EDMA_REG_TX_ISR, 0xffff);
-+#ifdef CONFIG_RFS_ACCEL
-+      for (i = 0; i < edma_cinfo->num_gmac; i++) {
-+              free_irq_cpu_rmap(edma_netdev[i]->rx_cpu_rmap);
-+              edma_netdev[i]->rx_cpu_rmap = NULL;
-+      }
-+#endif
-+
-+      for (i = 0; i < edma_cinfo->num_gmac; i++) {
-+              struct edma_adapter *adapter = netdev_priv(edma_netdev[i]);
-+
-+              if (adapter->phydev)
-+                      phy_disconnect(adapter->phydev);
-+      }
-+
-+      del_timer_sync(&edma_cinfo->edma_stats_timer);
-+      edma_free_irqs(adapter);
-+      unregister_net_sysctl_table(edma_cinfo->edma_ctl_table_hdr);
-+      edma_free_tx_resources(edma_cinfo);
-+      edma_free_rx_resources(edma_cinfo);
-+      edma_free_tx_rings(edma_cinfo);
-+      edma_free_rx_rings(edma_cinfo);
-+      edma_free_queues(edma_cinfo);
-+      for (i = 0; i < edma_cinfo->num_gmac; i++)
-+              free_netdev(edma_netdev[i]);
-+
-+      kfree(edma_cinfo);
-+
-+      return 0;
-+}
-+
-+static const struct of_device_id edma_of_mtable[] = {
-+      {.compatible = "qcom,ess-edma" },
-+      {}
-+};
-+MODULE_DEVICE_TABLE(of, edma_of_mtable);
-+
-+static struct platform_driver edma_axi_driver = {
-+      .driver = {
-+              .name    = edma_axi_driver_name,
-+              .of_match_table = edma_of_mtable,
-+      },
-+      .probe    = edma_axi_probe,
-+      .remove   = edma_axi_remove,
-+};
-+
-+module_platform_driver(edma_axi_driver);
-+
-+MODULE_AUTHOR("Qualcomm Atheros Inc");
-+MODULE_DESCRIPTION("QCA ESS EDMA driver");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma_ethtool.c
-@@ -0,0 +1,374 @@
-+/*
-+ * Copyright (c) 2015 - 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <linux/ethtool.h>
-+#include <linux/netdevice.h>
-+#include <linux/string.h>
-+#include "edma.h"
-+
-+struct edma_ethtool_stats {
-+      uint8_t stat_string[ETH_GSTRING_LEN];
-+      uint32_t stat_offset;
-+};
-+
-+#define EDMA_STAT(m)    offsetof(struct edma_ethtool_statistics, m)
-+#define DRVINFO_LEN   32
-+
-+/* Array of strings describing statistics
-+ */
-+static const struct edma_ethtool_stats edma_gstrings_stats[] = {
-+      {"tx_q0_pkt", EDMA_STAT(tx_q0_pkt)},
-+      {"tx_q1_pkt", EDMA_STAT(tx_q1_pkt)},
-+      {"tx_q2_pkt", EDMA_STAT(tx_q2_pkt)},
-+      {"tx_q3_pkt", EDMA_STAT(tx_q3_pkt)},
-+      {"tx_q4_pkt", EDMA_STAT(tx_q4_pkt)},
-+      {"tx_q5_pkt", EDMA_STAT(tx_q5_pkt)},
-+      {"tx_q6_pkt", EDMA_STAT(tx_q6_pkt)},
-+      {"tx_q7_pkt", EDMA_STAT(tx_q7_pkt)},
-+      {"tx_q8_pkt", EDMA_STAT(tx_q8_pkt)},
-+      {"tx_q9_pkt", EDMA_STAT(tx_q9_pkt)},
-+      {"tx_q10_pkt", EDMA_STAT(tx_q10_pkt)},
-+      {"tx_q11_pkt", EDMA_STAT(tx_q11_pkt)},
-+      {"tx_q12_pkt", EDMA_STAT(tx_q12_pkt)},
-+      {"tx_q13_pkt", EDMA_STAT(tx_q13_pkt)},
-+      {"tx_q14_pkt", EDMA_STAT(tx_q14_pkt)},
-+      {"tx_q15_pkt", EDMA_STAT(tx_q15_pkt)},
-+      {"tx_q0_byte", EDMA_STAT(tx_q0_byte)},
-+      {"tx_q1_byte", EDMA_STAT(tx_q1_byte)},
-+      {"tx_q2_byte", EDMA_STAT(tx_q2_byte)},
-+      {"tx_q3_byte", EDMA_STAT(tx_q3_byte)},
-+      {"tx_q4_byte", EDMA_STAT(tx_q4_byte)},
-+      {"tx_q5_byte", EDMA_STAT(tx_q5_byte)},
-+      {"tx_q6_byte", EDMA_STAT(tx_q6_byte)},
-+      {"tx_q7_byte", EDMA_STAT(tx_q7_byte)},
-+      {"tx_q8_byte", EDMA_STAT(tx_q8_byte)},
-+      {"tx_q9_byte", EDMA_STAT(tx_q9_byte)},
-+      {"tx_q10_byte", EDMA_STAT(tx_q10_byte)},
-+      {"tx_q11_byte", EDMA_STAT(tx_q11_byte)},
-+      {"tx_q12_byte", EDMA_STAT(tx_q12_byte)},
-+      {"tx_q13_byte", EDMA_STAT(tx_q13_byte)},
-+      {"tx_q14_byte", EDMA_STAT(tx_q14_byte)},
-+      {"tx_q15_byte", EDMA_STAT(tx_q15_byte)},
-+      {"rx_q0_pkt", EDMA_STAT(rx_q0_pkt)},
-+      {"rx_q1_pkt", EDMA_STAT(rx_q1_pkt)},
-+      {"rx_q2_pkt", EDMA_STAT(rx_q2_pkt)},
-+      {"rx_q3_pkt", EDMA_STAT(rx_q3_pkt)},
-+      {"rx_q4_pkt", EDMA_STAT(rx_q4_pkt)},
-+      {"rx_q5_pkt", EDMA_STAT(rx_q5_pkt)},
-+      {"rx_q6_pkt", EDMA_STAT(rx_q6_pkt)},
-+      {"rx_q7_pkt", EDMA_STAT(rx_q7_pkt)},
-+      {"rx_q0_byte", EDMA_STAT(rx_q0_byte)},
-+      {"rx_q1_byte", EDMA_STAT(rx_q1_byte)},
-+      {"rx_q2_byte", EDMA_STAT(rx_q2_byte)},
-+      {"rx_q3_byte", EDMA_STAT(rx_q3_byte)},
-+      {"rx_q4_byte", EDMA_STAT(rx_q4_byte)},
-+      {"rx_q5_byte", EDMA_STAT(rx_q5_byte)},
-+      {"rx_q6_byte", EDMA_STAT(rx_q6_byte)},
-+      {"rx_q7_byte", EDMA_STAT(rx_q7_byte)},
-+      {"tx_desc_error", EDMA_STAT(tx_desc_error)},
-+};
-+
-+#define EDMA_STATS_LEN ARRAY_SIZE(edma_gstrings_stats)
-+
-+/* edma_get_strset_count()
-+ *    Get strset count
-+ */
-+static int edma_get_strset_count(struct net_device *netdev,
-+                               int sset)
-+{
-+      switch (sset) {
-+      case ETH_SS_STATS:
-+              return EDMA_STATS_LEN;
-+      default:
-+              netdev_dbg(netdev, "%s: Invalid string set", __func__);
-+              return -EOPNOTSUPP;
-+      }
-+}
-+
-+
-+/* edma_get_strings()
-+ *    get stats string
-+ */
-+static void edma_get_strings(struct net_device *netdev, uint32_t stringset,
-+                           uint8_t *data)
-+{
-+      uint8_t *p = data;
-+      uint32_t i;
-+
-+      switch (stringset) {
-+      case ETH_SS_STATS:
-+              for (i = 0; i < EDMA_STATS_LEN; i++) {
-+                      memcpy(p, edma_gstrings_stats[i].stat_string,
-+                              min((size_t)ETH_GSTRING_LEN,
-+                                  strlen(edma_gstrings_stats[i].stat_string)
-+                                  + 1));
-+                      p += ETH_GSTRING_LEN;
-+              }
-+              break;
-+      }
-+}
-+
-+/* edma_get_ethtool_stats()
-+ *    Get ethtool statistics
-+ */
-+static void edma_get_ethtool_stats(struct net_device *netdev,
-+                                 struct ethtool_stats *stats, uint64_t *data)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+      struct edma_common_info *edma_cinfo = adapter->edma_cinfo;
-+      int i;
-+      uint8_t *p = NULL;
-+
-+      edma_read_append_stats(edma_cinfo);
-+
-+      for(i = 0; i < EDMA_STATS_LEN; i++) {
-+              p = (uint8_t *)&(edma_cinfo->edma_ethstats) +
-+                      edma_gstrings_stats[i].stat_offset;
-+              data[i] = *(uint32_t *)p;
-+      }
-+}
-+
-+/* edma_get_drvinfo()
-+ *    get edma driver info
-+ */
-+static void edma_get_drvinfo(struct net_device *dev,
-+                           struct ethtool_drvinfo *info)
-+{
-+      strlcpy(info->driver, "ess_edma", DRVINFO_LEN);
-+      strlcpy(info->bus_info, "axi", ETHTOOL_BUSINFO_LEN);
-+}
-+
-+/* edma_nway_reset()
-+ *    Reset the phy, if available.
-+ */
-+static int edma_nway_reset(struct net_device *netdev)
-+{
-+      return -EINVAL;
-+}
-+
-+/* edma_get_wol()
-+ *    get wake on lan info
-+ */
-+static void edma_get_wol(struct net_device *netdev,
-+                       struct ethtool_wolinfo *wol)
-+{
-+      wol->supported = 0;
-+      wol->wolopts = 0;
-+}
-+
-+/* edma_get_msglevel()
-+ *    get message level.
-+ */
-+static uint32_t edma_get_msglevel(struct net_device *netdev)
-+{
-+      return 0;
-+}
-+
-+/* edma_get_settings()
-+ *    Get edma settings
-+ */
-+static int edma_get_settings(struct net_device *netdev,
-+                           struct ethtool_cmd *ecmd)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+
-+      if (adapter->poll_required) {
-+              struct phy_device *phydev = NULL;
-+              uint16_t phyreg;
-+
-+              if ((adapter->forced_speed != SPEED_UNKNOWN)
-+                      && !(adapter->poll_required))
-+                      return -EPERM;
-+
-+              phydev = adapter->phydev;
-+
-+              ecmd->advertising = phydev->advertising;
-+              ecmd->autoneg = phydev->autoneg;
-+
-+              if (adapter->link_state == __EDMA_LINKDOWN) {
-+                      ecmd->speed =  SPEED_UNKNOWN;
-+                      ecmd->duplex = DUPLEX_UNKNOWN;
-+              } else {
-+                      ecmd->speed = phydev->speed;
-+                      ecmd->duplex = phydev->duplex;
-+              }
-+
-+              ecmd->phy_address = adapter->phy_mdio_addr;
-+
-+              phyreg = (uint16_t)phy_read(adapter->phydev, MII_LPA);
-+              if (phyreg & LPA_10HALF)
-+                      ecmd->lp_advertising |= ADVERTISED_10baseT_Half;
-+
-+              if (phyreg & LPA_10FULL)
-+                      ecmd->lp_advertising |= ADVERTISED_10baseT_Full;
-+
-+              if (phyreg & LPA_100HALF)
-+                      ecmd->lp_advertising |= ADVERTISED_100baseT_Half;
-+
-+              if (phyreg & LPA_100FULL)
-+                      ecmd->lp_advertising |= ADVERTISED_100baseT_Full;
-+
-+              phyreg = (uint16_t)phy_read(adapter->phydev, MII_STAT1000);
-+              if (phyreg & LPA_1000HALF)
-+                      ecmd->lp_advertising |= ADVERTISED_1000baseT_Half;
-+
-+              if (phyreg & LPA_1000FULL)
-+                      ecmd->lp_advertising |= ADVERTISED_1000baseT_Full;
-+      } else {
-+              /* If the speed/duplex for this GMAC is forced and we
-+               * are not polling for link state changes, return the
-+               * values as specified by platform. This will be true
-+               * for GMACs connected to switch, and interfaces that
-+               * do not use a PHY.
-+               */
-+              if (!(adapter->poll_required)) {
-+                      if (adapter->forced_speed != SPEED_UNKNOWN) {
-+                              /* set speed and duplex */
-+                              ethtool_cmd_speed_set(ecmd, SPEED_1000);
-+                              ecmd->duplex = DUPLEX_FULL;
-+
-+                              /* Populate capabilities advertised by self */
-+                              ecmd->advertising = 0;
-+                              ecmd->autoneg = 0;
-+                              ecmd->port = PORT_TP;
-+                              ecmd->transceiver = XCVR_EXTERNAL;
-+                      } else {
-+                              /* non link polled and non
-+                               * forced speed/duplex interface
-+                               */
-+                              return -EIO;
-+                      }
-+              }
-+      }
-+
-+      return 0;
-+}
-+
-+/* edma_set_settings()
-+ *    Set EDMA settings
-+ */
-+static int edma_set_settings(struct net_device *netdev,
-+                           struct ethtool_cmd *ecmd)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+      struct phy_device *phydev = NULL;
-+
-+      if ((adapter->forced_speed != SPEED_UNKNOWN) &&
-+           !adapter->poll_required)
-+              return -EPERM;
-+
-+      phydev = adapter->phydev;
-+      phydev->advertising = ecmd->advertising;
-+      phydev->autoneg = ecmd->autoneg;
-+      phydev->speed = ethtool_cmd_speed(ecmd);
-+      phydev->duplex = ecmd->duplex;
-+
-+      genphy_config_aneg(phydev);
-+
-+      return 0;
-+}
-+
-+/* edma_get_coalesce
-+ *    get interrupt mitigation
-+ */
-+static int edma_get_coalesce(struct net_device *netdev,
-+                           struct ethtool_coalesce *ec)
-+{
-+      u32 reg_val;
-+
-+      edma_get_tx_rx_coalesce(&reg_val);
-+
-+      /* We read the Interrupt Moderation Timer(IMT) register value,
-+       * use lower 16 bit for rx and higher 16 bit for Tx. We do a
-+       * left shift by 1, because IMT resolution timer is 2usecs.
-+       * Hence the value given by the register is multiplied by 2 to
-+       * get the actual time in usecs.
-+       */
-+      ec->tx_coalesce_usecs = (((reg_val >> 16) & 0xffff) << 1);
-+      ec->rx_coalesce_usecs = ((reg_val & 0xffff) << 1);
-+
-+      return 0;
-+}
-+
-+/* edma_set_coalesce
-+ *    set interrupt mitigation
-+ */
-+static int edma_set_coalesce(struct net_device *netdev,
-+                           struct ethtool_coalesce *ec)
-+{
-+      if (ec->tx_coalesce_usecs)
-+              edma_change_tx_coalesce(ec->tx_coalesce_usecs);
-+      if (ec->rx_coalesce_usecs)
-+              edma_change_rx_coalesce(ec->rx_coalesce_usecs);
-+
-+      return 0;
-+}
-+
-+/* edma_set_priv_flags()
-+ *    Set EDMA private flags
-+ */
-+static int edma_set_priv_flags(struct net_device *netdev, u32 flags)
-+{
-+      return 0;
-+}
-+
-+/* edma_get_priv_flags()
-+ *    get edma driver flags
-+ */
-+static u32 edma_get_priv_flags(struct net_device *netdev)
-+{
-+      return 0;
-+}
-+
-+/* edma_get_ringparam()
-+ *    get ring size
-+ */
-+static void edma_get_ringparam(struct net_device *netdev,
-+                             struct ethtool_ringparam *ring)
-+{
-+      struct edma_adapter *adapter = netdev_priv(netdev);
-+      struct edma_common_info *edma_cinfo = adapter->edma_cinfo;
-+
-+      ring->tx_max_pending = edma_cinfo->tx_ring_count;
-+      ring->rx_max_pending = edma_cinfo->rx_ring_count;
-+}
-+
-+/* Ethtool operations
-+ */
-+static const struct ethtool_ops edma_ethtool_ops = {
-+      .get_drvinfo = &edma_get_drvinfo,
-+      .get_link = &ethtool_op_get_link,
-+      .get_msglevel = &edma_get_msglevel,
-+      .nway_reset = &edma_nway_reset,
-+      .get_wol = &edma_get_wol,
-+      .get_settings = &edma_get_settings,
-+      .set_settings = &edma_set_settings,
-+      .get_strings = &edma_get_strings,
-+      .get_sset_count = &edma_get_strset_count,
-+      .get_ethtool_stats = &edma_get_ethtool_stats,
-+      .get_coalesce = &edma_get_coalesce,
-+      .set_coalesce = &edma_set_coalesce,
-+      .get_priv_flags = edma_get_priv_flags,
-+      .set_priv_flags = edma_set_priv_flags,
-+      .get_ringparam = edma_get_ringparam,
-+};
-+
-+/* edma_set_ethtool_ops
-+ *    Set ethtool operations
-+ */
-+void edma_set_ethtool_ops(struct net_device *netdev)
-+{
-+      netdev->ethtool_ops = &edma_ethtool_ops;
-+}
---- /dev/null
-+++ b/drivers/net/ethernet/qualcomm/essedma/ess_edma.h
-@@ -0,0 +1,332 @@
-+/*
-+ * Copyright (c) 2014 - 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for
-+ * any purpose with or without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all copies.
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _ESS_EDMA_H_
-+#define _ESS_EDMA_H_
-+
-+#include <linux/types.h>
-+
-+struct edma_adapter;
-+struct edma_hw;
-+
-+/* register definition */
-+#define EDMA_REG_MAS_CTRL 0x0
-+#define EDMA_REG_TIMEOUT_CTRL 0x004
-+#define EDMA_REG_DBG0 0x008
-+#define EDMA_REG_DBG1 0x00C
-+#define EDMA_REG_SW_CTRL0 0x100
-+#define EDMA_REG_SW_CTRL1 0x104
-+
-+/* Interrupt Status Register */
-+#define EDMA_REG_RX_ISR 0x200
-+#define EDMA_REG_TX_ISR 0x208
-+#define EDMA_REG_MISC_ISR 0x210
-+#define EDMA_REG_WOL_ISR 0x218
-+
-+#define EDMA_MISC_ISR_RX_URG_Q(x) (1 << x)
-+
-+#define EDMA_MISC_ISR_AXIR_TIMEOUT 0x00000100
-+#define EDMA_MISC_ISR_AXIR_ERR 0x00000200
-+#define EDMA_MISC_ISR_TXF_DEAD 0x00000400
-+#define EDMA_MISC_ISR_AXIW_ERR 0x00000800
-+#define EDMA_MISC_ISR_AXIW_TIMEOUT 0x00001000
-+
-+#define EDMA_WOL_ISR 0x00000001
-+
-+/* Interrupt Mask Register */
-+#define EDMA_REG_MISC_IMR 0x214
-+#define EDMA_REG_WOL_IMR 0x218
-+
-+#define EDMA_RX_IMR_NORMAL_MASK 0x1
-+#define EDMA_TX_IMR_NORMAL_MASK 0x1
-+#define EDMA_MISC_IMR_NORMAL_MASK 0x80001FFF
-+#define EDMA_WOL_IMR_NORMAL_MASK 0x1
-+
-+/* Edma receive consumer index */
-+#define EDMA_REG_RX_SW_CONS_IDX_Q(x) (0x220 + ((x) << 2)) /* x is the queue id */
-+/* Edma transmit consumer index */
-+#define EDMA_REG_TX_SW_CONS_IDX_Q(x) (0x240 + ((x) << 2)) /* x is the queue id */
-+
-+/* IRQ Moderator Initial Timer Register */
-+#define EDMA_REG_IRQ_MODRT_TIMER_INIT 0x280
-+#define EDMA_IRQ_MODRT_TIMER_MASK 0xFFFF
-+#define EDMA_IRQ_MODRT_RX_TIMER_SHIFT 0
-+#define EDMA_IRQ_MODRT_TX_TIMER_SHIFT 16
-+
-+/* Interrupt Control Register */
-+#define EDMA_REG_INTR_CTRL 0x284
-+#define EDMA_INTR_CLR_TYP_SHIFT 0
-+#define EDMA_INTR_SW_IDX_W_TYP_SHIFT 1
-+#define EDMA_INTR_CLEAR_TYPE_W1 0
-+#define EDMA_INTR_CLEAR_TYPE_R 1
-+
-+/* RX Interrupt Mask Register */
-+#define EDMA_REG_RX_INT_MASK_Q(x) (0x300 + ((x) << 2)) /* x = queue id */
-+
-+/* TX Interrupt mask register */
-+#define EDMA_REG_TX_INT_MASK_Q(x) (0x340 + ((x) << 2)) /* x = queue id */
-+
-+/* Load Ptr Register
-+ * Software sets this bit after the initialization of the head and tail
-+ */
-+#define EDMA_REG_TX_SRAM_PART 0x400
-+#define EDMA_LOAD_PTR_SHIFT 16
-+
-+/* TXQ Control Register */
-+#define EDMA_REG_TXQ_CTRL 0x404
-+#define EDMA_TXQ_CTRL_IP_OPTION_EN 0x10
-+#define EDMA_TXQ_CTRL_TXQ_EN 0x20
-+#define EDMA_TXQ_CTRL_ENH_MODE 0x40
-+#define EDMA_TXQ_CTRL_LS_8023_EN 0x80
-+#define EDMA_TXQ_CTRL_TPD_BURST_EN 0x100
-+#define EDMA_TXQ_CTRL_LSO_BREAK_EN 0x200
-+#define EDMA_TXQ_NUM_TPD_BURST_MASK 0xF
-+#define EDMA_TXQ_TXF_BURST_NUM_MASK 0xFFFF
-+#define EDMA_TXQ_NUM_TPD_BURST_SHIFT 0
-+#define EDMA_TXQ_TXF_BURST_NUM_SHIFT 16
-+
-+#define       EDMA_REG_TXF_WATER_MARK 0x408 /* In 8-bytes */
-+#define EDMA_TXF_WATER_MARK_MASK 0x0FFF
-+#define EDMA_TXF_LOW_WATER_MARK_SHIFT 0
-+#define EDMA_TXF_HIGH_WATER_MARK_SHIFT 16
-+#define EDMA_TXQ_CTRL_BURST_MODE_EN 0x80000000
-+
-+/* WRR Control Register */
-+#define EDMA_REG_WRR_CTRL_Q0_Q3 0x40c
-+#define EDMA_REG_WRR_CTRL_Q4_Q7 0x410
-+#define EDMA_REG_WRR_CTRL_Q8_Q11 0x414
-+#define EDMA_REG_WRR_CTRL_Q12_Q15 0x418
-+
-+/* Weight round robin(WRR), it takes queue as input, and computes
-+ * starting bits where we need to write the weight for a particular
-+ * queue
-+ */
-+#define EDMA_WRR_SHIFT(x) (((x) * 5) % 20)
-+
-+/* Tx Descriptor Control Register */
-+#define EDMA_REG_TPD_RING_SIZE 0x41C
-+#define EDMA_TPD_RING_SIZE_SHIFT 0
-+#define EDMA_TPD_RING_SIZE_MASK 0xFFFF
-+
-+/* Transmit descriptor base address */
-+#define EDMA_REG_TPD_BASE_ADDR_Q(x) (0x420 + ((x) << 2)) /* x = queue id */
-+
-+/* TPD Index Register */
-+#define EDMA_REG_TPD_IDX_Q(x) (0x460 + ((x) << 2)) /* x = queue id */
-+
-+#define EDMA_TPD_PROD_IDX_BITS 0x0000FFFF
-+#define EDMA_TPD_CONS_IDX_BITS 0xFFFF0000
-+#define EDMA_TPD_PROD_IDX_MASK 0xFFFF
-+#define EDMA_TPD_CONS_IDX_MASK 0xFFFF
-+#define EDMA_TPD_PROD_IDX_SHIFT 0
-+#define EDMA_TPD_CONS_IDX_SHIFT 16
-+
-+/* TX Virtual Queue Mapping Control Register */
-+#define EDMA_REG_VQ_CTRL0 0x4A0
-+#define EDMA_REG_VQ_CTRL1 0x4A4
-+
-+/* Virtual QID shift, it takes queue as input, and computes
-+ * Virtual QID position in virtual qid control register
-+ */
-+#define EDMA_VQ_ID_SHIFT(i) (((i) * 3) % 24)
-+
-+/* Virtual Queue Default Value */
-+#define EDMA_VQ_REG_VALUE 0x240240
-+
-+/* Tx side Port Interface Control Register */
-+#define EDMA_REG_PORT_CTRL 0x4A8
-+#define EDMA_PAD_EN_SHIFT 15
-+
-+/* Tx side VLAN Configuration Register */
-+#define EDMA_REG_VLAN_CFG 0x4AC
-+
-+#define EDMA_TX_CVLAN 16
-+#define EDMA_TX_INS_CVLAN 17
-+#define EDMA_TX_CVLAN_TAG_SHIFT 0
-+
-+#define EDMA_TX_SVLAN 14
-+#define EDMA_TX_INS_SVLAN 15
-+#define EDMA_TX_SVLAN_TAG_SHIFT 16
-+
-+/* Tx Queue Packet Statistic Register */
-+#define EDMA_REG_TX_STAT_PKT_Q(x) (0x700 + ((x) << 3)) /* x = queue id */
-+
-+#define EDMA_TX_STAT_PKT_MASK 0xFFFFFF
-+
-+/* Tx Queue Byte Statistic Register */
-+#define EDMA_REG_TX_STAT_BYTE_Q(x) (0x704 + ((x) << 3)) /* x = queue id */
-+
-+/* Load Balance Based Ring Offset Register */
-+#define EDMA_REG_LB_RING 0x800
-+#define EDMA_LB_RING_ENTRY_MASK 0xff
-+#define EDMA_LB_RING_ID_MASK 0x7
-+#define EDMA_LB_RING_PROFILE_ID_MASK 0x3
-+#define EDMA_LB_RING_ENTRY_BIT_OFFSET 8
-+#define EDMA_LB_RING_ID_OFFSET 0
-+#define EDMA_LB_RING_PROFILE_ID_OFFSET 3
-+#define EDMA_LB_REG_VALUE 0x6040200
-+
-+/* Load Balance Priority Mapping Register */
-+#define EDMA_REG_LB_PRI_START 0x804
-+#define EDMA_REG_LB_PRI_END 0x810
-+#define EDMA_LB_PRI_REG_INC 4
-+#define EDMA_LB_PRI_ENTRY_BIT_OFFSET 4
-+#define EDMA_LB_PRI_ENTRY_MASK 0xf
-+
-+/* RSS Priority Mapping Register */
-+#define EDMA_REG_RSS_PRI 0x820
-+#define EDMA_RSS_PRI_ENTRY_MASK 0xf
-+#define EDMA_RSS_RING_ID_MASK 0x7
-+#define EDMA_RSS_PRI_ENTRY_BIT_OFFSET 4
-+
-+/* RSS Indirection Register */
-+#define EDMA_REG_RSS_IDT(x) (0x840 + ((x) << 2)) /* x = No. of indirection table */
-+#define EDMA_NUM_IDT 16
-+#define EDMA_RSS_IDT_VALUE 0x64206420
-+
-+/* Default RSS Ring Register */
-+#define EDMA_REG_DEF_RSS 0x890
-+#define EDMA_DEF_RSS_MASK 0x7
-+
-+/* RSS Hash Function Type Register */
-+#define EDMA_REG_RSS_TYPE 0x894
-+#define EDMA_RSS_TYPE_NONE 0x01
-+#define EDMA_RSS_TYPE_IPV4TCP 0x02
-+#define EDMA_RSS_TYPE_IPV6_TCP 0x04
-+#define EDMA_RSS_TYPE_IPV4_UDP 0x08
-+#define EDMA_RSS_TYPE_IPV6UDP 0x10
-+#define EDMA_RSS_TYPE_IPV4 0x20
-+#define EDMA_RSS_TYPE_IPV6 0x40
-+#define EDMA_RSS_HASH_MODE_MASK 0x7f
-+
-+#define EDMA_REG_RSS_HASH_VALUE 0x8C0
-+
-+#define EDMA_REG_RSS_TYPE_RESULT 0x8C4
-+
-+#define EDMA_HASH_TYPE_START 0
-+#define EDMA_HASH_TYPE_END 5
-+#define EDMA_HASH_TYPE_SHIFT 12
-+
-+#define EDMA_RFS_FLOW_ENTRIES 1024
-+#define EDMA_RFS_FLOW_ENTRIES_MASK (EDMA_RFS_FLOW_ENTRIES - 1)
-+#define EDMA_RFS_EXPIRE_COUNT_PER_CALL 128
-+
-+/* RFD Base Address Register */
-+#define EDMA_REG_RFD_BASE_ADDR_Q(x) (0x950 + ((x) << 2)) /* x = queue id */
-+
-+/* RFD Index Register */
-+#define EDMA_REG_RFD_IDX_Q(x) (0x9B0 + ((x) << 2))
-+
-+#define EDMA_RFD_PROD_IDX_BITS 0x00000FFF
-+#define EDMA_RFD_CONS_IDX_BITS 0x0FFF0000
-+#define EDMA_RFD_PROD_IDX_MASK 0xFFF
-+#define EDMA_RFD_CONS_IDX_MASK 0xFFF
-+#define EDMA_RFD_PROD_IDX_SHIFT 0
-+#define EDMA_RFD_CONS_IDX_SHIFT 16
-+
-+/* Rx Descriptor Control Register */
-+#define EDMA_REG_RX_DESC0 0xA10
-+#define EDMA_RFD_RING_SIZE_MASK 0xFFF
-+#define EDMA_RX_BUF_SIZE_MASK 0xFFFF
-+#define EDMA_RFD_RING_SIZE_SHIFT 0
-+#define EDMA_RX_BUF_SIZE_SHIFT 16
-+
-+#define EDMA_REG_RX_DESC1 0xA14
-+#define EDMA_RXQ_RFD_BURST_NUM_MASK 0x3F
-+#define EDMA_RXQ_RFD_PF_THRESH_MASK 0x1F
-+#define EDMA_RXQ_RFD_LOW_THRESH_MASK 0xFFF
-+#define EDMA_RXQ_RFD_BURST_NUM_SHIFT 0
-+#define EDMA_RXQ_RFD_PF_THRESH_SHIFT 8
-+#define EDMA_RXQ_RFD_LOW_THRESH_SHIFT 16
-+
-+/* RXQ Control Register */
-+#define EDMA_REG_RXQ_CTRL 0xA18
-+#define EDMA_FIFO_THRESH_TYPE_SHIF 0
-+#define EDMA_FIFO_THRESH_128_BYTE 0x0
-+#define EDMA_FIFO_THRESH_64_BYTE 0x1
-+#define EDMA_RXQ_CTRL_RMV_VLAN 0x00000002
-+#define EDMA_RXQ_CTRL_EN 0x0000FF00
-+
-+/* AXI Burst Size Config */
-+#define EDMA_REG_AXIW_CTRL_MAXWRSIZE 0xA1C
-+#define EDMA_AXIW_MAXWRSIZE_VALUE 0x0
-+
-+/* Rx Statistics Register */
-+#define EDMA_REG_RX_STAT_BYTE_Q(x) (0xA30 + ((x) << 2)) /* x = queue id */
-+#define EDMA_REG_RX_STAT_PKT_Q(x) (0xA50 + ((x) << 2)) /* x = queue id */
-+
-+/* WoL Pattern Length Register */
-+#define EDMA_REG_WOL_PATTERN_LEN0 0xC00
-+#define EDMA_WOL_PT_LEN_MASK 0xFF
-+#define EDMA_WOL_PT0_LEN_SHIFT 0
-+#define EDMA_WOL_PT1_LEN_SHIFT 8
-+#define EDMA_WOL_PT2_LEN_SHIFT 16
-+#define EDMA_WOL_PT3_LEN_SHIFT 24
-+
-+#define EDMA_REG_WOL_PATTERN_LEN1 0xC04
-+#define EDMA_WOL_PT4_LEN_SHIFT 0
-+#define EDMA_WOL_PT5_LEN_SHIFT 8
-+#define EDMA_WOL_PT6_LEN_SHIFT 16
-+
-+/* WoL Control Register */
-+#define EDMA_REG_WOL_CTRL 0xC08
-+#define EDMA_WOL_WK_EN 0x00000001
-+#define EDMA_WOL_MG_EN 0x00000002
-+#define EDMA_WOL_PT0_EN 0x00000004
-+#define EDMA_WOL_PT1_EN 0x00000008
-+#define EDMA_WOL_PT2_EN 0x00000010
-+#define EDMA_WOL_PT3_EN 0x00000020
-+#define EDMA_WOL_PT4_EN 0x00000040
-+#define EDMA_WOL_PT5_EN 0x00000080
-+#define EDMA_WOL_PT6_EN 0x00000100
-+
-+/* MAC Control Register */
-+#define EDMA_REG_MAC_CTRL0 0xC20
-+#define EDMA_REG_MAC_CTRL1 0xC24
-+
-+/* WoL Pattern Register */
-+#define EDMA_REG_WOL_PATTERN_START 0x5000
-+#define EDMA_PATTERN_PART_REG_OFFSET 0x40
-+
-+
-+/* TX descriptor fields */
-+#define EDMA_TPD_HDR_SHIFT 0
-+#define EDMA_TPD_PPPOE_EN 0x00000100
-+#define EDMA_TPD_IP_CSUM_EN 0x00000200
-+#define EDMA_TPD_TCP_CSUM_EN 0x0000400
-+#define EDMA_TPD_UDP_CSUM_EN 0x00000800
-+#define EDMA_TPD_CUSTOM_CSUM_EN 0x00000C00
-+#define EDMA_TPD_LSO_EN 0x00001000
-+#define EDMA_TPD_LSO_V2_EN 0x00002000
-+#define EDMA_TPD_IPV4_EN 0x00010000
-+#define EDMA_TPD_MSS_MASK 0x1FFF
-+#define EDMA_TPD_MSS_SHIFT 18
-+#define EDMA_TPD_CUSTOM_CSUM_SHIFT 18
-+
-+/* RRD descriptor fields */
-+#define EDMA_RRD_NUM_RFD_MASK 0x000F
-+#define EDMA_RRD_SVLAN 0x8000
-+#define EDMA_RRD_FLOW_COOKIE_MASK 0x07FF;
-+
-+#define EDMA_RRD_PKT_SIZE_MASK 0x3FFF
-+#define EDMA_RRD_CSUM_FAIL_MASK 0xC000
-+#define EDMA_RRD_CVLAN 0x0001
-+#define EDMA_RRD_DESC_VALID 0x8000
-+
-+#define EDMA_RRD_PRIORITY_SHIFT 4
-+#define EDMA_RRD_PRIORITY_MASK 0x7
-+#define EDMA_RRD_PORT_TYPE_SHIFT 7
-+#define EDMA_RRD_PORT_TYPE_MASK 0x1F
-+#endif /* _ESS_EDMA_H_ */
diff --git a/target/linux/ipq40xx/patches-4.19/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-4.19/711-dts-ipq4019-add-ethernet-essedma-node.patch
deleted file mode 100644 (file)
index 7302d23..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From c611d3780fa101662a822d10acf8feb04ca97409 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 20 Nov 2016 01:01:10 +0100
-Subject: [PATCH] dts: ipq4019: add ethernet essedma node
-
-This patch adds the device-tree node for the ethernet
-interfaces.
-
-Note: The driver isn't anywhere close to be upstream,
-so the info might change.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 60 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -44,6 +44,8 @@
-               spi1 = &blsp1_spi2;
-               i2c0 = &blsp1_i2c3;
-               i2c1 = &blsp1_i2c4;
-+              ethernet0 = &gmac0;
-+              ethernet1 = &gmac1;
-       };
-       cpus {
-@@ -617,6 +619,64 @@
-                       status = "disabled";
-               };
-+              edma@c080000 {
-+                      compatible = "qcom,ess-edma";
-+                      reg = <0xc080000 0x8000>;
-+                      qcom,page-mode = <0>;
-+                      qcom,rx_head_buf_size = <1540>;
-+                      qcom,mdio_supported;
-+                      qcom,poll_required = <1>;
-+                      qcom,num_gmac = <2>;
-+                      interrupts = <0  65 IRQ_TYPE_EDGE_RISING
-+                                    0  66 IRQ_TYPE_EDGE_RISING
-+                                    0  67 IRQ_TYPE_EDGE_RISING
-+                                    0  68 IRQ_TYPE_EDGE_RISING
-+                                    0  69 IRQ_TYPE_EDGE_RISING
-+                                    0  70 IRQ_TYPE_EDGE_RISING
-+                                    0  71 IRQ_TYPE_EDGE_RISING
-+                                    0  72 IRQ_TYPE_EDGE_RISING
-+                                    0  73 IRQ_TYPE_EDGE_RISING
-+                                    0  74 IRQ_TYPE_EDGE_RISING
-+                                    0  75 IRQ_TYPE_EDGE_RISING
-+                                    0  76 IRQ_TYPE_EDGE_RISING
-+                                    0  77 IRQ_TYPE_EDGE_RISING
-+                                    0  78 IRQ_TYPE_EDGE_RISING
-+                                    0  79 IRQ_TYPE_EDGE_RISING
-+                                    0  80 IRQ_TYPE_EDGE_RISING
-+                                    0 240 IRQ_TYPE_EDGE_RISING
-+                                    0 241 IRQ_TYPE_EDGE_RISING
-+                                    0 242 IRQ_TYPE_EDGE_RISING
-+                                    0 243 IRQ_TYPE_EDGE_RISING
-+                                    0 244 IRQ_TYPE_EDGE_RISING
-+                                    0 245 IRQ_TYPE_EDGE_RISING
-+                                    0 246 IRQ_TYPE_EDGE_RISING
-+                                    0 247 IRQ_TYPE_EDGE_RISING
-+                                    0 248 IRQ_TYPE_EDGE_RISING
-+                                    0 249 IRQ_TYPE_EDGE_RISING
-+                                    0 250 IRQ_TYPE_EDGE_RISING
-+                                    0 251 IRQ_TYPE_EDGE_RISING
-+                                    0 252 IRQ_TYPE_EDGE_RISING
-+                                    0 253 IRQ_TYPE_EDGE_RISING
-+                                    0 254 IRQ_TYPE_EDGE_RISING
-+                                    0 255 IRQ_TYPE_EDGE_RISING>;
-+
-+                      status = "disabled";
-+
-+                      gmac0: gmac0 {
-+                              local-mac-address = [00 00 00 00 00 00];
-+                              vlan_tag = <1 0x1f>;
-+                      };
-+
-+                      gmac1: gmac1 {
-+                              local-mac-address = [00 00 00 00 00 00];
-+                              qcom,phy_mdio_addr = <4>;
-+                              qcom,poll_required = <1>;
-+                              qcom,forced_speed = <1000>;
-+                              qcom,forced_duplex = <1>;
-+                              vlan_tag = <2 0x20>;
-+                      };
-+              };
-+
-               usb3_ss_phy: ssphy@9a000 {
-                       compatible = "qcom,usb-ss-ipq4019-phy";
-                       #phy-cells = <0>;
diff --git a/target/linux/ipq40xx/patches-4.19/712-mr33-essedma.patch b/target/linux/ipq40xx/patches-4.19/712-mr33-essedma.patch
deleted file mode 100644 (file)
index ee6452e..0000000
+++ /dev/null
@@ -1,334 +0,0 @@
---- a/drivers/net/ethernet/qualcomm/essedma/edma.c
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c
-@@ -161,8 +161,10 @@ static void edma_configure_rx(struct edm
-       /* Set Rx FIFO threshold to start to DMA data to host */
-       rxq_ctrl_data = EDMA_FIFO_THRESH_128_BYTE;
-+      if (!edma_cinfo->is_single_phy) {
-       /* Set RX remove vlan bit */
-       rxq_ctrl_data |= EDMA_RXQ_CTRL_RMV_VLAN;
-+      }
-       edma_write_reg(EDMA_REG_RXQ_CTRL, rxq_ctrl_data);
- }
-@@ -1293,6 +1295,10 @@ void edma_adjust_link(struct net_device
-       if (status == __EDMA_LINKUP && adapter->link_state == __EDMA_LINKDOWN) {
-               dev_info(&adapter->pdev->dev, "%s: GMAC Link is up with phy_speed=%d\n", netdev->name, phydev->speed);
-               adapter->link_state = __EDMA_LINKUP;
-+              if (adapter->edma_cinfo->is_single_phy) {
-+                      ess_set_port_status_speed(adapter->edma_cinfo, phydev,
-+                                                ffs(adapter->dp_bitmap) - 1);
-+              }
-               netif_carrier_on(netdev);
-               if (netif_running(netdev))
-                       netif_tx_wake_all_queues(netdev);
-@@ -1386,10 +1392,12 @@ netdev_tx_t edma_xmit(struct sk_buff *sk
-       }
-       /* Check and mark VLAN tag offload */
--      if (skb_vlan_tag_present(skb))
--              flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_FLAG;
--      else if (adapter->default_vlan_tag)
--              flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_DEFAULT_FLAG;
-+      if (!adapter->edma_cinfo->is_single_phy) {
-+              if (unlikely(skb_vlan_tag_present(skb)))
-+                      flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_FLAG;
-+              else if (adapter->default_vlan_tag)
-+                      flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_DEFAULT_FLAG;
-+      }
-       /* Check and mark checksum offload */
-       if (likely(skb->ip_summed == CHECKSUM_PARTIAL))
---- a/drivers/net/ethernet/qualcomm/essedma/edma.h
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma.h
-@@ -31,6 +31,7 @@
- #include <linux/platform_device.h>
- #include <linux/of.h>
- #include <linux/of_device.h>
-+#include <linux/clk.h>
- #include <linux/kernel.h>
- #include <linux/device.h>
- #include <linux/sysctl.h>
-@@ -332,6 +333,9 @@ struct edma_common_info {
-       struct edma_per_cpu_queues_info edma_percpu_info[CONFIG_NR_CPUS]; /* per cpu information */
-       spinlock_t stats_lock; /* protect edma stats area for updation */
-       struct timer_list edma_stats_timer;
-+      bool is_single_phy;
-+      void __iomem *ess_hw_addr;
-+      struct clk *ess_clk;
- };
- /* transimit packet descriptor (tpd) ring */
-@@ -444,4 +448,6 @@ void edma_change_tx_coalesce(int usecs);
- void edma_change_rx_coalesce(int usecs);
- void edma_get_tx_rx_coalesce(u32 *reg_val);
- void edma_clear_irq_status(void);
-+void ess_set_port_status_speed(struct edma_common_info *edma_cinfo,
-+                               struct phy_device *phydev, uint8_t port_id);
- #endif /* _EDMA_H_ */
---- a/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma_axi.c
-@@ -17,6 +17,11 @@
- #include <linux/of.h>
- #include <linux/of_net.h>
- #include <linux/timer.h>
-+#include <linux/of_platform.h>
-+#include <linux/of_address.h>
-+#include <linux/clk.h>
-+#include <linux/string.h>
-+#include <linux/reset.h>
- #include "edma.h"
- #include "ess_edma.h"
-@@ -81,6 +86,101 @@ void edma_read_reg(u16 reg_addr, volatil
-       *reg_value = readl((void __iomem *)(edma_hw_addr + reg_addr));
- }
-+static void ess_write_reg(struct edma_common_info *edma, u16 reg_addr, u32 reg_value)
-+{
-+      writel(reg_value, ((void __iomem *)
-+              ((unsigned long)edma->ess_hw_addr + reg_addr)));
-+}
-+
-+static void ess_read_reg(struct edma_common_info *edma, u16 reg_addr,
-+                volatile u32 *reg_value)
-+{
-+      *reg_value = readl((void __iomem *)
-+              ((unsigned long)edma->ess_hw_addr + reg_addr));
-+}
-+
-+static int ess_reset(struct edma_common_info *edma)
-+{
-+      struct device_node *switch_node = NULL;
-+      struct reset_control *ess_rst;
-+      u32 regval;
-+
-+      switch_node = of_find_node_by_name(NULL, "ess-switch");
-+      if (!switch_node) {
-+              pr_err("switch-node not found\n");
-+              return -EINVAL;
-+      }
-+
-+      ess_rst = of_reset_control_get(switch_node, "ess_rst");
-+      of_node_put(switch_node);
-+
-+      if (IS_ERR(ess_rst)) {
-+              pr_err("failed to find ess_rst!\n");
-+              return -ENOENT;
-+      }
-+
-+      reset_control_assert(ess_rst);
-+      msleep(10);
-+      reset_control_deassert(ess_rst);
-+      msleep(100);
-+      reset_control_put(ess_rst);
-+
-+      /* Enable only port 5 <--> port 0
-+       * bits 0:6 bitmap of ports it can fwd to */
-+#define SET_PORT_BMP(r,v) \
-+              ess_read_reg(edma, r, &regval); \
-+              ess_write_reg(edma, r, ((regval & ~0x3F) | v));
-+
-+      SET_PORT_BMP(ESS_PORT0_LOOKUP_CTRL,0x20);
-+      SET_PORT_BMP(ESS_PORT1_LOOKUP_CTRL,0x00);
-+      SET_PORT_BMP(ESS_PORT2_LOOKUP_CTRL,0x00);
-+      SET_PORT_BMP(ESS_PORT3_LOOKUP_CTRL,0x00);
-+      SET_PORT_BMP(ESS_PORT4_LOOKUP_CTRL,0x00);
-+      SET_PORT_BMP(ESS_PORT5_LOOKUP_CTRL,0x01);
-+      ess_write_reg(edma, ESS_RGMII_CTRL, 0x400);
-+      ess_write_reg(edma, ESS_PORT0_STATUS, ESS_PORT_1G_FDX);
-+      ess_write_reg(edma, ESS_PORT5_STATUS, ESS_PORT_1G_FDX);
-+      ess_write_reg(edma, ESS_PORT0_HEADER_CTRL, 0);
-+#undef SET_PORT_BMP
-+
-+      /* forward multicast and broadcast frames to CPU */
-+      ess_write_reg(edma, ESS_FWD_CTRL1,
-+              (ESS_PORTS_ALL << ESS_FWD_CTRL1_UC_FLOOD_S) |
-+              (ESS_PORTS_ALL << ESS_FWD_CTRL1_MC_FLOOD_S) |
-+              (ESS_PORTS_ALL << ESS_FWD_CTRL1_BC_FLOOD_S));
-+
-+      return 0;
-+}
-+
-+void ess_set_port_status_speed(struct edma_common_info *edma,
-+                             struct phy_device *phydev, uint8_t port_id)
-+{
-+      uint16_t reg_off = ESS_PORT0_STATUS + (4 * port_id);
-+      uint32_t reg_val = 0;
-+
-+      ess_read_reg(edma, reg_off, &reg_val);
-+
-+      /* reset the speed bits [0:1] */
-+      reg_val &= ~ESS_PORT_STATUS_SPEED_INV;
-+
-+      /* set the new speed */
-+      switch(phydev->speed) {
-+              case SPEED_1000:  reg_val |= ESS_PORT_STATUS_SPEED_1000; break;
-+              case SPEED_100:   reg_val |= ESS_PORT_STATUS_SPEED_100;  break;
-+              case SPEED_10:    reg_val |= ESS_PORT_STATUS_SPEED_10;   break;
-+              default:          reg_val |= ESS_PORT_STATUS_SPEED_INV;  break;
-+      }
-+
-+      /* check full/half duplex */
-+      if (phydev->duplex) {
-+              reg_val |= ESS_PORT_STATUS_DUPLEX_MODE;
-+      } else {
-+              reg_val &= ~ESS_PORT_STATUS_DUPLEX_MODE;
-+      }
-+
-+      ess_write_reg(edma, reg_off, reg_val);
-+}
-+
- /* edma_change_tx_coalesce()
-  *    change tx interrupt moderation timer
-  */
-@@ -550,6 +650,31 @@ static struct ctl_table edma_table[] = {
-       {}
- };
-+static int ess_parse(struct edma_common_info *edma)
-+{
-+      struct device_node *switch_node;
-+      int ret = -EINVAL;
-+
-+      switch_node = of_find_node_by_name(NULL, "ess-switch");
-+      if (!switch_node) {
-+              pr_err("cannot find ess-switch node\n");
-+              goto out;
-+      }
-+
-+      edma->ess_hw_addr = of_io_request_and_map(switch_node,
-+                                                0, KBUILD_MODNAME);
-+      if (!edma->ess_hw_addr) {
-+              pr_err("%s ioremap fail.", __func__);
-+              goto out;
-+      }
-+
-+      edma->ess_clk = of_clk_get_by_name(switch_node, "ess_clk");
-+      ret = clk_prepare_enable(edma->ess_clk);
-+out:
-+      of_node_put(switch_node);
-+      return ret;
-+}
-+
- /* edma_axi_netdev_ops
-  *    Describe the operations supported by registered netdevices
-  *
-@@ -785,6 +910,17 @@ static int edma_axi_probe(struct platfor
-               miibus = mdio_data->mii_bus;
-       }
-+      if (of_property_read_bool(np, "qcom,single-phy") &&
-+          edma_cinfo->num_gmac == 1) {
-+              err = ess_parse(edma_cinfo);
-+              if (!err)
-+                      err = ess_reset(edma_cinfo);
-+              if (err)
-+                      goto err_single_phy_init;
-+              else
-+                      edma_cinfo->is_single_phy = true;
-+      }
-+
-       for_each_available_child_of_node(np, pnp) {
-               const char *mac_addr;
-@@ -1073,11 +1209,15 @@ static int edma_axi_probe(struct platfor
-       for (i = 0; i < edma_cinfo->num_gmac; i++) {
-               if (adapter[i]->poll_required) {
-+                      int phy_mode = of_get_phy_mode(np);
-+
-+                      if (phy_mode < 0)
-+                              phy_mode = PHY_INTERFACE_MODE_SGMII;
-                       adapter[i]->phydev =
-                               phy_connect(edma_netdev[i],
-                                           (const char *)adapter[i]->phy_id,
-                                           &edma_adjust_link,
--                                          PHY_INTERFACE_MODE_SGMII);
-+                                          phy_mode);
-                       if (IS_ERR(adapter[i]->phydev)) {
-                               dev_dbg(&pdev->dev, "PHY attach FAIL");
-                               err = -EIO;
-@@ -1121,6 +1261,9 @@ err_rmap_alloc_fail:
-       for (i = 0; i < edma_cinfo->num_gmac; i++)
-               unregister_netdev(edma_netdev[i]);
- err_register:
-+err_single_phy_init:
-+      iounmap(edma_cinfo->ess_hw_addr);
-+      clk_disable_unprepare(edma_cinfo->ess_clk);
- err_mdiobus_init_fail:
-       edma_free_rx_rings(edma_cinfo);
- err_rx_rinit:
-@@ -1181,6 +1324,8 @@ static int edma_axi_remove(struct platfo
-       del_timer_sync(&edma_cinfo->edma_stats_timer);
-       edma_free_irqs(adapter);
-       unregister_net_sysctl_table(edma_cinfo->edma_ctl_table_hdr);
-+      iounmap(edma_cinfo->ess_hw_addr);
-+      clk_disable_unprepare(edma_cinfo->ess_clk);
-       edma_free_tx_resources(edma_cinfo);
-       edma_free_rx_resources(edma_cinfo);
-       edma_free_tx_rings(edma_cinfo);
---- a/drivers/net/ethernet/qualcomm/essedma/ess_edma.h
-+++ b/drivers/net/ethernet/qualcomm/essedma/ess_edma.h
-@@ -329,4 +329,61 @@ struct edma_hw;
- #define EDMA_RRD_PRIORITY_MASK 0x7
- #define EDMA_RRD_PORT_TYPE_SHIFT 7
- #define EDMA_RRD_PORT_TYPE_MASK 0x1F
-+
-+#define ESS_RGMII_CTRL                0x0004
-+
-+/* Port status registers */
-+#define ESS_PORT0_STATUS      0x007C
-+#define ESS_PORT1_STATUS      0x0080
-+#define ESS_PORT2_STATUS      0x0084
-+#define ESS_PORT3_STATUS      0x0088
-+#define ESS_PORT4_STATUS      0x008C
-+#define ESS_PORT5_STATUS      0x0090
-+
-+#define ESS_PORT_STATUS_HDX_FLOW_CTL  0x80
-+#define ESS_PORT_STATUS_DUPLEX_MODE   0x40
-+#define ESS_PORT_STATUS_RX_FLOW_EN    0x20
-+#define ESS_PORT_STATUS_TX_FLOW_EN    0x10
-+#define ESS_PORT_STATUS_RX_MAC_EN     0x08
-+#define ESS_PORT_STATUS_TX_MAC_EN     0x04
-+#define ESS_PORT_STATUS_SPEED_INV     0x03
-+#define ESS_PORT_STATUS_SPEED_1000    0x02
-+#define ESS_PORT_STATUS_SPEED_100     0x01
-+#define ESS_PORT_STATUS_SPEED_10      0x00
-+
-+#define ESS_PORT_1G_FDX      (ESS_PORT_STATUS_DUPLEX_MODE | ESS_PORT_STATUS_RX_FLOW_EN | \
-+                             ESS_PORT_STATUS_TX_FLOW_EN  | ESS_PORT_STATUS_RX_MAC_EN  | \
-+                             ESS_PORT_STATUS_TX_MAC_EN   | ESS_PORT_STATUS_SPEED_1000)
-+
-+#define PHY_STATUS_REG                        0x11
-+#define PHY_STATUS_SPEED              0xC000
-+#define PHY_STATUS_SPEED_SHIFT                14
-+#define PHY_STATUS_DUPLEX             0x2000
-+#define PHY_STATUS_DUPLEX_SHIFT       13
-+#define PHY_STATUS_SPEED_DUPLEX_RESOLVED 0x0800
-+#define PHY_STATUS_CARRIER            0x0400
-+#define PHY_STATUS_CARRIER_SHIFT      10
-+
-+/* Port lookup control registers */
-+#define ESS_PORT0_LOOKUP_CTRL 0x0660
-+#define ESS_PORT1_LOOKUP_CTRL 0x066C
-+#define ESS_PORT2_LOOKUP_CTRL 0x0678
-+#define ESS_PORT3_LOOKUP_CTRL 0x0684
-+#define ESS_PORT4_LOOKUP_CTRL 0x0690
-+#define ESS_PORT5_LOOKUP_CTRL 0x069C
-+
-+#define ESS_PORT0_HEADER_CTRL 0x009C
-+
-+#define ESS_PORTS_ALL         0x3f
-+
-+#define ESS_FWD_CTRL1         0x0624
-+#define   ESS_FWD_CTRL1_UC_FLOOD              BITS(0, 7)
-+#define   ESS_FWD_CTRL1_UC_FLOOD_S            0
-+#define   ESS_FWD_CTRL1_MC_FLOOD              BITS(8, 7)
-+#define   ESS_FWD_CTRL1_MC_FLOOD_S            8
-+#define   ESS_FWD_CTRL1_BC_FLOOD              BITS(16, 7)
-+#define   ESS_FWD_CTRL1_BC_FLOOD_S            16
-+#define   ESS_FWD_CTRL1_IGMP                  BITS(24, 7)
-+#define   ESS_FWD_CTRL1_IGMP_S                        24
-+
- #endif /* _ESS_EDMA_H_ */
diff --git a/target/linux/ipq40xx/patches-4.19/713-essedma-alloc-skb-ip-align.patch b/target/linux/ipq40xx/patches-4.19/713-essedma-alloc-skb-ip-align.patch
deleted file mode 100644 (file)
index 8c70fce..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-From 17681f0bb474d0d227f07369144149d1555d8bce Mon Sep 17 00:00:00 2001
-From: Chen Minqiang <ptpt52@gmail.com>
-Date: Sun, 17 Jun 2018 04:14:13 +0800
-Subject: [PATCH] essedma: alloc skb ip align
-
-Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
----
- drivers/net/ethernet/qualcomm/essedma/edma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/qualcomm/essedma/edma.c
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c
-@@ -201,7 +201,7 @@ static int edma_alloc_rx_buf(struct edma
-                       skb = sw_desc->skb;
-               } else {
-                       /* alloc skb */
--                      skb = netdev_alloc_skb(edma_netdev[0], length);
-+                      skb = netdev_alloc_skb_ip_align(edma_netdev[0], length);
-                       if (!skb) {
-                               /* Better luck next round */
-                               break;
diff --git a/target/linux/ipq40xx/patches-4.19/714-essedma-add-fix-for-memory-allocation.patch b/target/linux/ipq40xx/patches-4.19/714-essedma-add-fix-for-memory-allocation.patch
deleted file mode 100644 (file)
index 5b9fcf7..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-From 72c050acbc425ef99313d5c2e4c866e25567e569 Mon Sep 17 00:00:00 2001
-From: Rakesh Nair <ranair@codeaurora.org>
-Date: Thu, 8 Jun 2017 14:29:20 +0530
-Subject: [PATCH] CHROMIUM: net: qualcomm: Add fix for memory allocation issues
-
-Added ethtool counters for memory allocation failures accounting.
-Added support to track number of allocation failures that could
-not be fulfilled in the current iteration in the rx descriptor
-field and use the info to allocate in the subsequent iteration.
-
-Change-Id: Ie4fd3b6cf25304e5db2c9247a498791e7e9bb4aa
-Signed-off-by: Rakesh Nair <ranair@codeaurora.org>
-Signed-off-by: Kan Yan <kyan@google.com>
-Reviewed-on: https://chromium-review.googlesource.com/535419
-Reviewed-by: Grant Grundler <grundler@chromium.org>
----
- drivers/net/ethernet/qualcomm/essedma/edma.c  | 54 ++++++++++++++-----
- drivers/net/ethernet/qualcomm/essedma/edma.h  |  2 +
- .../ethernet/qualcomm/essedma/edma_ethtool.c  |  1 +
- 3 files changed, 43 insertions(+), 14 deletions(-)
-
---- a/drivers/net/ethernet/qualcomm/essedma/edma.c
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c
-@@ -103,6 +103,9 @@ static int edma_alloc_rx_ring(struct edm
-               return -ENOMEM;
-       }
-+      /* Initialize pending_fill */
-+      erxd->pending_fill = 0;
-+
-       return 0;
- }
-@@ -185,11 +188,8 @@ static int edma_alloc_rx_buf(struct edma
-       u16 prod_idx, length;
-       u32 reg_data;
--      if (cleaned_count > erdr->count) {
--              dev_err(&pdev->dev, "Incorrect cleaned_count %d",
--                     cleaned_count);
--              return -1;
--      }
-+      if (cleaned_count > erdr->count)
-+              cleaned_count = erdr->count - 1;
-       i = erdr->sw_next_to_fill;
-@@ -199,6 +199,9 @@ static int edma_alloc_rx_buf(struct edma
-               if (sw_desc->flags & EDMA_SW_DESC_FLAG_SKB_REUSE) {
-                       skb = sw_desc->skb;
-+
-+                      /* Clear REUSE Flag */
-+                      sw_desc->flags &= ~EDMA_SW_DESC_FLAG_SKB_REUSE;
-               } else {
-                       /* alloc skb */
-                       skb = netdev_alloc_skb_ip_align(edma_netdev[0], length);
-@@ -264,6 +267,13 @@ static int edma_alloc_rx_buf(struct edma
-       reg_data &= ~EDMA_RFD_PROD_IDX_BITS;
-       reg_data |= prod_idx;
-       edma_write_reg(EDMA_REG_RFD_IDX_Q(queue_id), reg_data);
-+
-+      /* If we couldn't allocate all the buffers
-+       * we increment the alloc failure counters
-+       */
-+      if (cleaned_count)
-+              edma_cinfo->edma_ethstats.rx_alloc_fail_ctr++;
-+
-       return cleaned_count;
- }
-@@ -534,7 +544,7 @@ static int edma_rx_complete_paged(struct
-  * edma_rx_complete()
-  *    Main api called from the poll function to process rx packets.
-  */
--static void edma_rx_complete(struct edma_common_info *edma_cinfo,
-+static u16 edma_rx_complete(struct edma_common_info *edma_cinfo,
-                           int *work_done, int work_to_do, int queue_id,
-                           struct napi_struct *napi)
- {
-@@ -554,6 +564,7 @@ static void edma_rx_complete(struct edma
-       u16 count = erdr->count, rfd_avail;
-       u8 queue_to_rxid[8] = {0, 0, 1, 1, 2, 2, 3, 3};
-+      cleaned_count = erdr->pending_fill;
-       sw_next_to_clean = erdr->sw_next_to_clean;
-       edma_read_reg(EDMA_REG_RFD_IDX_Q(queue_id), &data);
-@@ -652,12 +663,13 @@ static void edma_rx_complete(struct edma
-                                               (*work_done)++;
-                                               drop_count = 0;
-                                       }
--                                      if (cleaned_count == EDMA_RX_BUFFER_WRITE) {
-+                                      if (cleaned_count >= EDMA_RX_BUFFER_WRITE) {
-                                               /* If buffer clean count reaches 16, we replenish HW buffers. */
-                                               ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
-                                               edma_write_reg(EDMA_REG_RX_SW_CONS_IDX_Q(queue_id),
-                                                             sw_next_to_clean);
-                                               cleaned_count = ret_count;
-+                                              erdr->pending_fill = ret_count;
-                                       }
-                                       continue;
-                               }
-@@ -730,11 +742,12 @@ static void edma_rx_complete(struct edma
-                       adapter->stats.rx_bytes += length;
-                       /* Check if we reached refill threshold */
--                      if (cleaned_count == EDMA_RX_BUFFER_WRITE) {
-+                      if (cleaned_count >= EDMA_RX_BUFFER_WRITE) {
-                               ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
-                               edma_write_reg(EDMA_REG_RX_SW_CONS_IDX_Q(queue_id),
-                                             sw_next_to_clean);
-                               cleaned_count = ret_count;
-+                              erdr->pending_fill = ret_count;
-                       }
-                       /* At this point skb should go to stack */
-@@ -756,11 +769,17 @@ static void edma_rx_complete(struct edma
-       /* Refill here in case refill threshold wasn't reached */
-       if (likely(cleaned_count)) {
-               ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
--              if (ret_count)
--                      dev_dbg(&pdev->dev, "Not all buffers was reallocated");
-+              erdr->pending_fill = ret_count;
-+              if (ret_count) {
-+                      if (net_ratelimit())
-+                              dev_dbg(&pdev->dev, "Not all buffers was reallocated");
-+              }
-+
-               edma_write_reg(EDMA_REG_RX_SW_CONS_IDX_Q(queue_id),
-                             erdr->sw_next_to_clean);
-       }
-+
-+      return erdr->pending_fill;
- }
- /* edma_delete_rfs_filter()
-@@ -2064,6 +2083,7 @@ int edma_poll(struct napi_struct *napi,
-       u32 shadow_rx_status, shadow_tx_status;
-       int queue_id;
-       int i, work_done = 0;
-+      u16 rx_pending_fill;
-       /* Store the Rx/Tx status by ANDing it with
-        * appropriate CPU RX?TX mask
-@@ -2097,13 +2117,19 @@ int edma_poll(struct napi_struct *napi,
-        */
-       while (edma_percpu_info->rx_status) {
-               queue_id = ffs(edma_percpu_info->rx_status) - 1;
--              edma_rx_complete(edma_cinfo, &work_done,
--                              budget, queue_id, napi);
-+              rx_pending_fill = edma_rx_complete(edma_cinfo, &work_done,
-+                                                 budget, queue_id, napi);
--              if (likely(work_done < budget))
-+              if (likely(work_done < budget)) {
-+                      if (rx_pending_fill) {
-+                              /* reschedule poll() to refill rx buffer deficit */
-+                              work_done = budget;
-+                              break;
-+                      }
-                       edma_percpu_info->rx_status &= ~(1 << queue_id);
--              else
-+              } else {
-                       break;
-+              }
-       }
-       /* Clear the status register, to avoid the interrupts to
---- a/drivers/net/ethernet/qualcomm/essedma/edma.h
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma.h
-@@ -225,6 +225,7 @@ struct edma_ethtool_statistics {
-       u32 rx_q6_byte;
-       u32 rx_q7_byte;
-       u32 tx_desc_error;
-+      u32 rx_alloc_fail_ctr;
- };
- struct edma_mdio_data {
-@@ -362,6 +363,7 @@ struct edma_rfd_desc_ring {
-       dma_addr_t dma; /* descriptor ring physical address */
-       u16 sw_next_to_fill; /* next descriptor to fill */
-       u16 sw_next_to_clean; /* next descriptor to clean */
-+      u16 pending_fill; /* fill pending from previous iteration */
- };
- /* edma_rfs_flter_node - rfs filter node in hash table */
---- a/drivers/net/ethernet/qualcomm/essedma/edma_ethtool.c
-+++ b/drivers/net/ethernet/qualcomm/essedma/edma_ethtool.c
-@@ -78,6 +78,7 @@ static const struct edma_ethtool_stats e
-       {"rx_q6_byte", EDMA_STAT(rx_q6_byte)},
-       {"rx_q7_byte", EDMA_STAT(rx_q7_byte)},
-       {"tx_desc_error", EDMA_STAT(tx_desc_error)},
-+      {"rx_alloc_fail_ctr", EDMA_STAT(rx_alloc_fail_ctr)},
- };
- #define EDMA_STATS_LEN ARRAY_SIZE(edma_gstrings_stats)
diff --git a/target/linux/ipq40xx/patches-4.19/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq40xx/patches-4.19/850-soc-add-qualcomm-syscon.patch
deleted file mode 100644 (file)
index 7b4eeff..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-From: Christian Lamparter <chunkeey@googlemail.com>
-Subject: SoC: add qualcomm syscon
---- a/drivers/soc/qcom/Makefile
-+++ b/drivers/soc/qcom/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_QCOM_SMEM_STATE) += smem_st
- obj-$(CONFIG_QCOM_SMP2P)      += smp2p.o
- obj-$(CONFIG_QCOM_SMSM)       += smsm.o
- obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
-+obj-$(CONFIG_QCOM_TCSR)        += qcom_tcsr.o
- obj-$(CONFIG_QCOM_APR) += apr.o
- obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o
- obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
---- a/drivers/soc/qcom/Kconfig
-+++ b/drivers/soc/qcom/Kconfig
-@@ -146,6 +146,13 @@ config QCOM_SMSM
-         Say yes here to support the Qualcomm Shared Memory State Machine.
-         The state machine is represented by bits in shared memory.
-+config QCOM_TCSR
-+      tristate "QCOM Top Control and Status Registers"
-+      depends on ARCH_QCOM
-+      help
-+        Say y here to enable TCSR support.  The TCSR provides control
-+        functions for various peripherals.
-+
- config QCOM_WCNSS_CTRL
-       tristate "Qualcomm WCNSS control driver"
-       depends on ARCH_QCOM
---- /dev/null
-+++ b/drivers/soc/qcom/qcom_tcsr.c
-@@ -0,0 +1,98 @@
-+/*
-+ * Copyright (c) 2014, The Linux foundation. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License rev 2 and
-+ * only rev 2 as published by the free Software foundation.
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_platform.h>
-+#include <linux/platform_device.h>
-+
-+#define TCSR_USB_PORT_SEL     0xb0
-+#define TCSR_USB_HSPHY_CONFIG 0xC
-+
-+#define TCSR_ESS_INTERFACE_SEL_OFFSET   0x0
-+#define TCSR_ESS_INTERFACE_SEL_MASK     0xf
-+
-+#define TCSR_WIFI0_GLB_CFG_OFFSET     0x0
-+#define TCSR_WIFI1_GLB_CFG_OFFSET     0x4
-+#define TCSR_PNOC_SNOC_MEMTYPE_M0_M2  0x4
-+
-+static int tcsr_probe(struct platform_device *pdev)
-+{
-+      struct resource *res;
-+      const struct device_node *node = pdev->dev.of_node;
-+      void __iomem *base;
-+      u32 val;
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      base = devm_ioremap_resource(&pdev->dev, res);
-+      if (IS_ERR(base))
-+              return PTR_ERR(base);
-+
-+      if (!of_property_read_u32(node, "qcom,usb-ctrl-select", &val)) {
-+              dev_err(&pdev->dev, "setting usb port select = %d\n", val);
-+              writel(val, base + TCSR_USB_PORT_SEL);
-+      }
-+
-+      if (!of_property_read_u32(node, "qcom,usb-hsphy-mode-select", &val)) {
-+              dev_info(&pdev->dev, "setting usb hs phy mode select = %x\n", val);
-+              writel(val, base + TCSR_USB_HSPHY_CONFIG);
-+      }
-+
-+      if (!of_property_read_u32(node, "qcom,ess-interface-select", &val)) {
-+              u32 tmp = 0;
-+              dev_info(&pdev->dev, "setting ess interface select = %x\n", val);
-+              tmp = readl(base + TCSR_ESS_INTERFACE_SEL_OFFSET);
-+              tmp = tmp & (~TCSR_ESS_INTERFACE_SEL_MASK);
-+              tmp = tmp | (val&TCSR_ESS_INTERFACE_SEL_MASK);
-+              writel(tmp, base + TCSR_ESS_INTERFACE_SEL_OFFSET);
-+        }
-+
-+      if (!of_property_read_u32(node, "qcom,wifi_glb_cfg", &val)) {
-+              dev_info(&pdev->dev, "setting wifi_glb_cfg = %x\n", val);
-+              writel(val, base + TCSR_WIFI0_GLB_CFG_OFFSET);
-+              writel(val, base + TCSR_WIFI1_GLB_CFG_OFFSET);
-+      }
-+
-+      if (!of_property_read_u32(node, "qcom,wifi_noc_memtype_m0_m2", &val)) {
-+              dev_info(&pdev->dev,
-+                      "setting wifi_noc_memtype_m0_m2 = %x\n", val);
-+              writel(val, base + TCSR_PNOC_SNOC_MEMTYPE_M0_M2);
-+      }
-+
-+      return 0;
-+}
-+
-+static const struct of_device_id tcsr_dt_match[] = {
-+      { .compatible = "qcom,tcsr", },
-+      { },
-+};
-+
-+MODULE_DEVICE_TABLE(of, tcsr_dt_match);
-+
-+static struct platform_driver tcsr_driver = {
-+      .driver = {
-+              .name           = "tcsr",
-+              .owner          = THIS_MODULE,
-+              .of_match_table = tcsr_dt_match,
-+      },
-+      .probe = tcsr_probe,
-+};
-+
-+module_platform_driver(tcsr_driver);
-+
-+MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
-+MODULE_DESCRIPTION("QCOM TCSR driver");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/include/dt-bindings/soc/qcom,tcsr.h
-@@ -0,0 +1,48 @@
-+/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 and
-+ * only version 2 as published by the Free Software Foundation.
-+ *
-+ * 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.
-+ */
-+#ifndef __DT_BINDINGS_QCOM_TCSR_H
-+#define __DT_BINDINGS_QCOM_TCSR_H
-+
-+#define TCSR_USB_SELECT_USB3_P0               0x1
-+#define TCSR_USB_SELECT_USB3_P1               0x2
-+#define TCSR_USB_SELECT_USB3_DUAL     0x3
-+
-+/* IPQ40xx HS PHY Mode Select */
-+#define TCSR_USB_HSPHY_HOST_MODE      0x00E700E7
-+#define TCSR_USB_HSPHY_DEVICE_MODE    0x00C700E7
-+
-+/* IPQ40xx ess interface mode select */
-+#define TCSR_ESS_PSGMII              0
-+#define TCSR_ESS_PSGMII_RGMII5       1
-+#define TCSR_ESS_PSGMII_RMII0        2
-+#define TCSR_ESS_PSGMII_RMII1        4
-+#define TCSR_ESS_PSGMII_RMII0_RMII1  6
-+#define TCSR_ESS_PSGMII_RGMII4       9
-+
-+/*
-+ * IPQ40xx WiFi Global Config
-+ * Bit 30:AXID_EN
-+ * Enable AXI master bus Axid translating to confirm all txn submitted by order
-+ * Bit 24: Use locally generated socslv_wxi_bvalid
-+ * 1:  use locally generate socslv_wxi_bvalid for performance.
-+ * 0:  use SNOC socslv_wxi_bvalid.
-+ */
-+#define TCSR_WIFI_GLB_CFG             0x41000000
-+
-+/* IPQ40xx MEM_TYPE_SEL_M0_M2 Select Bit 26:24 - 2 NORMAL */
-+#define TCSR_WIFI_NOC_MEMTYPE_M0_M2   0x02222222
-+
-+/* TCSR A/B REG */
-+#define IPQ806X_TCSR_REG_A_ADM_CRCI_MUX_SEL     0
-+#define IPQ806X_TCSR_REG_B_ADM_CRCI_MUX_SEL     1
-+
-+#endif
diff --git a/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch b/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch
deleted file mode 100644 (file)
index 4882537..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
-@@ -15,6 +15,7 @@
-  */
- #include "qcom-ipq4019.dtsi"
-+#include <dt-bindings/soc/qcom,tcsr.h>
- / {
-       model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";
-@@ -29,6 +30,32 @@
-       };
-       soc {
-+              tcsr@194b000 {
-+                      /* select hostmode */
-+                      compatible = "qcom,tcsr";
-+                      reg = <0x194b000 0x100>;
-+                      qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-+                      status = "ok";
-+              };
-+
-+              ess_tcsr@1953000 {
-+                      compatible = "qcom,tcsr";
-+                      reg = <0x1953000 0x1000>;
-+                      qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-+              };
-+
-+              tcsr@1949000 {
-+                      compatible = "qcom,tcsr";
-+                      reg = <0x1949000 0x100>;
-+                      qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-+              };
-+
-+              tcsr@1957000 {
-+                      compatible = "qcom,tcsr";
-+                      reg = <0x1957000 0x100>;
-+                      qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-+              };
-+
-               rng@22000 {
-                       status = "ok";
-               };
-@@ -74,14 +101,6 @@
-                       pinctrl-names = "default";
-                       status = "ok";
-                       cs-gpios = <&tlmm 54 0>;
--
--                      mx25l25635e@0 {
--                              #address-cells = <1>;
--                              #size-cells = <1>;
--                              reg = <0>;
--                              compatible = "mx25l25635e";
--                              spi-max-frequency = <24000000>;
--                      };
-               };
-               serial@78af000 {
-@@ -110,6 +129,22 @@
-                       status = "ok";
-               };
-+              mdio@90000 {
-+                      status = "okay";
-+              };
-+
-+              ess-switch@c000000 {
-+                      status = "okay";
-+              };
-+
-+              ess-psgmii@98000 {
-+                      status = "okay";
-+              };
-+
-+              edma@c080000 {
-+                      status = "okay";
-+              };
-+
-               usb3_ss_phy: ssphy@9a000 {
-                       status = "ok";
-               };
---- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts
-+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts
-@@ -18,5 +18,73 @@
- / {
-       model = "Qualcomm Technologies, Inc. IPQ40xx/AP-DK01.1-C1";
-+      compatible = "qcom,ap-dk01.1-c1", "qcom,ap-dk01.2-c1";
-+      memory {
-+              device_type = "memory";
-+              reg = <0x80000000 0x10000000>;
-+      };
-+};
-+
-+&blsp1_spi1 {
-+      mx25l25635f@0 {
-+              compatible = "mx25l25635f", "jedec,spi-nor";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+              reg = <0>;
-+              spi-max-frequency = <24000000>;
-+
-+              SBL1@0 {
-+                      label = "SBL1";
-+                      reg = <0x0 0x40000>;
-+                      read-only;
-+              };
-+              MIBIB@40000 {
-+                      label = "MIBIB";
-+                      reg = <0x40000 0x20000>;
-+                      read-only;
-+              };
-+              QSEE@60000 {
-+                      label = "QSEE";
-+                      reg = <0x60000 0x60000>;
-+                      read-only;
-+              };
-+              CDT@c0000 {
-+                      label = "CDT";
-+                      reg = <0xc0000 0x10000>;
-+                      read-only;
-+              };
-+              DDRPARAMS@d0000 {
-+                      label = "DDRPARAMS";
-+                      reg = <0xd0000 0x10000>;
-+                      read-only;
-+              };
-+              APPSBLENV@e0000 {
-+                      label = "APPSBLENV";
-+                      reg = <0xe0000 0x10000>;
-+                      read-only;
-+              };
-+              APPSBL@f0000 {
-+                      label = "APPSBL";
-+                      reg = <0xf0000 0x80000>;
-+                      read-only;
-+              };
-+              ART@170000 {
-+                      label = "ART";
-+                      reg = <0x170000 0x10000>;
-+                      read-only;
-+              };
-+              kernel@180000 {
-+                      label = "kernel";
-+                      reg = <0x180000 0x400000>;
-+              };
-+              rootfs@580000 {
-+                      label = "rootfs";
-+                      reg = <0x580000 0x1600000>;
-+              };
-+              firmware@180000 {
-+                      label = "firmware";
-+                      reg = <0x180000 0x1a00000>;
-+              };
-+      };
- };
diff --git a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch
deleted file mode 100644 (file)
index a0386f6..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8f68331e14dff9a101f2d0e1d6bec84a031f27ee Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 9 Mar 2017 11:03:18 +0100
-Subject: [PATCH 69/69] arm: boot: add dts files
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- arch/arm/boot/dts/Makefile | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -785,11 +785,33 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-       qcom-apq8074-dragonboard.dtb \
-       qcom-apq8084-ifc6540.dtb \
-       qcom-apq8084-mtp.dtb \
-+      qcom-ipq4018-a42.dtb \
-+      qcom-ipq4018-ap120c-ac.dtb \
-+      qcom-ipq4018-ea6350v3.dtb \
-+      qcom-ipq4018-eap1300.dtb \
-+      qcom-ipq4018-ens620ext.dtb \
-+      qcom-ipq4018-ex6100v2.dtb \
-+      qcom-ipq4018-ex6150v2.dtb \
-+      qcom-ipq4018-fritz4040.dtb \
-+      qcom-ipq4018-jalapeno.dtb \
-+      qcom-ipq4018-nbg6617.dtb \
-+      qcom-ipq4018-rt-ac58u.dtb \
-+      qcom-ipq4018-wre6606.dtb \
-       qcom-ipq4019-ap.dk01.1-c1.dtb \
-       qcom-ipq4019-ap.dk04.1-c1.dtb \
-       qcom-ipq4019-ap.dk04.1-c3.dtb \
-       qcom-ipq4019-ap.dk07.1-c1.dtb \
-       qcom-ipq4019-ap.dk07.1-c2.dtb \
-+      qcom-ipq4019-a62.dtb \
-+      qcom-ipq4019-fritzbox-7530.dtb \
-+      qcom-ipq4019-fritzrepeater-3000.dtb \
-+      qcom-ipq4019-linksys_ea8300.dtb \
-+      qcom-ipq4019-map-ac2200.dtb \
-+      qcom-ipq4019-qxwlan-e2600ac-c1.dtb \
-+      qcom-ipq4019-qxwlan-e2600ac-c2.dtb \
-+      qcom-ipq4028-wpj428.dtb \
-+      qcom-ipq4029-gl-b1300.dtb \
-+      qcom-ipq4029-mr33.dtb \
-       qcom-ipq8064-ap148.dtb \
-       qcom-msm8660-surf.dtb \
-       qcom-msm8960-cdp.dtb \
diff --git a/target/linux/ipq40xx/patches-4.19/997-device_tree_cmdline.patch b/target/linux/ipq40xx/patches-4.19/997-device_tree_cmdline.patch
deleted file mode 100644 (file)
index 7600b0e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -1090,6 +1090,9 @@ int __init early_init_dt_scan_chosen(uns
-       p = of_get_flat_dt_prop(node, "bootargs", &l);
-       if (p != NULL && l > 0)
-               strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
-+      p = of_get_flat_dt_prop(node, "bootargs-append", &l);
-+      if (p != NULL && l > 0)
-+              strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
-       /*
-        * CONFIG_CMDLINE is meant to be a default in case nothing else
diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
deleted file mode 100644 (file)
index e196433..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=armeb
-BOARD:=ixp4xx
-BOARDNAME:=Intel IXP4xx
-FEATURES:=squashfs
-MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
-           Imre Kaloz <kaloz@openwrt.org>
-SUBTARGETS:=generic harddisk
-
-KERNEL_PATCHVER:=4.9
-
-include $(INCLUDE_DIR)/target.mk
-
-DEFAULT_PACKAGES += ixp4xx-microcode fconfig
-KERNELNAME:=zImage
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/ixp4xx/base-files/lib/ixp4xx.sh b/target/linux/ixp4xx/base-files/lib/ixp4xx.sh
deleted file mode 100644 (file)
index 3f73dd9..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-
-IXP4XX_BOARD_NAME=
-IXP4XX_MODEL=
-
-ixp4xx_board_detect() {
-       local machine
-       local name
-
-       machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /Hardware/ {print $2}' /proc/cpuinfo)
-
-       case "$machine" in
-       "Gateworks Cambria"*)
-               name="cambria"
-               ;;
-       "Gateworks Avila"*)
-               name="avila"
-               ;;
-       *)
-               name="generic";
-               ;;
-       esac
-
-       [ -z "$IXP4XX_BOARD_NAME" ] && IXP4XX_BOARD_NAME="$name"
-       [ -z "$IXP4XX_MODEL" ] && IXP4XX_MODEL="$machine"
-
-       [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
-
-       echo "$IXP4XX_BOARD_NAME" > /tmp/sysinfo/board_name
-       echo "$IXP4XX_MODEL" > /tmp/sysinfo/model
-}
diff --git a/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo b/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo
deleted file mode 100644 (file)
index 7699e9a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-do_sysinfo_ixp4xx() {
-       . /lib/ixp4xx.sh
-
-       ixp4xx_board_detect
-}
-
-boot_hook_add preinit_main do_sysinfo_ixp4xx
diff --git a/target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx b/target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx
deleted file mode 100644 (file)
index adda197..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set_ether_mac() {
-
-       RB_CONFIG="$(grep "RedBoot config" /proc/mtd | cut -d: -f1)"
-
-       for npe in eth0 eth1 eth2
-       do
-               if [ "$(ifconfig $npe 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
-                       ifconfig $npe hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n npe_"$npe"_esa)
-               fi
-       done
-
-       # Some developers should be shot on sight at Zcom/Netgear
-       # -- Fixup for the WG302v1, need someone with a WAG302v1 to fix that, too
-
-       if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
-                       ifconfig eth0 hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n zcom_npe_esa)
-       fi
-
-       # Others (*cough*, Tonze) are dumb enough to not handle mac addresses at all
-
-       if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
-               ifconfig eth0 hw ether 00:11:22:33:44:55
-       fi
-       if [ "$(ifconfig eth1 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
-               ifconfig eth1 hw ether 00:11:22:33:44:56
-       fi
-}
-
-boot_hook_add preinit_main set_ether_mac
-
diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
deleted file mode 100644 (file)
index 92eeaff..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-CI_BLKSZ=65536
-CI_LDADR=0x00800000
-
-platform_find_partitions() {
-       local first dev size erasesize name
-       while read dev size erasesize name; do
-               name=${name#'"'}; name=${name%'"'}
-               case "$name" in
-                       vmlinux.bin.l7|kernel|linux|rootfs)
-                               if [ -z "$first" ]; then
-                                       first="$name"
-                               else
-                                       echo "$erasesize:$first:$name"
-                                       break
-                               fi
-                       ;;
-               esac
-       done < /proc/mtd
-}
-
-platform_find_kernelpart() {
-       local part
-       for part in "${1%:*}" "${1#*:}"; do
-               case "$part" in
-                       vmlinux.bin.l7|kernel|linux)
-                               echo "$part"
-                               break
-                       ;;
-               esac
-       done
-}
-
-platform_find_part_size() {
-       local first dev size erasesize name
-       while read dev size erasesize name; do
-               name=${name#'"'}; name=${name%'"'}
-               [ "$name" = "$1" ] && {
-                       echo "$size"
-                       break
-               }
-       done < /proc/mtd
-}
-
-platform_do_upgrade_combined() {
-       local partitions=$(platform_find_partitions)
-       local kernelpart=$(platform_find_kernelpart "${partitions#*:}")
-       local erase_size=$((0x${partitions%%:*})); partitions="${partitions#*:}"
-       local kern_part_size=0x$(platform_find_part_size "$kernelpart")
-       local kern_part_blocks=$(($kern_part_size / $CI_BLKSZ))
-       local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null)
-       local kern_blocks=$(($kern_length / $CI_BLKSZ))
-       local root_blocks=$((0x$(dd if="$1" bs=2 skip=5 count=4 2>/dev/null) / $CI_BLKSZ))
-
-       v "platform_do_upgrade_combined"
-       v "partitions=$partitions"
-       v "kernelpart=$kernelpart"
-       v "kernel_part_size=$kern_part_size"
-       v "kernel_part_blocks=$kern_part_blocks"
-       v "kern_length=$kern_length"
-       v "erase_size=$erase_size"
-       v "kern_blocks=$kern_blocks"
-       v "root_blocks=$root_blocks"
-       v "kern_pad_blocks=$(($kern_part_blocks-$kern_blocks))"
-
-       if [ -n "$partitions" ] && [ -n "$kernelpart" ] && \
-          [ ${kern_blocks:-0} -gt 0 ] && \
-          [ ${root_blocks:-0} -gt 0 ] && \
-          [ ${erase_size:-0} -gt 0 ];
-       then
-               local append=""
-               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
-
-               # write the kernel
-               dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null | \
-                       mtd -F$kernelpart:$kern_part_size:$CI_LDADR write - $kernelpart
-               # write the rootfs
-               dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null | \
-                       mtd $append write - rootfs
-       else
-               echo "invalid image"
-       fi
-}
-
-platform_check_image() {
-       local board=$(board_name)
-       local magic="$(get_magic_word "$1")"
-       local partitions=$(platform_find_partitions)
-       local kernelpart=$(platform_find_kernelpart "${partitions#*:}")
-       local kern_part_size=0x$(platform_find_part_size "$kernelpart")
-       local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null)
-
-       [ "$#" -gt 1 ] && return 1
-
-       case "$board" in
-       avila | cambria )
-               [ "$magic" != "4349" ] && {
-                       echo "Invalid image. Use *-sysupgrade.bin files on this board"
-                       return 1
-               }
-
-               kern_length_b=$(printf '%d' $kern_length)
-               kern_part_size_b=$(printf '%d' $kern_part_size)
-               if [ $kern_length_b -gt $kern_part_size_b ]; then
-                       echo "Invalid image. Kernel size ($kern_length) exceeds kernel partition ($kern_part_size)"
-                       return 1
-               fi
-
-               local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null)
-               local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"
-               if [ -n "$md5_img" -a -n "$md5_chk" ] && [ "$md5_img" = "$md5_chk" ]; then
-                       return 0
-               else
-                       echo "Invalid image. Contents do not match checksum (image:$md5_img calculated:$md5_chk)"
-                       return 1
-               fi
-
-               return 0
-               ;;
-       esac
-
-       echo "Sysupgrade is not yet supported on $board."
-       return 1
-}
-
-platform_do_upgrade() {
-       local board=$(board_name)
-
-       v "board=$board"
-       case "$board" in
-       avila | cambria )
-               platform_do_upgrade_combined "$ARGV"
-               ;;
-       *)
-               default_do_upgrade "$ARGV"
-               ;;
-       esac
-}
diff --git a/target/linux/ixp4xx/config-4.9 b/target/linux/ixp4xx/config-4.9
deleted file mode 100644 (file)
index c9b1be9..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_ARCH_ADI_COYOTE is not set
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# CONFIG_ARCH_HAS_SG_CHAIN is not set
-CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_IXCDP1100=y
-CONFIG_ARCH_IXDP425=y
-CONFIG_ARCH_IXDP4XX=y
-CONFIG_ARCH_IXP4XX=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_ARCH_NR_GPIO=0
-# CONFIG_ARCH_PRPMC1100 is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=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_PATCH_PHYS_VIRT=y
-# CONFIG_ARM_THUMB is not set
-CONFIG_ATAGS=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BOUNCE=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_CLKSRC_MMIO=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_BIG_ENDIAN=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_ENDIAN_BE32=y
-# CONFIG_CPU_ENDIAN_BE8 is not set
-CONFIG_CPU_IXP43X=y
-CONFIG_CPU_IXP46X=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_USE_DOMAINS=y
-CONFIG_CPU_XSCALE=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
-CONFIG_DEBUG_UART_8250=y
-# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
-CONFIG_DEBUG_UART_8250_SHIFT=2
-# CONFIG_DEBUG_UART_8250_WORD is not set
-CONFIG_DEBUG_UART_PHYS=0xc8000003
-CONFIG_DEBUG_UART_VIRT=0xfef00003
-# CONFIG_DEBUG_USER is not set
-CONFIG_DMABOUNCE=y
-CONFIG_DNOTIFY=y
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EEPROM_AT24=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IO=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_HARDIRQS_SW_RESEND=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_AUDITSYSCALL=y
-# CONFIG_HAVE_ARCH_BITREVERSE is not set
-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_CBPF_JIT=y
-CONFIG_HAVE_CC_STACKPROTECTOR=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_CONTIGUOUS=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_MEMBLOCK=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_UID16=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_IXP4XX=y
-CONFIG_HZ_FIXED=0
-CONFIG_HZ_PERIODIC=y
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_GPIO=y
-# CONFIG_I2C_IOP3XX is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IOMMU_HELPER=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=y
-# CONFIG_IWMMXT is not set
-CONFIG_IXP4XX_ETH=y
-# CONFIG_IXP4XX_INDIRECT_PCI is not set
-CONFIG_IXP4XX_NPE=y
-CONFIG_IXP4XX_QMGR=y
-CONFIG_IXP4XX_WATCHDOG=y
-CONFIG_LEDS_FSG=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_LATCH=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_MACH_AP1000=y
-CONFIG_MACH_AP42X=y
-# CONFIG_MACH_ARCOM_VULCAN is not set
-CONFIG_MACH_AVILA=y
-CONFIG_MACH_CAMBRIA=y
-CONFIG_MACH_COMPEXWP18=y
-# CONFIG_MACH_DEVIXP is not set
-CONFIG_MACH_DSMG600=y
-CONFIG_MACH_FSG=y
-CONFIG_MACH_GATEWAY7001=y
-# CONFIG_MACH_GORAMO_MLR is not set
-# CONFIG_MACH_GTWX5715 is not set
-# CONFIG_MACH_IXDP465 is not set
-CONFIG_MACH_IXDPG425=y
-# CONFIG_MACH_KIXRP435 is not set
-CONFIG_MACH_LOFT=y
-CONFIG_MACH_MI424WR=y
-# CONFIG_MACH_MIC256 is not set
-# CONFIG_MACH_MICCPT is not set
-CONFIG_MACH_NAS100D=y
-CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORN=y
-CONFIG_MACH_PRONGHORNMETRO=y
-CONFIG_MACH_SIDEWINDER=y
-CONFIG_MACH_TW2662=y
-CONFIG_MACH_TW5334=y
-CONFIG_MACH_USR8200=y
-CONFIG_MACH_WG302V1=y
-CONFIG_MACH_WG302V2=y
-CONFIG_MACH_WRT300NV2=y
-CONFIG_MDIO_BOARDINFO=y
-CONFIG_MIGHT_HAVE_PCI=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_IXP4XX=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_KUSER_HELPERS=y
-CONFIG_NEED_MACH_IO_H=y
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NET_VENDOR_XSCALE=y
-CONFIG_NO_BOOTMEM=y
-CONFIG_NVMEM=y
-# CONFIG_OF is not set
-CONFIG_OLD_SIGACTION=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
-# CONFIG_PCI_DOMAINS_GENERIC is not set
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PHYLIB=y
-# CONFIG_RCU_STALL_COMMON is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1672=y
-CONFIG_RTC_DRV_ISL1208=y
-CONFIG_RTC_DRV_PCF8563=y
-CONFIG_RTC_DRV_X1205=y
-CONFIG_RTC_I2C_AND_SPI=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_SCHED_INFO is not set
-# CONFIG_SCSI_DMA is not set
-CONFIG_SENSORS_AD7418=y
-CONFIG_SENSORS_MAX6650=y
-CONFIG_SENSORS_W83781D=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SPLIT_PTLOCK_CPUS=999999
-CONFIG_SRCU=y
-CONFIG_SWIOTLB=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
-CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
-CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_SUPPORT=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/target/linux/ixp4xx/generic/profiles/100-Default.mk b/target/linux/ixp4xx/generic/profiles/100-Default.mk
deleted file mode 100644 (file)
index c881c80..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Default
-  NAME:=Default Profile
-  PACKAGES:=kmod-ath5k
-endef
-
-define Profile/Default/Description
-       Default IXP4xx Profile
-endef
-$(eval $(call Profile,Default))
-
diff --git a/target/linux/ixp4xx/generic/profiles/105-Atheros-ath5k.mk b/target/linux/ixp4xx/generic/profiles/105-Atheros-ath5k.mk
deleted file mode 100644 (file)
index 8f74277..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Atheros-ath5k
-  NAME:=Atheros WiFi (atk5k)
-  PACKAGES:=kmod-ath5k
-endef
-
-define Profile/Atheros-ath5k/Description
-       Package set compatible with hardware using Atheros WiFi cards
-endef
-$(eval $(call Profile,Atheros-ath5k))
-
diff --git a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk
deleted file mode 100644 (file)
index 6a54f74..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/NSLU2
-  NAME:=Linksys NSLU2
-  PACKAGES:=-wpad-basic -kmod-ath5k kmod-scsi-core \
-       kmod-usb-core kmod-usb-ohci-pci kmod-usb2-pci kmod-usb-storage \
-       kmod-fs-ext4
-endef
-
-define Profile/NSLU2/Description
-       Package set optimized for the Linksys NSLU2
-endef
-$(eval $(call Profile,NSLU2))
-
diff --git a/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk b/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk
deleted file mode 100644 (file)
index 28ac79c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/NAS100d
-  NAME:=Iomega NAS 100d
-  PACKAGES:=kmod-ath5k \
-       kmod-scsi-core \
-       kmod-ata-core kmod-ata-artop \
-       kmod-usb-core kmod-usb2-pci kmod-usb-storage \
-       kmod-fs-ext4
-endef
-
-define Profile/NAS100d/Description
-       Package set optimized for the Iomega NAS 100d
-endef
-$(eval $(call Profile,NAS100d))
-
diff --git a/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk b/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk
deleted file mode 100644 (file)
index c8b53a8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/DSMG600RevA
-  NAME:=DSM-G600 Rev A
-  PACKAGES:=kmod-via-velocity \
-       kmod-ath5k \
-       kmod-scsi-core \
-       kmod-ata-core kmod-ata-artop \
-       kmod-usb-core kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \
-       kmod-fs-ext4
-endef
-
-define Profile/DSMG600RevA/Description
-       Package set optimized for the DSM-G600 Rev A
-endef
-$(eval $(call Profile,DSMG600RevA))
-
diff --git a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk
deleted file mode 100644 (file)
index 959c399..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/USR8200
-  NAME:=USRobotics USR8200
-  PACKAGES:=-wpad-basic kmod-scsi-core \
-       kmod-usb-core kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \
-       kmod-fs-ext4 kmod-firewire kmod-firewire-ohci kmod-firewire-sbp2
-endef
-
-define Profile/USR8200/Description
-       Package set optimized for the USRobotics USR8200
-endef
-$(eval $(call Profile,USR8200))
-
diff --git a/target/linux/ixp4xx/generic/target.mk b/target/linux/ixp4xx/generic/target.mk
deleted file mode 100644 (file)
index 4794755..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-BOARDNAME:=Generic
-
-DEFAULT_PACKAGES+= wpad-basic
-
-define Target/Description
-       Build firmware images for ixp4xx based boards that boot from internal flash
-       (e.g : Linksys NSLU2, ...)
-endef
-
diff --git a/target/linux/ixp4xx/harddisk/config-default b/target/linux/ixp4xx/harddisk/config-default
deleted file mode 100644 (file)
index 78e599c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_ATA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CMDLINE="root=/dev/sda1 noinitrd console=ttyS0,115200"
-CONFIG_EXT4_FS=y
-CONFIG_JBD=y
-CONFIG_REISERFS_FS=y
-CONFIG_SATA_VIA=y
-CONFIG_USB=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_SPLIT_ISO=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_STORAGE=y
diff --git a/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk b/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk
deleted file mode 100644 (file)
index 21f5e1f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/FSG3
-  NAME:=Freecom FSG-3
-  PACKAGES:= \
-       kmod-ath5k \
-       kmod-usb-core kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \
-       kmod-fs-ext4 kmod-fs-reiserfs
-endef
-
-define Profile/FSG3/Description
-       Package set optimized for the Freecom FSG-3
-endef
-$(eval $(call Profile,FSG3))
-
diff --git a/target/linux/ixp4xx/harddisk/target.mk b/target/linux/ixp4xx/harddisk/target.mk
deleted file mode 100644 (file)
index c71065e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-BOARDNAME:=Internal Hard-Disk
-
-define Target/Description
-       Build firmware images for ixp4xx based boards that boot directly from internal disk storage
-       (e.g : Freecom FSG-3, ...)
-endef
diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile
deleted file mode 100644 (file)
index 5b6ff0b..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# 
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-ifdef CONFIG_PACKAGE_apex
-  define Image/Build/Linksys
-       BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-               -L $(STAGING_DIR_IMAGE)/apex-$(2)-armeb.bin \
-               -k $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage \
-               -r rootfs:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
-               -p -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).bin
-       BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-               -F -L $(STAGING_DIR_IMAGE)/apex-$(2)-16mb-armeb.bin \
-               -k $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage \
-               -r rootfs:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
-               -p -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-16mb.bin
-  endef
-endif
-
-define Image/Build/Freecom
-       $(INSTALL_DIR) $(TARGET_DIR)/boot
-       # TODO: Add special CMDLINE shim for webupgrade image here
-       $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage $(TARGET_DIR)/zImage
-       $(TAR) cfj $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
-       $(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).img $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-webupgrade.img
-       rm -f $(TARGET_DIR)/zImage
-endef
-
-define Image/BuildKernel
-       cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
-       BIN_DIR=$(BIN_DIR) IMG_PREFIX="$(IMG_PREFIX)" $(TOPDIR)/scripts/arm-magic.sh
-endef
-
-define Image/BuildKernel/Initramfs
-       cp $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-initramfs-zImage
-       BIN_DIR=$(BIN_DIR) IMG_PREFIX="$(IMG_PREFIX)-initramfs" $(TOPDIR)/scripts/arm-magic.sh
-endef
-
-# Build sysupgrade image
-define BuildFirmware/Generic
-       dd if=$(KDIR)/zImage of=$(KDIR)/zImage.pad bs=64k conv=sync; \
-       dd if=$(KDIR)/root.$(1) of=$(KDIR)/root.$(1).pad bs=128k conv=sync; \
-       sh $(TOPDIR)/scripts/combined-image.sh \
-               $(KDIR)/zImage.pad \
-               $(KDIR)/root.$(1).pad \
-               $(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))-sysupgrade.bin
-endef
-
-define Image/Build
-       $(call Image/Build/$(1),$(1))
-       $(call BuildFirmware/Generic,$(1))
-endef
-
-define Image/Build/jffs2-64k
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=65536 conv=sync
-endef
-
-define Image/Build/jffs2-128k
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync
-       $(call Image/Build/Linksys,$(1),nslu2,$(1))
-       $(call Image/Build/Freecom,$(1),fsg3,$(1))
-endef
-
-define Image/Build/squashfs
-       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync
-       $(call Image/Build/Linksys,$(1),nslu2,$(1))
-       $(call Image/Build/Freecom,$(1),fsg3,$(1))
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ixp4xx/modules.mk b/target/linux/ixp4xx/modules.mk
deleted file mode 100644 (file)
index 2d6446c..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define KernelPackage/ata-ixp4xx-cf
-  SUBMENU:=$(BLOCK_MENU)
-  TITLE:=IXP4XX Compact Flash support
-  DEPENDS:=@TARGET_ixp4xx
-  KCONFIG:=CONFIG_PATA_IXP4XX_CF
-  FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.ko
-  AUTOLOAD:=$(call AutoLoad,41,pata_ixp4xx_cf,1)
-  $(call AddDepends/ata)
-endef
-
-define KernelPackage/ata-ixp4xx-cf/description
- IXP4XX Compact Flash support.
-endef
-
-$(eval $(call KernelPackage,ata-ixp4xx-cf))
-
-
-define KernelPackage/ixp4xx-beeper
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=IXP4XX Beeper support
-  DEPENDS:=@TARGET_ixp4xx +kmod-input-core
-  KCONFIG:= \
-       CONFIG_INPUT_MISC=y \
-       CONFIG_INPUT_IXP4XX_BEEPER
-  FILES:=$(LINUX_DIR)/drivers/input/misc/ixp4xx-beeper.ko
-  AUTOLOAD:=$(call AutoLoad,50,ixp4xx-beeper)
-  $(call AddDepends/input)
-endef
-
-define KernelPackage/ixp4xx-beeper/description
- IXP4XX Beeper support
-endef
-
-$(eval $(call KernelPackage,ixp4xx-beeper))
-
-
-define KernelPackage/crypto-hw-ixp4xx
-  TITLE:=Intel IXP4xx hardware crypto module
-  DEPENDS:=@TARGET_ixp4xx
-  KCONFIG:= \
-       CONFIG_CRYPTO_DEV_IXP4XX
-  FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko
-  AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
-  $(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des)
-endef
-
-define KernelPackage/crypto-hw-ixp4xx/description
-  Kernel support for the Intel IXP4xx HW crypto engine.
-endef
-
-$(eval $(call KernelPackage,crypto-hw-ixp4xx))
-
-
-define KernelPackage/ixp4xx-eth
-  SUBMENU:=$(NETWORK_DEVICES_MENU)
-  TITLE:=IXP4xxt Ethernet Adapter kernel support
-  DEPENDS:=@TARGET_ixp4xx
-  KCONFIG:=CONFIG_IXP4XX_ETH
-  FILES:=$(LINUX_DIR)/drivers/net/ethernet/xscale/ixp4xx_eth.ko
-  AUTOLOAD:=$(call AutoLoad,50,ixp4xx_eth)
-endef
-
-define KernelPackage/ixp4xx-eth/description
- Kernel modules for Intel IXP4xx Ethernet chipsets.
-endef
-
-$(eval $(call KernelPackage,ixp4xx-eth))
diff --git a/target/linux/ixp4xx/patches-4.9/001-arm-ixp4xx-set-cohorent_dma_mask-for-ethernet-platfo.patch b/target/linux/ixp4xx/patches-4.9/001-arm-ixp4xx-set-cohorent_dma_mask-for-ethernet-platfo.patch
deleted file mode 100644 (file)
index 3ca3eb7..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-From 7113f56b683c5123df5c20724ac813cee66fa21a Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 1 Jul 2013 16:49:05 +0200
-Subject: [PATCH 1/2] arm: ixp4xx: set cohorent_dma_mask for ethernet platform
- devices
-
-ARM requires the cohorent_dma_mask set, so set it for the platform
-devices so that the ethernet driver has access to it.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/arm/mach-ixp4xx/fsg-setup.c     |    2 ++
- arch/arm/mach-ixp4xx/goramo_mlr.c    |    2 ++
- arch/arm/mach-ixp4xx/ixdp425-setup.c |    3 +++
- arch/arm/mach-ixp4xx/nas100d-setup.c |    1 +
- arch/arm/mach-ixp4xx/nslu2-setup.c   |    1 +
- arch/arm/mach-ixp4xx/omixp-setup.c   |    3 +++
- arch/arm/mach-ixp4xx/vulcan-setup.c  |    2 ++
- 7 files changed, 14 insertions(+)
-
---- a/arch/arm/mach-ixp4xx/fsg-setup.c
-+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
-@@ -142,12 +142,14 @@ static struct platform_device fsg_eth[]
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev = {
-                       .platform_data  = fsg_plat_eth,
-+                      .coherent_dma_mask = DMA_BIT_MASK(32),
-               },
-       }, {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEC,
-               .dev = {
-                       .platform_data  = fsg_plat_eth + 1,
-+                      .coherent_dma_mask = DMA_BIT_MASK(32),
-               },
-       }
- };
---- a/arch/arm/mach-ixp4xx/goramo_mlr.c
-+++ b/arch/arm/mach-ixp4xx/goramo_mlr.c
-@@ -295,10 +295,12 @@ static struct platform_device device_eth
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev.platform_data      = eth_plat,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       }, {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEC,
-               .dev.platform_data      = eth_plat + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       }
- };
---- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
-+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
-@@ -20,6 +20,7 @@
- #include <linux/mtd/nand.h>
- #include <linux/mtd/partitions.h>
- #include <linux/delay.h>
-+#include <linux/dma-mapping.h>
- #include <linux/gpio.h>
- #include <asm/types.h>
- #include <asm/setup.h>
-@@ -196,10 +197,12 @@ static struct platform_device ixdp425_et
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev.platform_data      = ixdp425_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       }, {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEC,
-               .dev.platform_data      = ixdp425_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       }
- };
---- a/arch/arm/mach-ixp4xx/nas100d-setup.c
-+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
-@@ -170,6 +170,7 @@ static struct platform_device nas100d_et
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev.platform_data      = nas100d_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       }
- };
---- a/arch/arm/mach-ixp4xx/nslu2-setup.c
-+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
-@@ -182,6 +182,7 @@ static struct platform_device nslu2_eth[
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev.platform_data      = nslu2_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       }
- };
---- a/arch/arm/mach-ixp4xx/omixp-setup.c
-+++ b/arch/arm/mach-ixp4xx/omixp-setup.c
-@@ -17,6 +17,7 @@
- #include <linux/serial_8250.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-+#include <linux/dma-mapping.h>
- #include <linux/leds.h>
- #include <asm/setup.h>
-@@ -188,10 +189,12 @@ static struct platform_device ixdp425_et
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev.platform_data      = ixdp425_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       }, {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEC,
-               .dev.platform_data      = ixdp425_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-       },
- };
---- a/arch/arm/mach-ixp4xx/vulcan-setup.c
-+++ b/arch/arm/mach-ixp4xx/vulcan-setup.c
-@@ -139,6 +139,7 @@ static struct platform_device vulcan_eth
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev = {
-                       .platform_data  = &vulcan_plat_eth[0],
-+                      .coherent_dma_mask = DMA_BIT_MASK(32),
-               },
-       },
-       [1] = {
-@@ -146,6 +147,7 @@ static struct platform_device vulcan_eth
-               .id                     = IXP4XX_ETH_NPEC,
-               .dev = {
-                       .platform_data  = &vulcan_plat_eth[1],
-+                      .coherent_dma_mask = DMA_BIT_MASK(32),
-               },
-       },
- };
diff --git a/target/linux/ixp4xx/patches-4.9/002-ixp4xx_eth-use-parent-device-for-dma-allocations.patch b/target/linux/ixp4xx/patches-4.9/002-ixp4xx_eth-use-parent-device-for-dma-allocations.patch
deleted file mode 100644 (file)
index b369b56..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From 1d67040af0144c549f4db8144d2ccc253ff8639c Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 1 Jul 2013 16:39:28 +0200
-Subject: [PATCH 2/2] net: ixp4xx_eth: use parent device for dma allocations
-
-Now that the platfomr device provides a dma_cohorent_mask, use it for
-dma operations.
-
-This fixes ethernet on ixp4xx which was broken since 3.7.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c |   23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -656,10 +656,10 @@ static inline void queue_put_desc(unsign
- static inline void dma_unmap_tx(struct port *port, struct desc *desc)
- {
- #ifdef __ARMEB__
--      dma_unmap_single(&port->netdev->dev, desc->data,
-+      dma_unmap_single(port->netdev->dev.parent, desc->data,
-                        desc->buf_len, DMA_TO_DEVICE);
- #else
--      dma_unmap_single(&port->netdev->dev, desc->data & ~3,
-+      dma_unmap_single(port->netdev->dev.parent, desc->data & ~3,
-                        ALIGN((desc->data & 3) + desc->buf_len, 4),
-                        DMA_TO_DEVICE);
- #endif
-@@ -725,9 +725,9 @@ static int eth_poll(struct napi_struct *
- #ifdef __ARMEB__
-               if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) {
--                      phys = dma_map_single(&dev->dev, skb->data,
-+                      phys = dma_map_single(dev->dev.parent, skb->data,
-                                             RX_BUFF_SIZE, DMA_FROM_DEVICE);
--                      if (dma_mapping_error(&dev->dev, phys)) {
-+                      if (dma_mapping_error(dev->dev.parent, phys)) {
-                               dev_kfree_skb(skb);
-                               skb = NULL;
-                       }
-@@ -750,10 +750,11 @@ static int eth_poll(struct napi_struct *
- #ifdef __ARMEB__
-               temp = skb;
-               skb = port->rx_buff_tab[n];
--              dma_unmap_single(&dev->dev, desc->data - NET_IP_ALIGN,
-+              dma_unmap_single(dev->dev.parent, desc->data - NET_IP_ALIGN,
-                                RX_BUFF_SIZE, DMA_FROM_DEVICE);
- #else
--              dma_sync_single_for_cpu(&dev->dev, desc->data - NET_IP_ALIGN,
-+              dma_sync_single_for_cpu(dev->dev.parent,
-+                                      desc->data - NET_IP_ALIGN,
-                                       RX_BUFF_SIZE, DMA_FROM_DEVICE);
-               memcpy_swab32((u32 *)skb->data, (u32 *)port->rx_buff_tab[n],
-                             ALIGN(NET_IP_ALIGN + desc->pkt_len, 4) / 4);
-@@ -872,7 +873,7 @@ static int eth_xmit(struct sk_buff *skb,
-       memcpy_swab32(mem, (u32 *)((int)skb->data & ~3), bytes / 4);
- #endif
--      phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE);
-+      phys = dma_map_single(dev->dev.parent, mem, bytes, DMA_TO_DEVICE);
-       if (dma_mapping_error(&dev->dev, phys)) {
-               dev_kfree_skb(skb);
- #ifndef __ARMEB__
-@@ -1107,7 +1108,7 @@ static int init_queues(struct port *port
-       int i;
-       if (!ports_open) {
--              dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev,
-+              dma_pool = dma_pool_create(DRV_NAME, port->netdev->dev.parent,
-                                          POOL_ALLOC_SIZE, 32, 0);
-               if (!dma_pool)
-                       return -ENOMEM;
-@@ -1135,9 +1136,9 @@ static int init_queues(struct port *port
-               data = buff;
- #endif
-               desc->buf_len = MAX_MRU;
--              desc->data = dma_map_single(&port->netdev->dev, data,
-+              desc->data = dma_map_single(port->netdev->dev.parent, data,
-                                           RX_BUFF_SIZE, DMA_FROM_DEVICE);
--              if (dma_mapping_error(&port->netdev->dev, desc->data)) {
-+              if (dma_mapping_error(port->netdev->dev.parent, desc->data)) {
-                       free_buffer(buff);
-                       return -EIO;
-               }
-@@ -1157,7 +1158,7 @@ static void destroy_queues(struct port *
-                       struct desc *desc = rx_desc_ptr(port, i);
-                       buffer_t *buff = port->rx_buff_tab[i];
-                       if (buff) {
--                              dma_unmap_single(&port->netdev->dev,
-+                              dma_unmap_single(port->netdev->dev.parent,
-                                                desc->data - NET_IP_ALIGN,
-                                                RX_BUFF_SIZE, DMA_FROM_DEVICE);
-                               free_buffer(buff);
diff --git a/target/linux/ixp4xx/patches-4.9/020-gateworks_i2c_pld.patch b/target/linux/ixp4xx/patches-4.9/020-gateworks_i2c_pld.patch
deleted file mode 100644 (file)
index 185a09f..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -656,6 +656,14 @@ config GPIO_WS16C48
-         parameter. The interrupt line numbers for the devices may be
-         configured via the irq module parameter.
-+config GPIO_GW_I2C_PLD
-+      tristate "Gateworks I2C PLD GPIO Expander"
-+      depends on I2C
-+      help
-+              Say yes here to provide access to the Gateworks I2C PLD GPIO
-+              Expander. This is used at least on the GW2358-4.
-+
-+
- endmenu
- menu "I2C GPIO expanders"
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -48,6 +48,7 @@ obj-$(CONFIG_GPIO_F7188X)    += gpio-f7188x
- obj-$(CONFIG_GPIO_GE_FPGA)    += gpio-ge.o
- obj-$(CONFIG_GPIO_GPIO_MM)    += gpio-gpio-mm.o
- obj-$(CONFIG_GPIO_GRGPIO)     += gpio-grgpio.o
-+obj-$(CONFIG_GPIO_GW_I2C_PLD) += gw_i2c_pld.o
- obj-$(CONFIG_HTC_EGPIO)               += gpio-htc-egpio.o
- obj-$(CONFIG_GPIO_ICH)                += gpio-ich.o
- obj-$(CONFIG_GPIO_IOP)                += gpio-iop.o
---- /dev/null
-+++ b/drivers/gpio/gw_i2c_pld.c
-@@ -0,0 +1,371 @@
-+/*
-+ * Gateworks I2C PLD GPIO expander
-+ *
-+ * Copyright (C) 2009 Gateworks Corporation
-+ *
-+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/slab.h>
-+#include <linux/hardirq.h>
-+#include <linux/i2c.h>
-+#include <linux/i2c/gw_i2c_pld.h>
-+#include <linux/module.h>
-+#include <linux/export.h>
-+#include <asm/gpio.h>
-+#include <mach/hardware.h>
-+
-+static const struct i2c_device_id gw_i2c_pld_id[] = {
-+      { "gw_i2c_pld", 8 },
-+      { }
-+};
-+MODULE_DEVICE_TABLE(i2c, gw_i2c_pld_id);
-+
-+/*
-+ * The Gateworks I2C PLD chip only expose one read and one
-+ * write register.  Writing a "one" bit (to match the reset state) lets
-+ * that pin be used as an input. It is an open-drain model.
-+ */
-+
-+struct gw_i2c_pld {
-+      struct gpio_chip        chip;
-+      struct i2c_client       *client;
-+      unsigned                out;            /* software latch */
-+};
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * The Gateworks I2C PLD chip does not properly send the acknowledge bit
-+ * thus we cannot use standard i2c_smbus functions. We have recreated
-+ * our own here, but we still use the rt_mutex_lock to lock the i2c_bus
-+ * as the device still exists on the I2C bus.
-+*/
-+
-+#define PLD_SCL_GPIO 6
-+#define PLD_SDA_GPIO 7
-+
-+#define SCL_LO()  gpio_line_set(PLD_SCL_GPIO, IXP4XX_GPIO_LOW)
-+#define SCL_HI()  gpio_line_set(PLD_SCL_GPIO, IXP4XX_GPIO_HIGH)
-+#define SCL_EN()  gpio_line_config(PLD_SCL_GPIO, IXP4XX_GPIO_OUT)
-+#define SDA_LO()  gpio_line_set(PLD_SDA_GPIO, IXP4XX_GPIO_LOW)
-+#define SDA_HI()  gpio_line_set(PLD_SDA_GPIO, IXP4XX_GPIO_HIGH)
-+#define SDA_EN()  gpio_line_config(PLD_SDA_GPIO, IXP4XX_GPIO_OUT)
-+#define SDA_DIS() gpio_line_config(PLD_SDA_GPIO, IXP4XX_GPIO_IN)
-+#define SDA_IN(x) gpio_line_get(PLD_SDA_GPIO, &x);
-+
-+static int i2c_pld_write_byte(int address, int byte)
-+{
-+      int i;
-+
-+      address = (address << 1) & ~0x1;
-+
-+      SDA_HI();
-+      SDA_EN();
-+      SCL_EN();
-+      SCL_HI();
-+      SDA_LO();
-+      SCL_LO();
-+
-+      for (i = 7; i >= 0; i--)
-+      {
-+              if (address & (1 << i))
-+                      SDA_HI();
-+              else
-+                      SDA_LO();
-+
-+              SCL_HI();
-+              SCL_LO();
-+      }
-+
-+      SDA_DIS();
-+      SCL_HI();
-+      SDA_IN(i);
-+      SCL_LO();
-+      SDA_EN();
-+
-+      for (i = 7; i >= 0; i--)
-+      {
-+              if (byte & (1 << i))
-+      SDA_HI();
-+              else
-+                      SDA_LO();
-+              SCL_HI();
-+              SCL_LO();
-+      }
-+
-+      SDA_DIS();
-+      SCL_HI();
-+      SDA_IN(i);
-+      SCL_LO();
-+
-+      SDA_HI();
-+      SDA_EN();
-+
-+      SDA_LO();
-+      SCL_HI();
-+      SDA_HI();
-+      SCL_LO();
-+      SCL_HI();
-+
-+      return 0;
-+}
-+
-+static unsigned int i2c_pld_read_byte(int address)
-+{
-+      int i = 0, byte = 0;
-+      int bit;
-+
-+      address = (address << 1) | 0x1;
-+
-+      SDA_HI();
-+      SDA_EN();
-+      SCL_EN();
-+      SCL_HI();
-+      SDA_LO();
-+      SCL_LO();
-+
-+      for (i = 7; i >= 0; i--)
-+      {
-+              if (address & (1 << i))
-+                      SDA_HI();
-+              else
-+                      SDA_LO();
-+
-+              SCL_HI();
-+              SCL_LO();
-+      }
-+
-+      SDA_DIS();
-+      SCL_HI();
-+      SDA_IN(i);
-+      SCL_LO();
-+      SDA_EN();
-+
-+      SDA_DIS();
-+      for (i = 7; i >= 0; i--)
-+      {
-+              SCL_HI();
-+              SDA_IN(bit);
-+              byte |= bit << i;
-+              SCL_LO();
-+      }
-+
-+      SDA_LO();
-+      SCL_HI();
-+      SDA_HI();
-+      SCL_LO();
-+      SCL_HI();
-+
-+      return byte;
-+}
-+
-+
-+static int gw_i2c_pld_input8(struct gpio_chip *chip, unsigned offset)
-+{
-+      int ret;
-+      struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip);
-+      struct i2c_adapter *adap = gpio->client->adapter;
-+
-+      if (in_atomic() || irqs_disabled()) {
-+              ret = rt_mutex_trylock(&adap->bus_lock);
-+              if (!ret)
-+                      /* I2C activity is ongoing. */
-+                      return -EAGAIN;
-+      } else {
-+              rt_mutex_lock(&adap->bus_lock);
-+      }
-+
-+      gpio->out |= (1 << offset);
-+
-+      ret = i2c_pld_write_byte(gpio->client->addr, gpio->out);
-+
-+      rt_mutex_unlock(&adap->bus_lock);
-+
-+      return ret;
-+}
-+
-+static int gw_i2c_pld_get8(struct gpio_chip *chip, unsigned offset)
-+{
-+      int ret;
-+      s32     value;
-+      struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip);
-+      struct i2c_adapter *adap = gpio->client->adapter;
-+
-+      if (in_atomic() || irqs_disabled()) {
-+              ret = rt_mutex_trylock(&adap->bus_lock);
-+              if (!ret)
-+                      /* I2C activity is ongoing. */
-+                      return -EAGAIN;
-+      } else {
-+              rt_mutex_lock(&adap->bus_lock);
-+      }
-+
-+      value = i2c_pld_read_byte(gpio->client->addr);
-+
-+      rt_mutex_unlock(&adap->bus_lock);
-+
-+      return (value < 0) ? 0 : (value & (1 << offset));
-+}
-+
-+static int gw_i2c_pld_output8(struct gpio_chip *chip, unsigned offset, int value)
-+{
-+      int ret;
-+
-+      struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip);
-+      struct i2c_adapter *adap = gpio->client->adapter;
-+
-+      unsigned bit = 1 << offset;
-+
-+      if (in_atomic() || irqs_disabled()) {
-+              ret = rt_mutex_trylock(&adap->bus_lock);
-+              if (!ret)
-+                      /* I2C activity is ongoing. */
-+                      return -EAGAIN;
-+      } else {
-+              rt_mutex_lock(&adap->bus_lock);
-+      }
-+
-+
-+      if (value)
-+              gpio->out |= bit;
-+      else
-+              gpio->out &= ~bit;
-+
-+      ret = i2c_pld_write_byte(gpio->client->addr, gpio->out);
-+
-+      rt_mutex_unlock(&adap->bus_lock);
-+
-+      return ret;
-+}
-+
-+static void gw_i2c_pld_set8(struct gpio_chip *chip, unsigned offset, int value)
-+{
-+      gw_i2c_pld_output8(chip, offset, value);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int gw_i2c_pld_probe(struct i2c_client *client,
-+                       const struct i2c_device_id *id)
-+{
-+      struct gw_i2c_pld_platform_data *pdata;
-+      struct gw_i2c_pld *gpio;
-+      int status;
-+
-+      pdata = client->dev.platform_data;
-+      if (!pdata)
-+              return -ENODEV;
-+
-+      /* Allocate, initialize, and register this gpio_chip. */
-+      gpio = kzalloc(sizeof *gpio, GFP_KERNEL);
-+      if (!gpio)
-+              return -ENOMEM;
-+
-+      gpio->chip.base = pdata->gpio_base;
-+      gpio->chip.can_sleep = 1;
-+      gpio->chip.dev = &client->dev;
-+      gpio->chip.owner = THIS_MODULE;
-+
-+      gpio->chip.ngpio = pdata->nr_gpio;
-+      gpio->chip.direction_input = gw_i2c_pld_input8;
-+      gpio->chip.get = gw_i2c_pld_get8;
-+      gpio->chip.direction_output = gw_i2c_pld_output8;
-+      gpio->chip.set = gw_i2c_pld_set8;
-+
-+      gpio->chip.label = client->name;
-+
-+      gpio->client = client;
-+      i2c_set_clientdata(client, gpio);
-+
-+      gpio->out = 0xFF;
-+
-+      status = gpiochip_add(&gpio->chip);
-+      if (status < 0)
-+              goto fail;
-+
-+      dev_info(&client->dev, "gpios %d..%d on a %s%s\n",
-+                      gpio->chip.base,
-+                      gpio->chip.base + gpio->chip.ngpio - 1,
-+                      client->name,
-+                      client->irq ? " (irq ignored)" : "");
-+
-+      /* Let platform code set up the GPIOs and their users.
-+       * Now is the first time anyone could use them.
-+       */
-+      if (pdata->setup) {
-+              status = pdata->setup(client,
-+                              gpio->chip.base, gpio->chip.ngpio,
-+                              pdata->context);
-+              if (status < 0)
-+                      dev_warn(&client->dev, "setup --> %d\n", status);
-+      }
-+
-+      return 0;
-+
-+fail:
-+      dev_dbg(&client->dev, "probe error %d for '%s'\n",
-+                      status, client->name);
-+      kfree(gpio);
-+      return status;
-+}
-+
-+static int gw_i2c_pld_remove(struct i2c_client *client)
-+{
-+      struct gw_i2c_pld_platform_data *pdata = client->dev.platform_data;
-+      struct gw_i2c_pld *gpio = i2c_get_clientdata(client);
-+      int                             status = 0;
-+
-+      if (pdata->teardown) {
-+              status = pdata->teardown(client,
-+                              gpio->chip.base, gpio->chip.ngpio,
-+                              pdata->context);
-+              if (status < 0) {
-+                      dev_err(&client->dev, "%s --> %d\n",
-+                                      "teardown", status);
-+                      return status;
-+              }
-+      }
-+
-+      gpiochip_remove(&gpio->chip);
-+      kfree(gpio);
-+      return 0;
-+}
-+
-+static struct i2c_driver gw_i2c_pld_driver = {
-+      .driver = {
-+              .name   = "gw_i2c_pld",
-+              .owner  = THIS_MODULE,
-+      },
-+      .probe  = gw_i2c_pld_probe,
-+      .remove = gw_i2c_pld_remove,
-+      .id_table = gw_i2c_pld_id,
-+};
-+
-+static int __init gw_i2c_pld_init(void)
-+{
-+      return i2c_add_driver(&gw_i2c_pld_driver);
-+}
-+module_init(gw_i2c_pld_init);
-+
-+static void __exit gw_i2c_pld_exit(void)
-+{
-+      i2c_del_driver(&gw_i2c_pld_driver);
-+}
-+module_exit(gw_i2c_pld_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Chris Lang");
---- /dev/null
-+++ b/include/linux/i2c/gw_i2c_pld.h
-@@ -0,0 +1,20 @@
-+#ifndef __LINUX_GW_I2C_PLD_H
-+#define __LINUX_GW_I2C_PLD_H
-+
-+/**
-+ * The Gateworks I2C PLD Implements an additional 8 bits of GPIO through the PLD
-+ */
-+
-+struct gw_i2c_pld_platform_data {
-+      unsigned gpio_base;
-+      unsigned nr_gpio;
-+      int             (*setup)(struct i2c_client *client,
-+                                      int gpio, unsigned ngpio,
-+                                      void *context);
-+      int             (*teardown)(struct i2c_client *client,
-+                                      int gpio, unsigned ngpio,
-+                                      void *context);
-+      void            *context;
-+};
-+
-+#endif /* __LINUX_GW_I2C_PLD_H */
diff --git a/target/linux/ixp4xx/patches-4.9/030-gpio_line_config.patch b/target/linux/ixp4xx/patches-4.9/030-gpio_line_config.patch
deleted file mode 100644 (file)
index 0e51793..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/arch/arm/mach-ixp4xx/common.c
-+++ b/arch/arm/mach-ixp4xx/common.c
-@@ -93,22 +93,7 @@ void __init ixp4xx_map_io(void)
- /*
-  * GPIO-functions
-  */
--/*
-- * The following converted to the real HW bits the gpio_line_config
-- */
--/* GPIO pin types */
--#define IXP4XX_GPIO_OUT               0x1
--#define IXP4XX_GPIO_IN                0x2
--
--/* GPIO signal types */
--#define IXP4XX_GPIO_LOW                       0
--#define IXP4XX_GPIO_HIGH              1
--
--/* GPIO Clocks */
--#define IXP4XX_GPIO_CLK_0             14
--#define IXP4XX_GPIO_CLK_1             15
--
--static void gpio_line_config(u8 line, u32 direction)
-+void gpio_line_config(u8 line, u32 direction)
- {
-       if (direction == IXP4XX_GPIO_IN)
-               *IXP4XX_GPIO_GPOER |= (1 << line);
-@@ -116,17 +101,17 @@ static void gpio_line_config(u8 line, u3
-               *IXP4XX_GPIO_GPOER &= ~(1 << line);
- }
--static void gpio_line_get(u8 line, int *value)
-+void gpio_line_get(u8 line, int *value)
- {
-       *value = (*IXP4XX_GPIO_GPINR >> line) & 0x1;
- }
--static void gpio_line_set(u8 line, int value)
-+void gpio_line_set(u8 line, int value)
- {
--      if (value == IXP4XX_GPIO_HIGH)
--          *IXP4XX_GPIO_GPOUTR |= (1 << line);
--      else if (value == IXP4XX_GPIO_LOW)
-+      if (value == IXP4XX_GPIO_LOW)
-           *IXP4XX_GPIO_GPOUTR &= ~(1 << line);
-+      else
-+          *IXP4XX_GPIO_GPOUTR |= (1 << line);
- }
- /*************************************************************************
---- a/arch/arm/mach-ixp4xx/include/mach/platform.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
-@@ -131,5 +131,21 @@ struct pci_sys_data;
- extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
- extern struct pci_ops ixp4xx_ops;
-+/* GPIO pin types */
-+#define IXP4XX_GPIO_OUT               0x1
-+#define IXP4XX_GPIO_IN                0x2
-+
-+/* GPIO signal types */
-+#define IXP4XX_GPIO_LOW                       0
-+#define IXP4XX_GPIO_HIGH              1
-+
-+/* GPIO Clocks */
-+#define IXP4XX_GPIO_CLK_0             14
-+#define IXP4XX_GPIO_CLK_1             15
-+
-+void gpio_line_config(u8 line, u32 direction);
-+void gpio_line_get(u8 line, int *value);
-+void gpio_line_set(u8 line, int value);
-+
- #endif // __ASSEMBLY__
diff --git a/target/linux/ixp4xx/patches-4.9/040-arm_mach_types.patch b/target/linux/ixp4xx/patches-4.9/040-arm_mach_types.patch
deleted file mode 100644 (file)
index c6392ef..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -1006,3 +1006,15 @@ eco5_bx2                MACH_ECO5_BX2           ECO5_BX2                4572
- eukrea_cpuimx28sd     MACH_EUKREA_CPUIMX28SD  EUKREA_CPUIMX28SD       4573
- domotab                       MACH_DOMOTAB            DOMOTAB                 4574
- pfla03                        MACH_PFLA03             PFLA03                  4575
-+wg302v1                       MACH_WG302V1            WG302V1                 889
-+pronghorn             MACH_PRONGHORN          PRONGHORN               928
-+pronghorn_metro               MACH_PRONGHORNMETRO     PRONGHORNMETRO          1040
-+sidewinder            MACH_SIDEWINDER         SIDEWINDER              1041
-+wrt300nv2             MACH_WRT300NV2          WRT300NV2               1077
-+compex42x             MACH_COMPEXWP18         COMPEXWP18              1273
-+cambria                       MACH_CAMBRIA            CAMBRIA                 1468
-+ap1000                        MACH_AP1000             AP1000                  1543
-+tw2662                        MACH_TW2662             TW2662                  1658
-+tw5334                        MACH_TW5334             TW5334                  1664
-+usr8200                       MACH_USR8200            USR8200                 1762
-+mi424wr                       MACH_MI424WR            MI424WR                 1778
diff --git a/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch
deleted file mode 100644 (file)
index 9da2139..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -279,11 +279,11 @@
- /*
-  * Configuration information
-  */
--#define INPUT_POOL_SHIFT      12
-+#define INPUT_POOL_SHIFT      13
- #define INPUT_POOL_WORDS      (1 << (INPUT_POOL_SHIFT-5))
--#define OUTPUT_POOL_SHIFT     10
-+#define OUTPUT_POOL_SHIFT     11
- #define OUTPUT_POOL_WORDS     (1 << (OUTPUT_POOL_SHIFT-5))
--#define SEC_XFER_SIZE         512
-+#define SEC_XFER_SIZE         1024
- #define EXTRACT_SIZE          10
- #define DEBUG_RANDOM_BOOT 0
diff --git a/target/linux/ixp4xx/patches-4.9/100-wg302v2_gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/100-wg302v2_gateway7001_mac_plat_info.patch
deleted file mode 100644 (file)
index 317103f..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/arch/arm/mach-ixp4xx/gateway7001-setup.c
-+++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
-@@ -17,6 +17,7 @@
- #include <linux/serial.h>
- #include <linux/tty.h>
- #include <linux/serial_8250.h>
-+#include <linux/dma-mapping.h>
- #include <asm/types.h>
- #include <asm/setup.h>
-@@ -75,9 +76,37 @@ static struct platform_device gateway700
-       .resource       = &gateway7001_uart_resource,
- };
-+static struct eth_plat_info gateway7001_plat_eth[] = {
-+      {
-+              .phy            = 1,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }, {
-+              .phy            = 2,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }
-+};
-+
-+static struct platform_device gateway7001_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = gateway7001_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = gateway7001_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
- static struct platform_device *gateway7001_devices[] __initdata = {
-       &gateway7001_flash,
--      &gateway7001_uart
-+      &gateway7001_uart,
-+      &gateway7001_eth[0],
-+      &gateway7001_eth[1],
- };
- static void __init gateway7001_init(void)
---- a/arch/arm/mach-ixp4xx/wg302v2-setup.c
-+++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
-@@ -76,9 +76,26 @@ static struct platform_device wg302v2_ua
-       .resource       = &wg302v2_uart_resource,
- };
-+static struct eth_plat_info wg302v2_plat_eth[] = {
-+      {
-+              .phy            = 8,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }
-+};
-+
-+static struct platform_device wg302v2_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = wg302v2_plat_eth,
-+      }
-+};
-+
- static struct platform_device *wg302v2_devices[] __initdata = {
-       &wg302v2_flash,
-       &wg302v2_uart,
-+      &wg302v2_eth[0],
- };
- static void __init wg302v2_init(void)
diff --git a/target/linux/ixp4xx/patches-4.9/105-wg302v1_support.patch b/target/linux/ixp4xx/patches-4.9/105-wg302v1_support.patch
deleted file mode 100644 (file)
index 8793549..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
---- a/arch/arm/configs/ixp4xx_defconfig
-+++ b/arch/arm/configs/ixp4xx_defconfig
-@@ -13,6 +13,7 @@ CONFIG_MACH_AVILA=y
- CONFIG_MACH_LOFT=y
- CONFIG_ARCH_ADI_COYOTE=y
- CONFIG_MACH_GATEWAY7001=y
-+CONFIG_MACH_WG302V1=y
- CONFIG_MACH_WG302V2=y
- CONFIG_ARCH_IXDP425=y
- CONFIG_MACH_IXDPG425=y
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -45,6 +45,14 @@ config MACH_GATEWAY7001
-         7001 Access Point. For more information on this platform,
-         see http://openwrt.org
-+config MACH_WG302V1
-+      bool "Netgear WG302 v1 / WAG302 v1"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support Netgear's
-+        WG302 v1 or WAG302 v1 Access Points. For more information
-+        on this platform, see http://openwrt.org
-+
- config MACH_WG302V2
-       bool "Netgear WG302 v2 / WAG302 v2"
-       select PCI
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NSLU2)         += nslu2-p
- obj-pci-$(CONFIG_MACH_NAS100D)                += nas100d-pci.o
- obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
- obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
-+obj-pci-$(CONFIG_MACH_WG302V1)                += wg302v1-pci.o
- obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
- obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
- obj-pci-$(CONFIG_MACH_ARCOM_VULCAN)   += vulcan-pci.o
-@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2)     += nslu2-setup.
- obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o
- obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
- obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
-+obj-$(CONFIG_MACH_WG302V1)    += wg302v1-setup.o
- obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
- obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
- obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/wg302v1-pci.c
-@@ -0,0 +1,63 @@
-+/*
-+ * arch/arch/mach-ixp4xx/wg302v1-pci.c
-+ *
-+ * PCI setup routines for the Netgear WG302 v1 and WAG302 v1
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Software, Inc.
-+ *
-+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+
-+#include <asm/mach/pci.h>
-+
-+void __init wg302v1_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init wg302v1_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 1)
-+              return IRQ_IXP4XX_GPIO8;
-+      else if (slot == 2)
-+              return IRQ_IXP4XX_GPIO10;
-+      else
-+              return -1;
-+}
-+
-+struct hw_pci wg302v1_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit =        wg302v1_pci_preinit,
-+      .ops =            &ixp4xx_ops,
-+      .setup =          ixp4xx_setup,
-+      .map_irq =        wg302v1_map_irq,
-+};
-+
-+int __init wg302v1_pci_init(void)
-+{
-+      if (machine_is_wg302v1())
-+              pci_common_init(&wg302v1_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(wg302v1_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
-@@ -0,0 +1,147 @@
-+/*
-+ * arch/arm/mach-ixp4xx/wg302v1-setup.c
-+ *
-+ * Board setup for the Netgear WG302 v1 and WAG302 v1
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <linux/memory.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/setup.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data wg302v1_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource wg302v1_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device wg302v1_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &wg302v1_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &wg302v1_flash_resource,
-+};
-+
-+static struct resource wg302v1_uart_resources[] = {
-+      {
-+              .start  = IXP4XX_UART1_BASE_PHYS,
-+              .end    = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      {
-+              .start  = IXP4XX_UART2_BASE_PHYS,
-+              .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags  = IORESOURCE_MEM,
-+      }
-+};
-+
-+static struct plat_serial8250_port wg302v1_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device wg302v1_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev                    = {
-+              .platform_data  = wg302v1_uart_data,
-+      },
-+      .num_resources  = 2,
-+      .resource       = wg302v1_uart_resources,
-+};
-+
-+static struct eth_plat_info wg302v1_plat_eth[] = {
-+      {
-+              .phy            = 30,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }
-+};
-+
-+static struct platform_device wg302v1_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = wg302v1_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct platform_device *wg302v1_devices[] __initdata = {
-+      &wg302v1_flash,
-+      &wg302v1_uart,
-+      &wg302v1_eth[0],
-+};
-+
-+static void __init wg302v1_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      wg302v1_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      wg302v1_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-+
-+      platform_add_devices(wg302v1_devices, ARRAY_SIZE(wg302v1_devices));
-+}
-+
-+#ifdef CONFIG_MACH_WG302V1
-+MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .fixup          = wg302v1_fixup,
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = wg302v1_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+#endif
diff --git a/target/linux/ixp4xx/patches-4.9/110-pronghorn_series_support.patch b/target/linux/ixp4xx/patches-4.9/110-pronghorn_series_support.patch
deleted file mode 100644 (file)
index d1fdfcb..0000000
+++ /dev/null
@@ -1,393 +0,0 @@
---- a/arch/arm/configs/ixp4xx_defconfig
-+++ b/arch/arm/configs/ixp4xx_defconfig
-@@ -15,6 +15,8 @@ CONFIG_ARCH_ADI_COYOTE=y
- CONFIG_MACH_GATEWAY7001=y
- CONFIG_MACH_WG302V1=y
- CONFIG_MACH_WG302V2=y
-+CONFIG_MACH_PRONGHORN=y
-+CONFIG_MACH_PRONGHORNMETRO=y
- CONFIG_ARCH_IXDP425=y
- CONFIG_MACH_IXDPG425=y
- CONFIG_MACH_IXDP465=y
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -61,6 +61,22 @@ config MACH_WG302V2
-         WG302 v2 or WAG302 v2 Access Points. For more information
-         on this platform, see http://openwrt.org
-+config MACH_PRONGHORN
-+      bool "ADI Pronghorn series"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support the ADI
-+        Engineering Pronghorn series. For more
-+        information on this platform, see http://www.adiengineering.com
-+
-+#
-+# There're only minimal differences kernel-wise between the Pronghorn and
-+# Pronghorn Metro boards - they use different chip selects to drive the
-+# CF slot connected to the expansion bus, so we just enable them together.
-+#
-+config MACH_PRONGHORNMETRO
-+      def_bool MACH_PRONGHORN
-+
- config ARCH_IXDP425
-       bool "IXDP425"
-       help
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_WG302V1)               += wg302
- obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
- obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
- obj-pci-$(CONFIG_MACH_ARCOM_VULCAN)   += vulcan-pci.o
-+obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
- obj-y += common.o
-@@ -39,6 +40,7 @@ obj-$(CONFIG_MACH_WG302V2)   += wg302v2-se
- obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
- obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o
- obj-$(CONFIG_MACH_ARCOM_VULCAN)       += vulcan-setup.o
-+obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set
-        */
-       if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
-           machine_is_gateway7001() || machine_is_wg302v2() ||
--          machine_is_devixp() || machine_is_miccpt() || machine_is_mic256())
-+          machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() ||
-+          machine_is_pronghorn() || machine_is_pronghorn_metro())
-               uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
-       else
-               uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/pronghorn-pci.c
-@@ -0,0 +1,69 @@
-+/*
-+ * arch/arch/mach-ixp4xx/pronghorn-pci.c
-+ *
-+ * PCI setup routines for ADI Engineering Pronghorn series
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ *
-+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+
-+#include <asm/mach/pci.h>
-+
-+void __init pronghorn_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO1, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init pronghorn_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 13)
-+              return IRQ_IXP4XX_GPIO4;
-+      else if (slot == 14)
-+              return IRQ_IXP4XX_GPIO6;
-+      else if (slot == 15)
-+              return IRQ_IXP4XX_GPIO11;
-+      else if (slot == 16)
-+              return IRQ_IXP4XX_GPIO1;
-+      else
-+              return -1;
-+}
-+
-+struct hw_pci pronghorn_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit        = pronghorn_pci_preinit,
-+      .ops            = &ixp4xx_ops,
-+      .setup          = ixp4xx_setup,
-+      .map_irq        = pronghorn_map_irq,
-+};
-+
-+int __init pronghorn_pci_init(void)
-+{
-+      if (machine_is_pronghorn() || machine_is_pronghorn_metro())
-+              pci_common_init(&pronghorn_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(pronghorn_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
-@@ -0,0 +1,252 @@
-+/*
-+ * arch/arm/mach-ixp4xx/pronghorn-setup.c
-+ *
-+ * Board setup for the ADI Engineering Pronghorn series
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <Kaloz@openwrt.org>
-+ *
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <linux/memory.h>
-+#include <linux/i2c-gpio.h>
-+#include <linux/leds.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/setup.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data pronghorn_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource pronghorn_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device pronghorn_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data  = &pronghorn_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &pronghorn_flash_resource,
-+};
-+
-+static struct resource pronghorn_uart_resources [] = {
-+      {
-+              .start          = IXP4XX_UART1_BASE_PHYS,
-+              .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      },
-+      {
-+              .start          = IXP4XX_UART2_BASE_PHYS,
-+              .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      }
-+};
-+
-+static struct plat_serial8250_port pronghorn_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device pronghorn_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev            = {
-+              .platform_data  = pronghorn_uart_data,
-+      },
-+      .num_resources  = 2,
-+      .resource       = pronghorn_uart_resources,
-+};
-+
-+static struct i2c_gpio_platform_data pronghorn_i2c_gpio_data = {
-+      .sda_pin        = 9,
-+      .scl_pin        = 10,
-+};
-+
-+static struct platform_device pronghorn_i2c_gpio = {
-+      .name           = "i2c-gpio",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data  = &pronghorn_i2c_gpio_data,
-+      },
-+};
-+
-+static struct gpio_led pronghorn_led_pin[] = {
-+      {
-+              .name           = "pronghorn:green:status",
-+              .gpio           = 7,
-+      }
-+};
-+
-+static struct gpio_led_platform_data pronghorn_led_data = {
-+      .num_leds               = 1,
-+      .leds                   = pronghorn_led_pin,
-+};
-+
-+static struct platform_device pronghorn_led = {
-+      .name                   = "leds-gpio",
-+      .id                     = -1,
-+      .dev.platform_data      = &pronghorn_led_data,
-+};
-+
-+static struct resource pronghorn_pata_resources[] = {
-+      {
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      {
-+              .name   = "intrq",
-+              .start  = IRQ_IXP4XX_GPIO0,
-+              .end    = IRQ_IXP4XX_GPIO0,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct ixp4xx_pata_data pronghorn_pata_data = {
-+      .cs0_bits       = 0xbfff0043,
-+      .cs1_bits       = 0xbfff0043,
-+};
-+
-+static struct platform_device pronghorn_pata = {
-+      .name                   = "pata_ixp4xx_cf",
-+      .id                     = 0,
-+      .dev.platform_data      = &pronghorn_pata_data,
-+      .num_resources          = ARRAY_SIZE(pronghorn_pata_resources),
-+      .resource               = pronghorn_pata_resources,
-+};
-+
-+static struct eth_plat_info pronghorn_plat_eth[] = {
-+      {
-+              .phy            = 0,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }, {
-+              .phy            = 1,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }
-+};
-+
-+static struct platform_device pronghorn_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = pronghorn_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = pronghorn_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct platform_device *pronghorn_devices[] __initdata = {
-+      &pronghorn_flash,
-+      &pronghorn_uart,
-+      &pronghorn_led,
-+      &pronghorn_eth[0],
-+      &pronghorn_eth[1],
-+};
-+
-+static void __init pronghorn_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      pronghorn_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      pronghorn_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-+
-+      platform_add_devices(pronghorn_devices, ARRAY_SIZE(pronghorn_devices));
-+
-+      if (machine_is_pronghorn()) {
-+              pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(2);
-+              pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(2);
-+
-+              pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(3);
-+              pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(3);
-+
-+              pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS2;
-+              pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS3;
-+      } else {
-+              pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(3);
-+              pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(3);
-+
-+              pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(4);
-+              pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(4);
-+
-+              pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS3;
-+              pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS4;
-+
-+              platform_device_register(&pronghorn_i2c_gpio);
-+      }
-+
-+      platform_device_register(&pronghorn_pata);
-+}
-+
-+MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = pronghorn_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+
-+MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = pronghorn_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
diff --git a/target/linux/ixp4xx/patches-4.9/111-pronghorn_swap_uarts.patch b/target/linux/ixp4xx/patches-4.9/111-pronghorn_swap_uarts.patch
deleted file mode 100644 (file)
index ed9f7a7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
-+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
-@@ -52,31 +52,31 @@ static struct platform_device pronghorn_
- static struct resource pronghorn_uart_resources [] = {
-       {
--              .start          = IXP4XX_UART1_BASE_PHYS,
--              .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .start          = IXP4XX_UART2_BASE_PHYS,
-+              .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM
-       },
-       {
--              .start          = IXP4XX_UART2_BASE_PHYS,
--              .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .start          = IXP4XX_UART1_BASE_PHYS,
-+              .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM
-       }
- };
- static struct plat_serial8250_port pronghorn_uart_data[] = {
-       {
--              .mapbase        = IXP4XX_UART1_BASE_PHYS,
--              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
--              .irq            = IRQ_IXP4XX_UART1,
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-               .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = IXP4XX_UART_XTAL,
-       },
-       {
--              .mapbase        = IXP4XX_UART2_BASE_PHYS,
--              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
--              .irq            = IRQ_IXP4XX_UART2,
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-               .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
diff --git a/target/linux/ixp4xx/patches-4.9/115-sidewinder_support.patch b/target/linux/ixp4xx/patches-4.9/115-sidewinder_support.patch
deleted file mode 100644 (file)
index 20adbb5..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-From 95dac4a842a3c66f69f949b48f9075e16275f77b Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 30 Jun 2013 15:48:47 +0200
-Subject: [PATCH 07/36] 115-sidewinder_support.patch
-
----
- arch/arm/mach-ixp4xx/Kconfig            |   10 +-
- arch/arm/mach-ixp4xx/Makefile           |    2 +
- arch/arm/mach-ixp4xx/sidewinder-pci.c   |   68 ++++++++++++++
- arch/arm/mach-ixp4xx/sidewinder-setup.c |  151 +++++++++++++++++++++++++++++++
- 4 files changed, 230 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm/mach-ixp4xx/sidewinder-pci.c
- create mode 100644 arch/arm/mach-ixp4xx/sidewinder-setup.c
-
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -77,6 +77,14 @@ config MACH_PRONGHORN
- config MACH_PRONGHORNMETRO
-       def_bool MACH_PRONGHORN
-+config MACH_SIDEWINDER
-+      bool "ADI Sidewinder"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support the ADI 
-+        Engineering Sidewinder board. For more information on this
-+        platform, see http://www.adiengineering.com
-+
- config ARCH_IXDP425
-       bool "IXDP425"
-       help
-@@ -173,7 +181,7 @@ config MACH_ARCOM_VULCAN
- #
- config CPU_IXP46X
-       bool
--      depends on MACH_IXDP465
-+      depends on MACH_IXDP465 || MACH_SIDEWINDER
-       default y
- config CPU_IXP43X
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_WG302V2)               += wg302
- obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
- obj-pci-$(CONFIG_MACH_ARCOM_VULCAN)   += vulcan-pci.o
- obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
-+obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
- obj-y += common.o
-@@ -41,6 +42,7 @@ obj-$(CONFIG_MACH_FSG)               += fsg-setup.o
- obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o
- obj-$(CONFIG_MACH_ARCOM_VULCAN)       += vulcan-setup.o
- obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
-+obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/sidewinder-pci.c
-@@ -0,0 +1,67 @@
-+/*
-+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
-+ *
-+ * PCI setup routines for ADI Engineering Sidewinder
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ *
-+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/pci.h>
-+
-+void __init sidewinder_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init sidewinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 1)
-+              return IRQ_IXP4XX_GPIO11;
-+      else if (slot == 2)
-+              return IRQ_IXP4XX_GPIO10;
-+      else if (slot == 3)
-+              return IRQ_IXP4XX_GPIO9;
-+      else
-+              return -1;
-+}
-+
-+struct hw_pci sidewinder_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit        = sidewinder_pci_preinit,
-+      .ops            = &ixp4xx_ops,
-+      .setup          = ixp4xx_setup,
-+      .map_irq        = sidewinder_map_irq,
-+};
-+
-+int __init sidewinder_pci_init(void)
-+{
-+      if (machine_is_sidewinder())
-+              pci_common_init(&sidewinder_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(sidewinder_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c
-@@ -0,0 +1,155 @@
-+/*
-+ * arch/arm/mach-ixp4xx/sidewinder-setup.c
-+ *
-+ * Board setup for the ADI Engineering Sidewinder
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <Kaloz@openwrt.org>
-+ *
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/serial.h>
-+#include <linux/serial_8250.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data sidewinder_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource sidewinder_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device sidewinder_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &sidewinder_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &sidewinder_flash_resource,
-+};
-+
-+static struct resource sidewinder_uart_resources[] = {
-+      {
-+              .start  = IXP4XX_UART1_BASE_PHYS,
-+              .end    = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      {
-+              .start  = IXP4XX_UART2_BASE_PHYS,
-+              .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags  = IORESOURCE_MEM,
-+      }
-+};
-+
-+static struct plat_serial8250_port sidewinder_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device sidewinder_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev            = {
-+              .platform_data  = sidewinder_uart_data,
-+      },
-+      .num_resources  = ARRAY_SIZE(sidewinder_uart_resources),
-+      .resource       = sidewinder_uart_resources,
-+};
-+
-+static struct eth_plat_info sidewinder_plat_eth[] = {
-+      {
-+              .phy            = 5,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }, {
-+              .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+              .phy_mask       = 0x1e,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }, {
-+              .phy            = 31,
-+              .rxq            = 2,
-+              .txreadyq       = 19,
-+      }
-+};
-+
-+static struct platform_device sidewinder_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = sidewinder_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = sidewinder_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEA,
-+              .dev.platform_data      = sidewinder_plat_eth + 2,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct platform_device *sidewinder_devices[] __initdata = {
-+      &sidewinder_flash,
-+      &sidewinder_uart,
-+      &sidewinder_eth[0],
-+      &sidewinder_eth[1],
-+      &sidewinder_eth[2],
-+};
-+
-+static void __init sidewinder_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      sidewinder_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      sidewinder_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_64M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-+
-+      platform_add_devices(sidewinder_devices, ARRAY_SIZE(sidewinder_devices));
-+}
-+
-+MACHINE_START(SIDEWINDER, "ADI Engineering Sidewinder")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = sidewinder_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
diff --git a/target/linux/ixp4xx/patches-4.9/116-sidewinder_fis_location.patch b/target/linux/ixp4xx/patches-4.9/116-sidewinder_fis_location.patch
deleted file mode 100644 (file)
index 8a28eb0..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -31,6 +31,8 @@
- #include <linux/module.h>
- #include <linux/mod_devicetable.h>
-+#include <asm/mach-types.h>
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t    flash_base;    // Address within FLASH of image
-@@ -48,7 +50,8 @@ struct fis_list {
-       struct fis_list *next;
- };
--static int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK;
-+int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK;
-+
- module_param(directory, int, 0);
- static inline int redboot_checksum(struct fis_image_desc *img)
-@@ -76,6 +79,8 @@ static int parse_redboot_partitions(stru
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-       static char nullstring[] = "unallocated";
- #endif
-+      if (machine_is_sidewinder())
-+              directory = -5;
-       if ( directory < 0 ) {
-               offset = master->size + directory * master->erasesize;
diff --git a/target/linux/ixp4xx/patches-4.9/120-compex_support.patch b/target/linux/ixp4xx/patches-4.9/120-compex_support.patch
deleted file mode 100644 (file)
index 2abc159..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-From 24025a2dcf1248079dd3019fac6ed955252d277f Mon Sep 17 00:00:00 2001
-From: Imre Kaloz <kaloz@openwrt.org>
-Date: Mon, 14 Jul 2008 21:56:34 +0200
-Subject: [PATCH] Add support for the Compex WP18 / NP18A boards
-
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
-
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -85,6 +85,14 @@ config MACH_SIDEWINDER
-         Engineering Sidewinder board. For more information on this
-         platform, see http://www.adiengineering.com
-+config MACH_COMPEXWP18
-+      bool "Compex WP18 / NP18A"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support Compex' 
-+        WP18 or NP18A boards. For more information on this
-+        platform, see http://www.compex.com.sg/home/OEM/product_ap.htm
-+
- config ARCH_IXDP425
-       bool "IXDP425"
-       help
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -21,6 +21,7 @@ obj-pci-$(CONFIG_MACH_FSG)           += fsg-pci.o
- obj-pci-$(CONFIG_MACH_ARCOM_VULCAN)   += vulcan-pci.o
- obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
- obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
-+obj-pci-$(CONFIG_MACH_COMPEXWP18)     += ixdp425-pci.o
- obj-y += common.o
-@@ -43,6 +44,7 @@ obj-$(CONFIG_MACH_GORAMO_MLR)        += goramo_
- obj-$(CONFIG_MACH_ARCOM_VULCAN)       += vulcan-setup.o
- obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
- obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
-+obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/compex42x-setup.c
-@@ -0,0 +1,141 @@
-+/*
-+ * arch/arm/mach-ixp4xx/compex-setup.c
-+ *
-+ * Compex WP18 / NP18A board-setup
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <Kaloz@openwrt.org>
-+ *
-+ * based on coyote-setup.c:
-+ *    Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/serial.h>
-+#include <linux/serial_8250.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data compex42x_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource compex42x_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device compex42x_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &compex42x_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &compex42x_flash_resource,
-+};
-+
-+static struct resource compex42x_uart_resources[] = {
-+      {
-+              .start          = IXP4XX_UART1_BASE_PHYS,
-+              .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      },
-+      {
-+              .start          = IXP4XX_UART2_BASE_PHYS,
-+              .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      }
-+};
-+
-+static struct plat_serial8250_port compex42x_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device compex42x_uart = {
-+      .name                   = "serial8250",
-+      .id                     = PLAT8250_DEV_PLATFORM,
-+      .dev.platform_data      = compex42x_uart_data,
-+      .num_resources          = 2,
-+      .resource               = compex42x_uart_resources,
-+};
-+
-+static struct eth_plat_info compex42x_plat_eth[] = {
-+      {
-+              .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+              .phy_mask       = 0xf0000,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }, {
-+              .phy            = 3,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }
-+};
-+
-+static struct platform_device compex42x_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = compex42x_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = compex42x_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct platform_device *compex42x_devices[] __initdata = {
-+      &compex42x_flash,
-+      &compex42x_uart,
-+      &compex42x_eth[0],
-+      &compex42x_eth[1],
-+};
-+
-+static void __init compex42x_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      compex42x_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      compex42x_flash_resource.end =
-+              IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      platform_add_devices(compex42x_devices, ARRAY_SIZE(compex42x_devices));
-+}
-+
-+MACHINE_START(COMPEXWP18, "Compex WP18 / NP18A")
-+      /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = compex42x_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
---- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
-+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
-@@ -69,7 +69,8 @@ struct hw_pci ixdp425_pci __initdata = {
- int __init ixdp425_pci_init(void)
- {
-       if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
--                      machine_is_ixdp465() || machine_is_kixrp435())
-+                      machine_is_ixdp465() || machine_is_kixrp435() ||
-+                      machine_is_compex42x())
-               pci_common_init(&ixdp425_pci);
-       return 0;
- }
diff --git a/target/linux/ixp4xx/patches-4.9/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-4.9/130-wrt300nv2_support.patch
deleted file mode 100644 (file)
index 49359be..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -93,6 +93,14 @@ config MACH_COMPEXWP18
-         WP18 or NP18A boards. For more information on this
-         platform, see http://www.compex.com.sg/home/OEM/product_ap.htm
-+config MACH_WRT300NV2
-+      bool "Linksys WRT300N v2"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support Linksys'
-+        WRT300N v2 router. For more information on this
-+        platform, see http://openwrt.org
-+
- config ARCH_IXDP425
-       bool "IXDP425"
-       help
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_ARCOM_VULCAN)  += v
- obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
- obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
- obj-pci-$(CONFIG_MACH_COMPEXWP18)     += ixdp425-pci.o
-+obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
- obj-y += common.o
-@@ -45,6 +46,7 @@ obj-$(CONFIG_MACH_ARCOM_VULCAN)      += vulca
- obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
- obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
- obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o
-+obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-@@ -43,7 +43,8 @@ static __inline__ void __arch_decomp_set
-       if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
-           machine_is_gateway7001() || machine_is_wg302v2() ||
-           machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() ||
--          machine_is_pronghorn() || machine_is_pronghorn_metro())
-+          machine_is_pronghorn() || machine_is_pronghorn_metro() ||
-+          machine_is_wrt300nv2())
-               uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
-       else
-               uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
-@@ -0,0 +1,64 @@
-+/*
-+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
-+ *
-+ * PCI setup routines for Linksys WRT300N v2
-+ *
-+ * Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ *
-+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/pci.h>
-+
-+extern void ixp4xx_pci_preinit(void);
-+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
-+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
-+
-+void __init wrt300nv2_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init wrt300nv2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 1)
-+              return IRQ_IXP4XX_GPIO8;
-+      else return -1;
-+}
-+
-+struct hw_pci wrt300nv2_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit        = wrt300nv2_pci_preinit,
-+      .ops            = &ixp4xx_ops,
-+      .setup          = ixp4xx_setup,
-+      .map_irq        = wrt300nv2_map_irq,
-+};
-+
-+int __init wrt300nv2_pci_init(void)
-+{
-+      if (machine_is_wrt300nv2())
-+              pci_common_init(&wrt300nv2_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(wrt300nv2_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-@@ -0,0 +1,110 @@
-+/*
-+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-+ *
-+ * Board setup for the Linksys WRT300N v2
-+ *
-+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
-+ *
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+
-+#include <asm/types.h>
-+#include <asm/setup.h>
-+#include <asm/memory.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data wrt300nv2_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource wrt300nv2_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device wrt300nv2_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &wrt300nv2_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &wrt300nv2_flash_resource,
-+};
-+
-+static struct resource wrt300nv2_uart_resource = {
-+      .start  = IXP4XX_UART2_BASE_PHYS,
-+      .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+      .flags  = IORESOURCE_MEM,
-+};
-+
-+static struct plat_serial8250_port wrt300nv2_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device wrt300nv2_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev                    = {
-+              .platform_data  = wrt300nv2_uart_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &wrt300nv2_uart_resource,
-+};
-+
-+static struct platform_device *wrt300nv2_devices[] __initdata = {
-+      &wrt300nv2_flash,
-+      &wrt300nv2_uart
-+};
-+
-+static void __init wrt300nv2_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-+
-+      platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));
-+}
-+
-+#ifdef CONFIG_MACH_WRT300NV2
-+MACHINE_START(WRT300NV2, "Linksys WRT300N v2")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = wrt300nv2_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+#endif
diff --git a/target/linux/ixp4xx/patches-4.9/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/131-wrt300nv2_mac_plat_info.patch
deleted file mode 100644 (file)
index 5debbf1..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-@@ -76,9 +76,38 @@ static struct platform_device wrt300nv2_
-       .resource       = &wrt300nv2_uart_resource,
- };
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info wrt300nv2_plat_eth[] = {
-+      {
-+              .phy            = -1,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }, {
-+              .phy            = 1,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }
-+};
-+
-+static struct platform_device wrt300nv2_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = wrt300nv2_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = wrt300nv2_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
- static struct platform_device *wrt300nv2_devices[] __initdata = {
-       &wrt300nv2_flash,
--      &wrt300nv2_uart
-+      &wrt300nv2_uart,
-+      &wrt300nv2_eth[0],
-+      &wrt300nv2_eth[1],
- };
- static void __init wrt300nv2_init(void)
diff --git a/target/linux/ixp4xx/patches-4.9/132-wrt300nv2_mac_fix.patch b/target/linux/ixp4xx/patches-4.9/132-wrt300nv2_mac_fix.patch
deleted file mode 100644 (file)
index 99db267..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-@@ -3,6 +3,7 @@
-  *
-  * Board setup for the Linksys WRT300N v2
-  *
-+ * Copyright (C) 2010 Alexandros C. Couloumbis <alex@ozo.com>
-  * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
-  *
-  * based on coyote-setup.c:
-@@ -18,6 +19,7 @@
- #include <linux/tty.h>
- #include <linux/serial_8250.h>
- #include <linux/slab.h>
-+#include <linux/etherdevice.h>
- #include <asm/types.h>
- #include <asm/setup.h>
-@@ -79,7 +81,8 @@ static struct platform_device wrt300nv2_
- /* Built-in 10/100 Ethernet MAC interfaces */
- static struct eth_plat_info wrt300nv2_plat_eth[] = {
-       {
--              .phy            = -1,
-+              .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+              .phy_mask       = 0x0F0000,
-               .rxq            = 3,
-               .txreadyq       = 20,
-       }, {
-@@ -112,6 +115,10 @@ static struct platform_device *wrt300nv2
- static void __init wrt300nv2_init(void)
- {
-+      uint8_t __iomem *f;
-+      int offset = 0;
-+      int i;
-+
-       ixp4xx_sys_init();
-       wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-@@ -121,6 +128,32 @@ static void __init wrt300nv2_init(void)
-       *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-       platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));
-+
-+      f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x60000);
-+
-+      if (f) {
-+              for (i = 0; i < 6; i++) {
-+#ifdef __ARMEB__
-+                      wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + i);
-+                      if (i == 5)
-+                              offset = 1;
-+                      wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset);
-+#else
-+                      wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + (i^3));
-+                      if (i == 5)
-+                              offset = 1;
-+                      wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset);
-+#endif
-+              }
-+              iounmap(f);
-+      }
-+
-+      if (!(is_valid_ether_addr(wrt300nv2_plat_eth[0].hwaddr)))
-+              random_ether_addr(wrt300nv2_plat_eth[0].hwaddr);
-+      if (!(is_valid_ether_addr(wrt300nv2_plat_eth[1].hwaddr))) {
-+              memcpy(wrt300nv2_plat_eth[1].hwaddr, wrt300nv2_plat_eth[0].hwaddr, ETH_ALEN);
-+              wrt300nv2_plat_eth[1].hwaddr[5] = (wrt300nv2_plat_eth[0].hwaddr[5] + 1);
-+      }
- }
- #ifdef CONFIG_MACH_WRT300NV2
diff --git a/target/linux/ixp4xx/patches-4.9/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-4.9/150-lanready_ap1000_support.patch
deleted file mode 100644 (file)
index fb5c3ad..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -101,6 +101,14 @@ config MACH_WRT300NV2
-         WRT300N v2 router. For more information on this
-         platform, see http://openwrt.org
-+config MACH_AP1000
-+      bool "Lanready AP-1000"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support Lanready's
-+        AP1000 board. For more information on this
-+        platform, see http://openwrt.org
-+
- config ARCH_IXDP425
-       bool "IXDP425"
-       help
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -23,6 +23,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORN)     += pron
- obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
- obj-pci-$(CONFIG_MACH_COMPEXWP18)     += ixdp425-pci.o
- obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
-+obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
- obj-y += common.o
-@@ -47,6 +48,7 @@ obj-$(CONFIG_MACH_PRONGHORN) += pronghor
- obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
- obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o
- obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
-+obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
-@@ -0,0 +1,152 @@
-+/*
-+ * arch/arm/mach-ixp4xx/ap1000-setup.c
-+ *
-+ * Lanready AP-1000
-+ *
-+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
-+ *
-+ * based on ixdp425-setup.c:
-+ *    Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/types.h>
-+#include <asm/setup.h>
-+#include <asm/memory.h>
-+#include <mach/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data ap1000_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource ap1000_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device ap1000_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &ap1000_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &ap1000_flash_resource,
-+};
-+
-+static struct resource ap1000_uart_resources[] = {
-+      {
-+              .start          = IXP4XX_UART1_BASE_PHYS,
-+              .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      },
-+      {
-+              .start          = IXP4XX_UART2_BASE_PHYS,
-+              .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      }
-+};
-+
-+static struct plat_serial8250_port ap1000_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device ap1000_uart = {
-+      .name                   = "serial8250",
-+      .id                     = PLAT8250_DEV_PLATFORM,
-+      .dev.platform_data      = ap1000_uart_data,
-+      .num_resources          = 2,
-+      .resource               = ap1000_uart_resources
-+};
-+
-+static struct platform_device *ap1000_devices[] __initdata = {
-+      &ap1000_flash,
-+      &ap1000_uart
-+};
-+
-+static char ap1000_mem_fixup[] __initdata = "mem=64M ";
-+
-+static void __init ap1000_fixup(struct tag *tags, char **cmdline)
-+{
-+      struct tag *t = tags;
-+      char *p = *cmdline;
-+
-+      /* Find the end of the tags table, taking note of any cmdline tag. */
-+      for (; t->hdr.size; t = tag_next(t)) {
-+              if (t->hdr.tag == ATAG_CMDLINE) {
-+                      p = t->u.cmdline.cmdline;
-+              }
-+      }
-+
-+      /* Overwrite the end of the table with a new cmdline tag. */
-+      t->hdr.tag = ATAG_CMDLINE;
-+      t->hdr.size = (sizeof (struct tag_header) +
-+              strlen(ap1000_mem_fixup) + strlen(p) + 1 + 4) >> 2;
-+      strlcpy(t->u.cmdline.cmdline, ap1000_mem_fixup, COMMAND_LINE_SIZE);
-+      strlcpy(t->u.cmdline.cmdline + strlen(ap1000_mem_fixup), p,
-+              COMMAND_LINE_SIZE - strlen(ap1000_mem_fixup));
-+
-+      /* Terminate the table. */
-+      t = tag_next(t);
-+      t->hdr.tag = ATAG_NONE;
-+      t->hdr.size = 0;
-+}
-+
-+static void __init ap1000_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      ap1000_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      ap1000_flash_resource.end =
-+              IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-+
-+      platform_add_devices(ap1000_devices, ARRAY_SIZE(ap1000_devices));
-+}
-+
-+#ifdef CONFIG_MACH_AP1000
-+MACHINE_START(AP1000, "Lanready AP-1000")
-+      /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
-+      .fixup          = ap1000_fixup,
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = ap1000_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+#endif
---- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
-+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
-@@ -70,7 +70,7 @@ int __init ixdp425_pci_init(void)
- {
-       if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
-                       machine_is_ixdp465() || machine_is_kixrp435() ||
--                      machine_is_compex42x())
-+                      machine_is_compex42x() || machine_is_ap1000())
-               pci_common_init(&ixdp425_pci);
-       return 0;
- }
diff --git a/target/linux/ixp4xx/patches-4.9/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/151-lanready_ap1000_mac_plat_info.patch
deleted file mode 100644 (file)
index a3ed2d0..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/arch/arm/mach-ixp4xx/ap1000-setup.c
-+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
-@@ -91,9 +91,39 @@ static struct platform_device ap1000_uar
-       .resource               = ap1000_uart_resources
- };
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info ap1000_plat_eth[] = {
-+      {
-+              .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+              .phy_mask       = 0x1e,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }, {
-+              .phy            = 5,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }
-+};
-+
-+static struct platform_device ap1000_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = ap1000_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = ap1000_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
- static struct platform_device *ap1000_devices[] __initdata = {
--      &ap1000_flash,
--      &ap1000_uart
-+      &ap1000_flash,
-+      &ap1000_uart,
-+      &ap1000_eth[0],
-+      &ap1000_eth[1],
- };
- static char ap1000_mem_fixup[] __initdata = "mem=64M ";
diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
deleted file mode 100644 (file)
index 00a5309..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
---- a/drivers/tty/serial/8250/8250_core.c
-+++ b/drivers/tty/serial/8250/8250_core.c
-@@ -833,6 +833,7 @@ static int serial8250_probe(struct platf
-               uart.port.get_mctrl     = p->get_mctrl;
-               uart.port.pm            = p->pm;
-               uart.port.dev           = &dev->dev;
-+              uart.port.rw_delay      = p->rw_delay;
-               uart.port.irqflags      |= irqflag;
-               ret = serial8250_register_8250_port(&uart);
-               if (ret < 0) {
-@@ -989,6 +990,7 @@ int serial8250_register_8250_port(struct
-               uart->bugs              = up->bugs;
-               uart->port.mapbase      = up->port.mapbase;
-               uart->port.mapsize      = up->port.mapsize;
-+              uart->port.rw_delay     = up->port.rw_delay;
-               uart->port.private_data = up->port.private_data;
-               uart->tx_loadsz         = up->tx_loadsz;
-               uart->capabilities      = up->capabilities;
---- a/drivers/tty/serial/serial_core.c
-+++ b/drivers/tty/serial/serial_core.c
-@@ -2260,6 +2260,7 @@ uart_report_port(struct uart_driver *drv
-               snprintf(address, sizeof(address),
-                        "I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
-               break;
-+      case UPIO_MEM_DELAY:
-       case UPIO_MEM:
-       case UPIO_MEM16:
-       case UPIO_MEM32:
-@@ -2924,6 +2925,7 @@ int uart_match_port(struct uart_port *po
-       case UPIO_HUB6:
-               return (port1->iobase == port2->iobase) &&
-                      (port1->hub6   == port2->hub6);
-+      case UPIO_MEM_DELAY:
-       case UPIO_MEM:
-       case UPIO_MEM16:
-       case UPIO_MEM32:
---- a/include/linux/serial_8250.h
-+++ b/include/linux/serial_8250.h
-@@ -28,6 +28,7 @@ struct plat_serial8250_port {
-       void            *private_data;
-       unsigned char   regshift;       /* register shift */
-       unsigned char   iotype;         /* UPIO_* */
-+      unsigned int rw_delay;  /* udelay for slower busses IXP4XX Expansion Bus */
-       unsigned char   hub6;
-       upf_t           flags;          /* UPF_* flags */
-       unsigned int    type;           /* If UPF_FIXED_TYPE */
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -152,6 +152,7 @@ struct uart_port {
- #define UPIO_TSI              (SERIAL_IO_TSI)         /* Tsi108/109 type IO */
- #define UPIO_MEM32BE          (SERIAL_IO_MEM32BE)     /* 32b big endian */
- #define UPIO_MEM16            (SERIAL_IO_MEM16)       /* 16b little endian */
-+#define UPIO_MEM_DELAY                (SERIAL_IO_MEM_DELAY)
-       unsigned int            read_status_mask;       /* driver specific */
-       unsigned int            ignore_status_mask;     /* driver specific */
-@@ -233,6 +234,7 @@ struct uart_port {
-       int                     hw_stopped;             /* sw-assisted CTS flow state */
-       unsigned int            mctrl;                  /* current modem ctrl settings */
-       unsigned int            timeout;                /* character-based timeout */
-+      unsigned int            rw_delay;               /* udelay for slow busses, IXP4XX Expansion Bus */
-       unsigned int            type;                   /* port type */
-       const struct uart_ops   *ops;
-       unsigned int            custom_divisor;
---- a/drivers/tty/serial/8250/8250_port.c
-+++ b/drivers/tty/serial/8250/8250_port.c
-@@ -383,6 +383,20 @@ static unsigned int mem16_serial_in(stru
-       return readw(p->membase + offset);
- }
-+static unsigned int memdelay_serial_in(struct uart_port *p, int offset)
-+{
-+      struct uart_8250_port *up = (struct uart_8250_port *)p;
-+      udelay(up->port.rw_delay);
-+      return mem_serial_in(p, offset);
-+}
-+
-+static void memdelay_serial_out(struct uart_port *p, int offset, int value)
-+{
-+      struct uart_8250_port *up = (struct uart_8250_port *)p;
-+      udelay(up->port.rw_delay);
-+      mem_serial_out(p, offset, value);
-+}
-+
- static void mem32_serial_out(struct uart_port *p, int offset, int value)
- {
-       offset = offset << p->regshift;
-@@ -455,6 +469,11 @@ static void set_io_from_upio(struct uart
-               p->serial_out = mem32be_serial_out;
-               break;
-+      case UPIO_MEM_DELAY:
-+              p->serial_in = memdelay_serial_in;
-+              p->serial_out = memdelay_serial_out;
-+              break;
-+
- #ifdef CONFIG_SERIAL_8250_RT288X
-       case UPIO_AU:
-               p->serial_in = au_serial_in;
-@@ -482,6 +501,7 @@ serial_port_out_sync(struct uart_port *p
-       case UPIO_MEM16:
-       case UPIO_MEM32:
-       case UPIO_MEM32BE:
-+      case UPIO_MEM_DELAY:
-       case UPIO_AU:
-               p->serial_out(p, offset, value);
-               p->serial_in(p, UART_LCR);      /* safe, no side-effects */
-@@ -2759,6 +2779,7 @@ static int serial8250_request_std_resour
-       case UPIO_MEM32BE:
-       case UPIO_MEM16:
-       case UPIO_MEM:
-+      case UPIO_MEM_DELAY:
-               if (!port->mapbase)
-                       break;
-@@ -2797,6 +2818,7 @@ static void serial8250_release_std_resou
-       case UPIO_MEM32BE:
-       case UPIO_MEM16:
-       case UPIO_MEM:
-+      case UPIO_MEM_DELAY:
-               if (!port->mapbase)
-                       break;
---- a/include/uapi/linux/serial.h
-+++ b/include/uapi/linux/serial.h
-@@ -70,6 +70,7 @@ struct serial_struct {
- #define SERIAL_IO_TSI   5
- #define SERIAL_IO_MEM32BE 6
- #define SERIAL_IO_MEM16       7
-+#define SERIAL_IO_MEM_DELAY 10
- #define UART_CLEAR_FIFO               0x01
- #define UART_USE_FIFO         0x02
diff --git a/target/linux/ixp4xx/patches-4.9/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-4.9/162-wg302v1_mem_fixup.patch
deleted file mode 100644 (file)
index efa389d..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
-+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
-@@ -117,6 +117,34 @@ static struct platform_device *wg302v1_d
-       &wg302v1_eth[0],
- };
-+static char wg302v1_mem_fixup[] __initdata = " mem=32M";
-+
-+static void __init wg302v1_fixup(struct tag *tags, char **cmdline)
-+{
-+      struct tag *t = tags;
-+      char *p = *cmdline;
-+      size_t fixlen, cmdlen;
-+
-+      /* Find the end of the tags table, taking note of any cmdline tag. */
-+      for (; t->hdr.size; t = tag_next(t)) {
-+              if (t->hdr.tag == ATAG_CMDLINE) {
-+                      p = t->u.cmdline.cmdline;
-+              }
-+      }
-+
-+      fixlen = strlen(wg302v1_mem_fixup);
-+      cmdlen = strlen(p);
-+      if (fixlen + cmdlen >= COMMAND_LINE_SIZE)
-+              return;
-+
-+      /* append the fixup to the cmdline */
-+      memmove(p + cmdlen, wg302v1_mem_fixup, fixlen + 1);
-+
-+      /* Adjust the size of the atag if there was one */
-+      if (t->hdr.size)
-+              t->hdr.size += fixlen;
-+}
-+
- static void __init wg302v1_init(void)
- {
-       ixp4xx_sys_init();
diff --git a/target/linux/ixp4xx/patches-4.9/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/170-ixdpg425_mac_plat_info.patch
deleted file mode 100644 (file)
index f7090cd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/arch/arm/mach-ixp4xx/coyote-setup.c
-+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
-@@ -14,6 +14,7 @@
- #include <linux/serial.h>
- #include <linux/tty.h>
- #include <linux/serial_8250.h>
-+#include <linux/dma-mapping.h>
- #include <asm/types.h>
- #include <asm/setup.h>
-@@ -81,9 +82,39 @@ static struct platform_device coyote_uar
-       .resource       = &coyote_uart_resource,
- };
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info ixdpg425_plat_eth[] = {
-+        {
-+                .phy            = 5,
-+                .rxq            = 3,
-+                .txreadyq       = 20,
-+        }, {
-+                .phy            = 4,
-+                .rxq            = 4,
-+                .txreadyq       = 21,
-+        }
-+};
-+
-+static struct platform_device ixdpg425_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = ixdpg425_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = ixdpg425_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+
- static struct platform_device *coyote_devices[] __initdata = {
-       &coyote_flash,
--      &coyote_uart
-+      &coyote_uart,
-+      &ixdpg425_eth[0],
-+      &ixdpg425_eth[1],
- };
- static void __init coyote_init(void)
diff --git a/target/linux/ixp4xx/patches-4.9/175-avila_hss_audio_support.patch b/target/linux/ixp4xx/patches-4.9/175-avila_hss_audio_support.patch
deleted file mode 100644 (file)
index 398344d..0000000
+++ /dev/null
@@ -1,2093 +0,0 @@
---- a/sound/soc/Kconfig
-+++ b/sound/soc/Kconfig
-@@ -47,6 +47,7 @@ source "sound/soc/cirrus/Kconfig"
- source "sound/soc/davinci/Kconfig"
- source "sound/soc/dwc/Kconfig"
- source "sound/soc/fsl/Kconfig"
-+source "sound/soc/gw-avila/Kconfig"
- source "sound/soc/jz4740/Kconfig"
- source "sound/soc/nuc900/Kconfig"
- source "sound/soc/omap/Kconfig"
---- a/sound/soc/Makefile
-+++ b/sound/soc/Makefile
-@@ -27,6 +27,7 @@ obj-$(CONFIG_SND_SOC)        += cirrus/
- obj-$(CONFIG_SND_SOC) += davinci/
- obj-$(CONFIG_SND_SOC) += dwc/
- obj-$(CONFIG_SND_SOC) += fsl/
-+obj-$(CONFIG_SND_SOC) += gw-avila/
- obj-$(CONFIG_SND_SOC) += jz4740/
- obj-$(CONFIG_SND_SOC) += img/
- obj-$(CONFIG_SND_SOC) += intel/
---- /dev/null
-+++ b/sound/soc/gw-avila/Kconfig
-@@ -0,0 +1,17 @@
-+config SND_GW_AVILA_SOC_PCM
-+      tristate
-+
-+config SND_GW_AVILA_SOC_HSS
-+      tristate
-+
-+config SND_GW_AVILA_SOC
-+      tristate "SoC Audio for the Gateworks AVILA Family"
-+      depends on ARCH_IXP4XX && SND_SOC
-+      select SND_GW_AVILA_SOC_PCM
-+      select SND_GW_AVILA_SOC_HSS
-+      select SND_SOC_TLV320AIC3X
-+      help
-+        Say Y or M if you want to add support for codecs attached to
-+        the Gateworks HSS interface. You will also need
-+        to select the audio interfaces to support below.
-+
---- /dev/null
-+++ b/sound/soc/gw-avila/Makefile
-@@ -0,0 +1,8 @@
-+# Gateworks Avila HSS Platform Support
-+snd-soc-gw-avila-objs := gw-avila.o ixp4xx_hss.o
-+snd-soc-gw-avila-pcm-objs := gw-avila-pcm.o
-+snd-soc-gw-avila-hss-objs := gw-avila-hss.o
-+
-+obj-$(CONFIG_SND_GW_AVILA_SOC) += snd-soc-gw-avila.o
-+obj-$(CONFIG_SND_GW_AVILA_SOC_PCM) += snd-soc-gw-avila-pcm.o
-+obj-$(CONFIG_SND_GW_AVILA_SOC_HSS) += snd-soc-gw-avila-hss.o
---- /dev/null
-+++ b/sound/soc/gw-avila/gw-avila-hss.c
-@@ -0,0 +1,103 @@
-+/*
-+ * gw-avila-hss.c -- HSS Audio Support for Gateworks Avila
-+ *
-+ * Author:    Chris Lang      <clang@gateworks.com>
-+ *
-+ * 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/init.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/interrupt.h>
-+#include <linux/wait.h>
-+#include <linux/delay.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/ac97_codec.h>
-+#include <sound/initval.h>
-+#include <sound/soc.h>
-+
-+#include <asm/irq.h>
-+#include <linux/mutex.h>
-+#include <linux/gpio.h>
-+
-+#include "ixp4xx_hss.h"
-+#include "gw-avila-hss.h"
-+
-+#define gw_avila_hss_suspend  NULL
-+#define gw_avila_hss_resume   NULL
-+
-+struct snd_soc_dai_driver gw_avila_hss_dai = {
-+      .playback = {
-+              .channels_min = 2,
-+              .channels_max = 2,
-+              .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-+                      SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |
-+                      SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
-+                      SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
-+                      SNDRV_PCM_RATE_KNOT),
-+              .formats = SNDRV_PCM_FMTBIT_S16_LE, },
-+      .capture = {
-+              .channels_min = 2,
-+              .channels_max = 2,
-+              .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-+                      SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |
-+                      SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
-+                      SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
-+                      SNDRV_PCM_RATE_KNOT),
-+              .formats = SNDRV_PCM_FMTBIT_S16_LE, },
-+};
-+
-+static const struct snd_soc_component_driver gw_avila_hss_component = {
-+      .name   = "gw_avila_hss",
-+};
-+
-+static int gw_avila_hss_probe(struct platform_device *pdev)
-+{
-+      int port = (pdev->id < 2) ? 0 : 1;
-+      int channel = (pdev->id % 2);
-+
-+      hss_handle[pdev->id] = hss_init(port, channel);
-+      if (!hss_handle[pdev->id]) {
-+              return -ENODEV;
-+      }
-+
-+      return snd_soc_register_component(&pdev->dev, &gw_avila_hss_component,
-+                                        &gw_avila_hss_dai, 1);
-+}
-+
-+static int gw_avila_hss_remove(struct platform_device *pdev)
-+{
-+      snd_soc_unregister_component(&pdev->dev);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gw_avila_hss_driver = {
-+      .probe    = gw_avila_hss_probe,
-+      .remove   = gw_avila_hss_remove,
-+      .driver   = {
-+              .name = "gw_avila_hss",
-+              .owner  = THIS_MODULE,
-+      }
-+};
-+
-+static int __init gw_avila_hss_init(void)
-+{
-+      return platform_driver_register(&gw_avila_hss_driver);
-+}
-+module_init(gw_avila_hss_init);
-+
-+static void __exit gw_avila_hss_exit(void)
-+{
-+      platform_driver_unregister(&gw_avila_hss_driver);
-+}
-+module_exit(gw_avila_hss_exit);
-+
-+MODULE_AUTHOR("Chris Lang");
-+MODULE_DESCRIPTION("HSS Audio Driver for Gateworks Avila");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/soc/gw-avila/gw-avila-hss.h
-@@ -0,0 +1,12 @@
-+/*
-+ * Author: Chris Lang <clang@gateworks.com>
-+ *
-+ * 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.
-+ */
-+
-+#ifndef _GW_AVILA_HSS_H
-+#define _GW_AVILA_HSS_H
-+
-+#endif
---- /dev/null
-+++ b/sound/soc/gw-avila/gw-avila-pcm.c
-@@ -0,0 +1,327 @@
-+/*
-+ * ALSA PCM interface for the TI DAVINCI processor
-+ *
-+ * Author:      Chris Lang, <clang@gateworks.com>
-+ * Copyright:   (C) 2009 Gateworks Corporation
-+ *
-+ * Based On:    davinci-evm.c, Author: Vladimir Barinov, <vbarinov@ru.mvista.com>
-+ *
-+ * 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/module.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+
-+#include <asm/dma.h>
-+
-+#include "gw-avila-pcm.h"
-+#include "gw-avila-hss.h"
-+#include "ixp4xx_hss.h"
-+
-+#define GW_AVILA_PCM_DEBUG 0
-+#if GW_AVILA_PCM_DEBUG
-+#define DPRINTK(x...) printk(KERN_DEBUG x)
-+#else
-+#define DPRINTK(x...)
-+#endif
-+
-+static struct snd_pcm_hardware gw_avila_pcm_hardware = {
-+      .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
-+               SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
-+/*             SNDRV_PCM_INFO_PAUSE),*/
-+      .formats = (SNDRV_PCM_FMTBIT_S16_LE),
-+      .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-+                SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |
-+                SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
-+                SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
-+                SNDRV_PCM_RATE_KNOT),
-+      .rate_min = 8000,
-+      .rate_max = 8000,
-+      .channels_min = 2,
-+      .channels_max = 2,
-+      .buffer_bytes_max = 64 * 1024, // All of the lines below may need to be changed
-+      .period_bytes_min = 128,
-+      .period_bytes_max = 4 * 1024,
-+      .periods_min = 16,
-+      .periods_max = 32,
-+      .fifo_size = 0,
-+};
-+
-+struct gw_avila_runtime_data {
-+      spinlock_t lock;
-+      int period;             /* current DMA period */
-+      int master_lch;         /* Master DMA channel */
-+      int slave_lch;          /* Slave DMA channel */
-+      struct gw_avila_pcm_dma_params *params; /* DMA params */
-+};
-+
-+static void gw_avila_dma_irq(void *data)
-+{
-+      struct snd_pcm_substream *substream = data;
-+      snd_pcm_period_elapsed(substream);
-+}
-+
-+static int gw_avila_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
-+{
-+      struct snd_pcm_runtime *runtime = substream->runtime;
-+      struct hss_device *hdev = runtime->private_data;
-+      int ret = 0;
-+
-+      switch (cmd) {
-+      case SNDRV_PCM_TRIGGER_START:
-+      case SNDRV_PCM_TRIGGER_RESUME:
-+      case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+              if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+                      hss_tx_start(hdev);
-+              else
-+                      hss_rx_start(hdev);
-+              break;
-+      case SNDRV_PCM_TRIGGER_STOP:
-+      case SNDRV_PCM_TRIGGER_SUSPEND:
-+      case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+              if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+                      hss_tx_stop(hdev);
-+              else
-+                      hss_rx_stop(hdev);
-+              break;
-+      default:
-+              ret = -EINVAL;
-+              break;
-+      }
-+      return ret;
-+}
-+
-+static int gw_avila_pcm_prepare(struct snd_pcm_substream *substream)
-+{
-+      struct snd_pcm_runtime *runtime = substream->runtime;
-+      struct hss_device *hdev = runtime->private_data;
-+
-+      if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-+              hss_set_tx_callback(hdev, gw_avila_dma_irq, substream);
-+              hss_config_tx_dma(hdev, runtime->dma_area, runtime->buffer_size, runtime->period_size);
-+      } else {
-+              hss_set_rx_callback(hdev, gw_avila_dma_irq, substream);
-+              hss_config_rx_dma(hdev, runtime->dma_area, runtime->buffer_size, runtime->period_size);
-+      }
-+
-+      return 0;
-+}
-+
-+static snd_pcm_uframes_t
-+gw_avila_pcm_pointer(struct snd_pcm_substream *substream)
-+{
-+      struct snd_pcm_runtime *runtime = substream->runtime;
-+      struct hss_device *hdev = runtime->private_data;
-+
-+      unsigned int curr = 0;
-+      if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+              curr = hss_curr_offset_tx(hdev);
-+      else
-+              curr = hss_curr_offset_rx(hdev);
-+  return curr;
-+}
-+
-+static int gw_avila_pcm_open(struct snd_pcm_substream *substream)
-+{
-+      struct snd_pcm_runtime *runtime = substream->runtime;
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-+
-+      snd_soc_set_runtime_hwparams(substream, &gw_avila_pcm_hardware);
-+
-+      if (hss_handle[cpu_dai->id] != NULL)
-+              runtime->private_data = hss_handle[cpu_dai->id];
-+      else {
-+              pr_err("hss_handle is NULL\n");
-+              return -1;
-+      }
-+
-+      hss_chan_open(hss_handle[cpu_dai->id]);
-+
-+      return 0;
-+}
-+
-+static int gw_avila_pcm_close(struct snd_pcm_substream *substream)
-+{
-+      struct snd_pcm_runtime *runtime = substream->runtime;
-+      struct hss_device *hdev = runtime->private_data;
-+
-+      if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-+              memset(hdev->tx_buf, 0, runtime->buffer_size);
-+      } else
-+              memset(hdev->rx_buf, 0, runtime->buffer_size);
-+
-+      hss_chan_close(hdev);
-+
-+      return 0;
-+}
-+
-+static int gw_avila_pcm_hw_params(struct snd_pcm_substream *substream,
-+                               struct snd_pcm_hw_params *hw_params)
-+{
-+      return snd_pcm_lib_malloc_pages(substream,
-+                                      params_buffer_bytes(hw_params));
-+}
-+
-+static int gw_avila_pcm_hw_free(struct snd_pcm_substream *substream)
-+{
-+      struct snd_pcm_runtime *runtime = substream->runtime;
-+
-+      if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+        memset(runtime->dma_area, 0, runtime->buffer_size);
-+
-+      return snd_pcm_lib_free_pages(substream);
-+}
-+
-+static int gw_avila_pcm_mmap(struct snd_pcm_substream *substream,
-+          struct vm_area_struct *vma)
-+{
-+      struct snd_pcm_runtime *runtime = substream->runtime;
-+
-+      return dma_mmap_writecombine(substream->pcm->card->dev, vma,
-+                                              runtime->dma_area,
-+                                              runtime->dma_addr,
-+                                              runtime->dma_bytes);
-+}
-+
-+struct snd_pcm_ops gw_avila_pcm_ops = {
-+      .open =         gw_avila_pcm_open,
-+      .close =        gw_avila_pcm_close,
-+      .ioctl =        snd_pcm_lib_ioctl,
-+      .hw_params =    gw_avila_pcm_hw_params,
-+      .hw_free =      gw_avila_pcm_hw_free,
-+      .prepare =      gw_avila_pcm_prepare,
-+      .trigger =      gw_avila_pcm_trigger,
-+      .pointer =      gw_avila_pcm_pointer,
-+      .mmap = gw_avila_pcm_mmap,
-+};
-+
-+static int gw_avila_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
-+{
-+      struct snd_pcm_substream *substream = pcm->streams[stream].substream;
-+      struct snd_dma_buffer *buf = &substream->dma_buffer;
-+      size_t size = gw_avila_pcm_hardware.buffer_bytes_max;
-+
-+      buf->dev.type = SNDRV_DMA_TYPE_DEV;
-+      buf->dev.dev = pcm->card->dev;
-+      buf->private_data = NULL;
-+
-+      buf->area = dma_alloc_coherent(pcm->card->dev, size,
-+                                         &buf->addr, GFP_KERNEL);
-+
-+      if (!buf->area) {
-+              return -ENOMEM;
-+      }
-+
-+      memset(buf->area, 0xff, size);
-+
-+      DPRINTK("preallocate_dma_buffer: area=%p, addr=%p, size=%d\n",
-+              (void *) buf->area, (void *) buf->addr, size);
-+
-+      buf->bytes = size;
-+
-+      return 0;
-+}
-+
-+static void gw_avila_pcm_free(struct snd_pcm *pcm)
-+{
-+      struct snd_pcm_substream *substream;
-+      struct snd_dma_buffer *buf;
-+      int stream;
-+
-+      for (stream = 0; stream < 2; stream++) {
-+              substream = pcm->streams[stream].substream;
-+              if (!substream)
-+                      continue;
-+
-+              buf = &substream->dma_buffer;
-+              if (!buf->area)
-+                      continue;
-+
-+              dma_free_coherent(NULL, buf->bytes, buf->area, 0);
-+              buf->area = NULL;
-+      }
-+}
-+
-+static u64 gw_avila_pcm_dmamask = 0xFFFFFFFF;
-+
-+static int gw_avila_pcm_new(struct snd_soc_pcm_runtime *rtd)
-+{
-+        struct snd_card *card = rtd->card->snd_card;
-+        struct snd_pcm *pcm = rtd->pcm;
-+        struct snd_soc_dai *dai = rtd->codec_dai;
-+      int ret;
-+
-+      if (!card->dev->dma_mask)
-+              card->dev->dma_mask = &gw_avila_pcm_dmamask;
-+      if (!card->dev->coherent_dma_mask)
-+              card->dev->coherent_dma_mask = 0xFFFFFFFF;
-+
-+      if (dai->driver->playback.channels_min) {
-+              ret = gw_avila_pcm_preallocate_dma_buffer(pcm,
-+                      SNDRV_PCM_STREAM_PLAYBACK);
-+              if (ret)
-+                      return ret;
-+      }
-+
-+      if (dai->driver->capture.channels_min) {
-+              ret = gw_avila_pcm_preallocate_dma_buffer(pcm,
-+                      SNDRV_PCM_STREAM_CAPTURE);
-+              if (ret)
-+                      return ret;
-+      }
-+
-+      return 0;
-+}
-+
-+struct snd_soc_platform_driver gw_avila_soc_platform = {
-+      .ops =  &gw_avila_pcm_ops,
-+      .pcm_new =      gw_avila_pcm_new,
-+      .pcm_free =     gw_avila_pcm_free,
-+};
-+
-+static int gw_avila_pcm_platform_probe(struct platform_device *pdev)
-+{
-+      return snd_soc_register_platform(&pdev->dev, &gw_avila_soc_platform);
-+}
-+
-+static int gw_avila_pcm_platform_remove(struct platform_device *pdev)
-+{
-+      snd_soc_unregister_platform(&pdev->dev);
-+      return 0;
-+}
-+
-+static struct platform_driver gw_avila_pcm_driver = {
-+      .driver = {
-+              .name = "gw_avila-audio",
-+              .owner = THIS_MODULE,
-+      },
-+      .probe = gw_avila_pcm_platform_probe,
-+      .remove = gw_avila_pcm_platform_remove,
-+};
-+
-+static int __init gw_avila_soc_platform_init(void)
-+{
-+      return platform_driver_register(&gw_avila_pcm_driver);
-+}
-+module_init(gw_avila_soc_platform_init);
-+
-+static void __exit gw_avila_soc_platform_exit(void)
-+{
-+      platform_driver_unregister(&gw_avila_pcm_driver);
-+}
-+module_exit(gw_avila_soc_platform_exit);
-+
-+MODULE_AUTHOR("Chris Lang");
-+MODULE_DESCRIPTION("Gateworks Avila PCM DMA module");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/soc/gw-avila/gw-avila-pcm.h
-@@ -0,0 +1,32 @@
-+/*
-+ * ALSA PCM interface for the Gateworks Avila platform
-+ *
-+ * Author:      Chris Lang, <clang@gateworks.com>
-+ * Copyright:   (C) 2009 Gateworks Corporation
-+ *
-+ * Based On:    davinci-evm.c, Author: Vladimir Barinov, <vbarinov@ru.mvista.com>
-+ *
-+ * 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.
-+ */
-+
-+#ifndef _GW_AVILA_PCM_H
-+#define _GW_AVILA_PCM_H
-+
-+#if 0
-+struct gw_avila_pcm_dma_params {
-+      char *name;             /* stream identifier */
-+      int channel;            /* sync dma channel ID */
-+      dma_addr_t dma_addr;    /* device physical address for DMA */
-+      unsigned int data_type; /* xfer data type */
-+};
-+
-+struct gw_avila_snd_platform_data {
-+      int tx_dma_ch; // XXX Do we need this?
-+      int rx_dma_ch; // XXX Do we need this
-+};
-+extern struct snd_soc_platform gw_avila_soc_platform[];
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/sound/soc/gw-avila/gw-avila.c
-@@ -0,0 +1,244 @@
-+/*
-+ * File:         sound/soc/gw-avila/gw_avila.c
-+ * Author:       Chris Lang <clang@gateworks.com>
-+ *
-+ * Created:      Tue June 06 2008
-+ * Description:  Board driver for Gateworks Avila
-+ *
-+ * Modified:
-+ *               Copyright 2009 Gateworks Corporation
-+ *
-+ * Bugs:         What Bugs?
-+ *
-+ * 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, see the file COPYING, or write
-+ * to the Free Software Foundation, Inc.,
-+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/device.h>
-+#include <asm/dma.h>
-+#include <linux/platform_device.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/soc.h>
-+#include <linux/slab.h>
-+#include <linux/gpio.h>
-+
-+#include "ixp4xx_hss.h"
-+#include "gw-avila-hss.h"
-+#include "gw-avila-pcm.h"
-+
-+#define CODEC_FREQ 33333000
-+
-+static int gw_avila_board_startup(struct snd_pcm_substream *substream)
-+{
-+      pr_debug("%s enter\n", __func__);
-+      return 0;
-+}
-+
-+static int gw_avila_hw_params(struct snd_pcm_substream *substream,
-+              struct snd_pcm_hw_params *params)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_dai *codec_dai = rtd->codec_dai;
-+      struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-+
-+      int ret = 0;
-+
-+      /* set codec DAI configuration */
-+      if (cpu_dai->id % 2) {
-+              ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS);
-+                      snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 1, 32);
-+      } else {
-+              ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM);
-+                      snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 0, 32);
-+      }
-+
-+      if (ret < 0)
-+          return ret;
-+
-+      /* set the codec system clock */
-+      ret = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_FREQ, SND_SOC_CLOCK_OUT);
-+      if (ret < 0)
-+          return ret;
-+
-+      return 0;
-+}
-+
-+static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
-+  SND_SOC_DAPM_HP("Headphone Jack", NULL),
-+  SND_SOC_DAPM_LINE("Line Out", NULL),
-+  SND_SOC_DAPM_LINE("Line In", NULL),
-+};
-+
-+static const struct snd_soc_dapm_route audio_map[] = {
-+  {"Headphone Jack", NULL, "HPLOUT"},
-+  {"Headphone Jack", NULL, "HPROUT"},
-+
-+  /* Line Out connected to LLOUT, RLOUT */
-+  {"Line Out", NULL, "LLOUT"},
-+  {"Line Out", NULL, "RLOUT"},
-+
-+  /* Line In connected to (LINE1L | LINE2L), (LINE1R | LINE2R) */
-+  {"LINE1L", NULL, "Line In"},
-+  {"LINE1R", NULL, "Line In"},
-+};
-+
-+/* Logic for a aic3x as connected on a davinci-evm */
-+static int avila_aic3x_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+      struct snd_soc_codec *codec = rtd->codec;
-+      struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
-+
-+  /* Add davinci-evm specific widgets */
-+  snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,
-+          ARRAY_SIZE(aic3x_dapm_widgets));
-+
-+  /* Set up davinci-evm specific audio path audio_map */
-+  snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-+
-+  /* not connected */
-+  snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");
-+  //snd_soc_dapm_disable_pin(dapm, "HPLCOM");
-+  //snd_soc_dapm_disable_pin(dapm, "HPRCOM");
-+  snd_soc_dapm_disable_pin(dapm, "MIC3L");
-+  snd_soc_dapm_disable_pin(dapm, "MIC3R");
-+  snd_soc_dapm_disable_pin(dapm, "LINE2L");
-+  snd_soc_dapm_disable_pin(dapm, "LINE2R");
-+
-+  /* always connected */
-+      snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-+  snd_soc_dapm_enable_pin(dapm, "Line Out");
-+  snd_soc_dapm_enable_pin(dapm, "Line In");
-+
-+  snd_soc_dapm_sync(dapm);
-+
-+      return 0;
-+}
-+
-+static struct snd_soc_ops gw_avila_board_ops = {
-+      .startup = gw_avila_board_startup,
-+      .hw_params = gw_avila_hw_params,
-+};
-+
-+static struct snd_soc_dai_link gw_avila_board_dai[] = {
-+      {
-+              .name = "HSS-0",
-+              .stream_name = "HSS-0",
-+              .cpu_dai_name = "gw_avila_hss.0",
-+              .codec_dai_name = "tlv320aic3x-hifi",
-+              .codec_name = "tlv320aic3x-codec.0-001b",
-+              .platform_name = "gw_avila-audio.0",
-+              .init = avila_aic3x_init,
-+              .ops = &gw_avila_board_ops,
-+      },{
-+              .name = "HSS-1",
-+              .stream_name = "HSS-1",
-+              .cpu_dai_name = "gw_avila_hss.1",
-+              .codec_dai_name = "tlv320aic3x-hifi",
-+              .codec_name = "tlv320aic3x-codec.0-001a",
-+              .platform_name = "gw_avila-audio.1",
-+              .init = avila_aic3x_init,
-+              .ops = &gw_avila_board_ops,
-+      },{
-+              .name = "HSS-2",
-+              .stream_name = "HSS-2",
-+              .cpu_dai_name = "gw_avila_hss.2",
-+              .codec_dai_name = "tlv320aic3x-hifi",
-+              .codec_name = "tlv320aic3x-codec.0-0019",
-+              .platform_name = "gw_avila-audio.2",
-+              .init = avila_aic3x_init,
-+              .ops = &gw_avila_board_ops,
-+      },{
-+              .name = "HSS-3",
-+              .stream_name = "HSS-3",
-+              .cpu_dai_name = "gw_avila_hss.3",
-+              .codec_dai_name = "tlv320aic3x-hifi",
-+              .codec_name = "tlv320aic3x-codec.0-0018",
-+              .platform_name = "gw_avila-audio.3",
-+              .init = avila_aic3x_init,
-+              .ops = &gw_avila_board_ops,
-+      },
-+};
-+
-+static struct snd_soc_card gw_avila_board[] = {
-+      {
-+              .name = "gw_avila-board.0",
-+              .owner = THIS_MODULE,
-+              .dai_link = &gw_avila_board_dai[0],
-+              .num_links = 1,
-+      },{
-+              .name = "gw_avila-board.1",
-+              .owner = THIS_MODULE,
-+              .dai_link = &gw_avila_board_dai[1],
-+              .num_links = 1,
-+      },{
-+              .name = "gw_avila-board.2",
-+              .owner = THIS_MODULE,
-+              .dai_link = &gw_avila_board_dai[2],
-+              .num_links = 1,
-+      },{
-+              .name = "gw_avila-board.3",
-+              .owner = THIS_MODULE,
-+              .dai_link = &gw_avila_board_dai[3],
-+              .num_links = 1,
-+      }
-+};
-+
-+static struct platform_device *gw_avila_board_snd_device[4];
-+
-+static int __init gw_avila_board_init(void)
-+{
-+      int ret;
-+      struct port *port;
-+      int i;
-+
-+      if ((hss_port[0] = kzalloc(sizeof(*port), GFP_KERNEL)) == NULL)
-+              return -ENOMEM;
-+
-+      if ((hss_port[1] = kzalloc(sizeof(*port), GFP_KERNEL)) == NULL)
-+              return -ENOMEM;
-+
-+      for (i = 0; i < 4; i++) {
-+              gw_avila_board_snd_device[i] = platform_device_alloc("soc-audio", i);
-+              if (!gw_avila_board_snd_device[i]) {
-+                      return -ENOMEM;
-+              }
-+
-+              platform_set_drvdata(gw_avila_board_snd_device[i], &gw_avila_board[i]);
-+              ret = platform_device_add(gw_avila_board_snd_device[i]);
-+
-+              if (ret) {
-+                      platform_device_put(gw_avila_board_snd_device[i]);
-+              }
-+      }
-+      return ret;
-+}
-+
-+static void __exit gw_avila_board_exit(void)
-+{
-+      int i;
-+      for (i = 0; i < 4; i++)
-+              platform_device_unregister(gw_avila_board_snd_device[i]);
-+}
-+
-+module_init(gw_avila_board_init);
-+module_exit(gw_avila_board_exit);
-+
-+/* Module information */
-+MODULE_AUTHOR("Chris Lang");
-+MODULE_DESCRIPTION("ALSA SoC HSS Audio gw_avila board");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/soc/gw-avila/ixp4xx_hss.c
-@@ -0,0 +1,902 @@
-+/*
-+ * Intel IXP4xx HSS (synchronous serial port) driver for Linux
-+ *
-+ * Copyright (C) 2009 Chris Lang <clang@gateworks.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of version 2 of the GNU General Public License
-+ * as published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/bitops.h>
-+#include <linux/cdev.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/dmapool.h>
-+#include <linux/fs.h>
-+#include <linux/io.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/poll.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+
-+#include <mach/npe.h>
-+#include <mach/qmgr.h>
-+
-+#include "ixp4xx_hss.h"
-+
-+/*****************************************************************************
-+ * global variables
-+ ****************************************************************************/
-+
-+void hss_chan_read(unsigned long data);
-+static char lock_init = 0;
-+static spinlock_t npe_lock;
-+static struct npe *npe;
-+
-+static const struct {
-+      int tx, txdone, rx, rxfree, chan;
-+}queue_ids[2] = {{HSS0_PKT_TX0_QUEUE, HSS0_PKT_TXDONE_QUEUE, HSS0_PKT_RX_QUEUE,
-+                HSS0_PKT_RXFREE0_QUEUE, HSS0_CHL_RXTRIG_QUEUE},
-+               {HSS1_PKT_TX0_QUEUE, HSS1_PKT_TXDONE_QUEUE, HSS1_PKT_RX_QUEUE,
-+                HSS1_PKT_RXFREE0_QUEUE, HSS1_CHL_RXTRIG_QUEUE},
-+};
-+
-+struct port *hss_port[2];
-+struct hss_device *hss_handle[32];
-+EXPORT_SYMBOL(hss_handle);
-+
-+/*****************************************************************************
-+ * utility functions
-+ ****************************************************************************/
-+
-+#ifndef __ARMEB__
-+static inline void memcpy_swab32(u32 *dest, u32 *src, int cnt)
-+{
-+      int i;
-+      for (i = 0; i < cnt; i++)
-+              dest[i] = swab32(src[i]);
-+}
-+#endif
-+
-+static inline unsigned int sub_offset(unsigned int a, unsigned int b,
-+                                    unsigned int modulo)
-+{
-+      return (modulo /* make sure the result >= 0 */ + a - b) % modulo;
-+}
-+
-+/*****************************************************************************
-+ * HSS access
-+ ****************************************************************************/
-+
-+static void hss_config_load(struct port *port)
-+{
-+      struct msg msg;
-+
-+      do {
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = PORT_CONFIG_LOAD;
-+              msg.hss_port = port->id;
-+              if (npe_send_message(npe, &msg, "HSS_LOAD_CONFIG"))
-+                      break;
-+              if (npe_recv_message(npe, &msg, "HSS_LOAD_CONFIG"))
-+                      break;
-+
-+              /* HSS_LOAD_CONFIG for port #1 returns port_id = #4 */
-+              if (msg.cmd != PORT_CONFIG_LOAD || msg.data32)
-+                      break;
-+
-+              /* HDLC may stop working without this */
-+              npe_recv_message(npe, &msg, "FLUSH_IT");
-+              return;
-+      } while (0);
-+
-+      printk(KERN_CRIT "HSS-%i: unable to reload HSS configuration\n",
-+             port->id);
-+      BUG();
-+}
-+
-+static void hss_config_set_pcr(struct port *port)
-+{
-+      struct msg msg;
-+
-+      do {
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = PORT_CONFIG_WRITE;
-+              msg.hss_port = port->id;
-+              msg.index = HSS_CONFIG_TX_PCR;
-+#if 0
-+              msg.data32 = PCR_FRM_SYNC_RISINGEDGE | PCR_MSB_ENDIAN |
-+                      PCR_TX_DATA_ENABLE | PCR_TX_UNASS_HIGH_IMP | PCR_TX_V56K_HIGH_IMP | PCR_TX_FB_HIGH_IMP;
-+#else
-+              msg.data32 = PCR_FRM_SYNC_RISINGEDGE | PCR_MSB_ENDIAN |
-+                      PCR_TX_DATA_ENABLE | PCR_TX_FB_HIGH_IMP | PCR_DCLK_EDGE_RISING;
-+#endif
-+              if (port->frame_size % 8 == 0)
-+                      msg.data32 |= PCR_SOF_NO_FBIT;
-+
-+              if (npe_send_message(npe, &msg, "HSS_SET_TX_PCR"))
-+                      break;
-+
-+              msg.index = HSS_CONFIG_RX_PCR;
-+              msg.data32 &= ~ (PCR_DCLK_EDGE_RISING | PCR_FCLK_EDGE_RISING | PCR_TX_DATA_ENABLE);
-+
-+              if (npe_send_message(npe, &msg, "HSS_SET_RX_PCR"))
-+                      break;
-+              return;
-+      } while (0);
-+
-+      printk(KERN_CRIT "HSS-%i: unable to set HSS PCR registers\n", port->id);
-+      BUG();
-+}
-+
-+static void hss_config_set_core(struct port *port)
-+{
-+      struct msg msg;
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = PORT_CONFIG_WRITE;
-+      msg.hss_port = port->id;
-+      msg.index = HSS_CONFIG_CORE_CR;
-+#if 0
-+      msg.data32 = 0 | CCR_LOOPBACK |
-+              (port->id ? CCR_SECOND_HSS : 0);
-+#else
-+      msg.data32 = 0 |
-+              (port->id ? CCR_SECOND_HSS : 0);
-+#endif
-+      if (npe_send_message(npe, &msg, "HSS_SET_CORE_CR")) {
-+              printk(KERN_CRIT "HSS-%i: unable to set HSS core control"
-+                     " register\n", port->id);
-+              BUG();
-+      }
-+}
-+
-+static void hss_config_set_line(struct port *port)
-+{
-+      struct msg msg;
-+
-+      hss_config_set_pcr(port);
-+      hss_config_set_core(port);
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = PORT_CONFIG_WRITE;
-+      msg.hss_port = port->id;
-+      msg.index = HSS_CONFIG_CLOCK_CR;
-+      msg.data32 = CLK42X_SPEED_8192KHZ /* FIXME */;
-+      if (npe_send_message(npe, &msg, "HSS_SET_CLOCK_CR")) {
-+              printk(KERN_CRIT "HSS-%i: unable to set HSS clock control"
-+                     " register\n", port->id);
-+              BUG();
-+      }
-+}
-+
-+static void hss_config_set_rx_frame(struct port *port)
-+{
-+      struct msg msg;
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = PORT_CONFIG_WRITE;
-+      msg.hss_port = port->id;
-+      msg.index = HSS_CONFIG_RX_FCR;
-+      msg.data16a = port->frame_sync_offset;
-+      msg.data16b = port->frame_size - 1;
-+      if (npe_send_message(npe, &msg, "HSS_SET_RX_FCR")) {
-+              printk(KERN_CRIT "HSS-%i: unable to set HSS RX frame size"
-+                     " and offset\n", port->id);
-+              BUG();
-+      }
-+}
-+
-+static void hss_config_set_frame(struct port *port)
-+{
-+      struct msg msg;
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = PORT_CONFIG_WRITE;
-+      msg.hss_port = port->id;
-+      msg.index = HSS_CONFIG_TX_FCR;
-+      msg.data16a = TX_FRAME_SYNC_OFFSET;
-+      msg.data16b = port->frame_size - 1;
-+      if (npe_send_message(npe, &msg, "HSS_SET_TX_FCR")) {
-+              printk(KERN_CRIT "HSS-%i: unable to set HSS TX frame size"
-+                     " and offset\n", port->id);
-+              BUG();
-+      }
-+      hss_config_set_rx_frame(port);
-+}
-+
-+static void hss_config_set_lut(struct port *port)
-+{
-+      struct msg msg;
-+      int chan_count = 32;
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = PORT_CONFIG_WRITE;
-+      msg.hss_port = port->id;
-+
-+      msg.index = HSS_CONFIG_TX_LUT;
-+      msg.data32 = 0xffffffff;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+      msg.data32 = 0x0;
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_TX_LUT");
-+
-+      msg.index = HSS_CONFIG_RX_LUT;
-+      msg.data32 = 0xffffffff;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+      msg.data32 = 0x0;
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+      msg.index += 4;
-+      npe_send_message(npe, &msg, "HSS_SET_RX_LUT");
-+
-+      hss_config_set_frame(port);
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = CHAN_NUM_CHANS_WRITE;
-+      msg.hss_port = port->id;
-+      msg.data8a = chan_count;
-+      if (npe_send_message(npe, &msg, "CHAN_NUM_CHANS_WRITE")) {
-+              printk(KERN_CRIT "HSS-%i: unable to set HSS channel count\n",
-+                     port->id);
-+              BUG();
-+      }
-+}
-+
-+static u32 hss_config_get_status(struct port *port)
-+{
-+      struct msg msg;
-+
-+      do {
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = PORT_ERROR_READ;
-+              msg.hss_port = port->id;
-+              if (npe_send_message(npe, &msg, "PORT_ERROR_READ"))
-+                      break;
-+              if (npe_recv_message(npe, &msg, "PORT_ERROR_READ"))
-+                      break;
-+
-+              return msg.data32;
-+      } while (0);
-+
-+      printk(KERN_CRIT "HSS-%i: unable to read HSS status\n", port->id);
-+      BUG();
-+}
-+
-+static void hss_config_start_chan(struct port *port)
-+{
-+      struct msg msg;
-+
-+      port->chan_last_tx = 0;
-+      port->chan_last_rx = 0;
-+
-+      do {
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = CHAN_RX_BUF_ADDR_WRITE;
-+              msg.hss_port = port->id;
-+              msg.data32 = port->chan_rx_buf_phys;
-+              if (npe_send_message(npe, &msg, "CHAN_RX_BUF_ADDR_WRITE"))
-+                      break;
-+
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = CHAN_TX_BUF_ADDR_WRITE;
-+              msg.hss_port = port->id;
-+              msg.data32 = port->chan_tx_pointers_phys;
-+              if (npe_send_message(npe, &msg, "CHAN_TX_BUF_ADDR_WRITE"))
-+                      break;
-+
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = CHAN_FLOW_ENABLE;
-+              msg.hss_port = port->id;
-+              if (npe_send_message(npe, &msg, "CHAN_FLOW_ENABLE"))
-+                      break;
-+              port->chan_started = 1;
-+              return;
-+      } while (0);
-+
-+      printk(KERN_CRIT "HSS-%i: unable to start channelized flow\n",
-+             port->id);
-+      BUG();
-+}
-+
-+static void hss_config_stop_chan(struct port *port)
-+{
-+      struct msg msg;
-+
-+      if (!port->chan_started)
-+              return;
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = CHAN_FLOW_DISABLE;
-+      msg.hss_port = port->id;
-+      if (npe_send_message(npe, &msg, "CHAN_FLOW_DISABLE")) {
-+              printk(KERN_CRIT "HSS-%i: unable to stop channelized flow\n",
-+                     port->id);
-+              BUG();
-+      }
-+      hss_config_get_status(port); /* make sure it's halted */
-+      port->chan_started = 0;
-+}
-+
-+static int hss_config_load_firmware(struct port *port)
-+{
-+      struct msg msg;
-+
-+      if (port->initialized)
-+              return 0;
-+
-+      if (!npe_running(npe)) {
-+              int err;
-+              if ((err = npe_load_firmware(npe, "NPE-A-HSS",
-+                                           port->dev)))
-+                      return err;
-+      }
-+
-+      do {
-+              /* HSS main configuration */
-+              hss_config_set_line(port);
-+
-+              hss_config_set_frame(port);
-+
-+              /* Channelized operation settings */
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = CHAN_TX_BLK_CFG_WRITE;
-+              msg.hss_port = port->id;
-+              msg.data8b = (CHAN_TX_LIST_FRAMES & ~7) / 2;
-+              msg.data8a = msg.data8b / 4;
-+              msg.data8d = CHAN_TX_LIST_FRAMES - msg.data8b;
-+              msg.data8c = msg.data8d / 4;
-+              if (npe_send_message(npe, &msg, "CHAN_TX_BLK_CFG_WRITE"))
-+                      break;
-+
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = CHAN_RX_BUF_CFG_WRITE;
-+              msg.hss_port = port->id;
-+              msg.data8a = CHAN_RX_TRIGGER / 8;
-+              msg.data8b = CHAN_RX_FRAMES;
-+              if (npe_send_message(npe, &msg, "CHAN_RX_BUF_CFG_WRITE"))
-+                      break;
-+
-+              memset(&msg, 0, sizeof(msg));
-+              msg.cmd = CHAN_TX_BUF_SIZE_WRITE;
-+              msg.hss_port = port->id;
-+              msg.data8a = CHAN_TX_LISTS;
-+              if (npe_send_message(npe, &msg, "CHAN_TX_BUF_SIZE_WRITE"))
-+                      break;
-+
-+              port->initialized = 1;
-+              return 0;
-+      } while (0);
-+
-+      printk(KERN_CRIT "HSS-%i: unable to start HSS operation\n", port->id);
-+      BUG();
-+}
-+
-+void hss_chan_irq(void *pdev)
-+{
-+      struct port *port = pdev;
-+
-+      qmgr_disable_irq(queue_ids[port->id].chan);
-+
-+      tasklet_hi_schedule(&port->task);
-+}
-+
-+
-+int hss_prepare_chan(struct port *port)
-+{
-+      int err, i, j;
-+      u32 *temp;
-+      u32 temp2;
-+      u8 *temp3;
-+
-+      if (port->initialized)
-+              return 0;
-+
-+      if ((err = hss_config_load_firmware(port)))
-+              return err;
-+
-+      if ((err = qmgr_request_queue(queue_ids[port->id].chan,
-+                                    CHAN_QUEUE_LEN, 0, 0, "%s:hss", "hss")))
-+              return err;
-+
-+      port->chan_tx_buf = dma_alloc_coherent(port->dev, chan_tx_buf_len(port), &port->chan_tx_buf_phys, GFP_DMA);
-+      memset(port->chan_tx_buf, 0, chan_tx_buf_len(port));
-+
-+      port->chan_tx_pointers = dma_alloc_coherent(port->dev, chan_tx_buf_len(port) / CHAN_TX_LIST_FRAMES * 4, &port->chan_tx_pointers_phys, GFP_DMA);
-+
-+      temp3 = port->chan_tx_buf;
-+      for (i = 0; i < CHAN_TX_LISTS; i++) {
-+              for (j = 0; j < 8; j++) {
-+                      port->tx_lists[i][j] = temp3;
-+                      temp3 += CHAN_TX_LIST_FRAMES * 4;
-+              }
-+      }
-+
-+      temp = port->chan_tx_pointers;
-+      temp2 = port->chan_tx_buf_phys;
-+      for (i = 0; i < CHAN_TX_LISTS; i++)
-+      {
-+              for (j = 0; j < 32; j++)
-+              {
-+                      *temp = temp2;
-+                      temp2 += CHAN_TX_LIST_FRAMES;
-+                      temp++;
-+              }
-+      }
-+
-+      port->chan_rx_buf = dma_alloc_coherent(port->dev, chan_rx_buf_len(port), &port->chan_rx_buf_phys, GFP_DMA);
-+
-+      for (i = 0; i < 8; i++) {
-+              temp3 = port->chan_rx_buf + (i * 4 * 128);
-+              for (j = 0; j < 8; j++) {
-+                      port->rx_frames[i][j] = temp3;
-+                      temp3 += CHAN_RX_TRIGGER;
-+              }
-+      }
-+
-+      qmgr_set_irq(queue_ids[port->id].chan, QUEUE_IRQ_SRC_NOT_EMPTY,
-+                   hss_chan_irq, port);
-+
-+      return 0;
-+
-+}
-+
-+int hss_tx_start(struct hss_device *hdev)
-+{
-+      unsigned long flags;
-+      struct port *port = hdev->port;
-+
-+      hdev->tx_loc = 0;
-+      hdev->tx_frame = 0;
-+
-+      set_bit((1 << hdev->id), &port->chan_tx_bitmap);
-+
-+      if (!port->chan_started)
-+      {
-+              qmgr_enable_irq(queue_ids[port->id].chan);
-+              spin_lock_irqsave(&npe_lock, flags);
-+              hss_config_start_chan(port);
-+              spin_unlock_irqrestore(&npe_lock, flags);
-+              hss_chan_irq(port);
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(hss_tx_start);
-+
-+int hss_rx_start(struct hss_device *hdev)
-+{
-+      unsigned long flags;
-+      struct port *port = hdev->port;
-+
-+      hdev->rx_loc = 0;
-+      hdev->rx_frame = 0;
-+
-+      set_bit((1 << hdev->id), &port->chan_rx_bitmap);
-+
-+      if (!port->chan_started)
-+      {
-+              qmgr_enable_irq(queue_ids[port->id].chan);
-+              spin_lock_irqsave(&npe_lock, flags);
-+              hss_config_start_chan(port);
-+              spin_unlock_irqrestore(&npe_lock, flags);
-+              hss_chan_irq(port);
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(hss_rx_start);
-+
-+int hss_tx_stop(struct hss_device *hdev)
-+{
-+      struct port *port = hdev->port;
-+
-+      clear_bit((1 << hdev->id), &port->chan_tx_bitmap);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(hss_tx_stop);
-+
-+int hss_rx_stop(struct hss_device *hdev)
-+{
-+      struct port *port = hdev->port;
-+
-+      clear_bit((1 << hdev->id), &port->chan_rx_bitmap);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(hss_rx_stop);
-+
-+int hss_chan_open(struct hss_device *hdev)
-+{
-+      struct port *port = hdev->port;
-+      int i, err = 0;
-+
-+      if (port->chan_open)
-+              return 0;
-+
-+      if (port->mode == MODE_HDLC) {
-+              err = -ENOSYS;
-+              goto out;
-+      }
-+
-+      if (port->mode == MODE_G704 && port->channels[0] == hdev->id) {
-+              err = -EBUSY; /* channel #0 is used for G.704 signaling */
-+              goto out;
-+      }
-+
-+      for (i = MAX_CHANNELS; i > port->frame_size / 8; i--)
-+              if (port->channels[i - 1] == hdev->id) {
-+                      err = -ECHRNG; /* frame too short */
-+                      goto out;
-+              }
-+
-+      hdev->rx_loc = hdev->tx_loc = 0;
-+      hdev->rx_frame = hdev->tx_frame = 0;
-+
-+      //clear_bit((1 << hdev->id), &port->chan_rx_bitmap);
-+      //clear_bit((1 << hdev->id), &port->chan_tx_bitmap);
-+
-+      if (!port->initialized) {
-+              hss_prepare_chan(port);
-+
-+              hss_config_stop_chan(port);
-+              hdev->open_count++;
-+              port->chan_open_count++;
-+
-+              hss_config_set_lut(port);
-+              hss_config_load(port);
-+
-+      }
-+      port->chan_open = 1;
-+
-+out:
-+      return err;
-+}
-+EXPORT_SYMBOL(hss_chan_open);
-+
-+int hss_chan_close(struct hss_device *hdev)
-+{
-+      return 0;
-+}
-+EXPORT_SYMBOL(hss_chan_close);
-+
-+void hss_chan_read(unsigned long data)
-+{
-+      struct port *port = (void *)data;
-+      struct hss_device *hdev;
-+      u8 *hw_buf, *save_buf;
-+      u8 *buf;
-+      u32 v;
-+  unsigned int tx_list, rx_frame;
-+      int i, j, channel;
-+      u8 more_work = 0;
-+
-+/*
-+      My Data in the hardware buffer is scattered by channels into 4 trunks
-+      as follows for rx
-+
-+                                      channel 0                                       channel 1                                       channel 2                                       channel 3
-+Trunk 1       =       0                       ->      127                     128             ->      255                     256             ->      383                     384             ->      512
-+Trunk 2 =     513             ->      639                     640             ->      768                     769             ->      895                     896             ->      1023
-+Trunk 3 =     1024    ->      1151            1152    ->      1207            1208    ->      1407            1408    ->      1535
-+Trunk 4 = 1535        ->      1663            1664    ->      1791            1792    ->      1920            1921    ->      2047
-+
-+      I will get CHAN_RX_TRIGGER worth of bytes out of each channel on each trunk
-+      with each IRQ
-+
-+      For TX Data, it is split into 8 lists with each list containing 16 bytes per
-+      channel
-+
-+Trunk 1 = 0           ->      16                              17              ->      32                      33              ->      48                      49              ->      64
-+Trunk 2 = 65  ->      80                              81              ->      96                      97              ->      112                     113             ->      128
-+Trunk 3       =       129     ->      144                             145             ->      160                     161             ->      176                     177             ->      192
-+Trunk 4       =       193     ->      208                             209             ->      224                     225             ->      240                     241             ->      256
-+
-+*/
-+
-+
-+      while ((v = qmgr_get_entry(queue_ids[port->id].chan)))
-+      {
-+              tx_list = (v >> 8) & 0xFF;
-+              rx_frame = v & 0xFF;
-+
-+              if (tx_list == 7)
-+                      tx_list = 0;
-+              else
-+                      tx_list++;
-+              for (channel = 0; channel < 8; channel++) {
-+
-+                      hdev = port->chan_devices[channel];
-+                      if (!hdev)
-+                              continue;
-+
-+                      if (test_bit(1 << channel, &port->chan_tx_bitmap)) {
-+                              buf = (u8 *)hdev->tx_buf + hdev->tx_loc;
-+#if 0
-+                              hw_buf = (u8 *)port->chan_tx_buf;
-+                              hw_buf += (tx_list * CHAN_TX_LIST_FRAMES * 32);
-+                              hw_buf += (4 * CHAN_TX_LIST_FRAMES * channel);
-+                              save_buf = hw_buf;
-+#else
-+                              save_buf = port->tx_lists[tx_list][channel];
-+#endif
-+                              for (i = 0; i < CHAN_TX_LIST_FRAMES; i++) {
-+                                      hw_buf = save_buf + i;
-+                                      for (j = 0; j < 4; j++) {
-+                                              *hw_buf = *(buf++);
-+                                              hw_buf += CHAN_TX_LIST_FRAMES;
-+                                      }
-+
-+                                      hdev->tx_loc += 4;
-+                                      hdev->tx_frame++;
-+                                      if (hdev->tx_loc >= hdev->tx_buffer_size) {
-+                                              hdev->tx_loc = 0;
-+                                              buf = (u8 *)hdev->tx_buf;
-+                                      }
-+                              }
-+                      } else {
-+#if 0
-+                              hw_buf = (u8 *)port->chan_tx_buf;
-+                              hw_buf += (tx_list * CHAN_TX_LIST_FRAMES * 32);
-+                              hw_buf += (4 * CHAN_TX_LIST_FRAMES * channel);
-+#else
-+                              hw_buf = port->tx_lists[tx_list][channel];
-+#endif
-+                              memset(hw_buf, 0, 64);
-+                      }
-+
-+                      if (hdev->tx_frame >= hdev->tx_period_size && test_bit(1 << channel, &port->chan_tx_bitmap))
-+                      {
-+                              hdev->tx_frame %= hdev->tx_period_size;
-+                              if (hdev->tx_callback)
-+                                      hdev->tx_callback(hdev->tx_data);
-+                              more_work = 1;
-+                      }
-+
-+                      if (test_bit(1 << channel, &port->chan_rx_bitmap)) {
-+                              buf = (u8 *)hdev->rx_buf + hdev->rx_loc;
-+#if 0
-+                              hw_buf = (u8 *)port->chan_rx_buf;
-+                              hw_buf += (4 * CHAN_RX_FRAMES * channel);
-+                              hw_buf += rx_frame;
-+                              save_buf = hw_buf;
-+#else
-+                              save_buf = port->rx_frames[channel][rx_frame >> 4];
-+#endif
-+                              for (i = 0; i < CHAN_RX_TRIGGER; i++) {
-+                                      hw_buf = save_buf + i;
-+                                      for (j = 0; j < 4; j++) {
-+                                              *(buf++) = *hw_buf;
-+                                              hw_buf += CHAN_RX_FRAMES;
-+                                      }
-+                                      hdev->rx_loc += 4;
-+                                      hdev->rx_frame++;
-+                                      if (hdev->rx_loc >= hdev->rx_buffer_size) {
-+                                              hdev->rx_loc = 0;
-+                                              buf = (u8 *)hdev->rx_buf;
-+                                      }
-+                              }
-+                      }
-+
-+                      if (hdev->rx_frame >= hdev->rx_period_size && test_bit(1 << channel, &port->chan_rx_bitmap))
-+                      {
-+                              hdev->rx_frame %= hdev->rx_period_size;
-+                              if (hdev->rx_callback)
-+                                      hdev->rx_callback(hdev->rx_data);
-+                              more_work = 1;
-+                      }
-+              }
-+#if 0
-+              if (more_work)
-+              {
-+                      tasklet_hi_schedule(&port->task);
-+                      return;
-+              }
-+#endif
-+      }
-+
-+      qmgr_enable_irq(queue_ids[port->id].chan);
-+
-+      return;
-+
-+}
-+
-+struct hss_device *hss_chan_create(struct port *port, unsigned int channel)
-+{
-+      struct hss_device *chan_dev;
-+      unsigned long flags;
-+
-+      chan_dev = kzalloc(sizeof(struct hss_device), GFP_KERNEL);
-+
-+      spin_lock_irqsave(&npe_lock, flags);
-+
-+      chan_dev->id = channel;
-+      chan_dev->port = port;
-+
-+      port->channels[channel] = channel;
-+
-+      port->chan_devices[channel] = chan_dev;
-+
-+      spin_unlock_irqrestore(&npe_lock, flags);
-+
-+      return chan_dev;
-+}
-+
-+/*****************************************************************************
-+ * initialization
-+ ****************************************************************************/
-+
-+static struct platform_device gw_avila_hss_device_0 = {
-+  .name     = "ixp4xx_hss",
-+  .id       = 0,
-+};
-+
-+static struct platform_device gw_avila_hss_device_1 = {
-+  .name     = "ixp4xx_hss",
-+  .id       = 1,
-+};
-+
-+static struct platform_device *gw_avila_hss_port_0;
-+static struct platform_device *gw_avila_hss_port_1;
-+static u64 hss_dmamask = 0xFFFFFFFF;
-+
-+struct hss_device *hss_init(int id, int channel)
-+{
-+      struct port *port = hss_port[id];
-+      struct hss_device *hdev;
-+      int ret;
-+
-+      if (!lock_init)
-+      {
-+              spin_lock_init(&npe_lock);
-+              lock_init = 1;
-+              npe = npe_request(0);
-+      }
-+
-+      if (!port->init) {
-+              if (id == 0) {
-+                      gw_avila_hss_port_0 = platform_device_alloc("hss-port", 0);
-+
-+                      platform_set_drvdata(gw_avila_hss_port_0, &gw_avila_hss_device_0);
-+                      port->dev = &gw_avila_hss_port_0->dev;
-+
-+                      if (!port->dev->dma_mask)
-+                  port->dev->dma_mask = &hss_dmamask;
-+                if (!port->dev->coherent_dma_mask)
-+              port->dev->coherent_dma_mask = 0xFFFFFFFF;
-+
-+                      ret = platform_device_add(gw_avila_hss_port_0);
-+
-+                if (ret)
-+                platform_device_put(gw_avila_hss_port_0);
-+
-+                      tasklet_init(&port->task, hss_chan_read, (unsigned long) port);
-+              }
-+              else
-+              {
-+                      gw_avila_hss_port_1 = platform_device_alloc("hss-port", 1);
-+
-+                      platform_set_drvdata(gw_avila_hss_port_1, &gw_avila_hss_device_1);
-+                      port->dev = &gw_avila_hss_port_1->dev;
-+
-+                      if (!port->dev->dma_mask)
-+                  port->dev->dma_mask = &hss_dmamask;
-+                if (!port->dev->coherent_dma_mask)
-+              port->dev->coherent_dma_mask = 0xFFFFFFFF;
-+
-+                      ret = platform_device_add(gw_avila_hss_port_1);
-+
-+                if (ret)
-+                platform_device_put(gw_avila_hss_port_1);
-+
-+                      tasklet_init(&port->task, hss_chan_read, (unsigned long) port);
-+              }
-+
-+              port->init = 1;
-+              port->id = id;
-+              port->clock_type = CLOCK_EXT;
-+              port->clock_rate = 8192000;
-+              port->frame_size = 256; /* E1 */
-+              port->mode = MODE_RAW;
-+              port->next_rx_frame = 0;
-+              memset(port->channels, CHANNEL_UNUSED, sizeof(port->channels));
-+      }
-+
-+      hdev = hss_chan_create(port, channel);
-+
-+      return hdev;
-+}
-+EXPORT_SYMBOL(hss_init);
-+
-+int hss_set_tx_callback(struct hss_device *hdev, void (*tx_callback)(void *), void *tx_data)
-+{
-+  BUG_ON(tx_callback == NULL);
-+  hdev->tx_callback = tx_callback;
-+  hdev->tx_data = tx_data;
-+
-+  return 0;
-+}
-+EXPORT_SYMBOL(hss_set_tx_callback);
-+
-+int hss_set_rx_callback(struct hss_device *hdev, void (*rx_callback)(void *), void *rx_data)
-+{
-+  BUG_ON(rx_callback == NULL);
-+  hdev->rx_callback = rx_callback;
-+  hdev->rx_data = rx_data;
-+
-+  return 0;
-+}
-+EXPORT_SYMBOL(hss_set_rx_callback);
-+
-+int hss_config_rx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size)
-+{
-+      /*
-+       * Period Size and Buffer Size are in Frames which are u32
-+       * We convert the u32 *buf to u8 in order to make channel reads
-+       * and rx_loc easier
-+       */
-+
-+      hdev->rx_buf = (u8 *)buf;
-+      hdev->rx_buffer_size = buffer_size << 2;
-+      hdev->rx_period_size = period_size;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(hss_config_rx_dma);
-+
-+int hss_config_tx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size)
-+{
-+      /*
-+       * Period Size and Buffer Size are in Frames which are u32
-+       * We convert the u32 *buf to u8 in order to make channel reads
-+       * and rx_loc easier
-+       */
-+
-+      hdev->tx_buf = (u8 *)buf;
-+      hdev->tx_buffer_size = buffer_size << 2;
-+      hdev->tx_period_size = period_size;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(hss_config_tx_dma);
-+
-+unsigned long hss_curr_offset_rx(struct hss_device *hdev)
-+{
-+      return hdev->rx_loc >> 2;
-+}
-+EXPORT_SYMBOL(hss_curr_offset_rx);
-+
-+unsigned long hss_curr_offset_tx(struct hss_device *hdev)
-+{
-+      return hdev->tx_loc >> 2;
-+}
-+EXPORT_SYMBOL(hss_curr_offset_tx);
-+
-+MODULE_AUTHOR("Chris Lang");
-+MODULE_DESCRIPTION("Intel IXP4xx HSS Audio driver");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/gw-avila/ixp4xx_hss.h
-@@ -0,0 +1,401 @@
-+/*
-+ *
-+ *
-+ * Copyright (C) 2009 Gateworks Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of version 2 of the GNU General Public License
-+ * as published by the Free Software Foundation.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/bitops.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/dmapool.h>
-+#include <linux/fs.h>
-+#include <linux/io.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/poll.h>
-+#include <mach/npe.h>
-+#include <mach/qmgr.h>
-+#include <linux/interrupt.h>
-+
-+//#include <linux/hdlc.h> XXX We aren't HDLC
-+
-+#define DEBUG_QUEUES          0
-+#define DEBUG_DESC            0
-+#define DEBUG_RX              0
-+#define DEBUG_TX              0
-+#define DEBUG_PKT_BYTES               0
-+#define DEBUG_CLOSE           0
-+#define DEBUG_FRAMER          0
-+
-+#define DRV_NAME              "ixp4xx_hss"
-+
-+#define PKT_EXTRA_FLAGS               0 /* orig 1 */
-+#define TX_FRAME_SYNC_OFFSET  0 /* channelized */
-+#define PKT_NUM_PIPES         1 /* 1, 2 or 4 */
-+#define PKT_PIPE_FIFO_SIZEW   4 /* total 4 dwords per HSS */
-+
-+#define RX_DESCS              512 /* also length of all RX queues */
-+#define TX_DESCS              512 /* also length of all TX queues */
-+
-+//#define POOL_ALLOC_SIZE             (sizeof(struct desc) * (RX_DESCS + TX_DESCS))
-+#define RX_SIZE                       (HDLC_MAX_MRU + 4) /* NPE needs more space */
-+#define MAX_CLOSE_WAIT                1000 /* microseconds */
-+#define HSS_COUNT             2
-+#define MIN_FRAME_SIZE                16   /* bits */
-+#define MAX_FRAME_SIZE                257  /* 256 bits + framing bit */
-+#define MAX_CHANNELS          (MAX_FRAME_SIZE / 8)
-+#define MAX_CHAN_DEVICES      32
-+#define CHANNEL_HDLC          0xFE
-+#define CHANNEL_UNUSED                0xFF
-+
-+#define NAPI_WEIGHT           16
-+#define CHAN_RX_TRIGGER               16 /* 8 RX frames = 1 ms @ E1 */
-+#define CHAN_RX_FRAMES                128
-+#define CHAN_RX_TRUNKS                1
-+#define MAX_CHAN_RX_BAD_SYNC  (CHAN_RX_TRIGGER / 2 /* pairs */ - 3)
-+
-+#define CHAN_TX_LIST_FRAMES   CHAN_RX_TRIGGER /* bytes/channel per list, 16 - 48 */
-+#define CHAN_TX_LISTS         8
-+#define CHAN_TX_TRUNKS CHAN_RX_TRUNKS
-+#define CHAN_TX_FRAMES                (CHAN_TX_LIST_FRAMES * CHAN_TX_LISTS)
-+
-+#define CHAN_QUEUE_LEN                32 /* minimum possible */
-+
-+#define chan_rx_buf_len(port) (port->frame_size / 8 * CHAN_RX_FRAMES * CHAN_RX_TRUNKS)
-+#define chan_tx_buf_len(port) (port->frame_size / 8 * CHAN_TX_FRAMES * CHAN_TX_TRUNKS)
-+
-+/* Queue IDs */
-+#define HSS0_CHL_RXTRIG_QUEUE 12      /* orig size = 32 dwords */
-+#define HSS0_PKT_RX_QUEUE     13      /* orig size = 32 dwords */
-+#define HSS0_PKT_TX0_QUEUE    14      /* orig size = 16 dwords */
-+#define HSS0_PKT_TX1_QUEUE    15
-+#define HSS0_PKT_TX2_QUEUE    16
-+#define HSS0_PKT_TX3_QUEUE    17
-+#define HSS0_PKT_RXFREE0_QUEUE        18      /* orig size = 16 dwords */
-+#define HSS0_PKT_RXFREE1_QUEUE        19
-+#define HSS0_PKT_RXFREE2_QUEUE        20
-+#define HSS0_PKT_RXFREE3_QUEUE        21
-+#define HSS0_PKT_TXDONE_QUEUE 22      /* orig size = 64 dwords */
-+
-+#define HSS1_CHL_RXTRIG_QUEUE 10
-+#define HSS1_PKT_RX_QUEUE     0
-+#define HSS1_PKT_TX0_QUEUE    5
-+#define HSS1_PKT_TX1_QUEUE    6
-+#define HSS1_PKT_TX2_QUEUE    7
-+#define HSS1_PKT_TX3_QUEUE    8
-+#define HSS1_PKT_RXFREE0_QUEUE        1
-+#define HSS1_PKT_RXFREE1_QUEUE        2
-+#define HSS1_PKT_RXFREE2_QUEUE        3
-+#define HSS1_PKT_RXFREE3_QUEUE        4
-+#define HSS1_PKT_TXDONE_QUEUE 9
-+
-+#define NPE_PKT_MODE_HDLC             0
-+#define NPE_PKT_MODE_RAW              1
-+#define NPE_PKT_MODE_56KMODE          2
-+#define NPE_PKT_MODE_56KENDIAN_MSB    4
-+
-+/* PKT_PIPE_HDLC_CFG_WRITE flags */
-+#define PKT_HDLC_IDLE_ONES            0x1 /* default = flags */
-+#define PKT_HDLC_CRC_32                       0x2 /* default = CRC-16 */
-+#define PKT_HDLC_MSB_ENDIAN           0x4 /* default = LE */
-+
-+
-+/* hss_config, PCRs */
-+/* Frame sync sampling, default = active low */
-+#define PCR_FRM_SYNC_ACTIVE_HIGH      0x40000000
-+#define PCR_FRM_SYNC_FALLINGEDGE      0x80000000
-+#define PCR_FRM_SYNC_RISINGEDGE               0xC0000000
-+
-+/* Frame sync pin: input (default) or output generated off a given clk edge */
-+#define PCR_FRM_SYNC_OUTPUT_FALLING   0x20000000
-+#define PCR_FRM_SYNC_OUTPUT_RISING    0x30000000
-+
-+/* Frame and data clock sampling on edge, default = falling */
-+#define PCR_FCLK_EDGE_RISING          0x08000000
-+#define PCR_DCLK_EDGE_RISING          0x04000000
-+
-+/* Clock direction, default = input */
-+#define PCR_SYNC_CLK_DIR_OUTPUT               0x02000000
-+
-+/* Generate/Receive frame pulses, default = enabled */
-+#define PCR_FRM_PULSE_DISABLED                0x01000000
-+
-+ /* Data rate is full (default) or half the configured clk speed */
-+#define PCR_HALF_CLK_RATE             0x00200000
-+
-+/* Invert data between NPE and HSS FIFOs? (default = no) */
-+#define PCR_DATA_POLARITY_INVERT      0x00100000
-+
-+/* TX/RX endianness, default = LSB */
-+#define PCR_MSB_ENDIAN                        0x00080000
-+
-+/* Normal (default) / open drain mode (TX only) */
-+#define PCR_TX_PINS_OPEN_DRAIN                0x00040000
-+
-+/* No framing bit transmitted and expected on RX? (default = framing bit) */
-+#define PCR_SOF_NO_FBIT                       0x00020000
-+
-+/* Drive data pins? */
-+#define PCR_TX_DATA_ENABLE            0x00010000
-+
-+/* Voice 56k type: drive the data pins low (default), high, high Z */
-+#define PCR_TX_V56K_HIGH              0x00002000
-+#define PCR_TX_V56K_HIGH_IMP          0x00004000
-+
-+/* Unassigned type: drive the data pins low (default), high, high Z */
-+#define PCR_TX_UNASS_HIGH             0x00000800
-+#define PCR_TX_UNASS_HIGH_IMP         0x00001000
-+
-+/* T1 @ 1.544MHz only: Fbit dictated in FIFO (default) or high Z */
-+#define PCR_TX_FB_HIGH_IMP            0x00000400
-+
-+/* 56k data endiannes - which bit unused: high (default) or low */
-+#define PCR_TX_56KE_BIT_0_UNUSED      0x00000200
-+
-+/* 56k data transmission type: 32/8 bit data (default) or 56K data */
-+#define PCR_TX_56KS_56K_DATA          0x00000100
-+
-+/* hss_config, cCR */
-+/* Number of packetized clients, default = 1 */
-+#define CCR_NPE_HFIFO_2_HDLC          0x04000000
-+#define CCR_NPE_HFIFO_3_OR_4HDLC      0x08000000
-+
-+/* default = no loopback */
-+#define CCR_LOOPBACK                  0x02000000
-+
-+/* HSS number, default = 0 (first) */
-+#define CCR_SECOND_HSS                        0x01000000
-+
-+
-+/* hss_config, clkCR: main:10, num:10, denom:12 */
-+#define CLK42X_SPEED_EXP      ((0x3FF << 22) | (  2 << 12) |   15) /*65 KHz*/
-+
-+#define CLK42X_SPEED_512KHZ   ((  130 << 22) | (  2 << 12) |   15)
-+#define CLK42X_SPEED_1536KHZ  ((   43 << 22) | ( 18 << 12) |   47)
-+#define CLK42X_SPEED_1544KHZ  ((   43 << 22) | ( 33 << 12) |  192)
-+#define CLK42X_SPEED_2048KHZ  ((   32 << 22) | ( 34 << 12) |   63)
-+#define CLK42X_SPEED_4096KHZ  ((   16 << 22) | ( 34 << 12) |  127)
-+#define CLK42X_SPEED_8192KHZ  ((    8 << 22) | ( 34 << 12) |  255)
-+
-+#define CLK46X_SPEED_512KHZ   ((  130 << 22) | ( 24 << 12) |  127)
-+#define CLK46X_SPEED_1536KHZ  ((   43 << 22) | (152 << 12) |  383)
-+#define CLK46X_SPEED_1544KHZ  ((   43 << 22) | ( 66 << 12) |  385)
-+#define CLK46X_SPEED_2048KHZ  ((   32 << 22) | (280 << 12) |  511)
-+#define CLK46X_SPEED_4096KHZ  ((   16 << 22) | (280 << 12) | 1023)
-+#define CLK46X_SPEED_8192KHZ  ((    8 << 22) | (280 << 12) | 2047)
-+
-+
-+/* hss_config, LUT entries */
-+#define TDMMAP_UNASSIGNED     0
-+#define TDMMAP_HDLC           1       /* HDLC - packetized */
-+#define TDMMAP_VOICE56K               2       /* Voice56K - 7-bit channelized */
-+#define TDMMAP_VOICE64K               3       /* Voice64K - 8-bit channelized */
-+
-+/* offsets into HSS config */
-+#define HSS_CONFIG_TX_PCR     0x00 /* port configuration registers */
-+#define HSS_CONFIG_RX_PCR     0x04
-+#define HSS_CONFIG_CORE_CR    0x08 /* loopback control, HSS# */
-+#define HSS_CONFIG_CLOCK_CR   0x0C /* clock generator control */
-+#define HSS_CONFIG_TX_FCR     0x10 /* frame configuration registers */
-+#define HSS_CONFIG_RX_FCR     0x14
-+#define HSS_CONFIG_TX_LUT     0x18 /* channel look-up tables */
-+#define HSS_CONFIG_RX_LUT     0x38
-+
-+
-+/* NPE command codes */
-+/* writes the ConfigWord value to the location specified by offset */
-+#define PORT_CONFIG_WRITE             0x40
-+
-+/* triggers the NPE to load the contents of the configuration table */
-+#define PORT_CONFIG_LOAD              0x41
-+
-+/* triggers the NPE to return an HssErrorReadResponse message */
-+#define PORT_ERROR_READ                       0x42
-+
-+/* reset NPE internal status and enable the HssChannelized operation */
-+#define CHAN_FLOW_ENABLE              0x43
-+#define CHAN_FLOW_DISABLE             0x44
-+#define CHAN_IDLE_PATTERN_WRITE               0x45
-+#define CHAN_NUM_CHANS_WRITE          0x46
-+#define CHAN_RX_BUF_ADDR_WRITE                0x47
-+#define CHAN_RX_BUF_CFG_WRITE         0x48
-+#define CHAN_TX_BLK_CFG_WRITE         0x49
-+#define CHAN_TX_BUF_ADDR_WRITE                0x4A
-+#define CHAN_TX_BUF_SIZE_WRITE                0x4B
-+#define CHAN_TSLOTSWITCH_ENABLE               0x4C
-+#define CHAN_TSLOTSWITCH_DISABLE      0x4D
-+
-+/* downloads the gainWord value for a timeslot switching channel associated
-+   with bypassNum */
-+#define CHAN_TSLOTSWITCH_GCT_DOWNLOAD 0x4E
-+
-+/* triggers the NPE to reset internal status and enable the HssPacketized
-+   operation for the flow specified by pPipe */
-+#define PKT_PIPE_FLOW_ENABLE          0x50
-+#define PKT_PIPE_FLOW_DISABLE         0x51
-+#define PKT_NUM_PIPES_WRITE           0x52
-+#define PKT_PIPE_FIFO_SIZEW_WRITE     0x53
-+#define PKT_PIPE_HDLC_CFG_WRITE               0x54
-+#define PKT_PIPE_IDLE_PATTERN_WRITE   0x55
-+#define PKT_PIPE_RX_SIZE_WRITE                0x56
-+#define PKT_PIPE_MODE_WRITE           0x57
-+
-+/* HDLC packet status values - desc->status */
-+#define ERR_SHUTDOWN          1 /* stop or shutdown occurrance */
-+#define ERR_HDLC_ALIGN                2 /* HDLC alignment error */
-+#define ERR_HDLC_FCS          3 /* HDLC Frame Check Sum error */
-+#define ERR_RXFREE_Q_EMPTY    4 /* RX-free queue became empty while receiving
-+                                   this packet (if buf_len < pkt_len) */
-+#define ERR_HDLC_TOO_LONG     5 /* HDLC frame size too long */
-+#define ERR_HDLC_ABORT                6 /* abort sequence received */
-+#define ERR_DISCONNECTING     7 /* disconnect is in progress */
-+
-+#define CLOCK_EXT 0
-+#define CLOCK_INT 1
-+
-+enum mode {MODE_HDLC = 0, MODE_RAW, MODE_G704};
-+enum rx_tx_bit {
-+      TX_BIT = 0,
-+      RX_BIT = 1
-+};
-+enum chan_bit {
-+      CHAN_0 = (1 << 0),
-+      CHAN_1 = (1 << 1),
-+      CHAN_2 = (1 << 2),
-+      CHAN_3 = (1 << 3),
-+      CHAN_4 = (1 << 4),
-+      CHAN_5 = (1 << 5),
-+      CHAN_6 = (1 << 6),
-+      CHAN_7 = (1 << 7),
-+      CHAN_8 = (1 << 8),
-+      CHAN_9 = (1 << 9),
-+      CHAN_10 = (1 << 10),
-+      CHAN_11 = (1 << 11),
-+      CHAN_12 = (1 << 12),
-+      CHAN_13 = (1 << 13),
-+      CHAN_14 = (1 << 14),
-+      CHAN_15 = (1 << 15)
-+};
-+
-+enum alignment { NOT_ALIGNED = 0, EVEN_FIRST, ODD_FIRST };
-+
-+#ifdef __ARMEB__
-+typedef struct sk_buff buffer_t;
-+#define free_buffer dev_kfree_skb
-+#define free_buffer_irq dev_kfree_skb_irq
-+#else
-+typedef void buffer_t;
-+#define free_buffer kfree
-+#define free_buffer_irq kfree
-+#endif
-+
-+struct hss_device {
-+      struct port *port;
-+      unsigned int open_count, excl_open;
-+      unsigned long tx_loc, rx_loc; /* bytes */
-+      unsigned long tx_frame, rx_frame; /* Frames */
-+      u8 id, chan_count;
-+      u8 log_channels[MAX_CHANNELS];
-+
-+  u8 *rx_buf;
-+  u8 *tx_buf;
-+
-+      size_t rx_buffer_size;
-+      size_t rx_period_size;
-+      size_t tx_buffer_size;
-+      size_t tx_period_size;
-+
-+  void (*rx_callback)(void *data);
-+  void *rx_data;
-+  void (*tx_callback)(void *data);
-+  void *tx_data;
-+  void *private_data;
-+};
-+
-+extern struct hss_device *hss_handle[32];
-+extern struct port *hss_port[2];
-+
-+struct port {
-+      unsigned char init;
-+
-+      struct device *dev;
-+
-+      struct tasklet_struct task;
-+      unsigned int id;
-+      unsigned long chan_rx_bitmap;
-+      unsigned long chan_tx_bitmap;
-+      unsigned char chan_open;
-+
-+      /* the following fields must be protected by npe_lock */
-+      enum mode mode;
-+      unsigned int clock_type, clock_rate, loopback;
-+      unsigned int frame_size, frame_sync_offset;
-+      unsigned int next_rx_frame;
-+
-+      struct hss_device *chan_devices[MAX_CHAN_DEVICES];
-+      u32 chan_tx_buf_phys, chan_rx_buf_phys;
-+      u32     chan_tx_pointers_phys;
-+      u32 *chan_tx_pointers;
-+      u8 *chan_rx_buf;
-+      u8 *chan_tx_buf;
-+      u8 *tx_lists[CHAN_TX_LISTS][8];
-+      u8 *rx_frames[8][CHAN_TX_LISTS];
-+      unsigned int chan_open_count, hdlc_open;
-+      unsigned int chan_started, initialized, just_set_offset;
-+      unsigned int chan_last_rx, chan_last_tx;
-+
-+      /* assigned channels, may be invalid with given frame length or mode */
-+      u8 channels[MAX_CHANNELS];
-+      int msg_count;
-+};
-+
-+/* NPE message structure */
-+struct msg {
-+#ifdef __ARMEB__
-+      u8 cmd, unused, hss_port, index;
-+      union {
-+              struct { u8 data8a, data8b, data8c, data8d; };
-+              struct { u16 data16a, data16b; };
-+              struct { u32 data32; };
-+      };
-+#else
-+      u8 index, hss_port, unused, cmd;
-+      union {
-+              struct { u8 data8d, data8c, data8b, data8a; };
-+              struct { u16 data16b, data16a; };
-+              struct { u32 data32; };
-+      };
-+#endif
-+};
-+
-+#define rx_desc_phys(port, n) ((port)->desc_tab_phys +                \
-+                               (n) * sizeof(struct desc))
-+#define rx_desc_ptr(port, n)  (&(port)->desc_tab[n])
-+
-+#define tx_desc_phys(port, n) ((port)->desc_tab_phys +                \
-+                               ((n) + RX_DESCS) * sizeof(struct desc))
-+#define tx_desc_ptr(port, n)  (&(port)->desc_tab[(n) + RX_DESCS])
-+
-+int hss_prepare_chan(struct port *port);
-+void hss_chan_stop(struct port *port);
-+
-+struct hss_device *hss_init(int id, int channel);
-+int hss_chan_open(struct hss_device *hdev);
-+int hss_chan_close(struct hss_device *hdev);
-+
-+int hss_set_tx_callback(struct hss_device *hdev, void (*tx_callback)(void *), void *tx_data);
-+int hss_set_rx_callback(struct hss_device *hdev, void (*rx_callback)(void *), void *rx_data);
-+int hss_tx_start(struct hss_device *hdev);
-+int hss_tx_stop(struct hss_device *hdev);
-+int hss_rx_start(struct hss_device *hdev);
-+int hss_rx_stop(struct hss_device *hdev);
-+
-+int hss_config_rx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size);
-+int hss_config_tx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size);
-+unsigned long hss_curr_offset_rx(struct hss_device *hdev);
-+unsigned long hss_curr_offset_tx(struct hss_device *hdev);
-+
diff --git a/target/linux/ixp4xx/patches-4.9/180-tw5334_support.patch b/target/linux/ixp4xx/patches-4.9/180-tw5334_support.patch
deleted file mode 100644 (file)
index b56fbb7..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -160,6 +160,14 @@ config ARCH_PRPMC1100
-         PrPCM1100 Processor Mezanine Module. For more information on
-         this platform, see <file:Documentation/arm/IXP4xx>.
-+config MACH_TW5334
-+      bool "Titan Wireless TW-533-4"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support the Titan
-+        Wireless TW533-4. For more information on this platform,
-+        see http://openwrt.org
-+
- config MACH_NAS100D
-       bool
-       prompt "NAS100D"
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER)    += sid
- obj-pci-$(CONFIG_MACH_COMPEXWP18)     += ixdp425-pci.o
- obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
- obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
-+obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o
- obj-y += common.o
-@@ -49,6 +50,7 @@ obj-$(CONFIG_MACH_SIDEWINDER)        += sidewin
- obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o
- obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
- obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
-+obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-@@ -44,7 +44,7 @@ static __inline__ void __arch_decomp_set
-           machine_is_gateway7001() || machine_is_wg302v2() ||
-           machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() ||
-           machine_is_pronghorn() || machine_is_pronghorn_metro() ||
--          machine_is_wrt300nv2())
-+          machine_is_wrt300nv2() || machine_is_tw5334())
-               uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
-       else
-               uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/tw5334-pci.c
-@@ -0,0 +1,68 @@
-+/*
-+ * arch/arch/mach-ixp4xx/tw5334-pci.c
-+ *
-+ * PCI setup routines for the Titan Wireless TW-533-4
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ *
-+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+
-+#include <asm/mach/pci.h>
-+
-+void __init tw5334_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO1, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO0, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init tw5334_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 12)
-+              return IRQ_IXP4XX_GPIO6;
-+      else if (slot == 13)
-+              return IRQ_IXP4XX_GPIO2;
-+      else if (slot == 14)
-+              return IRQ_IXP4XX_GPIO1;
-+      else if (slot == 15)
-+              return IRQ_IXP4XX_GPIO0;
-+      else return -1;
-+}
-+
-+struct hw_pci tw5334_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit =        tw5334_pci_preinit,
-+      .ops =            &ixp4xx_ops,
-+      .setup =          ixp4xx_setup,
-+      .map_irq =        tw5334_map_irq,
-+};
-+
-+int __init tw5334_pci_init(void)
-+{
-+      if (machine_is_tw5334())
-+              pci_common_init(&tw5334_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(tw5334_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
-@@ -0,0 +1,167 @@
-+/*
-+ * arch/arm/mach-ixp4xx/tw5334-setup.c
-+ *
-+ * Board setup for the Titan Wireless TW-533-4
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/if_ether.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+
-+#include <asm/types.h>
-+#include <asm/setup.h>
-+#include <asm/memory.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data tw5334_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource tw5334_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device tw5334_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &tw5334_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &tw5334_flash_resource,
-+};
-+
-+static struct resource tw5334_uart_resource = {
-+      .start  = IXP4XX_UART2_BASE_PHYS,
-+      .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+      .flags  = IORESOURCE_MEM,
-+};
-+
-+static struct plat_serial8250_port tw5334_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device tw5334_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev                    = {
-+              .platform_data  = tw5334_uart_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &tw5334_uart_resource,
-+};
-+
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info tw5334_plat_eth[] = {
-+        {
-+                .phy            = 0,
-+                .rxq            = 3,
-+              .txreadyq       = 20,
-+        }, {
-+                .phy            = 1,
-+                .rxq            = 4,
-+              .txreadyq       = 21,
-+      }
-+};
-+
-+static struct platform_device tw5334_eth[] = {
-+        {
-+                .name                   = "ixp4xx_eth",
-+                .id                     = IXP4XX_ETH_NPEB,
-+                .dev.platform_data      = tw5334_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+        }, {
-+                .name                   = "ixp4xx_eth",
-+                .id                     = IXP4XX_ETH_NPEC,
-+                .dev.platform_data      = tw5334_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct platform_device *tw5334_devices[] __initdata = {
-+      &tw5334_flash,
-+      &tw5334_uart,
-+      &tw5334_eth[0],
-+      &tw5334_eth[1],
-+};
-+
-+static void __init tw5334_init(void)
-+{
-+      uint8_t __iomem *f;
-+      int i;
-+
-+      ixp4xx_sys_init();
-+
-+      tw5334_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      tw5334_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-+
-+      platform_add_devices(tw5334_devices, ARRAY_SIZE(tw5334_devices));
-+
-+      /*
-+       * Map in a portion of the flash and read the MAC addresses.
-+       * Since it is stored in BE in the flash itself, we need to
-+       * byteswap it if we're in LE mode.
-+       */
-+      f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000);
-+      if (f) {
-+              for (i = 0; i < 6; i++) {
-+#ifdef __ARMEB__
-+                      tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i);
-+                      tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i);
-+#else
-+                      tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3));
-+                      tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3));
-+#endif
-+              }
-+              iounmap(f);
-+      }
-+
-+      printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 0\n",
-+              tw5334_plat_eth[0].hwaddr);
-+      printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 1\n",
-+              tw5334_plat_eth[1].hwaddr);
-+}
-+
-+#ifdef CONFIG_MACH_TW5334
-+MACHINE_START(TW5334, "Titan Wireless TW-533-4")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = tw5334_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+#endif
diff --git a/target/linux/ixp4xx/patches-4.9/185-mi424wr_support.patch b/target/linux/ixp4xx/patches-4.9/185-mi424wr_support.patch
deleted file mode 100644 (file)
index 7c22927..0000000
+++ /dev/null
@@ -1,504 +0,0 @@
---- a/arch/arm/configs/ixp4xx_defconfig
-+++ b/arch/arm/configs/ixp4xx_defconfig
-@@ -26,6 +26,7 @@ CONFIG_MACH_NAS100D=y
- CONFIG_MACH_DSMG600=y
- CONFIG_MACH_FSG=y
- CONFIG_MACH_GTWX5715=y
-+CONFIG_MACH_MI424WR=y
- CONFIG_IXP4XX_QMGR=y
- CONFIG_IXP4XX_NPE=y
- # CONFIG_ARM_THUMB is not set
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -258,6 +258,13 @@ config MACH_MIC256
-         Say 'Y' here if you want your kernel to support the MIC256
-         board from OMICRON electronics GmbH.
-+config MACH_MI424WR
-+      bool "Actiontec MI424WR"
-+      depends on ARCH_IXP4XX
-+      select PCI
-+      help
-+              Add support for the Actiontec MI424-WR.
-+
- comment "IXP4xx Options"
- config IXP4XX_INDIRECT_PCI
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -25,6 +25,7 @@ obj-pci-$(CONFIG_MACH_COMPEXWP18)    += ixd
- obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
- obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
- obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o
-+obj-pci-$(CONFIG_MACH_MI424WR)                += mi424wr-pci.o
- obj-y += common.o
-@@ -51,6 +52,7 @@ obj-$(CONFIG_MACH_COMPEXWP18)        += compex4
- obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
- obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
- obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o
-+obj-$(CONFIG_MACH_MI424WR)    += mi424wr-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/mi424wr-pci.c
-@@ -0,0 +1,70 @@
-+/*
-+ * arch/arm/mach-ixp4xx/mi424wr-pci.c
-+ *
-+ * Actiontec MI424WR board-level PCI initialization
-+ *
-+ * Copyright (C) 2008 Jose Vasconcellos
-+ *
-+ * Maintainer: Jose Vasconcellos <jvasco@verizon.net>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/mach/pci.h>
-+
-+/* PCI controller GPIO to IRQ pin mappings
-+ * This information was obtained from Actiontec's GPL release.
-+ *
-+ *            INTA            INTB
-+ * SLOT 13    8               6
-+ * SLOT 14    7               8
-+ * SLOT 15    6               7
-+ */
-+
-+void __init mi424wr_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init mi424wr_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 13)
-+              return IRQ_IXP4XX_GPIO8;
-+      if (slot == 14)
-+              return IRQ_IXP4XX_GPIO7;
-+      if (slot == 15)
-+              return IRQ_IXP4XX_GPIO6;
-+
-+      return -1;
-+}
-+
-+struct hw_pci mi424wr_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit        = mi424wr_pci_preinit,
-+      .ops            = &ixp4xx_ops,
-+      .setup          = ixp4xx_setup,
-+      .map_irq        = mi424wr_map_irq,
-+};
-+
-+int __init mi424wr_pci_init(void)
-+{
-+      if (machine_is_mi424wr())
-+              pci_common_init(&mi424wr_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(mi424wr_pci_init);
-+
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/mi424wr-setup.c
-@@ -0,0 +1,384 @@
-+/*
-+ * arch/arm/mach-ixp4xx/mi424wr-setup.c
-+ *
-+ * Actiontec MI424-WR board setup
-+ * Copyright (c) 2008 Jose Vasconcellos
-+ *
-+ * Based on Gemtek GTWX5715 by
-+ * Copyright (C) 2004 George T. Joseph
-+ * Derived from Coyote
-+ *
-+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ *
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/serial_8250.h>
-+#include <linux/types.h>
-+#include <linux/memory.h>
-+#include <linux/leds.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/setup.h>
-+#include <asm/system_info.h>
-+#include <asm/irq.h>
-+#include <asm/io.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+/*
-+ * GPIO 2,3,4 and 9 are hard wired to the Micrel/Kendin KS8995M Switch
-+ * and operate as an SPI type interface.  The details of the interface
-+ * are available on Kendin/Micrel's web site.
-+ */
-+
-+#define MI424WR_KSSPI_SELECT          9
-+#define MI424WR_KSSPI_TXD             4
-+#define MI424WR_KSSPI_CLOCK           2
-+#define MI424WR_KSSPI_RXD             3
-+
-+/*
-+ * The "reset" button is wired to GPIO 10.
-+ * The GPIO is brought "low" when the button is pushed.
-+ */
-+
-+#define MI424WR_BUTTON_GPIO   10
-+#define MI424WR_BUTTON_IRQ    IRQ_IXP4XX_GPIO10
-+
-+#define MI424WR_MOCA_WAN_LED  11
-+
-+/* Latch on CS1 - taken from Actiontec's 2.4 source code
-+ *
-+ * default latch value
-+ * 0  - power alarm led (red)           0 (off)
-+ * 1  - power led (green)               0 (off)
-+ * 2  - wireless led    (green)         1 (off)
-+ * 3  - no internet led (red)           0 (off)
-+ * 4  - internet ok led (green)         0 (off)
-+ * 5  - moca LAN                        0 (off)
-+ * 6  - WAN alarm led (red)           0 (off)
-+ * 7  - PCI reset                       1 (not reset)
-+ * 8  - IP phone 1 led (green)          1 (off)
-+ * 9  - IP phone 2 led (green)          1 (off)
-+ * 10 - VOIP ready led (green)          1 (off)
-+ * 11 - PSTN relay 1 control            0 (PSTN)
-+ * 12 - PSTN relay 1 control            0 (PSTN)
-+ * 13 - N/A
-+ * 14 - N/A
-+ * 15 - N/A
-+ */
-+
-+#define MI424WR_LATCH_MASK              0x04
-+#define MI424WR_LATCH_DEFAULT           0x1f86
-+
-+#define MI424WR_LATCH_ALARM_LED         0x00
-+#define MI424WR_LATCH_POWER_LED         0x01
-+#define MI424WR_LATCH_WIRELESS_LED      0x02
-+#define MI424WR_LATCH_INET_DOWN_LED     0x03
-+#define MI424WR_LATCH_INET_OK_LED       0x04
-+#define MI424WR_LATCH_MOCA_LAN_LED      0x05
-+#define MI424WR_LATCH_WAN_ALARM_LED     0x06
-+#define MI424WR_LATCH_PCI_RESET         0x07
-+#define MI424WR_LATCH_PHONE1_LED        0x08
-+#define MI424WR_LATCH_PHONE2_LED        0x09
-+#define MI424WR_LATCH_VOIP_LED          0x10
-+#define MI424WR_LATCH_PSTN_RELAY1       0x11
-+#define MI424WR_LATCH_PSTN_RELAY2       0x12
-+
-+/* initialize CS1 to default timings, Intel style, 16-bit bus */
-+#define MI424WR_CS1_CONFIG    0x80000002
-+
-+/* Define both UARTs but they are not easily accessible.
-+ */
-+
-+static struct resource mi424wr_uart_resources[] = {
-+      {
-+              .start  = IXP4XX_UART1_BASE_PHYS,
-+              .end    = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      {
-+              .start  = IXP4XX_UART2_BASE_PHYS,
-+              .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags  = IORESOURCE_MEM,
-+      }
-+};
-+
-+
-+static struct plat_serial8250_port mi424wr_uart_platform_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device mi424wr_uart_device = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev.platform_data      = mi424wr_uart_platform_data,
-+      .num_resources  = ARRAY_SIZE(mi424wr_uart_resources),
-+      .resource       = mi424wr_uart_resources,
-+};
-+
-+static struct flash_platform_data mi424wr_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource mi424wr_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device mi424wr_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev.platform_data = &mi424wr_flash_data,
-+      .num_resources  = 1,
-+      .resource       = &mi424wr_flash_resource,
-+};
-+
-+static struct spi_gpio_platform_data mi424wr_spi_platform_data = {
-+        .sck            = MI424WR_KSSPI_CLOCK,
-+        .mosi           = MI424WR_KSSPI_TXD,
-+        .miso           = MI424WR_KSSPI_RXD,
-+        .num_chipselect = 1,
-+};
-+
-+static struct platform_device mi424wr_spi_device = {
-+        .name   = "spi-gpio",
-+        .id     = 1,
-+        .dev.platform_data  = &mi424wr_spi_platform_data,
-+};
-+
-+static struct spi_board_info mi424wr_spi_devices[] __initdata = {
-+       {
-+              .modalias               = "spi-ks8995",
-+              .max_speed_hz           = 500000,
-+              .mode                   = SPI_MODE_0,
-+              .bus_num                = 1,
-+              .chip_select            = 0,
-+              .controller_data        = (void *)MI424WR_KSSPI_SELECT,
-+      }
-+};
-+
-+static struct gpio_led mi424wr_gpio_led[] = {
-+      {
-+              .name           = "moca-wan",   /* green led */
-+              .gpio           = MI424WR_MOCA_WAN_LED,
-+              .active_low     = 0,
-+      }
-+};
-+
-+static struct gpio_led_platform_data mi424wr_gpio_leds_data = {
-+      .num_leds       = 1,
-+      .leds           = mi424wr_gpio_led,
-+};
-+
-+static struct platform_device mi424wr_gpio_leds = {
-+      .name           = "leds-gpio",
-+      .id             = -1,
-+      .dev.platform_data = &mi424wr_gpio_leds_data,
-+};
-+
-+static uint16_t latch_value = MI424WR_LATCH_DEFAULT;
-+static uint16_t __iomem *iobase;
-+
-+static void mi424wr_latch_set_led(u8 bit, enum led_brightness value)
-+{
-+
-+      if (((MI424WR_LATCH_MASK >> bit) & 1) ^ (value == LED_OFF))
-+              latch_value &= ~(0x1 << bit);
-+      else
-+              latch_value |= (0x1 << bit);
-+
-+      __raw_writew(latch_value, iobase);
-+
-+}
-+
-+static struct latch_led mi424wr_latch_led[] = {
-+      {
-+              .name   = "power-alarm",
-+              .bit    = MI424WR_LATCH_ALARM_LED,
-+      },
-+      {
-+              .name   = "power-ok",
-+              .bit    = MI424WR_LATCH_POWER_LED,
-+      },
-+      {
-+              .name   = "wireless",   /* green led */
-+              .bit    = MI424WR_LATCH_WIRELESS_LED,
-+      },
-+      {
-+              .name   = "inet-down",  /* red led */
-+              .bit    = MI424WR_LATCH_INET_DOWN_LED,
-+      },
-+      {
-+              .name   = "inet-up",    /* green led */
-+              .bit    = MI424WR_LATCH_INET_OK_LED,
-+      },
-+      {
-+              .name   = "moca-lan",   /* green led */
-+              .bit    = MI424WR_LATCH_MOCA_LAN_LED,
-+      },
-+      {
-+              .name   = "wan-alarm",  /* red led */
-+              .bit    = MI424WR_LATCH_WAN_ALARM_LED,
-+      }
-+};
-+
-+static struct latch_led_platform_data mi424wr_latch_leds_data = {
-+      .num_leds       = ARRAY_SIZE(mi424wr_latch_led),
-+      .mem            = 0x51000000,
-+      .leds           = mi424wr_latch_led,
-+      .set_led        = mi424wr_latch_set_led,
-+};
-+
-+static struct platform_device mi424wr_latch_leds = {
-+      .name           = "leds-latch",
-+      .id             = -1,
-+      .dev.platform_data = &mi424wr_latch_leds_data,
-+};
-+
-+static struct eth_plat_info mi424wr_wan_data = {
-+      .phy            = 17,   /* KS8721 */
-+      .rxq            = 3,
-+      .txreadyq       = 20,
-+};
-+
-+static struct eth_plat_info mi424wr_lan_data = {
-+      .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+      .phy_mask       = 0x1e, /* ports 1-4 of the KS8995 switch */
-+      .rxq            = 4,
-+      .txreadyq       = 21,
-+};
-+
-+static struct platform_device mi424wr_npe_devices[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = &mi424wr_lan_data,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = &mi424wr_wan_data,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct eth_plat_info mi424wr_wanD_data = {
-+      .phy            = 5,
-+      .rxq            = 4,
-+      .txreadyq       = 21,
-+};
-+
-+static struct eth_plat_info mi424wr_lanD_data = {
-+      .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+      .phy_mask       = 0x1e, /* ports 1-4 of the KS8995 switch */
-+      .rxq            = 3,
-+      .txreadyq       = 20,
-+};
-+
-+static struct platform_device mi424wr_npeD_devices[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = &mi424wr_lanD_data,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = &mi424wr_wanD_data,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct platform_device *mi424wr_devices[] __initdata = {
-+      &mi424wr_uart_device,
-+      &mi424wr_flash,
-+      &mi424wr_spi_device,
-+      &mi424wr_gpio_leds,
-+      &mi424wr_latch_leds,
-+};
-+
-+static void __init mi424wr_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      mi424wr_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      mi424wr_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS1 = MI424WR_CS1_CONFIG;
-+
-+      /* configure button as input
-+       */
-+      gpio_line_config(MI424WR_BUTTON_GPIO, IXP4XX_GPIO_IN);
-+
-+      /* Initialize LEDs and enables PCI bus.
-+       */
-+      iobase = ioremap_nocache(IXP4XX_EXP_BUS_BASE(1), 0x1000);
-+      __raw_writew(latch_value, iobase);
-+
-+      spi_register_board_info(mi424wr_spi_devices, ARRAY_SIZE(mi424wr_spi_devices));
-+      platform_add_devices(mi424wr_devices, ARRAY_SIZE(mi424wr_devices));
-+
-+      /* Need to figure out how to detect revD.
-+       * Look for a revision argument sent by redboot.
-+       */
-+#define revD 4
-+      if (system_rev == revD) {
-+              platform_device_register(&mi424wr_npeD_devices[0]);
-+              platform_device_register(&mi424wr_npeD_devices[1]);
-+      } else {
-+              platform_device_register(&mi424wr_npe_devices[0]);
-+              platform_device_register(&mi424wr_npe_devices[1]);
-+      }
-+}
-+
-+
-+MACHINE_START(MI424WR, "Actiontec MI424WR")
-+      /* Maintainer: Jose Vasconcellos */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = mi424wr_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+
diff --git a/target/linux/ixp4xx/patches-4.9/190-cambria_support.patch b/target/linux/ixp4xx/patches-4.9/190-cambria_support.patch
deleted file mode 100644 (file)
index 83a3319..0000000
+++ /dev/null
@@ -1,1131 +0,0 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -21,6 +21,14 @@ config MACH_AVILA
-         Avila Network Platform. For more information on this platform,
-         see <file:Documentation/arm/IXP4xx>.
-+config MACH_CAMBRIA
-+      bool "Cambria"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support the Gateworks
-+        Cambria series. For more information on this platform,
-+        see <file:Documentation/arm/IXP4xx>.
-+
- config MACH_LOFT
-     bool "Loft"
-     depends on MACH_AVILA
-@@ -218,7 +226,7 @@ config CPU_IXP46X
- config CPU_IXP43X
-       bool
--      depends on MACH_KIXRP435
-+      depends on MACH_KIXRP435 || MACH_CAMBRIA
-       default y
- config MACH_GTWX5715
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -7,6 +7,7 @@ obj-pci-n      :=
- obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
- obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o
-+obj-pci-$(CONFIG_MACH_CAMBRIA)                += cambria-pci.o
- obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
- obj-pci-$(CONFIG_ARCH_ADI_COYOTE)     += coyote-pci.o
- obj-pci-$(CONFIG_MACH_GTWX5715)               += gtwx5715-pci.o
-@@ -31,6 +32,7 @@ obj-y        += common.o
- obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
- obj-$(CONFIG_MACH_AVILA)      += avila-setup.o
-+obj-$(CONFIG_MACH_CAMBRIA)    += cambria-setup.o
- obj-$(CONFIG_MACH_IXDPG425)   += coyote-setup.o
- obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
- obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/cambria-pci.c
-@@ -0,0 +1,78 @@
-+/*
-+ * arch/arch/mach-ixp4xx/cambria-pci.c
-+ *
-+ * PCI setup routines for Gateworks Cambria series
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ *
-+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/pci.h>
-+
-+extern void ixp4xx_pci_preinit(void);
-+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
-+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
-+
-+void __init cambria_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init cambria_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 1)
-+              return IRQ_IXP4XX_GPIO11;
-+      else if (slot == 2)
-+              return IRQ_IXP4XX_GPIO10;
-+      else if (slot == 3)
-+              return IRQ_IXP4XX_GPIO9;
-+      else if (slot == 4)
-+              return IRQ_IXP4XX_GPIO8;
-+      else if (slot == 6)
-+              return IRQ_IXP4XX_GPIO10;
-+      else if (slot == 15)
-+              return IRQ_IXP4XX_GPIO8;
-+
-+      else return -1;
-+}
-+
-+struct hw_pci cambria_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit =        cambria_pci_preinit,
-+      .ops =            &ixp4xx_ops,
-+      .setup =          ixp4xx_setup,
-+      .map_irq =        cambria_map_irq,
-+};
-+
-+int __init cambria_pci_init(void)
-+{
-+      if (machine_is_cambria())
-+              pci_common_init(&cambria_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(cambria_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -0,0 +1,1003 @@
-+/*
-+ * arch/arm/mach-ixp4xx/cambria-setup.c
-+ *
-+ * Board setup for the Gateworks Cambria series
-+ *
-+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2012 Gateworks Corporation <support@gateworks.com>
-+ *
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <kaloz@openwrt.org>
-+ *         Tim Harvey <tharvey@gateworks.com>
-+ */
-+
-+#include <linux/device.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/gpio.h>
-+#include <linux/i2c.h>
-+#include <linux/i2c-gpio.h>
-+#include <linux/platform_data/at24.h>
-+#include <linux/i2c/gw_i2c_pld.h>
-+#include <linux/platform_data/pca953x.h>
-+#include <linux/if_ether.h>
-+#include <linux/init.h>
-+#include <linux/input.h>
-+#include <linux/kernel.h>
-+#include <linux/leds.h>
-+#include <linux/memory.h>
-+#include <linux/netdevice.h>
-+#include <linux/serial.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+#include <linux/socket.h>
-+#include <linux/types.h>
-+#include <linux/tty.h>
-+#include <linux/irq.h>
-+#include <linux/usb/ehci_pdriver.h>
-+
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+#include <asm/setup.h>
-+
-+#define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)
-+
-+struct cambria_board_info {
-+      unsigned char   *model;
-+      void            (*setup)(void);
-+};
-+
-+static struct cambria_board_info *cambria_info __initdata;
-+
-+static struct flash_platform_data cambria_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource cambria_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device cambria_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &cambria_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &cambria_flash_resource,
-+};
-+
-+static struct i2c_gpio_platform_data cambria_i2c_gpio_data = {
-+      .sda_pin        = 7,
-+      .scl_pin        = 6,
-+};
-+
-+static struct platform_device cambria_i2c_gpio = {
-+      .name           = "i2c-gpio",
-+      .id             = 0,
-+      .dev = {
-+              .platform_data  = &cambria_i2c_gpio_data,
-+      },
-+};
-+
-+#ifdef SFP_SERIALID
-+static struct i2c_gpio_platform_data cambria_i2c_gpio_sfpa_data = {
-+      .sda_pin        = 113,
-+      .scl_pin        = 112,
-+      .sda_is_open_drain = 0,
-+      .scl_is_open_drain = 0,
-+};
-+
-+static struct platform_device cambria_i2c_gpio_sfpa = {
-+      .name           = "i2c-gpio",
-+      .id             = 1,
-+      .dev = {
-+              .platform_data  = &cambria_i2c_gpio_sfpa_data,
-+      },
-+};
-+
-+static struct i2c_gpio_platform_data cambria_i2c_gpio_sfpb_data = {
-+      .sda_pin        = 115,
-+      .scl_pin        = 114,
-+      .sda_is_open_drain = 0,
-+      .scl_is_open_drain = 0,
-+};
-+
-+static struct platform_device cambria_i2c_gpio_sfpb = {
-+      .name           = "i2c-gpio",
-+      .id             = 2,
-+      .dev = {
-+              .platform_data  = &cambria_i2c_gpio_sfpb_data,
-+      },
-+};
-+#endif // #ifdef SFP_SERIALID
-+
-+static struct eth_plat_info cambria_npec_data = {
-+      .phy            = 1,
-+      .rxq            = 4,
-+      .txreadyq       = 21,
-+};
-+
-+static struct eth_plat_info cambria_npea_data = {
-+      .phy            = 2,
-+      .rxq            = 2,
-+      .txreadyq       = 19,
-+};
-+
-+static struct platform_device cambria_npec_device = {
-+      .name                   = "ixp4xx_eth",
-+      .id                     = IXP4XX_ETH_NPEC,
-+      .dev.platform_data      = &cambria_npec_data,
-+      .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+};
-+
-+static struct platform_device cambria_npea_device = {
-+      .name                   = "ixp4xx_eth",
-+      .id                     = IXP4XX_ETH_NPEA,
-+      .dev.platform_data      = &cambria_npea_data,
-+      .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+};
-+
-+static struct resource cambria_uart_resource = {
-+      .start  = IXP4XX_UART1_BASE_PHYS,
-+      .end    = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+      .flags  = IORESOURCE_MEM,
-+};
-+
-+static struct plat_serial8250_port cambria_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device cambria_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev = {
-+              .platform_data  = cambria_uart_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &cambria_uart_resource,
-+};
-+
-+static struct resource cambria_optional_uart_resources[] = {
-+      {
-+              .start  = 0x52000000,
-+              .end    = 0x52000fff,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .start  = 0x53000000,
-+              .end    = 0x53000fff,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .start  = 0x52000000,
-+              .end    = 0x52000fff,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .start  = 0x52000000,
-+              .end    = 0x52000fff,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .start  = 0x52000000,
-+              .end    = 0x52000fff,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .start  = 0x52000000,
-+              .end    = 0x52000fff,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .start  = 0x52000000,
-+              .end    = 0x52000fff,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .start  = 0x53000000,
-+              .end    = 0x53000fff,
-+              .flags  = IORESOURCE_MEM
-+      }
-+};
-+
-+static struct plat_serial8250_port cambria_optional_uart_data[] = {
-+      {
-+              .flags          = UPF_BOOT_AUTOCONF,
-+              .iotype         = UPIO_MEM_DELAY,
-+              .regshift       = 0,
-+              .uartclk        = 1843200,
-+              .rw_delay       = 10,
-+      },
-+      {
-+              .flags          = UPF_BOOT_AUTOCONF,
-+              .iotype         = UPIO_MEM_DELAY,
-+              .regshift       = 0,
-+              .uartclk        = 1843200,
-+              .rw_delay       = 10,
-+      },
-+      {
-+              .flags          = UPF_BOOT_AUTOCONF,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 0,
-+              .uartclk        = 18432000,
-+      },
-+      {
-+              .flags          = UPF_BOOT_AUTOCONF,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 0,
-+              .uartclk        = 18432000,
-+      },
-+      {
-+              .flags          = UPF_BOOT_AUTOCONF,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 0,
-+              .uartclk        = 18432000,
-+      },
-+      {
-+              .flags          = UPF_BOOT_AUTOCONF,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 0,
-+              .uartclk        = 18432000,
-+      },
-+      {
-+              .flags          = UPF_BOOT_AUTOCONF,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 0,
-+              .uartclk        = 18432000,
-+      },
-+  { },
-+};
-+
-+static struct platform_device cambria_optional_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM1,
-+      .dev.platform_data      = cambria_optional_uart_data,
-+      .num_resources  = 2,
-+      .resource       = cambria_optional_uart_resources,
-+};
-+
-+static struct resource cambria_pata_resources[] = {
-+      {
-+              .flags  = IORESOURCE_MEM
-+      },
-+      {
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      {
-+              .name   = "intrq",
-+              .start  = IRQ_IXP4XX_GPIO12,
-+              .end    = IRQ_IXP4XX_GPIO12,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct ixp4xx_pata_data cambria_pata_data = {
-+      .cs0_bits       = 0xbfff3c03,
-+      .cs1_bits       = 0xbfff3c03,
-+};
-+
-+static struct platform_device cambria_pata = {
-+      .name                   = "pata_ixp4xx_cf",
-+      .id                     = 0,
-+      .dev.platform_data      = &cambria_pata_data,
-+      .num_resources          = ARRAY_SIZE(cambria_pata_resources),
-+      .resource               = cambria_pata_resources,
-+};
-+
-+static struct gpio_led cambria_gpio_leds[] = {
-+      {
-+              .name           = "user",
-+              .gpio           = 5,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "user2",
-+              .gpio           = 0,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "user3",
-+              .gpio           = 0,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "user4",
-+              .gpio           = 0,
-+              .active_low     = 1,
-+      }
-+};
-+
-+static struct gpio_led_platform_data cambria_gpio_leds_data = {
-+      .num_leds       = 1,
-+      .leds           = cambria_gpio_leds,
-+};
-+
-+static struct platform_device cambria_gpio_leds_device = {
-+      .name           = "leds-gpio",
-+      .id             = -1,
-+      .dev.platform_data = &cambria_gpio_leds_data,
-+};
-+
-+static struct resource cambria_gpio_resources[] = {
-+      {
-+              .name = "gpio",
-+              .flags  = 0,
-+      },
-+};
-+
-+static struct gpio cambria_gpios_gw2350[] = {
-+      // ARM GPIO
-+#if 0 // configured from bootloader
-+      {  0, GPIOF_IN,            "ARM_DIO0" },
-+      {  1, GPIOF_IN,            "ARM_DIO1" },
-+      {  2, GPIOF_IN,            "ARM_DIO2" },
-+      {  3, GPIOF_IN,            "ARM_DIO3" },
-+      {  4, GPIOF_IN,            "ARM_DIO4" },
-+      {  5, GPIOF_IN,            "ARM_DIO5" },
-+      { 12, GPIOF_OUT_INIT_HIGH, "WDOGEN#" },
-+#endif
-+      {  8, GPIOF_IN,            "ARM_DIO8" },
-+      {  9, GPIOF_IN,            "ARM_DIO9" },
-+};
-+
-+static struct gpio cambria_gpios_gw2358[] = {
-+      // ARM GPIO
-+#if 0 // configured from bootloader
-+      {  0, GPIOF_IN,            "*VINLOW#" },
-+      {  2, GPIOF_IN,            "*GPS_PPS" },
-+      {  3, GPIOF_IN,            "*GPS_IRQ#" },
-+      {  4, GPIOF_IN,            "*RS485_IRQ#" },
-+      {  5, GPIOF_IN,            "*SER_EN#" },
-+      { 14, GPIOF_OUT_INIT_HIGH, "*WDOGEN#" },
-+#endif
-+};
-+
-+static struct gpio cambria_gpios_gw2359[] = {
-+      // ARM GPIO
-+#if 0 // configured from bootloader
-+      {  0, GPIOF_IN,            "*PCA_IRQ#" },
-+      {  1, GPIOF_IN,            "ARM_DIO1" },
-+      {  2, GPIOF_IN,            "ARM_DIO2" },
-+      {  3, GPIOF_IN,            "ARM_DIO3" },
-+      {  4, GPIOF_IN,            "ARM_DIO4" },
-+      {  5, GPIOF_IN,            "ARM_DIO5" },
-+      {  8, GPIOF_OUT_INIT_HIGH, "*WDOGEN#" },
-+#endif
-+      { 11, GPIOF_OUT_INIT_HIGH, "*SER_EN"   },       // console serial enable
-+      { 12, GPIOF_IN,            "*GSC_IRQ#" },
-+      { 13, GPIOF_OUT_INIT_HIGH, "*PCIE_RST#"},
-+      // GSC GPIO
-+#if !(IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED))
-+      {100, GPIOF_IN,            "*USER_PB#" },
-+#endif
-+      {103, GPIOF_OUT_INIT_HIGH, "*5V_EN" },         // 5V aux supply enable
-+      {108, GPIOF_IN,            "*SMUXDA0" },
-+      {109, GPIOF_IN,            "*SMUXDA1" },
-+      {110, GPIOF_IN,            "*SMUXDA2" },
-+      {111, GPIOF_IN,            "*SMUXDB0" },
-+      {112, GPIOF_IN,            "*SMUXDB1" },
-+      {113, GPIOF_IN,            "*SMUXDB2" },
-+      // PCA GPIO
-+      {118, GPIOF_IN,            "*USIM2_DET#"},     // USIM2 Detect
-+      {120, GPIOF_OUT_INIT_LOW,  "*USB1_PCI_SEL"},   // USB1  Select (1=PCI, 0=FP)
-+      {121, GPIOF_OUT_INIT_LOW,  "*USB2_PCI_SEL"},   // USB2  Select (1=PCI, 0=FP)
-+      {122, GPIOF_IN,            "*USIM1_DET#"},     // USIM1 Detect
-+      {123, GPIOF_OUT_INIT_HIGH, "*COM1_DTR#" },     // J21/J10
-+      {124, GPIOF_IN,            "*COM1_DSR#" },     // J21/J10
-+      {127, GPIOF_IN,            "PCA_DIO0" },
-+      {128, GPIOF_IN,            "PCA_DIO1" },
-+      {129, GPIOF_IN,            "PCA_DIO2" },
-+      {130, GPIOF_IN,            "PCA_DIO3" },
-+      {131, GPIOF_IN,            "PCA_DIO4" },
-+};
-+
-+static struct gpio cambria_gpios_gw2360[] = {
-+      // ARM GPIO
-+      {  0, GPIOF_IN,            "*PCA_IRQ#" },
-+      { 11, GPIOF_OUT_INIT_LOW, "*SER0_EN#" },
-+      { 12, GPIOF_IN,            "*GSC_IRQ#" },
-+      { 13, GPIOF_OUT_INIT_HIGH, "*PCIE_RST#"},
-+      // GSC GPIO
-+#if !(IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED))
-+      {100, GPIOF_IN,            "*USER_PB#" },
-+#endif
-+      {108, GPIOF_OUT_INIT_LOW,  "*ENET1_EN#" },     // ENET1 TX Enable
-+      {109, GPIOF_IN,            "*ENET1_PRES#" },   // ENET1 Detect (0=SFP present)
-+      {110, GPIOF_OUT_INIT_LOW,  "*ENET2_EN#" },     // ENET2 TX Enable
-+      {111, GPIOF_IN,            "*ENET2_PRES#"},    // ENET2 Detect (0=SFP present)
-+      // PCA GPIO
-+      {116, GPIOF_OUT_INIT_HIGH, "*USIM2_LOC"},      // USIM2 Select (1=Loc, 0=Rem)
-+      {117, GPIOF_IN,            "*USIM2_DET_LOC#" },// USIM2 Detect (Local Slot)
-+      {118, GPIOF_IN,            "*USIM2_DET_REM#" },// USIM2 Detect (Remote Slot)
-+      {120, GPIOF_OUT_INIT_LOW,  "*USB1_PCI_SEL"},   // USB1  Select (1=PCIe1, 0=J1)
-+      {121, GPIOF_OUT_INIT_LOW,  "*USB2_PCI_SEL"},   // USB2  Select (1=PCIe2, 0=J1)
-+      {122, GPIOF_IN,            "*USIM1_DET#"},     // USIM1 Detect
-+      {127, GPIOF_IN,            "DIO0" },
-+      {128, GPIOF_IN,            "DIO1" },
-+      {129, GPIOF_IN,            "DIO2" },
-+      {130, GPIOF_IN,            "DIO3" },
-+      {131, GPIOF_IN,            "DIO4" },
-+};
-+
-+static struct latch_led cambria_latch_leds[] = {
-+      {
-+              .name   = "ledA",  /* green led */
-+              .bit    = 0,
-+      },
-+      {
-+              .name   = "ledB",  /* green led */
-+              .bit    = 1,
-+      },
-+      {
-+              .name   = "ledC",  /* green led */
-+              .bit    = 2,
-+      },
-+      {
-+              .name   = "ledD",  /* green led */
-+              .bit    = 3,
-+      },
-+      {
-+              .name   = "ledE",  /* green led */
-+              .bit    = 4,
-+      },
-+      {
-+              .name   = "ledF",  /* green led */
-+              .bit    = 5,
-+      },
-+      {
-+              .name   = "ledG",  /* green led */
-+              .bit    = 6,
-+      },
-+      {
-+              .name   = "ledH",  /* green led */
-+              .bit    = 7,
-+      }
-+};
-+
-+static struct latch_led_platform_data cambria_latch_leds_data = {
-+      .num_leds       = 8,
-+      .leds           = cambria_latch_leds,
-+      .mem            = 0x53F40000,
-+};
-+
-+static struct platform_device cambria_latch_leds_device = {
-+      .name           = "leds-latch",
-+      .id             = -1,
-+      .dev.platform_data = &cambria_latch_leds_data,
-+};
-+
-+static struct resource cambria_usb0_resources[] = {
-+      {
-+              .start  = 0xCD000000,
-+              .end    = 0xCD000300,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      {
-+              .start  = 32,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct resource cambria_usb1_resources[] = {
-+      {
-+              .start  = 0xCE000000,
-+              .end    = 0xCE000300,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      {
-+              .start  = 33,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static u64 ehci_dma_mask = ~(u32)0;
-+
-+static struct usb_ehci_pdata cambria_usb_pdata = {
-+      .big_endian_desc = 1,
-+      .big_endian_mmio = 1,
-+      .has_tt = 1,
-+      .caps_offset = 0x100,
-+};
-+
-+static struct platform_device cambria_usb0_device =  {
-+      .name           = "ehci-platform",
-+      .id             = 0,
-+      .resource       = cambria_usb0_resources,
-+      .num_resources  = ARRAY_SIZE(cambria_usb0_resources),
-+      .dev = {
-+              .dma_mask               = &ehci_dma_mask,
-+              .coherent_dma_mask      = 0xffffffff,
-+              .platform_data = &cambria_usb_pdata,
-+      },
-+};
-+
-+static struct platform_device cambria_usb1_device = {
-+      .name           = "ehci-platform",
-+      .id             = 1,
-+      .resource       = cambria_usb1_resources,
-+      .num_resources  = ARRAY_SIZE(cambria_usb1_resources),
-+      .dev = {
-+              .dma_mask               = &ehci_dma_mask,
-+              .coherent_dma_mask      = 0xffffffff,
-+              .platform_data = &cambria_usb_pdata,
-+      },
-+};
-+
-+static struct gw_i2c_pld_platform_data gw_i2c_pld_data0 = {
-+      .gpio_base      = 16,
-+      .nr_gpio        = 8,
-+};
-+
-+static struct gw_i2c_pld_platform_data gw_i2c_pld_data1 = {
-+      .gpio_base      = 24,
-+      .nr_gpio        = 2,
-+};
-+
-+
-+static struct gpio_keys_button cambria_gpio_buttons[] = {
-+      {
-+              .desc           = "user",
-+              .type           = EV_KEY,
-+              .code           = BTN_0,
-+              .debounce_interval = 6,
-+              .gpio           = 25,
-+      }
-+};
-+
-+static struct gpio_keys_platform_data cambria_gpio_buttons_data = {
-+      .poll_interval  = 500,
-+      .nbuttons       = 1,
-+      .buttons        = cambria_gpio_buttons,
-+};
-+
-+static struct platform_device cambria_gpio_buttons_device = {
-+      .name                   = "gpio-keys-polled",
-+      .id                     = -1,
-+      .dev.platform_data      = &cambria_gpio_buttons_data,
-+};
-+
-+static struct platform_device *cambria_devices[] __initdata = {
-+      &cambria_i2c_gpio,
-+      &cambria_flash,
-+      &cambria_uart,
-+};
-+
-+static int cambria_register_gpio(struct gpio *array, size_t num)
-+{
-+      int i, err, ret;
-+
-+      ret = 0;
-+      for (i = 0; i < num; i++, array++) {
-+              const char *label = array->label;
-+              if (label[0] == '*')
-+                      label++;
-+              err = gpio_request_one(array->gpio, array->flags, label);
-+              if (err)
-+                      ret = err;
-+              else {
-+                      err = gpio_export(array->gpio, array->label[0] != '*');
-+              }
-+      }
-+      return ret;
-+}
-+
-+static void __init cambria_gw23xx_setup(void)
-+{
-+      cambria_gpio_resources[0].start = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) |\
-+                                                                                                                                              (1 << 5) | (1 << 8) | (1 << 9) | (1 << 12);
-+      cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
-+
-+      platform_device_register(&cambria_npec_device);
-+      platform_device_register(&cambria_npea_device);
-+}
-+
-+static void __init cambria_gw2350_setup(void)
-+{
-+      *IXP4XX_EXP_CS2 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
-+      cambria_optional_uart_data[0].mapbase   = 0x52FF0000;
-+      cambria_optional_uart_data[0].membase   = (void __iomem *)ioremap(0x52FF0000, 0x0fff);
-+      cambria_optional_uart_data[0].irq               = IRQ_IXP4XX_GPIO3;
-+
-+      *IXP4XX_EXP_CS3 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING);
-+      cambria_optional_uart_data[1].mapbase   = 0x53FF0000;
-+      cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
-+      cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
-+
-+      cambria_gpio_resources[0].start = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) |\
-+                                                                                                                                              (1 << 5) | (1 << 8) | (1 << 9) | (1 << 12);
-+      cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
-+
-+      platform_device_register(&cambria_optional_uart);
-+      platform_device_register(&cambria_npec_device);
-+      platform_device_register(&cambria_npea_device);
-+
-+      platform_device_register(&cambria_usb0_device);
-+      platform_device_register(&cambria_usb1_device);
-+
-+      platform_device_register(&cambria_gpio_leds_device);
-+
-+      /* gpio config (/sys/class/gpio) */
-+      cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2350));
-+}
-+
-+static void __init cambria_gw2358_setup(void)
-+{
-+      *IXP4XX_EXP_CS3 = 0xBFFF3C43; // bit0 = 16bit vs 8bit bus
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
-+      cambria_optional_uart_data[0].mapbase   = 0x53FC0000;
-+      cambria_optional_uart_data[0].membase   = (void __iomem *)ioremap(0x53FC0000, 0x0fff);
-+      cambria_optional_uart_data[0].irq               = IRQ_IXP4XX_GPIO3;
-+
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING);
-+      cambria_optional_uart_data[1].mapbase   = 0x53F80000;
-+      cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53F80000, 0x0fff);
-+      cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
-+
-+      cambria_gpio_resources[0].start = (1 << 14) | (1 << 16) | (1 << 17) | (1 << 18) |\
-+                                                                                                                                              (1 << 19) | (1 << 20) | (1 << 24) | (1 << 25);
-+      cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
-+
-+      platform_device_register(&cambria_optional_uart);
-+
-+      platform_device_register(&cambria_npec_device);
-+      platform_device_register(&cambria_npea_device);
-+
-+      platform_device_register(&cambria_usb0_device);
-+      platform_device_register(&cambria_usb1_device);
-+
-+      platform_device_register(&cambria_pata);
-+
-+      cambria_gpio_leds[0].gpio = 24;
-+      platform_device_register(&cambria_gpio_leds_device);
-+
-+      platform_device_register(&cambria_latch_leds_device);
-+
-+      platform_device_register(&cambria_gpio_buttons_device);
-+
-+      /* gpio config (/sys/class/gpio) */
-+      cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2358));
-+}
-+
-+static void __init cambria_gw2359_setup(void)
-+{
-+#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE)
-+      /* The mvswitch driver has some hard-coded values which could
-+       * easily be turned into a platform resource if needed.  For now they
-+       * match our hardware configuration:
-+       *  MV_BASE    0x10 - phy base address
-+       *  MV_WANPORT 0 - Port0 (ENET2) is WAN (SFP module)
-+       *  MV_CPUPORT 5 - Port5 is CPU NPEA (eth1)
-+       *
-+       * The mvswitch driver registers a fixup which forces a driver match
-+       * if phy_addr matches MV_BASE
-+       *
-+       * Two static defautl VLAN's are created: WAN port in 1, and all other ports
-+       * in the other.
-+       */
-+      cambria_npea_data.phy = 0x10; // mvswitch driver catches this
-+#else
-+      // Switch Port5 to CPU is MII<->MII (no PHY) - this disables the genphy driver
-+      cambria_npea_data.phy = IXP4XX_ETH_PHY_MAX_ADDR;
-+      // CPU NPE-C is in bridge bypass mode to Port4 PHY@0x14
-+      cambria_npec_data.phy = 0x14;
-+#endif
-+      platform_device_register(&cambria_npec_device);
-+      platform_device_register(&cambria_npea_device);
-+
-+      platform_device_register(&cambria_usb0_device);
-+      platform_device_register(&cambria_usb1_device);
-+
-+      cambria_gpio_leds_data.num_leds = 3;
-+      cambria_gpio_leds[0].name = "user1";
-+      cambria_gpio_leds[0].gpio = 125; // PNLLED1#
-+      cambria_gpio_leds[1].gpio = 126; // PNLLED3#
-+      cambria_gpio_leds[2].gpio = 119; // PNLLED4#
-+      platform_device_register(&cambria_gpio_leds_device);
-+
-+#if (IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED))
-+      cambria_gpio_buttons[0].gpio = 100;
-+      platform_device_register(&cambria_gpio_buttons_device);
-+#endif
-+
-+      /* gpio config (/sys/class/gpio) */
-+      cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2359));
-+}
-+
-+static void __init cambria_gw2360_setup(void)
-+{
-+      /* The GW2360 has 8 UARTs in addition to the 1 IXP4xxx UART.
-+       * The chip-selects are expanded via a 3-to-8 decoder and CS2
-+       * and they are 8bit devices
-+       */
-+      *IXP4XX_EXP_CS2 = 0xBFFF3C43;
-+      cambria_optional_uart_data[0].mapbase = 0x52000000;
-+      cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52000000, 0x0fff);
-+      cambria_optional_uart_data[0].uartclk = 18432000;
-+      cambria_optional_uart_data[0].iotype  = UPIO_MEM;
-+      cambria_optional_uart_data[0].irq     = IRQ_IXP4XX_GPIO2;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_EDGE_RISING);
-+
-+      cambria_optional_uart_data[1].mapbase = 0x52000008;
-+      cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x52000008, 0x0fff);
-+      cambria_optional_uart_data[1].uartclk = 18432000;
-+      cambria_optional_uart_data[1].iotype  = UPIO_MEM;
-+      cambria_optional_uart_data[1].irq     = IRQ_IXP4XX_GPIO3;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
-+
-+      cambria_optional_uart_data[2].mapbase = 0x52000010;
-+      cambria_optional_uart_data[2].membase = (void __iomem *)ioremap(0x52000010, 0x0fff);
-+      cambria_optional_uart_data[2].uartclk = 18432000;
-+      cambria_optional_uart_data[2].iotype  = UPIO_MEM;
-+      cambria_optional_uart_data[2].irq     = IRQ_IXP4XX_GPIO4;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING);
-+
-+      cambria_optional_uart_data[3].mapbase = 0x52000018;
-+      cambria_optional_uart_data[3].membase = (void __iomem *)ioremap(0x52000018, 0x0fff);
-+      cambria_optional_uart_data[3].uartclk = 18432000;
-+      cambria_optional_uart_data[3].iotype  = UPIO_MEM;
-+      cambria_optional_uart_data[3].irq     = IRQ_IXP4XX_GPIO5;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO5, IRQ_TYPE_EDGE_RISING);
-+
-+      cambria_optional_uart_data[4].mapbase = 0x52000020;
-+      cambria_optional_uart_data[4].membase = (void __iomem *)ioremap(0x52000020, 0x0fff);
-+      cambria_optional_uart_data[4].uartclk = 18432000;
-+      cambria_optional_uart_data[4].iotype  = UPIO_MEM;
-+      cambria_optional_uart_data[4].irq     = IRQ_IXP4XX_GPIO8;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_EDGE_RISING);
-+
-+      cambria_optional_uart_data[5].mapbase = 0x52000028;
-+      cambria_optional_uart_data[5].membase = (void __iomem *)ioremap(0x52000028, 0x0fff);
-+      cambria_optional_uart_data[5].uartclk = 18432000;
-+      cambria_optional_uart_data[5].iotype  = UPIO_MEM;
-+      cambria_optional_uart_data[5].irq     = IRQ_IXP4XX_GPIO9;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_EDGE_RISING);
-+
-+      cambria_optional_uart_data[6].mapbase = 0x52000030;
-+      cambria_optional_uart_data[6].membase = (void __iomem *)ioremap(0x52000030, 0x0fff);
-+      cambria_optional_uart_data[6].uartclk = 18432000;
-+      cambria_optional_uart_data[6].iotype  = UPIO_MEM;
-+      cambria_optional_uart_data[6].irq     = IRQ_IXP4XX_GPIO10;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_EDGE_RISING);
-+
-+      cambria_optional_uart.num_resources   = 7,
-+      platform_device_register(&cambria_optional_uart);
-+
-+#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE)
-+      /* The mvswitch driver has some hard-coded values which could
-+       * easily be turned into a platform resource if needed.  For now they
-+       * match our hardware configuration:
-+       *  MV_BASE    0x10 - phy base address
-+       *  MV_WANPORT 0 - Port0 (ENET2) is WAN (SFP module)
-+       *  MV_CPUPORT 5 - Port5 is CPU NPEA (eth1)
-+       *
-+       * The mvswitch driver registers a fixup which forces a driver match
-+       * if phy_addr matches MV_BASE
-+       *
-+       * Two static defautl VLAN's are created: WAN port in 1, and all other ports
-+       * in the other.
-+       */
-+      cambria_npea_data.phy = 0x10; // mvswitch driver catches this
-+#else
-+      // Switch Port5 to CPU is MII<->MII (no PHY) - this disables the generic PHY driver
-+      cambria_npea_data.phy = IXP4XX_ETH_PHY_MAX_ADDR;
-+#endif
-+
-+      // disable genphy autonegotiation on NPE-C PHY (eth1) as its 100BaseFX
-+      //cambria_npec_data.noautoneg = 1;   // disable autoneg
-+      cambria_npec_data.speed_10 = 0;    // 100mbps
-+      cambria_npec_data.half_duplex = 0; // full-duplex
-+      platform_device_register(&cambria_npec_device);
-+      platform_device_register(&cambria_npea_device);
-+
-+      platform_device_register(&cambria_usb0_device);
-+      platform_device_register(&cambria_usb1_device);
-+
-+      cambria_gpio_leds_data.num_leds = 3;
-+      cambria_gpio_leds[0].name = "user1";
-+      cambria_gpio_leds[0].gpio = 125;
-+      cambria_gpio_leds[1].gpio = 126;
-+      cambria_gpio_leds[2].gpio = 119;
-+      platform_device_register(&cambria_gpio_leds_device);
-+
-+#if (IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED))
-+      cambria_gpio_buttons[0].gpio = 100;
-+      platform_device_register(&cambria_gpio_buttons_device);
-+#endif
-+
-+#ifdef SFP_SERIALID
-+      /* the SFP modules each have an i2c bus for serial ident via GSC GPIO
-+       * To use these the i2c-gpio driver must be changed to use the _cansleep
-+       * varients of gpio_get_value/gpio_set_value (I don't know why it doesn't
-+       * use that anyway as it doesn't operate in an IRQ context).
-+       * Additionally the i2c-gpio module must set the gpio to output-high prior
-+       * to changing direction to an input to enable internal Pullups
-+       */
-+      platform_device_register(&cambria_i2c_gpio_sfpa);
-+      platform_device_register(&cambria_i2c_gpio_sfpb);
-+#endif
-+
-+      /* gpio config (/sys/class/gpio) */
-+      cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2360));
-+}
-+
-+static struct cambria_board_info cambria_boards[] __initdata = {
-+      {
-+              .model  = "GW2350",
-+              .setup  = cambria_gw2350_setup,
-+      }, {
-+              .model  = "GW2351",
-+              .setup  = cambria_gw2350_setup,
-+      }, {
-+              .model  = "GW2358",
-+              .setup  = cambria_gw2358_setup,
-+      }, {
-+              .model  = "GW2359",
-+              .setup  = cambria_gw2359_setup,
-+      }, {
-+              .model  = "GW2360",
-+              .setup  = cambria_gw2360_setup,
-+      }, {
-+              .model  = "GW2371",
-+              .setup  = cambria_gw2358_setup,
-+      }
-+};
-+
-+static struct cambria_board_info * __init cambria_find_board_info(char *model)
-+{
-+      int i;
-+      model[6] = '\0';
-+
-+      for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) {
-+              struct cambria_board_info *info = &cambria_boards[i];
-+              if (strcmp(info->model, model) == 0)
-+                      return info;
-+      }
-+
-+      return NULL;
-+}
-+
-+static struct nvmem_device *at24_nvmem;
-+
-+static void at24_setup(struct nvmem_device *mem_acc, void *context)
-+{
-+      char mac_addr[ETH_ALEN];
-+      char model[7];
-+
-+      at24_nvmem = mem_acc;
-+
-+      /* Read MAC addresses */
-+      if (nvmem_device_read(at24_nvmem, 0x0, 6, mac_addr) == 6) {
-+              memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
-+      }
-+      if (nvmem_device_read(at24_nvmem, 0x6, 6, mac_addr) == 6) {
-+              memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
-+      }
-+
-+      /* Read the first 6 bytes of the model number */
-+      if (nvmem_device_read(at24_nvmem, 0x20, 6, model) == 6) {
-+              cambria_info = cambria_find_board_info(model);
-+      }
-+
-+}
-+
-+static struct at24_platform_data cambria_eeprom_info = {
-+      .byte_len       = 1024,
-+      .page_size      = 16,
-+      .flags          = AT24_FLAG_READONLY,
-+      .setup          = at24_setup,
-+};
-+
-+static struct pca953x_platform_data cambria_pca_data = {
-+      .gpio_base = 100,
-+      .irq_base = -1,
-+};
-+
-+static struct pca953x_platform_data cambria_pca2_data = {
-+      .gpio_base = 116,
-+      .irq_base = -1,
-+};
-+
-+static struct i2c_board_info __initdata cambria_i2c_board_info[] = {
-+      {
-+              I2C_BOARD_INFO("pca9555", 0x23),
-+              .platform_data = &cambria_pca_data,
-+      },
-+      {
-+              I2C_BOARD_INFO("pca9555", 0x27),
-+              .platform_data = &cambria_pca2_data,
-+      },
-+      {
-+              I2C_BOARD_INFO("ds1672", 0x68),
-+      },
-+      {
-+              I2C_BOARD_INFO("gsp", 0x29),
-+      },
-+      {
-+              I2C_BOARD_INFO("ad7418", 0x28),
-+      },
-+      {
-+              I2C_BOARD_INFO("24c08", 0x51),
-+              .platform_data  = &cambria_eeprom_info
-+      },
-+      {
-+              I2C_BOARD_INFO("gw_i2c_pld", 0x56),
-+              .platform_data  = &gw_i2c_pld_data0,
-+      },
-+      {
-+              I2C_BOARD_INFO("gw_i2c_pld", 0x57),
-+              .platform_data  = &gw_i2c_pld_data1,
-+      },
-+};
-+
-+static void __init cambria_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      cambria_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      cambria_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; // make sure window is writable
-+      *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-+
-+      platform_add_devices(ARRAY_AND_SIZE(cambria_devices));
-+
-+      cambria_pata_resources[0].start = 0x53e00000;
-+      cambria_pata_resources[0].end = 0x53e3ffff;
-+
-+      cambria_pata_resources[1].start = 0x53e40000;
-+      cambria_pata_resources[1].end = 0x53e7ffff;
-+
-+      cambria_pata_data.cs0_cfg = IXP4XX_EXP_CS3;
-+      cambria_pata_data.cs1_cfg = IXP4XX_EXP_CS3;
-+
-+      i2c_register_board_info(0, ARRAY_AND_SIZE(cambria_i2c_board_info));
-+}
-+
-+static int __init cambria_model_setup(void)
-+{
-+      if (!machine_is_cambria())
-+              return 0;
-+
-+      if (cambria_info) {
-+              printk(KERN_DEBUG "Running on Gateworks Cambria %s\n",
-+                              cambria_info->model);
-+              cambria_info->setup();
-+      } else {
-+              printk(KERN_INFO "Unknown/missing Cambria model number"
-+                              " -- defaults will be used\n");
-+              cambria_gw23xx_setup();
-+      }
-+
-+      return 0;
-+}
-+late_initcall(cambria_model_setup);
-+
-+MACHINE_START(CAMBRIA, "Gateworks Cambria series")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = cambria_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
diff --git a/target/linux/ixp4xx/patches-4.9/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-4.9/201-npe_driver_print_license_location.patch
deleted file mode 100644 (file)
index f46b9c6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-@@ -586,6 +586,8 @@ int npe_load_firmware(struct npe *npe, c
-       npe_reset(npe);
- #endif
-+      print_npe(KERN_INFO, npe, "firmware's license can be found in /usr/share/doc/LICENSE.IPL\n");
-+
-       print_npe(KERN_INFO, npe, "firmware functionality 0x%X, "
-                 "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
-                 (image->id >> 8) & 0xFF, image->id & 0xFF);
diff --git a/target/linux/ixp4xx/patches-4.9/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-4.9/205-npe_driver_separate_phy_functions.patch
deleted file mode 100644 (file)
index cc77c5d..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-From e3eab80fb5d0a7d7fdb0f2f231b27161d5ec3804 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 30 Jun 2013 15:52:53 +0200
-Subject: [PATCH 23/36] 205-npe_driver_separate_phy_functions.patch
-
----
- drivers/net/ethernet/xscale/ixp4xx_eth.c |   70 ++++++++++++++++++++++--------
- 1 file changed, 51 insertions(+), 19 deletions(-)
-
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -588,6 +588,51 @@ static void ixp4xx_adjust_link(struct ne
-              dev->name, port->speed, port->duplex ? "full" : "half");
- }
-+static int ixp4xx_phy_connect(struct net_device *dev)
-+{
-+      struct port *port = netdev_priv(dev);
-+      struct eth_plat_info *plat = port->plat;
-+      char phy_id[MII_BUS_ID_SIZE + 3];
-+
-+      snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
-+              mdio_bus->id, plat->phy);
-+      port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
-+                                 PHY_INTERFACE_MODE_MII);
-+      if (IS_ERR(port->phydev)) {
-+              printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
-+              return PTR_ERR(port->phydev);
-+      }
-+
-+      /* mask with MAC supported features */
-+      port->phydev->supported &= PHY_BASIC_FEATURES;
-+      port->phydev->advertising = port->phydev->supported;
-+
-+      port->phydev->irq = PHY_POLL;
-+
-+      return 0;
-+}
-+
-+static void ixp4xx_phy_disconnect(struct net_device *dev)
-+{
-+      struct port *port = netdev_priv(dev);
-+
-+      phy_disconnect(port->phydev);
-+}
-+
-+static void ixp4xx_phy_start(struct net_device *dev)
-+{
-+      struct port *port = netdev_priv(dev);
-+
-+      port->speed = 0;        /* force "link up" message */
-+      phy_start(port->phydev);
-+}
-+
-+static void ixp4xx_phy_stop(struct net_device *dev)
-+{
-+      struct port *port = netdev_priv(dev);
-+
-+      phy_stop(port->phydev);
-+}
- static inline void debug_pkt(struct net_device *dev, const char *func,
-                            u8 *data, int len)
-@@ -1242,8 +1287,7 @@ static int eth_open(struct net_device *d
-               return err;
-       }
--      port->speed = 0;        /* force "link up" message */
--      phy_start(dev->phydev);
-+      ixp4xx_phy_start(dev);
-       for (i = 0; i < ETH_ALEN; i++)
-               __raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
-@@ -1364,7 +1408,7 @@ static int eth_close(struct net_device *
-               printk(KERN_CRIT "%s: unable to disable loopback\n",
-                      dev->name);
--      phy_stop(dev->phydev);
-+      ixp4xx_phy_stop(dev);
-       if (!ports_open)
-               qmgr_disable_irq(TXDONE_QUEUE);
-@@ -1391,7 +1435,6 @@ static int eth_init_one(struct platform_
-       struct eth_plat_info *plat = dev_get_platdata(&pdev->dev);
-       struct phy_device *phydev = NULL;
-       u32 regs_phys;
--      char phy_id[MII_BUS_ID_SIZE + 3];
-       int err;
-       if (!(dev = alloc_etherdev(sizeof(struct port))))
-@@ -1449,16 +1492,9 @@ static int eth_init_one(struct platform_
-       __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
-       udelay(50);
--      snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
--              mdio_bus->id, plat->phy);
--      phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
--                           PHY_INTERFACE_MODE_MII);
--      if (IS_ERR(phydev)) {
--              err = PTR_ERR(phydev);
-+      err = ixp4xx_phy_connect(dev);
-+      if (err)
-               goto err_free_mem;
--      }
--
--      phydev->irq = PHY_POLL;
-       if ((err = register_netdev(dev)))
-               goto err_phy_dis;
-@@ -1469,7 +1505,7 @@ static int eth_init_one(struct platform_
-       return 0;
- err_phy_dis:
--      phy_disconnect(phydev);
-+      ixp4xx_phy_disconnect(phydev);
- err_free_mem:
-       npe_port_tab[NPE_ID(port->id)] = NULL;
-       release_resource(port->mem_res);
-@@ -1487,7 +1523,7 @@ static int eth_remove_one(struct platfor
-       struct port *port = netdev_priv(dev);
-       unregister_netdev(dev);
--      phy_disconnect(phydev);
-+      ixp4xx_phy_disconnect(phydev);
-       npe_port_tab[NPE_ID(port->id)] = NULL;
-       npe_release(port->npe);
-       release_resource(port->mem_res);
diff --git a/target/linux/ixp4xx/patches-4.9/206-npe_driver_add_update_link_function.patch b/target/linux/ixp4xx/patches-4.9/206-npe_driver_add_update_link_function.patch
deleted file mode 100644 (file)
index e12764e..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -171,12 +171,13 @@ struct port {
-       struct npe *npe;
-       struct net_device *netdev;
-       struct napi_struct napi;
-+      struct phy_device *phydev;
-       struct eth_plat_info *plat;
-       buffer_t *rx_buff_tab[RX_DESCS], *tx_buff_tab[TX_DESCS];
-       struct desc *desc_tab;  /* coherent */
-       u32 desc_tab_phys;
-       int id;                 /* logical port ID */
--      int speed, duplex;
-+      int link, speed, duplex;
-       u8 firmware[4];
-       int hwts_tx_en;
-       int hwts_rx_en;
-@@ -558,36 +559,46 @@ static void ixp4xx_mdio_remove(void)
- }
--static void ixp4xx_adjust_link(struct net_device *dev)
-+static void ixp4xx_update_link(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
--      struct phy_device *phydev = dev->phydev;
--
--      if (!phydev->link) {
--              if (port->speed) {
--                      port->speed = 0;
--                      printk(KERN_INFO "%s: link down\n", dev->name);
--              }
--              return;
--      }
--
--      if (port->speed == phydev->speed && port->duplex == phydev->duplex)
--              return;
--
--      port->speed = phydev->speed;
--      port->duplex = phydev->duplex;
--      if (port->duplex)
-+      if (port->duplex == DUPLEX_FULL)
-               __raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX,
-                            &port->regs->tx_control[0]);
-       else
-               __raw_writel(DEFAULT_TX_CNTRL0 | TX_CNTRL0_HALFDUPLEX,
-                            &port->regs->tx_control[0]);
-+      netif_carrier_on(dev);
-       printk(KERN_INFO "%s: link up, speed %u Mb/s, %s duplex\n",
-              dev->name, port->speed, port->duplex ? "full" : "half");
- }
-+static void ixp4xx_adjust_link(struct net_device *dev)
-+{
-+      struct port *port = netdev_priv(dev);
-+      struct phy_device *phydev = port->phydev;
-+      int status_change = 0;
-+
-+      if (phydev->link) {
-+              if (port->duplex != phydev->duplex
-+                  || port->speed != phydev->speed) {
-+                      status_change = 1;
-+              }
-+      }
-+
-+      if (phydev->link != port->link)
-+              status_change = 1;
-+
-+      port->link = phydev->link;
-+      port->speed = phydev->speed;
-+      port->duplex = phydev->duplex;
-+
-+      if (status_change)
-+              ixp4xx_update_link(dev);
-+}
-+
- static int ixp4xx_phy_connect(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-@@ -623,7 +634,6 @@ static void ixp4xx_phy_start(struct net_
- {
-       struct port *port = netdev_priv(dev);
--      port->speed = 0;        /* force "link up" message */
-       phy_start(port->phydev);
- }
-@@ -1499,6 +1509,10 @@ static int eth_init_one(struct platform_
-       if ((err = register_netdev(dev)))
-               goto err_phy_dis;
-+      port->link = 0;
-+      port->speed = 0;
-+      port->duplex = -1;
-+
-       printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
-              npe_name(port->npe));
diff --git a/target/linux/ixp4xx/patches-4.9/207-npe_driver_multiphy_support.patch b/target/linux/ixp4xx/patches-4.9/207-npe_driver_multiphy_support.patch
deleted file mode 100644 (file)
index a23644a..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-TODO: take care of additional PHYs through the PHY abstraction layer
-
---- a/arch/arm/mach-ixp4xx/include/mach/platform.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
-@@ -95,12 +95,23 @@ struct ixp4xx_pata_data {
- #define IXP4XX_ETH_NPEB               0x10
- #define IXP4XX_ETH_NPEC               0x20
-+#define IXP4XX_ETH_PHY_MAX_ADDR       32
-+
- /* Information about built-in Ethernet MAC interfaces */
- struct eth_plat_info {
-       u8 phy;         /* MII PHY ID, 0 - 31 */
-       u8 rxq;         /* configurable, currently 0 - 31 only */
-       u8 txreadyq;
-       u8 hwaddr[6];
-+
-+      u32 phy_mask;
-+#if 0
-+      int speed;
-+      int duplex;
-+#else
-+      int speed_10;
-+      int half_duplex;
-+#endif
- };
- /* Information about built-in HSS (synchronous serial) interfaces */
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -605,6 +605,37 @@ static int ixp4xx_phy_connect(struct net
-       struct eth_plat_info *plat = port->plat;
-       char phy_id[MII_BUS_ID_SIZE + 3];
-+      if (plat->phy == IXP4XX_ETH_PHY_MAX_ADDR) {
-+#if 0
-+              switch (plat->speed) {
-+              case SPEED_10:
-+              case SPEED_100:
-+                      break;
-+              default:
-+                      printk(KERN_ERR "%s: invalid speed (%d)\n",
-+                                      dev->name, plat->speed);
-+                      return -EINVAL;
-+              }
-+
-+              switch (plat->duplex) {
-+              case DUPLEX_HALF:
-+              case DUPLEX_FULL:
-+                      break;
-+              default:
-+                      printk(KERN_ERR "%s: invalid duplex mode (%d)\n",
-+                                      dev->name, plat->duplex);
-+                      return -EINVAL;
-+              }
-+              port->speed = plat->speed;
-+              port->duplex = plat->duplex;
-+#else
-+              port->speed = plat->speed_10 ? SPEED_10 : SPEED_100;
-+              port->duplex = plat->half_duplex ? DUPLEX_HALF : DUPLEX_FULL;
-+#endif
-+
-+              return 0;
-+      }
-+
-       snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
-               mdio_bus->id, plat->phy);
-       port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
-@@ -627,21 +658,32 @@ static void ixp4xx_phy_disconnect(struct
- {
-       struct port *port = netdev_priv(dev);
--      phy_disconnect(port->phydev);
-+      if (port->phydev)
-+              phy_disconnect(port->phydev);
- }
- static void ixp4xx_phy_start(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
--      phy_start(port->phydev);
-+      if (port->phydev) {
-+              phy_start(port->phydev);
-+      } else {
-+              port->link = 1;
-+              ixp4xx_update_link(dev);
-+      }
- }
- static void ixp4xx_phy_stop(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
--      phy_stop(port->phydev);
-+      if (port->phydev) {
-+              phy_stop(port->phydev);
-+      } else {
-+              port->link = 0;
-+              ixp4xx_update_link(dev);
-+      }
- }
- static inline void debug_pkt(struct net_device *dev, const char *func,
-@@ -1030,6 +1072,8 @@ static void eth_set_mcast_list(struct ne
- static int eth_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
- {
-+      struct port *port = netdev_priv(dev);
-+
-       if (!netif_running(dev))
-               return -EINVAL;
-@@ -1040,6 +1084,9 @@ static int eth_ioctl(struct net_device *
-                       return hwtstamp_get(dev, req);
-       }
-+      if (!port->phydev)
-+              return -EOPNOTSUPP;
-+
-       return phy_mii_ioctl(dev->phydev, req, cmd);
- }
-@@ -1059,6 +1106,11 @@ static void ixp4xx_get_drvinfo(struct ne
- static int ixp4xx_nway_reset(struct net_device *dev)
- {
-+      struct port *port = netdev_priv(dev);
-+
-+      if (!port->phydev)
-+              return -EOPNOTSUPP;
-+
-       return phy_start_aneg(dev->phydev);
- }
-@@ -1519,7 +1571,7 @@ static int eth_init_one(struct platform_
-       return 0;
- err_phy_dis:
--      ixp4xx_phy_disconnect(phydev);
-+      ixp4xx_phy_disconnect(port->netdev);
- err_free_mem:
-       npe_port_tab[NPE_ID(port->id)] = NULL;
-       release_resource(port->mem_res);
-@@ -1537,7 +1589,7 @@ static int eth_remove_one(struct platfor
-       struct port *port = netdev_priv(dev);
-       unregister_netdev(dev);
--      ixp4xx_phy_disconnect(phydev);
-+      ixp4xx_phy_disconnect(port->netdev);
-       npe_port_tab[NPE_ID(port->id)] = NULL;
-       npe_release(port->npe);
-       release_resource(port->mem_res);
diff --git a/target/linux/ixp4xx/patches-4.9/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-4.9/295-latch_led_driver.patch
deleted file mode 100644 (file)
index 66bc3e8..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -312,6 +312,12 @@ config LEDS_LP8860
-         on the LP8860 4 channel LED driver using the I2C communication
-         bus.
-+config LEDS_LATCH
-+      tristate "LED Support for Memory Latched LEDs"
-+      depends on LEDS_CLASS
-+      help
-+              -- To Do --
-+
- config LEDS_CLEVO_MAIL
-       tristate "Mail LED on Clevo notebook"
-       depends on LEDS_CLASS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -25,6 +25,7 @@ obj-$(CONFIG_LEDS_SUNFIRE)           += leds-sunf
- obj-$(CONFIG_LEDS_PCA9532)            += leds-pca9532.o
- obj-$(CONFIG_LEDS_GPIO_REGISTER)      += leds-gpio-register.o
- obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
-+obj-$(CONFIG_LEDS_LATCH)              += leds-latch.o
- obj-$(CONFIG_LEDS_LP3944)             += leds-lp3944.o
- obj-$(CONFIG_LEDS_LP3952)             += leds-lp3952.o
- obj-$(CONFIG_LEDS_LP55XX_COMMON)      += leds-lp55xx-common.o
---- /dev/null
-+++ b/drivers/leds/leds-latch.c
-@@ -0,0 +1,152 @@
-+/*
-+ * LEDs driver for Memory Latched Devices
-+ *
-+ * Copyright (C) 2008 Gateworks Corp.
-+ * Chris Lang <clang@gateworks.com>
-+ *
-+ * 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/slab.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <linux/workqueue.h>
-+#include <asm/io.h>
-+#include <linux/spinlock.h>
-+#include <linux/slab.h>
-+#include <linux/module.h>
-+#include <linux/export.h>
-+
-+static unsigned int mem_keep = 0xFF;
-+static spinlock_t mem_lock;
-+static unsigned char *iobase;
-+
-+struct latch_led_data {
-+      struct led_classdev cdev;
-+      struct work_struct work;
-+      u8 new_level;
-+      u8 bit;
-+      void (*set_led)(u8 bit, enum led_brightness value);
-+};
-+
-+static void latch_set_led(u8 bit, enum led_brightness value)
-+{
-+      if (value == LED_OFF)
-+              mem_keep |= (0x1 << bit);
-+      else
-+              mem_keep &= ~(0x1 << bit);
-+
-+      writeb(mem_keep, iobase);
-+}
-+
-+static void latch_led_set(struct led_classdev *led_cdev,
-+      enum led_brightness value)
-+{
-+      struct latch_led_data *led_dat =
-+              container_of(led_cdev, struct latch_led_data, cdev);
-+
-+      raw_spin_lock(mem_lock);
-+
-+      led_dat->set_led(led_dat->bit, value);
-+
-+      raw_spin_unlock(mem_lock);
-+}
-+
-+static int latch_led_probe(struct platform_device *pdev)
-+{
-+      struct latch_led_platform_data *pdata = pdev->dev.platform_data;
-+      struct latch_led *cur_led;
-+      struct latch_led_data *leds_data, *led_dat;
-+      int i, ret = 0;
-+
-+      if (!pdata)
-+              return -EBUSY;
-+
-+      leds_data = kzalloc(sizeof(struct latch_led_data) * pdata->num_leds,
-+                              GFP_KERNEL);
-+      if (!leds_data)
-+              return -ENOMEM;
-+
-+      for (i = 0; i < pdata->num_leds; i++) {
-+              cur_led = &pdata->leds[i];
-+              led_dat = &leds_data[i];
-+
-+              led_dat->cdev.name = cur_led->name;
-+              led_dat->cdev.default_trigger = cur_led->default_trigger;
-+              led_dat->cdev.brightness_set = latch_led_set;
-+              led_dat->cdev.brightness = LED_OFF;
-+              led_dat->bit = cur_led->bit;
-+              led_dat->set_led = pdata->set_led ? pdata->set_led : latch_set_led;
-+
-+              ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
-+              if (ret < 0) {
-+                      goto err;
-+              }
-+      }
-+
-+      if (!pdata->set_led) {
-+              iobase = ioremap_nocache(pdata->mem, 0x1000);
-+              writeb(0xFF, iobase);
-+      }
-+      platform_set_drvdata(pdev, leds_data);
-+
-+      return 0;
-+
-+err:
-+      if (i > 0) {
-+              for (i = i - 1; i >= 0; i--) {
-+                      led_classdev_unregister(&leds_data[i].cdev);
-+              }
-+      }
-+
-+      kfree(leds_data);
-+
-+      return ret;
-+}
-+
-+static int latch_led_remove(struct platform_device *pdev)
-+{
-+      int i;
-+      struct latch_led_platform_data *pdata = pdev->dev.platform_data;
-+      struct latch_led_data *leds_data;
-+
-+      leds_data = platform_get_drvdata(pdev);
-+
-+      for (i = 0; i < pdata->num_leds; i++) {
-+              led_classdev_unregister(&leds_data[i].cdev);
-+              cancel_work_sync(&leds_data[i].work);
-+      }
-+
-+      kfree(leds_data);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver latch_led_driver = {
-+      .probe          = latch_led_probe,
-+      .remove         = latch_led_remove,
-+      .driver         = {
-+              .name   = "leds-latch",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init latch_led_init(void)
-+{
-+      return platform_driver_register(&latch_led_driver);
-+}
-+
-+static void __exit latch_led_exit(void)
-+{
-+      platform_driver_unregister(&latch_led_driver);
-+}
-+
-+module_init(latch_led_init);
-+module_exit(latch_led_exit);
-+
-+MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
-+MODULE_DESCRIPTION("Latch LED driver");
---- a/include/linux/leds.h
-+++ b/include/linux/leds.h
-@@ -423,4 +423,18 @@ static inline void ledtrig_cpu(enum cpu_
- }
- #endif
-+/* For the leds-latch driver */
-+struct latch_led {
-+      const char *name;
-+      char *default_trigger;
-+      unsigned  bit;
-+};
-+
-+struct latch_led_platform_data {
-+      int     num_leds;
-+      u32     mem;
-+      struct latch_led *leds;
-+      void    (*set_led)(u8 bit, enum led_brightness value);
-+};
-+
- #endif                /* __LINUX_LEDS_H_INCLUDED */
diff --git a/target/linux/ixp4xx/patches-4.9/300-avila_support.patch b/target/linux/ixp4xx/patches-4.9/300-avila_support.patch
deleted file mode 100644 (file)
index c801607..0000000
+++ /dev/null
@@ -1,726 +0,0 @@
---- a/arch/arm/mach-ixp4xx/avila-pci.c
-+++ b/arch/arm/mach-ixp4xx/avila-pci.c
-@@ -27,8 +27,8 @@
- #include <mach/hardware.h>
- #include <asm/mach-types.h>
--#define AVILA_MAX_DEV 4
--#define LOFT_MAX_DEV  6
-+#define AVILA_MAX_DEV 6
-+
- #define IRQ_LINES     4
- /* PCI controller GPIO to IRQ pin mappings */
-@@ -55,10 +55,8 @@ static int __init avila_map_irq(const st
-               IXP4XX_GPIO_IRQ(INTD)
-       };
--      if (slot >= 1 &&
--          slot <= (machine_is_loft() ? LOFT_MAX_DEV : AVILA_MAX_DEV) &&
--          pin >= 1 && pin <= IRQ_LINES)
--              return pci_irq_table[(slot + pin - 2) % 4];
-+      if (slot >= 1 && slot <= AVILA_MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
-+              return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
-       return -1;
- }
---- a/arch/arm/mach-ixp4xx/avila-setup.c
-+++ b/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -14,9 +14,16 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/device.h>
-+#include <linux/if_ether.h>
-+#include <linux/socket.h>
-+#include <linux/netdevice.h>
- #include <linux/serial.h>
- #include <linux/tty.h>
- #include <linux/serial_8250.h>
-+#include <linux/i2c.h>
-+#include <linux/platform_data/at24.h>
-+#include <linux/leds.h>
-+#include <linux/platform_data/pca953x.h>
- #include <linux/i2c-gpio.h>
- #include <asm/types.h>
- #include <asm/setup.h>
-@@ -26,10 +33,25 @@
- #include <asm/irq.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/flash.h>
-+#include <linux/irq.h>
- #define AVILA_SDA_PIN 7
- #define AVILA_SCL_PIN 6
-+/* User LEDs */
-+#define AVILA_GW23XX_LED_USER_GPIO     3
-+#define AVILA_GW23X7_LED_USER_GPIO     4
-+
-+/* gpio mask used by platform device */
-+#define AVILA_GPIO_MASK        (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)
-+
-+struct avila_board_info {
-+      unsigned char   *model;
-+      void            (*setup)(void);
-+};
-+
-+static struct avila_board_info *avila_info __initdata;
-+
- static struct flash_platform_data avila_flash_data = {
-       .map_name       = "cfi_probe",
-       .width          = 2,
-@@ -105,14 +127,69 @@ static struct platform_device avila_uart
-       .resource               = avila_uart_resources
- };
--static struct resource avila_pata_resources[] = {
-+static struct resource avila_optional_uart_resources[] = {
-       {
--              .flags  = IORESOURCE_MEM
--      },
-+              .start  = 0x54000000,
-+              .end  = 0x54000fff,
-+              .flags  = IORESOURCE_MEM
-+      },{
-+              .start  = 0x55000000,
-+              .end  = 0x55000fff,
-+              .flags  = IORESOURCE_MEM
-+      },{
-+              .start  = 0x56000000,
-+              .end  = 0x56000fff,
-+              .flags  = IORESOURCE_MEM
-+      },{
-+              .start  = 0x57000000,
-+              .end  = 0x57000fff,
-+              .flags  = IORESOURCE_MEM
-+      }
-+};
-+
-+static struct plat_serial8250_port avila_optional_uart_data[] = {
-       {
--              .flags  = IORESOURCE_MEM,
-+              .flags    = UPF_BOOT_AUTOCONF,
-+              .iotype   = UPIO_MEM,
-+              .regshift = 0,
-+              .uartclk  = 18432000,
-+              .rw_delay = 2,
-+      },{
-+              .flags    = UPF_BOOT_AUTOCONF,
-+              .iotype   = UPIO_MEM,
-+              .regshift = 0,
-+              .uartclk  = 18432000,
-+              .rw_delay = 2,
-+      },{
-+              .flags    = UPF_BOOT_AUTOCONF,
-+              .iotype   = UPIO_MEM,
-+              .regshift = 0,
-+              .uartclk  = 18432000,
-+              .rw_delay = 2,
-+      },{
-+              .flags    = UPF_BOOT_AUTOCONF,
-+              .iotype   = UPIO_MEM,
-+              .regshift = 0,
-+              .uartclk  = 18432000,
-+              .rw_delay = 2,
-       },
-+      { }
-+};
-+
-+static struct platform_device avila_optional_uart = {
-+  .name   = "serial8250",
-+  .id   = PLAT8250_DEV_PLATFORM1,
-+  .dev.platform_data  = avila_optional_uart_data,
-+  .num_resources  = 4,
-+  .resource = avila_optional_uart_resources,
-+};
-+
-+static struct resource avila_pata_resources[] = {
-       {
-+              .flags  = IORESOURCE_MEM
-+      },{
-+              .flags  = IORESOURCE_MEM,
-+      },{
-               .name   = "intrq",
-               .start  = IRQ_IXP4XX_GPIO12,
-               .end    = IRQ_IXP4XX_GPIO12,
-@@ -133,21 +210,237 @@ static struct platform_device avila_pata
-       .resource               = avila_pata_resources,
- };
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info avila_npeb_data = {
-+      .phy            = 0,
-+      .rxq            = 3,
-+      .txreadyq       = 20,
-+};
-+
-+static struct eth_plat_info avila_npec_data = {
-+      .phy            = 1,
-+      .rxq            = 4,
-+      .txreadyq       = 21,
-+};
-+
-+static struct platform_device avila_npeb_device = {
-+      .name                   = "ixp4xx_eth",
-+      .id                     = IXP4XX_ETH_NPEB,
-+      .dev.platform_data      = &avila_npeb_data,
-+      .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+};
-+
-+static struct platform_device avila_npec_device = {
-+      .name                   = "ixp4xx_eth",
-+      .id                     = IXP4XX_ETH_NPEC,
-+      .dev.platform_data      = &avila_npec_data,
-+      .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+};
-+
-+static struct gpio_led avila_gpio_leds[] = {
-+      {
-+              .name           = "user",  /* green led */
-+              .gpio           = AVILA_GW23XX_LED_USER_GPIO,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "radio1",  /* green led */
-+              .gpio           = 104,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "radio2",  /* green led */
-+              .gpio           = 105,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "radio3",  /* green led */
-+              .gpio           = 106,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "radio4",  /* green led */
-+              .gpio           = 107,
-+              .active_low     = 1,
-+      },
-+
-+};
-+
-+static struct gpio_led_platform_data avila_gpio_leds_data = {
-+      .num_leds               = 1,
-+      .leds                   = avila_gpio_leds,
-+};
-+
-+static struct platform_device avila_gpio_leds_device = {
-+      .name                   = "leds-gpio",
-+      .id                     = -1,
-+      .dev.platform_data      = &avila_gpio_leds_data,
-+};
-+
-+static struct latch_led avila_latch_leds[] = {
-+      {
-+              .name   = "led0",  /* green led */
-+              .bit    = 0,
-+      },
-+      {
-+              .name   = "led1",  /* green led */
-+              .bit    = 1,
-+      },
-+      {
-+              .name   = "led2",  /* green led */
-+              .bit    = 2,
-+      },
-+      {
-+              .name   = "led3",  /* green led */
-+              .bit    = 3,
-+      },
-+      {
-+              .name   = "led4",  /* green led */
-+              .bit    = 4,
-+      },
-+      {
-+              .name   = "led5",  /* green led */
-+              .bit    = 5,
-+      },
-+      {
-+              .name   = "led6",  /* green led */
-+              .bit    = 6,
-+      },
-+      {
-+              .name   = "led7",  /* green led */
-+              .bit    = 7,
-+      }
-+};
-+
-+static struct latch_led_platform_data avila_latch_leds_data = {
-+      .num_leds       = 8,
-+      .leds           = avila_latch_leds,
-+      .mem            = 0x51000000,
-+};
-+
-+static struct platform_device avila_latch_leds_device = {
-+      .name                   = "leds-latch",
-+      .id                     = -1,
-+      .dev.platform_data      = &avila_latch_leds_data,
-+};
-+
- static struct platform_device *avila_devices[] __initdata = {
-       &avila_i2c_gpio,
--      &avila_flash,
-       &avila_uart
- };
--static void __init avila_init(void)
-+/*
-+ * Audio Devices
-+ */
-+
-+static struct platform_device avila_hss_device[] = {
-+      {
-+              .name = "gw_avila_hss",
-+              .id = 0,
-+      },{
-+              .name = "gw_avila_hss",
-+              .id = 1,
-+      },{
-+              .name = "gw_avila_hss",
-+              .id = 2,
-+      },{
-+              .name = "gw_avila_hss",
-+              .id = 3,
-+      },
-+};
-+
-+static struct platform_device avila_pcm_device[] = {
-+      {
-+              .name = "gw_avila-audio",
-+              .id = 0,
-+      },{
-+              .name = "gw_avila-audio",
-+              .id = 1,
-+      },{
-+              .name = "gw_avila-audio",
-+              .id = 2,
-+      },{
-+              .name = "gw_avila-audio",
-+              .id = 3,
-+      }
-+};
-+
-+static void setup_audio_devices(void) {
-+      platform_device_register(&avila_hss_device[0]);
-+      platform_device_register(&avila_hss_device[1]);
-+      platform_device_register(&avila_hss_device[2]);
-+      platform_device_register(&avila_hss_device[3]);
-+
-+      platform_device_register(&avila_pcm_device[0]);
-+      platform_device_register(&avila_pcm_device[1]);
-+      platform_device_register(&avila_pcm_device[2]);
-+      platform_device_register(&avila_pcm_device[3]);
-+}
-+
-+static void __init avila_gw23xx_setup(void)
- {
--      ixp4xx_sys_init();
-+      platform_device_register(&avila_npeb_device);
-+      platform_device_register(&avila_npec_device);
--      avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
--      avila_flash_resource.end =
--              IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-+      platform_device_register(&avila_gpio_leds_device);
-+}
--      platform_add_devices(avila_devices, ARRAY_SIZE(avila_devices));
-+static void __init avila_gw2342_setup(void)
-+{
-+      platform_device_register(&avila_npeb_device);
-+      platform_device_register(&avila_npec_device);
-+
-+      platform_device_register(&avila_gpio_leds_device);
-+
-+      avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
-+      avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
-+
-+      avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2);
-+      avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2);
-+
-+      avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1;
-+      avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
-+
-+      platform_device_register(&avila_pata);
-+}
-+
-+static void __init avila_gw2345_setup(void)
-+{
-+      avila_npeb_data.phy = IXP4XX_ETH_PHY_MAX_ADDR;
-+      avila_npeb_data.phy_mask = 0x1e; /* ports 1-4 of the KS8995 switch */
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
-+      platform_device_register(&avila_npec_device);
-+
-+      platform_device_register(&avila_gpio_leds_device);
-+
-+      avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
-+      avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
-+
-+      avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2);
-+      avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2);
-+
-+      avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1;
-+      avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
-+
-+      platform_device_register(&avila_pata);
-+}
-+
-+static void __init avila_gw2347_setup(void)
-+{
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-+      platform_device_register(&avila_gpio_leds_device);
-+}
-+
-+static void __init avila_gw2348_setup(void)
-+{
-+      platform_device_register(&avila_npeb_device);
-+      platform_device_register(&avila_npec_device);
-+
-+      platform_device_register(&avila_gpio_leds_device);
-       avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
-       avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
-@@ -159,8 +452,335 @@ static void __init avila_init(void)
-       avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
-       platform_device_register(&avila_pata);
-+}
-+
-+static void __init avila_gw2353_setup(void)
-+{
-+      platform_device_register(&avila_npeb_device);
-+      platform_device_register(&avila_gpio_leds_device);
-+}
-+
-+static void __init avila_gw2355_setup(void)
-+{
-+      avila_npeb_data.phy = IXP4XX_ETH_PHY_MAX_ADDR;
-+      avila_npeb_data.phy_mask = 0x1e; /* ports 1-4 of the KS8995 switch */
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_npec_data.phy = 16;
-+      platform_device_register(&avila_npec_device);
-+
-+      avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-+      platform_device_register(&avila_gpio_leds_device);
-+
-+      *IXP4XX_EXP_CS4 |= 0xbfff3c03;
-+      avila_latch_leds[0].name = "RXD";
-+      avila_latch_leds[1].name = "TXD";
-+      avila_latch_leds[2].name = "POL";
-+      avila_latch_leds[3].name = "LNK";
-+      avila_latch_leds[4].name = "ERR";
-+      avila_latch_leds_data.num_leds = 5;
-+      avila_latch_leds_data.mem = 0x54000000;
-+      platform_device_register(&avila_latch_leds_device);
-+
-+      avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
-+      avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
-+
-+      avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2);
-+      avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2);
-+
-+      avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1;
-+      avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
-+
-+      platform_device_register(&avila_pata);
-+}
-+
-+static void __init avila_gw2357_setup(void)
-+{
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-+      platform_device_register(&avila_gpio_leds_device);
-+
-+      *IXP4XX_EXP_CS1 |= 0xbfff3c03;
-+      platform_device_register(&avila_latch_leds_device);
-+}
-+
-+static void __init avila_gw2365_setup(void)
-+{
-+      avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      *IXP4XX_EXP_CS4 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO0, IRQ_TYPE_EDGE_RISING);
-+      avila_optional_uart_data[0].mapbase = 0x54000000;
-+      avila_optional_uart_data[0].membase = (void __iomem *)ioremap(0x54000000, 0x0fff);
-+      avila_optional_uart_data[0].irq   = IRQ_IXP4XX_GPIO0;
-+
-+      *IXP4XX_EXP_CS5 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO1, IRQ_TYPE_EDGE_RISING);
-+      avila_optional_uart_data[1].mapbase = 0x55000000;
-+      avila_optional_uart_data[1].membase = (void __iomem *)ioremap(0x55000000, 0x0fff);
-+      avila_optional_uart_data[1].irq   = IRQ_IXP4XX_GPIO1;
-+
-+      *IXP4XX_EXP_CS6 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_EDGE_RISING);
-+      avila_optional_uart_data[2].mapbase = 0x56000000;
-+      avila_optional_uart_data[2].membase = (void __iomem *)ioremap(0x56000000, 0x0fff);
-+      avila_optional_uart_data[2].irq   = IRQ_IXP4XX_GPIO2;
-+
-+      *IXP4XX_EXP_CS7 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
-+      avila_optional_uart_data[3].mapbase = 0x57000000;
-+      avila_optional_uart_data[3].membase = (void __iomem *)ioremap(0x57000000, 0x0fff);
-+      avila_optional_uart_data[3].irq   = IRQ_IXP4XX_GPIO3;
-+
-+      platform_device_register(&avila_optional_uart);
-+
-+      avila_npeb_data.phy = 1;
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_npec_data.phy = 2;
-+      platform_device_register(&avila_npec_device);
-+
-+      avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(2);
-+      avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(2);
-+
-+      avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(3);
-+      avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(3);
-+
-+      avila_pata_data.cs0_cfg = IXP4XX_EXP_CS2;
-+      avila_pata_data.cs1_cfg = IXP4XX_EXP_CS3;
-+
-+      platform_device_register(&avila_pata);
-+
-+      avila_gpio_leds[0].gpio = 109;
-+      avila_gpio_leds_data.num_leds = 5;
-+      platform_device_register(&avila_gpio_leds_device);
-+
-+      setup_audio_devices();
-+}
-+
-+static void __init avila_gw2369_setup(void)
-+{
-+      avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      avila_npeb_data.phy = 1;
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_npec_data.phy = 2;
-+      platform_device_register(&avila_npec_device);
-+
-+      setup_audio_devices();
-+}
-+
-+static void __init avila_gw2370_setup(void)
-+{
-+      avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      avila_npeb_data.phy = 5;
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_npec_data.phy = IXP4XX_ETH_PHY_MAX_ADDR;
-+      avila_npec_data.phy_mask = 0x1e; /* ports 1-4 of the KS8995 switch */
-+      platform_device_register(&avila_npec_device);
-+
-+      *IXP4XX_EXP_CS2 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_EDGE_RISING);
-+      avila_optional_uart_data[0].mapbase = 0x52000000;
-+      avila_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52000000, 0x0fff);
-+      avila_optional_uart_data[0].irq   = IRQ_IXP4XX_GPIO2;
-+
-+      *IXP4XX_EXP_CS3 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
-+      avila_optional_uart_data[1].mapbase = 0x53000000;
-+      avila_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53000000, 0x0fff);
-+      avila_optional_uart_data[1].irq   = IRQ_IXP4XX_GPIO3;
-+
-+      avila_optional_uart.num_resources = 2;
-+
-+      platform_device_register(&avila_optional_uart);
-+
-+      avila_gpio_leds[0].gpio = 101;
-+      platform_device_register(&avila_gpio_leds_device);
-+
-+      setup_audio_devices();
-+}
-+
-+static void __init avila_gw2375_setup(void)
-+{
-+      avila_npeb_data.phy = 1;
-+      platform_device_register(&avila_npeb_device);
-+
-+      avila_npec_data.phy = 2;
-+      platform_device_register(&avila_npec_device);
-+
-+      *IXP4XX_EXP_CS2 = 0xBFFF3C43;
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_EDGE_RISING);
-+      avila_optional_uart_data[0].mapbase = 0x52000000;
-+      avila_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52000000, 0x0fff);
-+      avila_optional_uart_data[0].irq   = IRQ_IXP4XX_GPIO10;
-+
-+      avila_optional_uart.num_resources = 1;
-+
-+      platform_device_register(&avila_optional_uart);
-+
-+      setup_audio_devices();
-+}
-+
-+
-+static struct avila_board_info avila_boards[] __initdata = {
-+      {
-+              .model          = "GW2342",
-+              .setup          = avila_gw2342_setup,
-+      }, {
-+              .model          = "GW2345",
-+              .setup          = avila_gw2345_setup,
-+      }, {
-+              .model          = "GW2347",
-+              .setup          = avila_gw2347_setup,
-+      }, {
-+              .model          = "GW2348",
-+              .setup          = avila_gw2348_setup,
-+      }, {
-+              .model          = "GW2353",
-+              .setup          = avila_gw2353_setup,
-+      }, {
-+              .model          = "GW2355",
-+              .setup          = avila_gw2355_setup,
-+      }, {
-+              .model          = "GW2357",
-+              .setup          = avila_gw2357_setup,
-+      }, {
-+              .model          = "GW2365",
-+              .setup          = avila_gw2365_setup,
-+      }, {
-+              .model          = "GW2369",
-+              .setup          = avila_gw2369_setup,
-+      }, {
-+              .model          = "GW2370",
-+              .setup          = avila_gw2370_setup,
-+      }, {
-+              .model          = "GW2373",
-+              .setup          = avila_gw2369_setup,
-+      }, {
-+              .model          = "GW2375",
-+              .setup          = avila_gw2375_setup,
-+      }
-+};
-+
-+static struct avila_board_info * __init avila_find_board_info(char *model)
-+{
-+      int i;
-+      model[6] = '\0';
-+
-+      for (i = 0; i < ARRAY_SIZE(avila_boards); i++) {
-+              struct avila_board_info *info = &avila_boards[i];
-+              if (strcmp(info->model, model) == 0)
-+                      return info;
-+      }
-+
-+      return NULL;
-+}
-+
-+static struct nvmem_device *at24_nvmem;
-+
-+static void at24_setup(struct nvmem_device *mem_acc, void *context)
-+{
-+      char mac_addr[ETH_ALEN];
-+      char model[7];
-+
-+      at24_nvmem = mem_acc;
-+
-+      /* Read MAC addresses */
-+      if (nvmem_device_read(at24_nvmem, 0x0, 6, mac_addr) == 6) {
-+              memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN);
-+      }
-+      if (nvmem_device_read(at24_nvmem, 0x6, 6, mac_addr) == 6) {
-+              memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN);
-+      }
-+
-+      /* Read the first 6 bytes of the model number */
-+      if (nvmem_device_read(at24_nvmem, 0x20, 6, model) == 6) {
-+              avila_info = avila_find_board_info(model);
-+      }
-+
-+}
-+
-+static struct at24_platform_data avila_eeprom_info = {
-+      .byte_len       = 1024,
-+      .page_size      = 16,
-+//    .flags          = AT24_FLAG_READONLY,
-+      .setup          = at24_setup,
-+};
-+
-+static struct pca953x_platform_data avila_pca_data = {
-+      .gpio_base  = 100,
-+};
-+
-+static struct i2c_board_info __initdata avila_i2c_board_info[] = {
-+      {
-+              I2C_BOARD_INFO("ds1672", 0x68),
-+      },
-+      {
-+              I2C_BOARD_INFO("gsp", 0x29),
-+      },
-+      {
-+              I2C_BOARD_INFO("pca9555", 0x23),
-+              .platform_data = &avila_pca_data,
-+      },
-+      {
-+              I2C_BOARD_INFO("ad7418", 0x28),
-+      },
-+      {
-+              I2C_BOARD_INFO("24c08", 0x51),
-+              .platform_data  = &avila_eeprom_info
-+      },
-+      {
-+              I2C_BOARD_INFO("tlv320aic33", 0x1b),
-+      },
-+      {
-+              I2C_BOARD_INFO("tlv320aic33", 0x1a),
-+      },
-+      {
-+              I2C_BOARD_INFO("tlv320aic33", 0x19),
-+      },
-+      {
-+              I2C_BOARD_INFO("tlv320aic33", 0x18),
-+      },
-+};
-+
-+static void __init avila_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      platform_add_devices(avila_devices, ARRAY_SIZE(avila_devices));
-+
-+      i2c_register_board_info(0, avila_i2c_board_info,
-+                      ARRAY_SIZE(avila_i2c_board_info));
-+}
-+
-+static int __init avila_model_setup(void)
-+{
-+      if (!machine_is_avila())
-+              return 0;
-+
-+      /* default 16MB flash */
-+      avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1;
-+
-+      if (avila_info) {
-+              printk(KERN_DEBUG "Running on Gateworks Avila %s\n",
-+                                                      avila_info->model);
-+              avila_info->setup();
-+      } else {
-+              printk(KERN_INFO "Unknown/missing Avila model number"
-+                                              " -- defaults will be used\n");
-+              avila_gw23xx_setup();
-+      }
-+      platform_device_register(&avila_flash);
-+      return 0;
- }
-+late_initcall(avila_model_setup);
- MACHINE_START(AVILA, "Gateworks Avila Network Platform")
-       /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
diff --git a/target/linux/ixp4xx/patches-4.9/304-ixp4xx_eth_jumboframe.patch b/target/linux/ixp4xx/patches-4.9/304-ixp4xx_eth_jumboframe.patch
deleted file mode 100644 (file)
index 108fbcb..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
-+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
-@@ -57,7 +57,7 @@
- #define POOL_ALLOC_SIZE               (sizeof(struct desc) * (RX_DESCS + TX_DESCS))
- #define REGS_SIZE             0x1000
--#define MAX_MRU                       1536 /* 0x600 */
-+#define MAX_MRU                       (14320 - ETH_HLEN - ETH_FCS_LEN)
- #define RX_BUFF_SIZE          ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
- #define NAPI_WEIGHT           16
-@@ -1289,6 +1289,32 @@ static void destroy_queues(struct port *
-       }
- }
-+static int eth_do_change_mtu(struct net_device *dev, int mtu)
-+{
-+      struct port *port;
-+      struct msg msg;
-+      /* adjust for ethernet headers */
-+      int framesize = mtu + ETH_HLEN + ETH_FCS_LEN;
-+
-+      port = netdev_priv(dev);
-+
-+      memset(&msg, 0, sizeof(msg));
-+      msg.cmd = NPE_SETMAXFRAMELENGTHS;
-+      msg.eth_id = port->id;
-+
-+      /* max rx/tx 64 byte blocks */
-+      msg.byte2 = ((framesize + 63) / 64) << 8;
-+      msg.byte3 = ((framesize + 63) / 64) << 8;
-+
-+      msg.byte4 = msg.byte6 = framesize >> 8;
-+      msg.byte5 = msg.byte7 = framesize & 0xff;
-+
-+      if (npe_send_recv_message(port->npe, &msg, "ETH_SET_MAX_FRAME_LENGTH"))
-+              return -EIO;
-+
-+      return 0;
-+}
-+
- static int eth_open(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-@@ -1340,6 +1366,8 @@ static int eth_open(struct net_device *d
-       if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
-               return -EIO;
-+      eth_do_change_mtu(dev, dev->mtu);
-+
-       if ((err = request_queues(port)) != 0)
-               return err;
-@@ -1479,7 +1507,26 @@ static int eth_close(struct net_device *
-       return 0;
- }
-+static int ixp_eth_change_mtu(struct net_device *dev, int mtu)
-+{
-+      int ret;
-+
-+      if (mtu > MAX_MRU)
-+              return -EINVAL;
-+
-+      if (dev->flags & IFF_UP) {
-+              ret = eth_do_change_mtu(dev, mtu);
-+              if (ret < 0)
-+                      return ret;
-+      }
-+
-+      dev->mtu = mtu;
-+
-+      return 0;
-+}
-+
- static const struct net_device_ops ixp4xx_netdev_ops = {
-+      .ndo_change_mtu = ixp_eth_change_mtu,
-       .ndo_open = eth_open,
-       .ndo_stop = eth_close,
-       .ndo_start_xmit = eth_xmit,
diff --git a/target/linux/ixp4xx/patches-4.9/310-gtwx5717_spi_bus.patch b/target/linux/ixp4xx/patches-4.9/310-gtwx5717_spi_bus.patch
deleted file mode 100644 (file)
index 51f3f14..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-@@ -27,6 +27,8 @@
- #include <linux/serial.h>
- #include <linux/tty.h>
- #include <linux/serial_8250.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_gpio.h>
- #include <asm/types.h>
- #include <asm/setup.h>
- #include <asm/memory.h>
-@@ -146,9 +148,37 @@ static struct platform_device gtwx5715_f
-       .resource       = &gtwx5715_flash_resource,
- };
-+static struct spi_gpio_platform_data gtwx5715_spi_platform_data = {
-+        .sck            = GTWX5715_KSSPI_CLOCK,
-+        .mosi           = GTWX5715_KSSPI_TXD,
-+        .miso           = GTWX5715_KSSPI_RXD,
-+        .num_chipselect = 1,
-+};
-+
-+static struct platform_device gtwx5715_spi_device = {
-+        .name   = "spi_gpio",
-+        .id     = 1,
-+        .dev    = {
-+                .platform_data  = &gtwx5715_spi_platform_data,
-+      }
-+};
-+
-+static struct spi_board_info gtwx5715_spi_devices[] __initdata = {
-+        {
-+                .modalias               = "spi-ks8995",
-+                .max_speed_hz           = 5000000,
-+                .mode                   = SPI_MODE_0,
-+                .bus_num                = 1,
-+                .chip_select            = 0,
-+                .controller_data        = (void *)GTWX5715_KSSPI_SELECT,
-+      }
-+};
-+
-+
- static struct platform_device *gtwx5715_devices[] __initdata = {
-       &gtwx5715_uart_device,
-       &gtwx5715_flash,
-+      &gtwx5715_spi_device,
- };
- static void __init gtwx5715_init(void)
-@@ -158,6 +188,7 @@ static void __init gtwx5715_init(void)
-       gtwx5715_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       gtwx5715_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1;
-+      spi_register_board_info(gtwx5715_spi_devices, ARRAY_SIZE(gtwx5715_spi_devices));
-       platform_add_devices(gtwx5715_devices, ARRAY_SIZE(gtwx5715_devices));
- }
diff --git a/target/linux/ixp4xx/patches-4.9/311-gtwx5717_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/311-gtwx5717_mac_plat_info.patch
deleted file mode 100644 (file)
index 85a8f16..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-@@ -29,6 +29,7 @@
- #include <linux/serial_8250.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_gpio.h>
-+#include <linux/dma-mapping.h>
- #include <asm/types.h>
- #include <asm/setup.h>
- #include <asm/memory.h>
-@@ -174,11 +175,39 @@ static struct spi_board_info gtwx5715_sp
-       }
- };
-+static struct eth_plat_info gtwx5715_npeb_data = {
-+      .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+      .phy_mask       = 0x1e, /* ports 1-4 of the KS8995 switch */
-+      .rxq            = 3,
-+      .txreadyq       = 20,
-+};
-+
-+static struct eth_plat_info gtwx5715_npec_data = {
-+      .phy            = 5,    /* port 5 of the KS8995 switch */
-+      .rxq            = 4,
-+      .txreadyq       = 21,
-+};
-+
-+static struct platform_device gtwx5715_npeb_device = {
-+      .name                   = "ixp4xx_eth",
-+      .id                     = IXP4XX_ETH_NPEB,
-+      .dev.platform_data      = &gtwx5715_npeb_data,
-+      .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+};
-+
-+static struct platform_device gtwx5715_npec_device = {
-+      .name                   = "ixp4xx_eth",
-+      .id                     = IXP4XX_ETH_NPEC,
-+      .dev.platform_data      = &gtwx5715_npec_data,
-+      .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+};
- static struct platform_device *gtwx5715_devices[] __initdata = {
-       &gtwx5715_uart_device,
-       &gtwx5715_flash,
-       &gtwx5715_spi_device,
-+      &gtwx5715_npeb_device,
-+      &gtwx5715_npec_device,
- };
- static void __init gtwx5715_init(void)
diff --git a/target/linux/ixp4xx/patches-4.9/312-ixp4xx_pata_optimization.patch b/target/linux/ixp4xx/patches-4.9/312-ixp4xx_pata_optimization.patch
deleted file mode 100644 (file)
index 59c2837..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
---- a/drivers/ata/pata_ixp4xx_cf.c
-+++ b/drivers/ata/pata_ixp4xx_cf.c
-@@ -24,16 +24,58 @@
- #include <scsi/scsi_host.h>
- #define DRV_NAME      "pata_ixp4xx_cf"
--#define DRV_VERSION   "0.2"
-+#define DRV_VERSION   "0.3"
- static int ixp4xx_set_mode(struct ata_link *link, struct ata_device **error)
- {
-+      struct ixp4xx_pata_data *data = link->ap->host->dev->platform_data;
-+      unsigned int pio_mask;
-       struct ata_device *dev;
-       ata_for_each_dev(dev, link, ENABLED) {
--              ata_dev_info(dev, "configured for PIO0\n");
--              dev->pio_mode = XFER_PIO_0;
--              dev->xfer_mode = XFER_PIO_0;
-+              if (dev->id[ATA_ID_FIELD_VALID] & (1 << 1)) {
-+                      pio_mask = dev->id[ATA_ID_PIO_MODES] & 0x03;
-+                      if (pio_mask & (1 << 1)) {
-+                              pio_mask = 4;
-+                      } else {
-+                              pio_mask = 3;
-+                      }
-+              } else {
-+                      pio_mask = (dev->id[ATA_ID_OLD_PIO_MODES] >> 8);
-+              }
-+
-+              switch (pio_mask){
-+                      case 0:
-+                              ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n");
-+                              dev->pio_mode = XFER_PIO_0;
-+                              dev->xfer_mode = XFER_PIO_0;
-+                              *data->cs0_cfg = 0x8a473c03;
-+                              break;
-+                      case 1:
-+                              ata_dev_printk(dev, KERN_INFO, "configured for PIO1\n");
-+                              dev->pio_mode = XFER_PIO_1;
-+                              dev->xfer_mode = XFER_PIO_1;
-+                              *data->cs0_cfg = 0x86433c03;
-+                              break;
-+                      case 2:
-+                              ata_dev_printk(dev, KERN_INFO, "configured for PIO2\n");
-+                              dev->pio_mode = XFER_PIO_2;
-+                              dev->xfer_mode = XFER_PIO_2;
-+                              *data->cs0_cfg = 0x82413c03;
-+                              break;
-+                      case 3:
-+                              ata_dev_printk(dev, KERN_INFO, "configured for PIO3\n");
-+                              dev->pio_mode = XFER_PIO_3;
-+                              dev->xfer_mode = XFER_PIO_3;
-+                              *data->cs0_cfg = 0x80823c03;
-+                              break;
-+                      case 4:
-+                              ata_dev_printk(dev, KERN_INFO, "configured for PIO4\n");
-+                              dev->pio_mode = XFER_PIO_4;
-+                              dev->xfer_mode = XFER_PIO_4;
-+                              *data->cs0_cfg = 0x80403c03;
-+                              break;
-+              }
-               dev->xfer_shift = ATA_SHIFT_PIO;
-               dev->flags |= ATA_DFLAG_PIO;
-       }
-@@ -46,6 +88,7 @@ static unsigned int ixp4xx_mmio_data_xfe
-       unsigned int i;
-       unsigned int words = buflen >> 1;
-       u16 *buf16 = (u16 *) buf;
-+      unsigned int pio_mask;
-       struct ata_port *ap = dev->link->ap;
-       void __iomem *mmio = ap->ioaddr.data_addr;
-       struct ixp4xx_pata_data *data = dev_get_platdata(ap->host->dev);
-@@ -53,8 +96,34 @@ static unsigned int ixp4xx_mmio_data_xfe
-       /* set the expansion bus in 16bit mode and restore
-        * 8 bit mode after the transaction.
-        */
--      *data->cs0_cfg &= ~(0x01);
--      udelay(100);
-+      if (dev->id[ATA_ID_FIELD_VALID] & (1 << 1)){
-+              pio_mask = dev->id[ATA_ID_PIO_MODES] & 0x03;
-+              if (pio_mask & (1 << 1)){
-+                      pio_mask = 4;
-+              }else{
-+                      pio_mask = 3;
-+              }
-+      }else{
-+              pio_mask = (dev->id[ATA_ID_OLD_PIO_MODES] >> 8);
-+      }
-+      switch (pio_mask){
-+              case 0:
-+                      *data->cs0_cfg = 0xa9643c42;
-+              break;
-+              case 1:
-+                      *data->cs0_cfg = 0x85033c42;
-+              break;
-+              case 2:
-+                      *data->cs0_cfg = 0x80b23c42;
-+              break;
-+              case 3:
-+                      *data->cs0_cfg = 0x80823c42;
-+              break;
-+              case 4:
-+                      *data->cs0_cfg = 0x80403c42;
-+              break;
-+      }
-+      udelay(5);
-       /* Transfer multiple of 2 bytes */
-       if (rw == READ)
-@@ -79,8 +148,24 @@ static unsigned int ixp4xx_mmio_data_xfe
-               words++;
-       }
--      udelay(100);
--      *data->cs0_cfg |= 0x01;
-+      udelay(5);
-+      switch (pio_mask){
-+              case 0:
-+                      *data->cs0_cfg = 0x8a473c03;
-+              break;
-+              case 1:
-+                      *data->cs0_cfg = 0x86433c03;
-+              break;
-+              case 2:
-+                      *data->cs0_cfg = 0x82413c03;
-+              break;
-+              case 3:
-+                      *data->cs0_cfg = 0x80823c03;
-+              break;
-+              case 4:
-+                      *data->cs0_cfg = 0x80403c03;
-+              break;
-+      }
-       return words << 1;
- }
diff --git a/target/linux/ixp4xx/patches-4.9/500-usr8200_support.patch b/target/linux/ixp4xx/patches-4.9/500-usr8200_support.patch
deleted file mode 100644 (file)
index fb7f03e..0000000
+++ /dev/null
@@ -1,347 +0,0 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -93,6 +93,14 @@ config MACH_SIDEWINDER
-         Engineering Sidewinder board. For more information on this
-         platform, see http://www.adiengineering.com
-+config MACH_USR8200
-+      bool "USRobotics USR8200"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support the USRobotics
-+        USR8200 router board. For more information on this platform, see
-+        http://openwrt.org
-+
- config MACH_COMPEXWP18
-       bool "Compex WP18 / NP18A"
-       select PCI
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -27,6 +27,7 @@ obj-pci-$(CONFIG_MACH_WRT300NV2)             += wrt
- obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
- obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o
- obj-pci-$(CONFIG_MACH_MI424WR)                += mi424wr-pci.o
-+obj-pci-$(CONFIG_MACH_USR8200)                += usr8200-pci.o
- obj-y += common.o
-@@ -55,6 +56,7 @@ obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv
- obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
- obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o
- obj-$(CONFIG_MACH_MI424WR)    += mi424wr-setup.o
-+obj-$(CONFIG_MACH_USR8200)    += usr8200-setup.o
- obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
- obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-@@ -44,7 +44,8 @@ static __inline__ void __arch_decomp_set
-           machine_is_gateway7001() || machine_is_wg302v2() ||
-           machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() ||
-           machine_is_pronghorn() || machine_is_pronghorn_metro() ||
--          machine_is_wrt300nv2() || machine_is_tw5334())
-+          machine_is_wrt300nv2() || machine_is_tw5334() ||
-+          machine_is_usr8200())
-               uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
-       else
-               uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/usr8200-pci.c
-@@ -0,0 +1,77 @@
-+/*
-+ * arch/arch/mach-ixp4xx/usr8200-pci.c
-+ *
-+ * PCI setup routines for USRobotics USR8200
-+ *
-+ * Copyright (C) 2008 Peter Denison <openwrt@marshadder.org>
-+ *
-+ * based on pronghorn-pci.c
-+ *    Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ *
-+ * Maintainer: Peter Denison <openwrt@marshadder.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+
-+#include <asm/mach/pci.h>
-+
-+void __init usr8200_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init usr8200_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == 14)
-+              return IRQ_IXP4XX_GPIO7;
-+      else if (slot == 15)
-+              return IRQ_IXP4XX_GPIO8;
-+      else if (slot == 16) {
-+              if (pin == 1)
-+                      return IRQ_IXP4XX_GPIO11;
-+              else if (pin == 2)
-+                      return IRQ_IXP4XX_GPIO10;
-+              else if (pin == 3)
-+                      return IRQ_IXP4XX_GPIO9;
-+              else
-+                      return -1;
-+      } else
-+              return -1;
-+}
-+
-+struct hw_pci usr8200_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit        = usr8200_pci_preinit,
-+      .ops            = &ixp4xx_ops,
-+      .setup          = ixp4xx_setup,
-+      .map_irq        = usr8200_map_irq,
-+};
-+
-+int __init usr8200_pci_init(void)
-+{
-+      if (machine_is_usr8200())
-+              pci_common_init(&usr8200_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(usr8200_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
-@@ -0,0 +1,217 @@
-+/*
-+ * arch/arm/mach-ixp4xx/usr8200-setup.c
-+ *
-+ * Board setup for the USRobotics USR8200
-+ *
-+ * Copyright (C) 2008 Peter Denison <openwrt@marshadder.org>
-+ *
-+ * based on pronghorn-setup.c:
-+ *    Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Peter Denison <openwrt@marshadder.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <linux/memory.h>
-+#include <linux/i2c-gpio.h>
-+#include <linux/leds.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/setup.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct flash_platform_data usr8200_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource usr8200_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device usr8200_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data  = &usr8200_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &usr8200_flash_resource,
-+};
-+
-+static struct resource usr8200_uart_resources [] = {
-+      {
-+              .start          = IXP4XX_UART2_BASE_PHYS,
-+              .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      },
-+      {
-+              .start          = IXP4XX_UART1_BASE_PHYS,
-+              .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      }
-+};
-+
-+static struct plat_serial8250_port usr8200_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device usr8200_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev            = {
-+              .platform_data  = usr8200_uart_data,
-+      },
-+      .num_resources  = 2,
-+      .resource       = usr8200_uart_resources,
-+};
-+
-+static struct gpio_led usr8200_led_pin[] = {
-+      {
-+              .name           = "usr8200:usb1",
-+              .gpio           = 0,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "usr8200:usb2",
-+              .gpio           = 1,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "usr8200:ieee1394",
-+              .gpio           = 2,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "usr8200:internal",
-+              .gpio           = 3,
-+              .active_low     = 1,
-+      },
-+      {
-+              .name           = "usr8200:power",
-+              .gpio           = 14,
-+      }
-+};
-+
-+static struct gpio_led_platform_data usr8200_led_data = {
-+      .num_leds               = ARRAY_SIZE(usr8200_led_pin),
-+      .leds                   = usr8200_led_pin,
-+};
-+
-+static struct platform_device usr8200_led = {
-+      .name                   = "leds-gpio",
-+      .id                     = -1,
-+      .dev.platform_data      = &usr8200_led_data,
-+};
-+
-+static struct eth_plat_info usr8200_plat_eth[] = {
-+      { /* NPEC - LAN with Marvell 88E6060 switch */
-+              .phy            = IXP4XX_ETH_PHY_MAX_ADDR,
-+              .phy_mask       = 0x0F0000,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }, { /* NPEB - WAN */
-+              .phy            = 9,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }
-+};
-+
-+static struct platform_device usr8200_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = usr8200_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = usr8200_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct resource usr8200_rtc_resources = {
-+      .flags          = IORESOURCE_MEM
-+};
-+
-+static struct platform_device usr8200_rtc = {
-+      .name           = "rtc7301",
-+      .id             = 0,
-+      .num_resources  = 1,
-+      .resource       = &usr8200_rtc_resources,
-+};
-+
-+static struct platform_device *usr8200_devices[] __initdata = {
-+      &usr8200_flash,
-+      &usr8200_uart,
-+      &usr8200_led,
-+      &usr8200_eth[0],
-+      &usr8200_eth[1],
-+      &usr8200_rtc,
-+};
-+
-+static void __init usr8200_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      usr8200_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      usr8200_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1;
-+
-+      usr8200_rtc_resources.start = IXP4XX_EXP_BUS_BASE(2);
-+      usr8200_rtc_resources.end = IXP4XX_EXP_BUS_BASE(2) + 0x01ff;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS2 = 0x3fff000 | IXP4XX_EXP_BUS_SIZE(0) | IXP4XX_EXP_BUS_WR_EN |
-+                        IXP4XX_EXP_BUS_CS_EN | IXP4XX_EXP_BUS_BYTE_EN;
-+      *IXP4XX_GPIO_GPCLKR = 0x01100000;
-+
-+      /* configure button as input */
-+      gpio_line_config(12, IXP4XX_GPIO_IN);
-+
-+      platform_add_devices(usr8200_devices, ARRAY_SIZE(usr8200_devices));
-+}
-+
-+MACHINE_START(USR8200, "USRobotics USR8200")
-+      /* Maintainer: Peter Denison <openwrt@marshadder.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = usr8200_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
diff --git a/target/linux/ixp4xx/patches-4.9/520-tw2662_support.patch b/target/linux/ixp4xx/patches-4.9/520-tw2662_support.patch
deleted file mode 100644 (file)
index 39a261b..0000000
+++ /dev/null
@@ -1,316 +0,0 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -176,6 +176,15 @@ config ARCH_PRPMC1100
-         PrPCM1100 Processor Mezanine Module. For more information on
-         this platform, see <file:Documentation/arm/IXP4xx>.
-+config MACH_TW2662
-+        bool "Titan Wireless TW-266-2"
-+        select PCI
-+        help
-+          Say 'Y' here if you want your kernel to support the Titan
-+          Wireless TW266-2. For more information on this platform,
-+          see http://openwrt.org
-+
-+
- config MACH_TW5334
-       bool "Titan Wireless TW-533-4"
-       select PCI
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -25,6 +25,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER)    += sid
- obj-pci-$(CONFIG_MACH_COMPEXWP18)     += ixdp425-pci.o
- obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
- obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
-+obj-pci-$(CONFIG_MACH_TW2662)         += tw2662-pci.o
- obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o
- obj-pci-$(CONFIG_MACH_MI424WR)                += mi424wr-pci.o
- obj-pci-$(CONFIG_MACH_USR8200)                += usr8200-pci.o
-@@ -54,6 +55,7 @@ obj-$(CONFIG_MACH_SIDEWINDER)        += sidewin
- obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o
- obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
- obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
-+obj-$(CONFIG_MACH_TW2662)     += tw2662-setup.o
- obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o
- obj-$(CONFIG_MACH_MI424WR)    += mi424wr-setup.o
- obj-$(CONFIG_MACH_USR8200)    += usr8200-setup.o
---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-@@ -45,7 +45,7 @@ static __inline__ void __arch_decomp_set
-           machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() ||
-           machine_is_pronghorn() || machine_is_pronghorn_metro() ||
-           machine_is_wrt300nv2() || machine_is_tw5334() ||
--          machine_is_usr8200())
-+          machine_is_usr8200() || machine_is_tw2662())
-               uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
-       else
-               uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/tw2662-pci.c
-@@ -0,0 +1,67 @@
-+/*
-+ * arch/arm/mach-ixp4xx/tw2662-pci.c
-+ *
-+ * PCI setup routines for Tiran Wireless TW-266-2 platform
-+ *
-+ * Copyright (C) 2002 Jungo Software Technologies.
-+ * Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ * Copyright (C) 2010 Alexandros C. Couloumbis <alex@ozo.com>
-+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * Maintainer: Deepak Saxena <dsaxena@mvista.com>
-+ * Maintainer: Alexandros C. Couloumbis <alex@ozo.com>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach/pci.h>
-+
-+#define SLOT0_DEVID   1
-+#define SLOT1_DEVID   3
-+
-+/* PCI controller GPIO to IRQ pin mappings */
-+#define SLOT0_INTA    11
-+#define SLOT1_INTA    9
-+
-+void __init tw2662_pci_preinit(void)
-+{
-+      irq_set_irq_type(IXP4XX_GPIO_IRQ(SLOT0_INTA), IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IXP4XX_GPIO_IRQ(SLOT1_INTA), IRQ_TYPE_LEVEL_LOW);
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init tw2662_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      if (slot == SLOT0_DEVID)
-+              return IXP4XX_GPIO_IRQ(SLOT0_INTA);
-+      else if (slot == SLOT1_DEVID)
-+              return IXP4XX_GPIO_IRQ(SLOT1_INTA);
-+      else return -1;
-+}
-+
-+struct hw_pci tw2662_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit =        tw2662_pci_preinit,
-+      .ops =            &ixp4xx_ops,
-+      .setup =          ixp4xx_setup,
-+      .map_irq =        tw2662_map_irq,
-+};
-+
-+int __init tw2662_pci_init(void)
-+{
-+        if (machine_is_tw2662())
-+              pci_common_init(&tw2662_pci);
-+        return 0;
-+}
-+
-+subsys_initcall(tw2662_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
-@@ -0,0 +1,196 @@
-+/*
-+ * arch/arm/mach-ixp4xx/tw2662-setup.c
-+ *
-+ * Titan Wireless TW-266-2
-+ *
-+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2010 Alexandros C. Couloumbis <alex@ozo.com>
-+ *
-+ * based on ap1000-setup.c:
-+ *    Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/if_ether.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/slab.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/io.h>
-+#include <asm/types.h>
-+#include <asm/setup.h>
-+#include <asm/memory.h>
-+#include <mach/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+/* gpio mask used by platform device */
-+#define TW2662_GPIO_MASK        (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7)
-+
-+static struct flash_platform_data tw2662_flash_data = {
-+      .map_name       = "cfi_probe",
-+      .width          = 2,
-+};
-+
-+static struct resource tw2662_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device tw2662_flash = {
-+      .name           = "IXP4XX-Flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data = &tw2662_flash_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &tw2662_flash_resource,
-+};
-+
-+static struct resource tw2662_uart_resources[] = {
-+      {
-+              .start          = IXP4XX_UART1_BASE_PHYS,
-+              .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      },
-+      {
-+              .start          = IXP4XX_UART2_BASE_PHYS,
-+              .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+              .flags          = IORESOURCE_MEM
-+      }
-+};
-+
-+static struct plat_serial8250_port tw2662_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART1_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART1,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device tw2662_uart = {
-+      .name                   = "serial8250",
-+      .id                     = PLAT8250_DEV_PLATFORM,
-+      .dev.platform_data      = tw2662_uart_data,
-+      .num_resources          = 2,
-+      .resource               = tw2662_uart_resources
-+};
-+
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info tw2662_plat_eth[] = {
-+        {
-+                .phy            = 3,
-+                .rxq            = 3,
-+                .txreadyq       = 20,
-+        }, {
-+                .phy            = 1,
-+                .rxq            = 4,
-+                .txreadyq       = 21,
-+        }
-+};
-+
-+static struct platform_device tw2662_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = tw2662_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = tw2662_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+
-+static struct platform_device *tw2662_devices[] __initdata = {
-+      &tw2662_flash,
-+      &tw2662_uart,
-+      &tw2662_eth[0],
-+      &tw2662_eth[1],
-+};
-+
-+static char tw2662_mem_fixup[] __initdata = "mem=64M ";
-+
-+static void __init tw2662_fixup(struct tag *tags, char **cmdline)
-+{
-+      struct tag *t = tags;
-+      char *p = *cmdline;
-+
-+      /* Find the end of the tags table, taking note of any cmdline tag. */
-+      for (; t->hdr.size; t = tag_next(t)) {
-+              if (t->hdr.tag == ATAG_CMDLINE) {
-+                      p = t->u.cmdline.cmdline;
-+              }
-+      }
-+
-+      /* Overwrite the end of the table with a new cmdline tag. */
-+      t->hdr.tag = ATAG_CMDLINE;
-+      t->hdr.size = (sizeof (struct tag_header) +
-+              strlen(tw2662_mem_fixup) + strlen(p) + 1 + 4) >> 2;
-+      strlcpy(t->u.cmdline.cmdline, tw2662_mem_fixup, COMMAND_LINE_SIZE);
-+      strlcpy(t->u.cmdline.cmdline + strlen(tw2662_mem_fixup), p,
-+              COMMAND_LINE_SIZE - strlen(tw2662_mem_fixup));
-+
-+      /* Terminate the table. */
-+      t = tag_next(t);
-+      t->hdr.tag = ATAG_NONE;
-+      t->hdr.size = 0;
-+}
-+
-+static void __init tw2662_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      tw2662_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      tw2662_flash_resource.end =
-+              IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-+
-+      platform_add_devices(tw2662_devices, ARRAY_SIZE(tw2662_devices));
-+
-+      if (!(is_valid_ether_addr(tw2662_plat_eth[0].hwaddr)))
-+              random_ether_addr(tw2662_plat_eth[0].hwaddr);
-+      if (!(is_valid_ether_addr(tw2662_plat_eth[1].hwaddr))) {
-+              memcpy(tw2662_plat_eth[1].hwaddr, tw2662_plat_eth[0].hwaddr, ETH_ALEN);
-+              tw2662_plat_eth[1].hwaddr[5] = (tw2662_plat_eth[0].hwaddr[5] + 1);
-+      }
-+
-+}
-+
-+#ifdef CONFIG_MACH_TW2662
-+MACHINE_START(TW2662, "Titan Wireless TW-266-2")
-+      /* Maintainer: Alexandros C. Couloumbis <alex@ozo.com> */
-+      .fixup          = tw2662_fixup,
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x0100,
-+      .init_machine   = tw2662_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+#endif
diff --git a/target/linux/ixp4xx/patches-4.9/530-ap42x_support.patch b/target/linux/ixp4xx/patches-4.9/530-ap42x_support.patch
deleted file mode 100644 (file)
index 1afbe3d..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -4,6 +4,14 @@ menu "Intel IXP4xx Implementation Option
- comment "IXP4xx Platforms"
-+config MACH_AP42X
-+      bool "Tonze AP-422/425"
-+      select PCI
-+      help
-+        Say 'Y' here if you want your kernel to support Tonze's
-+        AP-422/425 boards. For more information on this platform,
-+        see http://tonze.com.tw
-+
- config MACH_NSLU2
-       bool
-       prompt "Linksys NSLU2"
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -5,6 +5,7 @@
- obj-pci-y     :=
- obj-pci-n     :=
-+obj-pci-$(CONFIG_MACH_AP42X)          += ap42x-pci.o
- obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
- obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o
- obj-pci-$(CONFIG_MACH_CAMBRIA)                += cambria-pci.o
-@@ -32,6 +33,7 @@ obj-pci-$(CONFIG_MACH_USR8200)               += usr82
- obj-y += common.o
-+obj-$(CONFIG_MACH_AP42X)      += ap42x-setup.o
- obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
- obj-$(CONFIG_MACH_AVILA)      += avila-setup.o
- obj-$(CONFIG_MACH_CAMBRIA)    += cambria-setup.o
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/ap42x-pci.c
-@@ -0,0 +1,63 @@
-+/*
-+ * arch/arch/mach-ixp4xx/ap42x-pci.c
-+ *
-+ * PCI setup routines for Tonze AP-422/425
-+ *
-+ * Copyright (C) 2012 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-pci.c:
-+ *    Copyright (C) 2002 Jungo Software Technologies.
-+ *    Copyright (C) 2003 MontaVista Softwrae, Inc.
-+ *
-+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/pci.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach-types.h>
-+#include <mach/hardware.h>
-+
-+#include <asm/mach/pci.h>
-+
-+void __init ap42x_pci_preinit(void)
-+{
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
-+      irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
-+
-+      ixp4xx_pci_preinit();
-+}
-+
-+static int __init ap42x_map_irq(const struct pci_dev *dev, u8 slot,
-+      u8 pin)
-+{
-+      if (slot == 1)
-+              return IRQ_IXP4XX_GPIO11;
-+      else if (slot == 2)
-+              return IRQ_IXP4XX_GPIO10;
-+      else return -1;
-+}
-+
-+struct hw_pci ap42x_pci __initdata = {
-+      .nr_controllers = 1,
-+      .preinit        = ap42x_pci_preinit,
-+      .ops            = &ixp4xx_ops,
-+      .setup          = ixp4xx_setup,
-+      .map_irq        = ap42x_map_irq,
-+};
-+
-+int __init ap42x_pci_init(void)
-+{
-+      if (machine_is_ap42x())
-+              pci_common_init(&ap42x_pci);
-+      return 0;
-+}
-+
-+subsys_initcall(ap42x_pci_init);
---- /dev/null
-+++ b/arch/arm/mach-ixp4xx/ap42x-setup.c
-@@ -0,0 +1,166 @@
-+/*
-+ * arch/arm/mach-ixp4xx/ap42x-setup.c
-+ *
-+ * Board setup for the Tonze AP-42x boards
-+ *
-+ * Copyright (C) 2012 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * based on coyote-setup.c:
-+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ *
-+ * Author: Imre Kaloz <Kaloz@openwrt.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/serial.h>
-+#include <linux/tty.h>
-+#include <linux/serial_8250.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <asm/types.h>
-+#include <asm/setup.h>
-+#include <asm/memory.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+
-+static struct mtd_partition ap42x_flash_partitions[] = {
-+      {
-+              .name           = "RedBoot",
-+              .offset         = 0x00000000,
-+              .size           = 0x00080000,
-+      }, {
-+              .name           = "linux",
-+              .offset         = 0x00080000,
-+              .size           = 0x00100000,
-+      }, {
-+              .name           = "rootfs",
-+              .offset         = 0x00180000,
-+              .size           = 0x00660000,
-+      }, {
-+              .name           = "FIS directory",
-+              .offset         = 0x007f8000,
-+              .size           = 0x00007000,
-+      }, {
-+              .name           = "RedBoot config",
-+              .offset         = 0x007ff000,
-+              .size           = 0x00001000,
-+      },
-+};
-+
-+static struct physmap_flash_data ap42x_flash_data = {
-+      .width          = 2,
-+      .parts          = ap42x_flash_partitions,
-+      .nr_parts       = ARRAY_SIZE(ap42x_flash_partitions),
-+};
-+
-+static struct resource ap42x_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+      .start          = IXP4XX_EXP_BUS_BASE_PHYS,
-+      .end            = IXP4XX_EXP_BUS_BASE_PHYS + SZ_8M - 1,
-+};
-+
-+static struct platform_device ap42x_flash = {
-+      .name                   = "physmap-flash",
-+      .id                     = 0,
-+      .dev            = {
-+              .platform_data  = &ap42x_flash_data,
-+      },
-+      .num_resources          = 1,
-+      .resource               = &ap42x_flash_resource,
-+};
-+
-+static struct resource ap42x_uart_resource = {
-+      .start  = IXP4XX_UART2_BASE_PHYS,
-+      .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-+      .flags  = IORESOURCE_MEM,
-+};
-+
-+static struct plat_serial8250_port ap42x_uart_data[] = {
-+      {
-+              .mapbase        = IXP4XX_UART2_BASE_PHYS,
-+              .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-+              .irq            = IRQ_IXP4XX_UART2,
-+              .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-+              .iotype         = UPIO_MEM,
-+              .regshift       = 2,
-+              .uartclk        = IXP4XX_UART_XTAL,
-+      },
-+      { },
-+};
-+
-+static struct platform_device ap42x_uart = {
-+      .name           = "serial8250",
-+      .id             = PLAT8250_DEV_PLATFORM,
-+      .dev                    = {
-+              .platform_data  = ap42x_uart_data,
-+      },
-+      .num_resources  = 1,
-+      .resource       = &ap42x_uart_resource,
-+};
-+
-+static struct eth_plat_info ap42x_plat_eth[] = {
-+      {
-+              .phy            = 2,
-+              .rxq            = 3,
-+              .txreadyq       = 20,
-+      }, {
-+              .phy            = 1,
-+              .rxq            = 4,
-+              .txreadyq       = 21,
-+      }
-+};
-+
-+static struct platform_device ap42x_eth[] = {
-+      {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEB,
-+              .dev.platform_data      = ap42x_plat_eth,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }, {
-+              .name                   = "ixp4xx_eth",
-+              .id                     = IXP4XX_ETH_NPEC,
-+              .dev.platform_data      = ap42x_plat_eth + 1,
-+              .dev.coherent_dma_mask  = DMA_BIT_MASK(32),
-+      }
-+};
-+
-+static struct platform_device *ap42x_devices[] __initdata = {
-+      &ap42x_flash,
-+      &ap42x_uart,
-+      &ap42x_eth[0],
-+      &ap42x_eth[1],
-+};
-+
-+static void __init ap42x_init(void)
-+{
-+      ixp4xx_sys_init();
-+
-+      ap42x_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+      ap42x_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-+
-+      *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-+      *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-+
-+      platform_add_devices(ap42x_devices, ARRAY_SIZE(ap42x_devices));
-+}
-+
-+#ifdef CONFIG_MACH_AP42X
-+MACHINE_START(AP42X, "Tonze AP-422/425")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .map_io         = ixp4xx_map_io,
-+      .init_irq       = ixp4xx_init_irq,
-+      .init_time      = ixp4xx_timer_init,
-+      .atag_offset    = 0x100,
-+      .init_machine   = ap42x_init,
-+#if defined(CONFIG_PCI)
-+      .dma_zone_size  = SZ_64M,
-+#endif
-+      .restart        = ixp4xx_restart,
-+MACHINE_END
-+#endif
---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-@@ -45,7 +45,8 @@ static __inline__ void __arch_decomp_set
-           machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() ||
-           machine_is_pronghorn() || machine_is_pronghorn_metro() ||
-           machine_is_wrt300nv2() || machine_is_tw5334() ||
--          machine_is_usr8200() || machine_is_tw2662())
-+          machine_is_usr8200() || machine_is_tw2662() ||
-+          machine_is_ap42x())
-               uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
-       else
-               uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
diff --git a/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch
deleted file mode 100644 (file)
index cdd9fde..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -215,6 +215,9 @@ struct sk_buff *__alloc_skb(unsigned int
-       if (sk_memalloc_socks() && (flags & SKB_ALLOC_RX))
-               gfp_mask |= __GFP_MEMALLOC;
-+#ifdef CONFIG_ARCH_IXP4XX
-+      gfp_mask |= GFP_DMA;
-+#endif
-       /* Get the HEAD */
-       skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
-@@ -1228,6 +1231,10 @@ int pskb_expand_head(struct sk_buff *skb
-       if (skb_shared(skb))
-               BUG();
-+#ifdef CONFIG_ARCH_IXP4XX
-+      gfp_mask |= GFP_DMA;
-+#endif
-+
-       size = SKB_DATA_ALIGN(size);
-       if (skb_pfmemalloc(skb))
diff --git a/target/linux/ixp4xx/patches-4.9/900-ixp4xx-crypto-include-module.h.patch b/target/linux/ixp4xx/patches-4.9/900-ixp4xx-crypto-include-module.h.patch
deleted file mode 100644 (file)
index 24c93dc..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/crypto/ixp4xx_crypto.c
-+++ b/drivers/crypto/ixp4xx_crypto.c
-@@ -14,6 +14,7 @@
- #include <linux/dmapool.h>
- #include <linux/crypto.h>
- #include <linux/kernel.h>
-+#include <linux/module.h>
- #include <linux/rtnetlink.h>
- #include <linux/interrupt.h>
- #include <linux/spinlock.h>
diff --git a/target/linux/ixp4xx/patches-4.9/910-ixp4xx-nr_irq_lines.patch b/target/linux/ixp4xx/patches-4.9/910-ixp4xx-nr_irq_lines.patch
deleted file mode 100644 (file)
index 06e09f4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
-+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
-@@ -53,7 +53,7 @@ static int __init ixdp425_map_irq(const
-       };
-       if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
--              return pci_irq_table[(slot + pin - 2) % 4];
-+              return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
-       return -1;
- }
---- a/arch/arm/mach-ixp4xx/miccpt-pci.c
-+++ b/arch/arm/mach-ixp4xx/miccpt-pci.c
-@@ -54,7 +54,7 @@ static int __init miccpt_map_irq(const s
-       };
-       if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
--              return pci_irq_table[(slot + pin - 2) % 4];
-+              return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
-       return -1;
- }
index adc7a496e12f1c4fbb92c73602d61bf5d74d04f7..3eac246a42ed0984593be480f00a228c3bcd9110 100644 (file)
@@ -14,7 +14,6 @@ CPU_TYPE:=xscale
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/kirkwood/patches-4.19/100-ib62x0.patch b/target/linux/kirkwood/patches-4.19/100-ib62x0.patch
deleted file mode 100644 (file)
index d1a5aa7..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
-+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
-@@ -6,7 +6,7 @@
- / {
-       model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
--      compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
-+      compatible = "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
-       memory {
-               device_type = "memory";
-@@ -118,13 +118,13 @@
-       };
-       partition@100000 {
--              label = "uImage";
--              reg = <0x0100000 0x600000>;
-+              label = "second stage u-boot";
-+              reg = <0x100000 0x200000>;
-       };
--      partition@700000 {
--              label = "root";
--              reg = <0x0700000 0xf900000>;
-+      partition@200000 {
-+              label = "ubi";
-+              reg = <0x200000 0xfe00000>;
-       };
- };
diff --git a/target/linux/kirkwood/patches-4.19/101-iconnect.patch b/target/linux/kirkwood/patches-4.19/101-iconnect.patch
deleted file mode 100644 (file)
index ab47b5a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-iconnect.dts
-+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
-@@ -16,8 +16,6 @@
-       chosen {
-               bootargs = "console=ttyS0,115200n8 earlyprintk";
-               stdout-path = &uart0;
--              linux,initrd-start = <0x4500040>;
--              linux,initrd-end   = <0x4800000>;
-       };
-       ocp@f1000000 {
-@@ -146,28 +144,23 @@
-       status = "okay";
-       partition@0 {
--              label = "uboot";
--              reg = <0x0000000 0xc0000>;
-+              label = "u-boot";
-+              reg = <0x0000000 0xe0000>;
-       };
--      partition@a0000 {
--              label = "env";
--              reg = <0xa0000 0x20000>;
-+      partition@e0000 {
-+              label = "u-boot environment";
-+              reg = <0xe0000 0x100000>;
-       };
-       partition@100000 {
--              label = "zImage";
--              reg = <0x100000 0x300000>;
-+              label = "second stage u-boot";
-+              reg = <0x100000 0x200000>;
-       };
--      partition@540000 {
--              label = "initrd";
--              reg = <0x540000 0x300000>;
--      };
--
--      partition@980000 {
--              label = "boot";
--              reg = <0x980000 0x1f400000>;
-+      partition@200000 {
-+              label = "ubi";
-+              reg = <0x200000 0x1fe00000>;
-       };
- };
diff --git a/target/linux/kirkwood/patches-4.19/102-dockstar.patch b/target/linux/kirkwood/patches-4.19/102-dockstar.patch
deleted file mode 100644 (file)
index 7462b93..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-dockstar.dts
-+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
-@@ -78,18 +78,22 @@
-       partition@0 {
-               label = "u-boot";
--              reg = <0x0000000 0x100000>;
--              read-only;
-+              reg = <0x0000000 0xe0000>;
-+      };
-+
-+      partition@e0000 {
-+              label = "u-boot environment";
-+              reg = <0xe0000 0x100000>;
-       };
-       partition@100000 {
--              label = "uImage";
--              reg = <0x0100000 0x400000>;
-+              label = "second stage u-boot";
-+              reg = <0x100000 0x200000>;
-       };
--      partition@500000 {
--              label = "data";
--              reg = <0x0500000 0xfb00000>;
-+      partition@200000 {
-+              label = "ubi";
-+              reg = <0x200000 0xfe00000>;
-       };
- };
diff --git a/target/linux/kirkwood/patches-4.19/103-iomega-ix2-200.patch b/target/linux/kirkwood/patches-4.19/103-iomega-ix2-200.patch
deleted file mode 100644 (file)
index 9036ead..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
-+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
-@@ -186,18 +186,18 @@
-       };
-       partition@a0000 {
--              label = "env";
-+              label = "u-boot environment";
-               reg = <0xa0000 0x20000>;
-               read-only;
-       };
-       partition@100000 {
--              label = "uImage";
-+              label = "kernel";
-               reg = <0x100000 0x300000>;
-       };
-       partition@400000 {
--              label = "rootfs";
-+              label = "ubi";
-               reg = <0x400000 0x1C00000>;
-       };
- };
-@@ -211,7 +211,7 @@
- };
- &eth0 {
--      status = "okay";
-+      status = "disabled";
-       ethernet0-port@0 {
-               speed = <1000>;
-               duplex = <1>;
diff --git a/target/linux/kirkwood/patches-4.19/104-ea3500.patch b/target/linux/kirkwood/patches-4.19/104-ea3500.patch
deleted file mode 100644 (file)
index 45dc670..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -269,6 +269,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
-       kirkwood-linkstation-lswsxl.dtb \
-       kirkwood-linkstation-lswvl.dtb \
-       kirkwood-linkstation-lswxl.dtb \
-+      kirkwood-linksys-audi.dtb \
-       kirkwood-linksys-viper.dtb \
-       kirkwood-lschlv2.dtb \
-       kirkwood-lsxhl.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
-@@ -0,0 +1,246 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
-+ *
-+ * (c) 2013 Jonas Gorski <jogo@openwrt.org>
-+ * (c) 2013 Deutsche Telekom Innovation Laboratories
-+ * (c) 2014 Luka Perkov <luka@openwrt.org>
-+ * (c) 2014 Dan Walters <dan@walters.io>
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+#include "kirkwood.dtsi"
-+#include "kirkwood-6282.dtsi"
-+
-+/ {
-+      model = "Linksys Audi (EA3500)";
-+      compatible = "linksys,audi", "marvell,kirkwood-88f6282", "marvell,kirkwood";
-+
-+      memory@0 {
-+              device_type = "memory";
-+              reg = <0x00000000 0x4000000>;
-+      };
-+
-+      aliases {
-+              serial0 = &uart0;
-+      };
-+
-+      chosen {
-+              stdout-path = "serial0:115200n8";
-+      };
-+
-+      gpio_keys {
-+              compatible = "gpio-keys";
-+              pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >;
-+              pinctrl-names = "default";
-+
-+              wps {
-+                      label = "WPS Button";
-+                      linux,code = <KEY_WPS_BUTTON>;
-+                      gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              reset {
-+                      label = "Reset Button";
-+                      linux,code = <KEY_RESTART>;
-+                      gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+
-+      gpio-leds {
-+              compatible = "gpio-leds";
-+              pinctrl-0 = < &pmx_led_green_power >;
-+              pinctrl-names = "default";
-+
-+              green-power {
-+                      label = "audi:green:power";
-+                      gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
-+              };
-+      };
-+
-+      switches {
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              mvsw61xx@10 {
-+                      compatible = "marvell,88e6171";
-+                      status = "okay";
-+                      reg = <0x10>;
-+
-+                      mii-bus = <&mdio>;
-+                      cpu-port-0 = <5>;
-+                      cpu-port-1 = <6>;
-+                      is-indirect;
-+              };
-+      };
-+
-+      dsa {
-+              compatible = "marvell,dsa";
-+              #address-cells = <2>;
-+              #size-cells = <0>;
-+
-+              dsa,ethernet = <&eth0port>;
-+              dsa,mii-bus = <&mdio>;
-+
-+              switch@16,0 {
-+                      #address-cells = <1>;
-+                      #size-cells = <0>;
-+                      reg = <16 0>;   /* MDIO address 16, switch 0 in tree */
-+
-+                      port@0 {
-+                              reg = <0>;
-+                              label = "ethernet1";
-+                      };
-+
-+                      port@1 {
-+                              reg = <1>;
-+                              label = "ethernet2";
-+                      };
-+
-+                      port@2 {
-+                              reg = <2>;
-+                              label = "ethernet3";
-+                      };
-+
-+                      port@3 {
-+                              reg = <3>;
-+                              label = "ethernet4";
-+                      };
-+
-+                      port@4 {
-+                              reg = <4>;
-+                              label = "internet";
-+                      };
-+
-+                      port@5 {
-+                              reg = <5>;
-+                              label = "cpu";
-+                      };
-+              };
-+      };
-+};
-+
-+&pinctrl {
-+      pmx_led_green_power: pmx-led-green-power {
-+              marvell,pins = "mpp7";
-+              marvell,function = "gpo";
-+      };
-+      pmx_btn_wps: pmx-btn-wps {
-+              marvell,pins = "mpp47";
-+              marvell,function = "gpio";
-+      };
-+      pmx_btn_reset: pmx-btn-reset {
-+              marvell,pins = "mpp48";
-+              marvell,function = "gpio";
-+      };
-+};
-+
-+&nand {
-+      status = "okay";
-+      pinctrl-0 = <&pmx_nand>;
-+      pinctrl-names = "default";
-+
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              partition@0 {
-+                      label = "u-boot";
-+                      reg = <0x0 0x80000>;
-+                      read-only;
-+              };
-+
-+              partition@80000 {
-+                      label = "u_env";
-+                      reg = <0x80000 0x4000>;
-+              };
-+
-+              partition@84000 {
-+                      label = "s_env";
-+                      reg = <0x84000 0x4000>;
-+              };
-+
-+              partition@200000 {
-+                      label = "kernel1";
-+                      reg = <0x200000 0x290000>;
-+              };
-+
-+              partition@490000 {
-+                      label = "rootfs1";
-+                      reg = <0x490000 0x1170000>;
-+              };
-+
-+              partition@1600000 {
-+                      label = "kernel2";
-+                      reg = <0x1600000 0x290000>;
-+              };
-+
-+              partition@1890000 {
-+                      label = "rootfs2";
-+                      reg = <0x1890000 0x1170000>;
-+              };
-+
-+              partition@2a00000 {
-+                      label = "syscfg";
-+                      reg = <0x2a00000  0x1600000>;
-+              };
-+
-+              partition@88000 {
-+                      label = "unused";
-+                      reg = <0x88000 0x178000>;
-+              };
-+
-+      };
-+};
-+
-+&pciec {
-+      status = "okay";
-+};
-+
-+&pcie0 {
-+      status = "okay";
-+};
-+
-+&pcie1 {
-+      status = "okay";
-+};
-+
-+&mdio {
-+      status = "okay";
-+};
-+
-+&uart0 {
-+      status = "okay";
-+};
-+
-+/* eth0 is connected to a Marvell 88E6171 switch, without a PHY. So set
-+ * fixed speed and duplex.
-+ */
-+&eth0 {
-+      status = "okay";
-+      ethernet0-port@0 {
-+              speed = <1000>;
-+              duplex = <1>;
-+      };
-+};
-+
-+/* eth1 is connected to the switch at port 6. However DSA only supports a
-+ * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
-+ */
-+&eth1 {
-+      status = "okay";
-+      ethernet1-port@0 {
-+              speed = <1000>;
-+              duplex = <1>;
-+      };
-+};
-+
-+/* There is no battery on the board, so the RTC does not keep
-+ * time when there is no power, making it useless.
-+ */
-+&rtc {
-+      status = "disabled";
-+};
diff --git a/target/linux/kirkwood/patches-4.19/105-ea4500.patch b/target/linux/kirkwood/patches-4.19/105-ea4500.patch
deleted file mode 100644 (file)
index c7c8b38..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
-+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
-@@ -67,9 +67,23 @@
-               };
-       };
--      dsa {
--              status = "disabled";
-+      switches {
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+              mvsw61xx@10 {
-+                      compatible = "marvell,88e6171";
-+                      status = "okay";
-+                      reg = <0x10>;
-+
-+                      mii-bus = <&mdio>;
-+                      cpu-port-0 = <5>;
-+                      cpu-port-1 = <6>;
-+                      is-indirect;
-+              };
-+      };
-+
-+      dsa {
-               compatible = "marvell,dsa";
-               #address-cells = <2>;
-               #size-cells = <0>;
-@@ -161,22 +175,22 @@
-               };
-               partition@200000 {
--                      label = "kernel";
-+                      label = "kernel1";
-                       reg = <0x200000 0x2A0000>;
-               };
-               partition@4a0000 {
--                      label = "rootfs";
-+                      label = "rootfs1";
-                       reg = <0x4A0000 0x1760000>;
-               };
-               partition@1c00000 {
--                      label = "alt_kernel";
-+                      label = "kernel2";
-                       reg = <0x1C00000 0x2A0000>;
-               };
-               partition@1ea0000 {
--                      label = "alt_rootfs";
-+                      label = "rootfs2";
-                       reg = <0x1EA0000 0x1760000>;
-               };
-@@ -207,53 +221,6 @@
- &mdio {
-       status = "okay";
--
--      switch@10 {
--              compatible = "marvell,mv88e6085";
--              #address-cells = <1>;
--              #size-cells = <0>;
--              reg = <16>;
--
--              ports {
--                      #address-cells = <1>;
--                      #size-cells = <0>;
--
--                      port@0 {
--                              reg = <0>;
--                              label = "ethernet1";
--                      };
--
--                      port@1 {
--                              reg = <1>;
--                              label = "ethernet2";
--                      };
--
--                      port@2 {
--                              reg = <2>;
--                              label = "ethernet3";
--                      };
--
--                      port@3 {
--                              reg = <3>;
--                              label = "ethernet4";
--                      };
--
--                      port@4 {
--                              reg = <4>;
--                              label = "internet";
--                      };
--
--                      port@5 {
--                              reg = <5>;
--                              label = "cpu";
--                              ethernet = <&eth0port>;
--                              fixed-link {
--                                      speed = <1000>;
--                                      full-duplex;
--                              };
--                      };
--              };
--      };
- };
- &uart0 {
-@@ -272,10 +239,14 @@
- };
- /* eth1 is connected to the switch at port 6. However DSA only supports a
-- * single CPU port. So leave this port disabled to avoid confusion.
-+ * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
-  */
- &eth1 {
--      status = "disabled";
-+      status = "okay";
-+      ethernet1-port@0 {
-+              speed = <1000>;
-+              duplex = <1>;
-+      };
- };
- /* There is no battery on the board, so the RTC does not keep
diff --git a/target/linux/kirkwood/patches-4.19/105-goflexhome.patch b/target/linux/kirkwood/patches-4.19/105-goflexhome.patch
deleted file mode 100644 (file)
index 9ac30b6..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -256,6 +256,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
-       kirkwood-ds411.dtb \
-       kirkwood-ds411j.dtb \
-       kirkwood-ds411slim.dtb \
-+      kirkwood-goflexhome.dtb \
-       kirkwood-goflexnet.dtb \
-       kirkwood-guruplug-server-plus.dtb \
-       kirkwood-ib62x0.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
-@@ -0,0 +1,117 @@
-+/dts-v1/;
-+
-+#include "kirkwood.dtsi"
-+#include "kirkwood-6281.dtsi"
-+
-+/ {
-+      model = "Seagate GoFlex Home";
-+      compatible = "seagate,goflexhome", "marvell,kirkwood-88f6281", "marvell,kirkwood";
-+
-+      memory@0 {
-+              device_type = "memory";
-+              reg = <0x00000000 0x8000000>;
-+      };
-+
-+      chosen {
-+              bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
-+              stdout-path = &uart0;
-+      };
-+
-+      ocp@f1000000 {
-+              pinctrl: pin-controller@10000 {
-+                      pmx_usb_power_enable: pmx-usb-power-enable {
-+                              marvell,pins = "mpp29";
-+                              marvell,function = "gpio";
-+                      };
-+                      pmx_led_white: pmx-led-white {
-+                              marvell,pins = "mpp40";
-+                              marvell,function = "gpio";
-+                      };
-+                      pmx_led_green: pmx-led_green {
-+                              marvell,pins = "mpp46";
-+                              marvell,function = "gpio";
-+                      };
-+                      pmx_led_orange: pmx-led-orange {
-+                              marvell,pins = "mpp47";
-+                              marvell,function = "gpio";
-+                      };
-+              };
-+              serial@12000 {
-+                      status = "ok";
-+              };
-+
-+              sata@80000 {
-+                      status = "okay";
-+                      nr-ports = <2>;
-+              };
-+
-+      };
-+      gpio-leds {
-+              compatible = "gpio-leds";
-+
-+              health {
-+                      label = "status:green:health";
-+                      gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-on";
-+              };
-+              fault {
-+                      label = "status:orange:fault";
-+                      gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
-+              };
-+              misc {
-+                      label = "status:white:misc";
-+                      gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "disk-activity";
-+              };
-+      };
-+      regulators {
-+              compatible = "simple-bus";
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+              pinctrl-0 = <&pmx_usb_power_enable>;
-+              pinctrl-names = "default";
-+
-+              usb_power: regulator@1 {
-+                      compatible = "regulator-fixed";
-+                      reg = <1>;
-+                      regulator-name = "USB Power";
-+                      regulator-min-microvolt = <5000000>;
-+                      regulator-max-microvolt = <5000000>;
-+                      enable-active-high;
-+                      regulator-always-on;
-+                      regulator-boot-on;
-+                      gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
-+              };
-+      };
-+};
-+
-+&nand {
-+      chip-delay = <40>;
-+      status = "okay";
-+
-+      partition@0 {
-+              label = "u-boot";
-+              reg = <0x0000000 0x100000>;
-+              read-only;
-+      };
-+
-+      partition@100000 {
-+              label = "ubi";
-+              reg = <0x100000 0x0ff00000>;
-+      };
-+};
-+
-+&mdio {
-+      status = "okay";
-+
-+      ethphy0: ethernet-phy@0 {
-+              reg = <0>;
-+      };
-+};
-+
-+&eth0 {
-+      status = "okay";
-+      ethernet0-port@0 {
-+              phy-handle = <&ethphy0>;
-+      };
-+};
diff --git a/target/linux/kirkwood/patches-4.19/106-goflexnet.patch b/target/linux/kirkwood/patches-4.19/106-goflexnet.patch
deleted file mode 100644 (file)
index b221768..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
-+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
-@@ -159,18 +159,8 @@
-       };
-       partition@100000 {
--              label = "uImage";
--              reg = <0x0100000 0x400000>;
--      };
--
--      partition@500000 {
--              label = "pogoplug";
--              reg = <0x0500000 0x2000000>;
--      };
--
--      partition@2500000 {
--              label = "root";
--              reg = <0x02500000 0xd800000>;
-+              label = "ubi";
-+              reg = <0x0100000 0x0ff00000>;
-       };
- };
diff --git a/target/linux/kirkwood/patches-4.19/107-01-zyxel-nsa3x0-common-nand-partitions.patch b/target/linux/kirkwood/patches-4.19/107-01-zyxel-nsa3x0-common-nand-partitions.patch
deleted file mode 100644 (file)
index df65403..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
-+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
-@@ -112,40 +112,16 @@
-       partition@0 {
-               label = "uboot";
--              reg = <0x0000000 0x0100000>;
-+              reg = <0x0000000 0x00c0000>;
-               read-only;
-       };
-       partition@100000 {
-               label = "uboot_env";
--              reg = <0x0100000 0x0080000>;
-+              reg = <0x00c0000 0x0080000>;
-       };
--      partition@180000 {
--              label = "key_store";
--              reg = <0x0180000 0x0080000>;
--      };
--      partition@200000 {
--              label = "info";
--              reg = <0x0200000 0x0080000>;
--      };
--      partition@280000 {
--              label = "etc";
--              reg = <0x0280000 0x0a00000>;
--      };
--      partition@c80000 {
--              label = "kernel_1";
--              reg = <0x0c80000 0x0a00000>;
--      };
--      partition@1680000 {
--              label = "rootfs1";
--              reg = <0x1680000 0x2fc0000>;
--      };
--      partition@4640000 {
--              label = "kernel_2";
--              reg = <0x4640000 0x0a00000>;
--      };
--      partition@5040000 {
--              label = "rootfs2";
--              reg = <0x5040000 0x2fc0000>;
-+      partition@140000 {
-+              label = "ubi";
-+              reg = <0x0140000 0x7ec0000>;
-       };
- };
diff --git a/target/linux/kirkwood/patches-4.19/107-02-nsa310b.patch b/target/linux/kirkwood/patches-4.19/107-02-nsa310b.patch
deleted file mode 100644 (file)
index f8b963e..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-kirkwood: add nsa310b dtb, a zyxel nsa310 variant
-
-add support to a nsa310 variant with red/green usb led
-and lm85 temp/fan controller
-
-Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
-
-NOTE: this patch can be upstreamed as-is, LEDE-specific
-               nand partitions are set in another patch
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -287,6 +287,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
-       kirkwood-ns2mini.dtb \
-       kirkwood-nsa310.dtb \
-       kirkwood-nsa310a.dtb \
-+      kirkwood-nsa310b.dtb \
-       kirkwood-nsa320.dtb \
-       kirkwood-nsa325.dtb \
-       kirkwood-openblocks_a6.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
-@@ -0,0 +1,124 @@
-+/dts-v1/;
-+
-+#include "kirkwood-nsa3x0-common.dtsi"
-+
-+/*
-+ * There are at least two different NSA310 designs. This variant has
-+ * a red/green USB Led (same as nsa310) and a lm85 temp/fan controller.
-+ */
-+
-+/ {
-+      model = "ZyXEL NSA310b";
-+      compatible = "zyxel,nsa310b", "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
-+
-+      memory@0 {
-+              device_type = "memory";
-+              reg = <0x00000000 0x10000000>;
-+      };
-+
-+      chosen {
-+              bootargs = "console=ttyS0,115200";
-+              stdout-path = &uart0;
-+      };
-+
-+      ocp@f1000000 {
-+              pinctrl: pin-controller@10000 {
-+                      pinctrl-names = "default";
-+
-+                      pmx_led_esata_green: pmx-led-esata-green {
-+                              marvell,pins = "mpp12";
-+                              marvell,function = "gpio";
-+                      };
-+
-+                      pmx_led_esata_red: pmx-led-esata-red {
-+                              marvell,pins = "mpp13";
-+                              marvell,function = "gpio";
-+                      };
-+
-+                      pmx_led_usb_green: pmx-led-usb-green {
-+                              marvell,pins = "mpp15";
-+                              marvell,function = "gpio";
-+                      };
-+
-+                      pmx_led_usb_red: pmx-led-usb-red {
-+                              marvell,pins = "mpp16";
-+                              marvell,function = "gpio";
-+                      };
-+
-+                      pmx_led_sys_green: pmx-led-sys-green {
-+                              marvell,pins = "mpp28";
-+                              marvell,function = "gpio";
-+                      };
-+
-+                      pmx_led_sys_red: pmx-led-sys-red {
-+                              marvell,pins = "mpp29";
-+                              marvell,function = "gpio";
-+                      };
-+
-+                      pmx_led_hdd_green: pmx-led-hdd-green {
-+                              marvell,pins = "mpp41";
-+                              marvell,function = "gpio";
-+                      };
-+
-+                      pmx_led_hdd_red: pmx-led-hdd-red {
-+                              marvell,pins = "mpp42";
-+                              marvell,function = "gpio";
-+                      };
-+
-+              };
-+
-+              i2c@11000 {
-+                      status = "okay";
-+
-+                      lm85: lm85@2e {
-+                              compatible = "national,lm85";
-+                              reg = <0x2e>;
-+                      };
-+              };
-+      };
-+
-+      gpio-leds {
-+              compatible = "gpio-leds";
-+
-+              green-sys {
-+                      label = "nsa310:green:sys";
-+                      gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
-+              };
-+              red-sys {
-+                      label = "nsa310:red:sys";
-+                      gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
-+              };
-+              green-hdd {
-+                      label = "nsa310:green:hdd";
-+                      gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-+              };
-+              red-hdd {
-+                      label = "nsa310:red:hdd";
-+                      gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-+              };
-+              green-esata {
-+                      label = "nsa310:green:esata";
-+                      gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
-+              };
-+              red-esata {
-+                      label = "nsa310:red:esata";
-+                      gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-+              };
-+              green-usb {
-+                      label = "nsa310:green:usb";
-+                      gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
-+              };
-+              red-usb {
-+                      label = "nsa310:red:usb";
-+                      gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
-+              };
-+              green-copy {
-+                      label = "nsa310:green:copy";
-+                      gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-+              };
-+              red-copy {
-+                      label = "nsa310:red:copy";
-+                      gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
-+              };
-+      };
-+};
diff --git a/target/linux/kirkwood/patches-4.19/108-on100.patch b/target/linux/kirkwood/patches-4.19/108-on100.patch
deleted file mode 100644 (file)
index 2f53595..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
---- /dev/null
-+++ b/arch/arm/boot/dts/kirkwood-on100.dts
-@@ -0,0 +1,158 @@
-+/dts-v1/;
-+
-+#include "kirkwood.dtsi"
-+#include "kirkwood-6282.dtsi"
-+
-+/ {
-+      model = "Cisco Systems ON100";
-+      compatible = "cisco,on100", "marvell,kirkwood-88f6282", "marvell,kirkwood";
-+
-+      memory@0 {
-+              device_type = "memory";
-+              reg = <0x00000000 0x20000000>;
-+      };
-+
-+      aliases {
-+              serial0 = &uart0;
-+      };
-+
-+      chosen {
-+              bootargs = "console=ttyS0,115200n8 earlyprintk";
-+              stdout-path = "serial0:115200n8";
-+      };
-+
-+      gpio_keys {
-+              compatible = "gpio-keys";
-+              pinctrl-0 = <&pmx_btn_reset>;
-+              pinctrl-names = "default";
-+
-+              reset {
-+                      label = "Reset Button";
-+                      linux,code = <KEY_RESTART>;
-+                      gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+
-+      gpio-leds {
-+              compatible = "gpio-leds";
-+              pinctrl-0 = < &pmx_led_health_r &pmx_led_health_g >;
-+              pinctrl-names = "default";
-+
-+              health-g {
-+                      label = "on100:green:health";
-+                      gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              health-r {
-+                      label = "on100:red:health";
-+                      gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              health2-g {
-+                      label = "on100:green:health2";
-+                      gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              health2-r {
-+                      label = "on100:red:health2";
-+                      gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+};
-+
-+&eth0 {
-+      status = "okay";
-+
-+      ethernet0-port@0 {
-+              phy-handle = <&ethphy0>;
-+              phy-connection-type = "rgmii-id";
-+      };
-+};
-+
-+&eth1 {
-+      status = "okay";
-+
-+      ethernet1-port@0 {
-+              phy-handle = <&ethphy1>;
-+              phy-connection-type = "rgmii-id";
-+      };
-+};
-+
-+&mdio {
-+      status = "okay";
-+
-+      ethphy0: ethernet-phy@0 {
-+              /* Marvell 88E1121R */
-+              compatible = "ethernet-phy-id0141.0cb0",
-+                           "ethernet-phy-ieee802.3-c22";
-+              reg = <0>;
-+      };
-+
-+      ethphy1: ethernet-phy@1 {
-+              /* Marvell 88E1121R */
-+              compatible = "ethernet-phy-id0141.0cb0",
-+                           "ethernet-phy-ieee802.3-c22";
-+              reg = <1>;
-+      };
-+};
-+
-+&nand {
-+      status = "okay";
-+
-+      partition@0 {
-+              label = "u-boot";
-+              reg = <0x00000000 0x000a0000>;
-+              read-only;
-+      };
-+
-+      partition@a0000 {
-+              label = "u-boot environment";
-+              reg = <0x000a0000 0x00020000>;
-+              read-only;
-+      };
-+
-+      partition@c0000 {
-+              label = "kernel";
-+              reg = <0x000c0000 0x00540000>;
-+      };
-+
-+      partition@600000 {
-+              label = "ubi";
-+              reg = <0x00600000 0x1fa00000>;
-+      };
-+};
-+
-+&pinctrl {
-+      pmx_led_health_r: pmx-led-health-r {
-+              marvell,pins = "mpp45";
-+              marvell,function = "gpio";
-+      };
-+
-+      pmx_led_health_g: pmx-led-health-g {
-+              marvell,pins = "mpp44";
-+              marvell,function = "gpio";
-+      };
-+
-+      pmx_led_health2_r: pmx-led-health2-r {
-+              marvell,pins = "mpp47";
-+              marvell,function = "gpio";
-+      };
-+
-+      pmx_led_health2_g: pmx-led-health2-g {
-+              marvell,pins = "mpp46";
-+              marvell,function = "gpio";
-+      };
-+
-+      pmx_btn_reset: pmx-led-reset {
-+              marvell,pins = "mpp31";
-+              marvell,function = "gpio";
-+      };
-+};
-+
-+&sdio {
-+      status = "okay";
-+};
-+
-+&uart0 {
-+      status = "okay";
-+};
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -290,6 +290,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
-       kirkwood-nsa310b.dtb \
-       kirkwood-nsa320.dtb \
-       kirkwood-nsa325.dtb \
-+      kirkwood-on100.dtb \
-       kirkwood-openblocks_a6.dtb \
-       kirkwood-openblocks_a7.dtb \
-       kirkwood-openrd-base.dtb \
diff --git a/target/linux/kirkwood/patches-4.19/109-pogoplug_v4.patch b/target/linux/kirkwood/patches-4.19/109-pogoplug_v4.patch
deleted file mode 100644 (file)
index b547682..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
-+++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
-@@ -24,6 +24,7 @@
-       };
-       chosen {
-+              bootargs = "console=ttyS0,115200";
-               stdout-path = "uart0:115200n8";
-       };
-@@ -37,8 +38,8 @@
-               eject {
-                       debounce-interval = <50>;
-                       wakeup-source;
--                      linux,code = <KEY_EJECTCD>;
--                      label = "Eject Button";
-+                      linux,code = <KEY_RESTART>;
-+                      label = "Reset";
-                       gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
-               };
-       };
-@@ -137,29 +138,19 @@
-               #size-cells = <1>;
-               partition@0 {
--                      label = "u-boot";
--                      reg = <0x00000000 0x200000>;
-+                      label = "uboot";
-+                      reg = <0x00000000 0x1c0000>;
-                       read-only;
-               };
--              partition@200000 {
--                      label = "uImage";
--                      reg = <0x00200000 0x300000>;
--              };
--
--              partition@500000 {
--                      label = "uImage2";
--                      reg = <0x00500000 0x300000>;
-+              partition@1c0000 {
-+                      label = "uboot_env";
-+                      reg = <0x001c0000 0x40000>;
-               };
--              partition@800000 {
--                      label = "failsafe";
--                      reg = <0x00800000 0x800000>;
--              };
--
--              partition@1000000 {
--                      label = "root";
--                      reg = <0x01000000 0x7000000>;
-+              partition@200000 {
-+                      label = "ubi";
-+                      reg = <0x00200000 0x7e00000>;
-               };
-       };
- };
diff --git a/target/linux/kirkwood/patches-4.19/201-enable-sata-port-specific-led-triggers.patch b/target/linux/kirkwood/patches-4.19/201-enable-sata-port-specific-led-triggers.patch
deleted file mode 100644 (file)
index 71d9bba..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/mach-mvebu/Kconfig
-+++ b/arch/arm/mach-mvebu/Kconfig
-@@ -118,6 +118,7 @@ config MACH_DOVE
- config MACH_KIRKWOOD
-       bool "Marvell Kirkwood boards"
-       depends on ARCH_MULTI_V5
-+      select ARCH_WANT_LIBATA_LEDS
-       select CPU_FEROCEON
-       select GPIOLIB
-       select KIRKWOOD_CLK
diff --git a/target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-4.19/202-linksys-find-active-root.patch
deleted file mode 100644 (file)
index 860d7b0..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-The WRT1900AC among other Linksys routers uses a dual-firmware layout.
-Dynamically rename the active partition to "ubi".
-
-Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
----
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
-       return of_get_property(pp, "compatible", NULL);
- }
-+static int mangled_rootblock;
-+
- static int parse_fixed_partitions(struct mtd_info *master,
-                                 const struct mtd_partition **pparts,
-                                 struct mtd_part_parser_data *data)
-@@ -32,6 +34,7 @@ static int parse_fixed_partitions(struct
-       struct mtd_partition *parts;
-       struct device_node *mtd_node;
-       struct device_node *ofpart_node;
-+      const char *owrtpart = "ubi";
-       const char *partname;
-       struct device_node *pp;
-       int nr_parts, i, ret = 0;
-@@ -110,9 +113,15 @@ static int parse_fixed_partitions(struct
-               parts[i].size = of_read_number(reg + a_cells, s_cells);
-               parts[i].of_node = pp;
--              partname = of_get_property(pp, "label", &len);
--              if (!partname)
--                      partname = of_get_property(pp, "name", &len);
-+              if (mangled_rootblock && (i == mangled_rootblock)) {
-+                      partname = owrtpart;
-+              } else {
-+                      partname = of_get_property(pp, "label", &len);
-+
-+                      if (!partname)
-+                              partname = of_get_property(pp, "name", &len);
-+              }
-+
-               parts[i].name = partname;
-               if (of_get_property(pp, "read-only", &len))
-@@ -219,6 +228,18 @@ static int __init ofpart_parser_init(voi
-       return 0;
- }
-+static int __init active_root(char *str)
-+{
-+      get_option(&str, &mangled_rootblock);
-+
-+      if (!mangled_rootblock)
-+              return 1;
-+
-+      return 1;
-+}
-+
-+__setup("mangled_rootblock=", active_root);
-+
- static void __exit ofpart_parser_exit(void)
- {
-       deregister_mtd_parser(&ofpart_parser);
index 9db478d87b99a978cbba459ef4edd8dc5a753b10..e08b00ab8e9baf31d440e82310b91d10824a5e80 100644 (file)
@@ -15,7 +15,6 @@ MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS:=generic p1020 p2020
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 KERNELNAME:=zImage
 
diff --git a/target/linux/mpc85xx/patches-4.19/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch b/target/linux/mpc85xx/patches-4.19/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch
deleted file mode 100644 (file)
index 58c4be6..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/powerpc/platforms/85xx/common.c
-+++ b/arch/powerpc/platforms/85xx/common.c
-@@ -33,6 +33,7 @@ static const struct of_device_id mpc85xx
-       { .compatible = "fsl,mpc8548-guts", },
-       /* Probably unnecessary? */
-       { .compatible = "gpio-leds", },
-+      { .compatible = "gpio-keys", },
-       /* For all PCI controllers */
-       { .compatible = "fsl,mpc8540-pci", },
-       { .compatible = "fsl,mpc8548-pcie", },
diff --git a/target/linux/mpc85xx/patches-4.19/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-4.19/100-powerpc-85xx-tl-wdr4900-v1-support.patch
deleted file mode 100644 (file)
index 3838077..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-From 1d9f596e572917772b87a2a37e1680902964782f Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Wed, 20 Feb 2013 08:40:33 +0100
-Subject: [PATCH] powerpc: 85xx: add support for the TP-Link TL-WDR4900 v1
- board
-
-This patch adds support for the TP-Link TL-WDR4900 v1
-concurrent dual-band wireless router. The devices uses
-the Freescale P1014 SoC.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- arch/powerpc/boot/Makefile           |  3 ++-
- arch/powerpc/boot/wrapper            |  5 +++++
- arch/powerpc/platforms/85xx/Kconfig  | 12 ++++++++++++
- arch/powerpc/platforms/85xx/Makefile |  1 +
- 4 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
-index 25e3184f11f7..0826346fd97c 100644
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -164,6 +164,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
- src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
- src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
- src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
-+src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S
- src-wlib := $(sort $(src-wlib-y))
- src-plat := $(sort $(src-plat-y))
-@@ -343,7 +344,7 @@ image-$(CONFIG_TQM8555)                    += cuImage.tqm8555
- image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
- image-$(CONFIG_SBC8548)                       += cuImage.sbc8548
- image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
--
-+image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
- # Board ports in arch/powerpc/platform/86xx/Kconfig
- image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
-diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
-index f9141eaec6ff..bd55094d9899 100755
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -302,6 +302,11 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-tl-wdr4900-v1)
-+    platformo="$object/fixed-head.o $object/simpleboot.o"
-+    link_address='0x1000000'
-+    binary=y
-+    ;;
- simpleboot-virtex405-*)
-     platformo="$object/virtex405-head.o $object/simpleboot.o $object/virtex.o"
-     binary=y
-diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
-index 68920d42b4bc..2bf6533ce023 100644
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -170,6 +170,18 @@ config STX_GP3
-       select CPM2
-       select DEFAULT_UIMAGE
-+config TL_WDR4900_V1
-+    bool "TP-Link TL-WDR4900 v1"
-+    select DEFAULT_UIMAGE
-+    select ARCH_REQUIRE_GPIOLIB
-+    select GPIO_MPC8XXX
-+    select SWIOTLB
-+    help
-+      This option enables support for the TP-Link TL-WDR4900 v1 board.
-+
-+      This board is a Concurrent Dual-Band wireless router with a
-+      Freescale P1014 SoC.
-+
- config TQM8540
-       bool "TQ Components TQM8540"
-       help
-diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
-index d1dd0dca5ebf..d0dab29a33eb 100644
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
- obj-$(CONFIG_FB_FSL_DIU)      += t1042rdb_diu.o
- obj-$(CONFIG_STX_GP3)   += stx_gp3.o
- obj-$(CONFIG_TQM85xx)   += tqm85xx.o
-+obj-$(CONFIG_TL_WDR4900_V1) += tl_wdr4900_v1.o
- obj-$(CONFIG_SBC8548)     += sbc8548.o
- obj-$(CONFIG_PPA8548)     += ppa8548.o
- obj-$(CONFIG_SOCRATES)    += socrates.o socrates_fpga_pic.o
--- 
-2.20.1
-
diff --git a/target/linux/mpc85xx/patches-4.19/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-4.19/101-powerpc-85xx-hiveap-330-support.patch
deleted file mode 100644 (file)
index 3456839..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -49,6 +49,17 @@ config BSC9132_QDS
-         and dual StarCore SC3850 DSP cores.
-         Manufacturer : Freescale Semiconductor, Inc
-+config HIVEAP_330
-+    bool "Aerohive HiveAP-330"
-+    select DEFAULT_UIMAGE
-+    select ARCH_REQUIRE_GPIOLIB
-+    select GPIO_MPC8XXX
-+    help
-+      This option enables support for the Aerohive HiveAP-330 board.
-+
-+      This board is a Concurrent Dual-Band wireless access point with a
-+      Freescale P1020 SoC.
-+
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
-       select DEFAULT_UIMAGE
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -10,6 +10,7 @@ obj-y += common.o
- obj-$(CONFIG_BSC9131_RDB) += bsc913x_rdb.o
- obj-$(CONFIG_BSC9132_QDS) += bsc913x_qds.o
- obj-$(CONFIG_C293_PCIE)   += c293pcie.o
-+obj-$(CONFIG_HIVEAP_330) += hiveap-330.o
- obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
- obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
- obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
diff --git a/target/linux/mpc85xx/patches-4.19/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-4.19/102-powerpc-add-cmdline-override.patch
deleted file mode 100644 (file)
index a99555f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -809,6 +809,14 @@ config CMDLINE_FORCE
-         This is useful if you cannot or don't want to change the
-         command-line options your boot loader passes to the kernel.
-+config CMDLINE_OVERRIDE
-+    bool "Use alternative cmdline from device tree"
-+    help
-+      Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can
-+      be used, this is not a good option for kernels that are shared across
-+      devices. This setting enables using "chosen/cmdline-override" as the
-+      cmdline if it exists in the device tree.
-+
- config EXTRA_TARGETS
-       string "Additional default image types"
-       help
---- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -1091,6 +1091,17 @@ int __init early_init_dt_scan_chosen(uns
-       if (p != NULL && l > 0)
-               strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
-+    /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
-+     * device tree option of chosen/bootargs-override. This is
-+     * helpful on boards where u-boot sets bootargs, and is unable
-+     * to be modified.
-+     */
-+#ifdef CONFIG_CMDLINE_OVERRIDE
-+      p = of_get_flat_dt_prop(node, "bootargs-override", &l);
-+      if (p != NULL && l > 0)
-+              strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
-+#endif
-+
-       /*
-        * CONFIG_CMDLINE is meant to be a default in case nothing else
-        * managed to set the command line, unless CONFIG_CMDLINE_FORCE
diff --git a/target/linux/mpc85xx/patches-4.19/103-powerpc-85xx-red-15w-rev1.patch b/target/linux/mpc85xx/patches-4.19/103-powerpc-85xx-red-15w-rev1.patch
deleted file mode 100644 (file)
index b84a566..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -173,6 +173,16 @@ config XES_MPC85xx
-         Manufacturer: Extreme Engineering Solutions, Inc.
-         URL: <http://www.xes-inc.com/>
-+config RED_15W_REV1
-+      bool "Sophos RED 15w Rev.1"
-+      select DEFAULT_UIMAGE
-+      select ARCH_REQUIRE_GPIOLIB
-+      select GPIO_MPC8XXX
-+      help
-+        This option enables support for the Sophos RED 15w Rev.1 board.
-+
-+        This board is a wireless VPN router with a Freescale P1010 SoC.
-+
- config STX_GP3
-       bool "Silicon Turnkey Express GP3"
-       help
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -25,6 +25,7 @@ obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o
- obj-$(CONFIG_TWR_P102x)   += twr_p102x.o
- obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
- obj-$(CONFIG_FB_FSL_DIU)      += t1042rdb_diu.o
-+obj-$(CONFIG_RED_15W_REV1)    += red15w_rev1.o
- obj-$(CONFIG_STX_GP3)   += stx_gp3.o
- obj-$(CONFIG_TQM85xx)   += tqm85xx.o
- obj-$(CONFIG_TL_WDR4900_V1) += tl_wdr4900_v1.o
diff --git a/target/linux/mpc85xx/patches-4.19/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch b/target/linux/mpc85xx/patches-4.19/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch
deleted file mode 100644 (file)
index 39c7231..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-From 93514afd769c305182beeed1f9c4c46235879ef8 Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Sun, 30 Dec 2018 23:24:41 +0100
-Subject: [PATCH] powerpc: mpc85xx: change P2020RDB dts file for OpenWRT
-
-This patch apply chages for OpenWRT in P2020RDB
-dts file.
-
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- arch/powerpc/boot/dts/fsl/p2020rdb.dts | 98 +++++++++++++++++---------
- 1 file changed, 63 insertions(+), 35 deletions(-)
-
---- a/arch/powerpc/boot/dts/fsl/p2020rdb.dts
-+++ b/arch/powerpc/boot/dts/fsl/p2020rdb.dts
-@@ -2,6 +2,7 @@
-  * P2020 RDB Device Tree Source
-  *
-  * Copyright 2009-2012 Freescale Semiconductor Inc.
-+ * Copyright 2018      Pawel Dembicki <paweldembicki@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
-@@ -9,10 +10,15 @@
-  * option) any later version.
-  */
-+/dts-v1/;
-+
- /include/ "p2020si-pre.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
- / {
--      model = "fsl,P2020RDB";
-+      model = "Freescale P2020RDB";
-       compatible = "fsl,P2020RDB";
-       aliases {
-@@ -38,48 +44,38 @@
-                         0x2 0x0 0x0 0xffb00000 0x00020000>;
-               nor@0,0 {
--                      #address-cells = <1>;
--                      #size-cells = <1>;
-                       compatible = "cfi-flash";
-                       reg = <0x0 0x0 0x1000000>;
-                       bank-width = <2>;
-                       device-width = <1>;
--                      partition@0 {
--                              /* This location must not be altered  */
--                              /* 256KB for Vitesse 7385 Switch firmware */
--                              reg = <0x0 0x00040000>;
--                              label = "NOR (RO) Vitesse-7385 Firmware";
--                              read-only;
--                      };
--
--                      partition@40000 {
--                              /* 256KB for DTB Image */
--                              reg = <0x00040000 0x00040000>;
--                              label = "NOR (RO) DTB Image";
--                              read-only;
--                      };
-+                      partitions {
-+                              compatible = "fixed-partitions";
-+                              #address-cells = <1>;
-+                              #size-cells = <1>;
--                      partition@80000 {
--                              /* 3.5 MB for Linux Kernel Image */
--                              reg = <0x00080000 0x00380000>;
--                              label = "NOR (RO) Linux Kernel Image";
--                              read-only;
--                      };
-+                              partition@0 {
-+                                      /* This location must not be altered  */
-+                                      /* 256KB for Vitesse 7385 Switch firmware */
-+                                      reg = <0x0 0x00040000>;
-+                                      label = "NOR (RO) Vitesse-7385 Firmware";
-+                                      read-only;
-+                              };
--                      partition@400000 {
--                              /* 11MB for JFFS2 based Root file System */
--                              reg = <0x00400000 0x00b00000>;
--                              label = "NOR (RW) JFFS2 Root File System";
--                      };
-+                              partition@40000 {
-+                                      compatible = "denx,fit";
-+                                      reg = <0x00040000 0x00ec0000>;
-+                                      label = "firmware";
-+                              };
--                      partition@f00000 {
--                              /* This location must not be altered  */
--                              /* 512KB for u-boot Bootloader Image */
--                              /* 512KB for u-boot Environment Variables */
--                              reg = <0x00f00000 0x00100000>;
--                              label = "NOR (RO) U-Boot Image";
--                              read-only;
-+                              partition@f00000 {
-+                                      /* This location must not be altered  */
-+                                      /* 512KB for u-boot Bootloader Image */
-+                                      /* 512KB for u-boot Environment Variables */
-+                                      reg = <0x00f00000 0x00100000>;
-+                                      label = "u-boot";
-+                                      read-only;
-+                              };
-                       };
-               };
-@@ -144,13 +140,43 @@
-       soc: soc@ffe00000 {
-               ranges = <0x0 0x0 0xffe00000 0x100000>;
-+              gpio0: gpio-controller@fc00 {
-+              };
-+
-               i2c@3000 {
-+                      temperature-sensor@4c {
-+                              compatible = "adi,adt7461";
-+                              reg = <0x4c>;
-+                      };
-+
-+                      eeprom@50 {
-+                              compatible = "atmel,24c256";
-+                              reg = <0x50>;
-+                      };
-+
-                       rtc@68 {
-                               compatible = "dallas,ds1339";
-                               reg = <0x68>;
-                       };
-               };
-+              i2c@3100 {
-+                      pmic@11 {
-+                              compatible = "zl2006";
-+                              reg = <0x11>;
-+                      };
-+
-+                      gpio@18 {
-+                              compatible = "nxp,pca9557";
-+                              reg = <0x18>;
-+                      };
-+
-+                      eeprom@52 {
-+                              compatible = "atmel,24c01";
-+                              reg = <0x52>;
-+                      };
-+              };
-+
-               spi@7000 {
-                       flash@0 {
-                               #address-cells = <1>;
-@@ -204,10 +230,12 @@
-                       phy0: ethernet-phy@0 {
-                               interrupts = <3 1 0 0>;
-                               reg = <0x0>;
-+                              reset-gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-                       };
-                       phy1: ethernet-phy@1 {
-                               interrupts = <3 1 0 0>;
-                               reg = <0x1>;
-+                              reset-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
-                       };
-                       tbi-phy@2 {
-                               device_type = "tbi-phy";
diff --git a/target/linux/mpc85xx/patches-4.19/105-powerpc-85xx-panda-support.patch b/target/linux/mpc85xx/patches-4.19/105-powerpc-85xx-panda-support.patch
deleted file mode 100644 (file)
index a08bc30..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -60,6 +60,17 @@ config HIVEAP_330
-       This board is a Concurrent Dual-Band wireless access point with a
-       Freescale P1020 SoC.
-+config PANDA
-+      bool "OCEDO PANDA"
-+      select DEFAULT_UIMAGE
-+      select ARCH_REQUIRE_GPIOLIB
-+      select GPIO_MPC8XXX
-+      help
-+        This option enables support for the OCEDO PANDA board.
-+
-+        This board is a Concurrent Dual-Band wireless access point with a
-+        Freescale P1020 SoC.
-+
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
-       select DEFAULT_UIMAGE
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_P1010_RDB)   += p1010rdb.o
- obj-$(CONFIG_P1022_DS)    += p1022_ds.o
- obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o
- obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o
-+obj-$(CONFIG_PANDA)       += panda.o
- obj-$(CONFIG_TWR_P102x)   += twr_p102x.o
- obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
- obj-$(CONFIG_FB_FSL_DIU)      += t1042rdb_diu.o
index 202ed39be7376e50e014784b12976c717d60cff3..6c0623cb9bfac4d1169c7fb8cbdae6e47ae40ba6 100644 (file)
@@ -14,7 +14,6 @@ CPU_TYPE:=octeonplus
 MAINTAINER:=John Crispin <john@phrozen.org>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 define Target/Description
        Build firmware images for Cavium Networks Octeon-based boards.
diff --git a/target/linux/octeon/patches-4.19/100-ubnt_edgerouter2_support.patch b/target/linux/octeon/patches-4.19/100-ubnt_edgerouter2_support.patch
deleted file mode 100644 (file)
index 991eb56..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-@@ -295,6 +295,8 @@ enum cvmx_board_types_enum {
-        */
-       CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
-       CVMX_BOARD_TYPE_UBNT_E100 = 20002,
-+      CVMX_BOARD_TYPE_UBNT_E200 = 20003,
-+      CVMX_BOARD_TYPE_UBNT_E220 = 20005,
-       CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
-       CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
-       CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
-@@ -396,6 +398,8 @@ static inline const char *cvmx_board_typ
-                   /* Customer private range */
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
-+              ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
-+              ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
---- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-@@ -173,6 +173,8 @@ int cvmx_helper_board_get_mii_address(in
-                       return 7 - ipd_port;
-               else
-                       return -1;
-+      case CVMX_BOARD_TYPE_UBNT_E200:
-+              return -1;
-       case CVMX_BOARD_TYPE_KONTRON_S1901:
-               if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
-                       return 1;
diff --git a/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch
deleted file mode 100644 (file)
index 93d1e93..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/drivers/staging/octeon/ethernet.c
-+++ b/drivers/staging/octeon/ethernet.c
-@@ -670,6 +670,7 @@ static int cvm_oct_probe(struct platform
-       int interface;
-       int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
-       int qos;
-+      int i;
-       struct device_node *pip;
-       int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
-@@ -793,13 +794,19 @@ static int cvm_oct_probe(struct platform
-       }
-       num_interfaces = cvmx_helper_get_number_of_interfaces();
--      for (interface = 0; interface < num_interfaces; interface++) {
--              cvmx_helper_interface_mode_t imode =
--                  cvmx_helper_interface_get_mode(interface);
--              int num_ports = cvmx_helper_ports_on_interface(interface);
-+      for (i = 0; i < num_interfaces; i++) {
-+              cvmx_helper_interface_mode_t imode;
-+              int interface;
-+              int num_ports;
-               int port;
-               int port_index;
-+              interface = i;
-+              if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_UBNT_E200)
-+                      interface = num_interfaces - (i + 1);
-+
-+              num_ports = cvmx_helper_ports_on_interface(interface);
-+              imode = cvmx_helper_interface_get_mode(interface);
-               for (port_index = 0,
-                    port = cvmx_helper_get_ipd_port(interface, 0);
-                    port < cvmx_helper_get_ipd_port(interface, num_ports);
diff --git a/target/linux/octeon/patches-4.19/120-cmdline-hack.patch b/target/linux/octeon/patches-4.19/120-cmdline-hack.patch
deleted file mode 100644 (file)
index 2b5978c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/arch/mips/cavium-octeon/setup.c
-+++ b/arch/mips/cavium-octeon/setup.c
-@@ -651,6 +651,35 @@ void octeon_user_io_init(void)
-       write_c0_derraddr1(0);
- }
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+extern char __image_cmdline[];
-+
-+static int __init octeon_use_image_cmdline(void)
-+{
-+       char *p = __image_cmdline;
-+       int replace = 0;
-+
-+       if (*p == '-') {
-+               replace = 1;
-+               p++;
-+       }
-+
-+       if (*p == '\0')
-+               return 0;
-+
-+       if (replace) {
-+               strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
-+       } else {
-+               strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
-+               strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
-+       }
-+
-+       return 1;
-+}
-+#else
-+static inline int octeon_use_image_cmdline(void) { return 0; }
-+#endif
-+
- /**
-  * Early entry point for arch setup
-  */
-@@ -895,6 +924,8 @@ void __init prom_init(void)
-               }
-       }
-+      octeon_use_image_cmdline();
-+
-       if (strstr(arcs_cmdline, "console=") == NULL) {
-               if (octeon_uart == 1)
-                       strcat(arcs_cmdline, " console=ttyS1,115200");
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
deleted file mode 100644 (file)
index 994c37e..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=orion
-BOARDNAME:=Marvell Orion
-FEATURES:=broken rtc
-SUBTARGETS:=generic harddisk
-MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-
-KERNEL_PATCHVER:=4.9
-
-include $(INCLUDE_DIR)/target.mk
-
-KERNELNAME:=zImage
-
-DEFAULT_PACKAGES += kmod-ath9k wpad-basic kmod-rtc-isl1208 uboot-envtools
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/orion/base-files/etc/board.d/02_network b/target/linux/orion/base-files/etc/board.d/02_network
deleted file mode 100755 (executable)
index ab74bf3..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. /lib/functions/uci-defaults.sh
-
-board_config_update
-
-if grep -q lan1 /proc/net/dev; then
-       ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
-else
-       ucidef_set_interface_lan "eth0"
-fi
-
-board_config_flush
-
-exit 0
diff --git a/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb b/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb
deleted file mode 100644 (file)
index 2ae0f73..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-usb_led=''
-usb_device=''
-
-led_set_attr() {
-       [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
-}
-
-usb_led_set_timer() {
-       led_set_attr "${usb_led}" 'trigger' 'timer'
-       led_set_attr "${usb_led}" 'delay_on' "$1"
-       led_set_attr "${usb_led}" 'delay_off' "$2"
-}
-
-usb_led_on() {
-       led_set_attr "${usb_led}" 'trigger' 'none'
-       led_set_attr "${usb_led}" 'brightness' 255
-}
-
-usb_led_off() {
-       led_set_attr "${usb_led}" 'trigger' 'none'
-       led_set_attr "${usb_led}" 'brightness' 0
-}
-
-get_usb_led() {
-       . /lib/functions.sh
-
-       case "$(board_name)" in
-        'Linksys WRT350N v2')
-               usb_led='wrt350nv2:green:usb'
-               usb_device='1-1:1.0'
-               ;;
-       esac;
-}
-
-get_usb_led
-
-case "${ACTION}" in
- add)
-       # update LEDs
-       [ "${usb_device}" = "${DEVICENAME}" ] && usb_led_on
-       ;;
- remove)
-       # update LEDs
-       [ "${usb_device}" = "${DEVICENAME}" ] && usb_led_off
-       ;;
-esac
diff --git a/target/linux/orion/base-files/lib/preinit/01_sysinfo b/target/linux/orion/base-files/lib/preinit/01_sysinfo
deleted file mode 100644 (file)
index 1ef07d7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-do_sysinfo_orion() {
-       local name="$(sed -n /Hardware/s/.*:.//p /proc/cpuinfo)"
-       [ -z "$name" ] && name="unknown"
-
-       [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
-       echo "$name" > /tmp/sysinfo/board_name
-       echo "unknown" > /tmp/sysinfo/model
-}
-
-boot_hook_add preinit_main do_sysinfo_orion
diff --git a/target/linux/orion/config-4.9 b/target/linux/orion/config-4.9
deleted file mode 100644 (file)
index 56ae5ee..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# CONFIG_ARCH_HAS_SG_CHAIN is not set
-CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_ARCH_MULTI_V4 is not set
-# CONFIG_ARCH_MULTI_V4T is not set
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_ARCH_ORION5X=y
-# CONFIG_ARCH_ORION5X_DT is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=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_PATCH_PHYS_VIRT=y
-# CONFIG_ARM_THUMB is not set
-CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
-CONFIG_ATAGS=y
-CONFIG_AUTO_ZRELADDR=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 earlyprintk"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_COMMON_CLK=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_FEROCEON=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_FEROCEON=y
-CONFIG_CPU_FEROCEON_OLD_ID=y
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_TLB_FEROCEON=y
-CONFIG_CPU_USE_DOMAINS=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_DEV_MARVELL_CESA=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
-CONFIG_DEBUG_LL_UART_8250=y
-CONFIG_DEBUG_UART_8250=y
-# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
-CONFIG_DEBUG_UART_8250_SHIFT=2
-# CONFIG_DEBUG_UART_8250_WORD is not set
-CONFIG_DEBUG_UART_PHYS=0xf1012000
-CONFIG_DEBUG_UART_VIRT=0xfe012000
-# CONFIG_DEBUG_USER is not set
-CONFIG_DMADEVICES=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DMA_OF=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_FIXED_PHY=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IO=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_SCHED_CLOCK=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_MVEBU=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_HARDIRQS_SW_RESEND=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_AUDITSYSCALL=y
-# CONFIG_HAVE_ARCH_BITREVERSE 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_CC_STACKPROTECTOR=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_CLK_PREPARE=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_IDE=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_UID16=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HZ_FIXED=0
-CONFIG_HZ_PERIODIC=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MV64XXX=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IOMMU_HELPER=y
-CONFIG_IRQCHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LIBFDT=y
-# CONFIG_MACH_D2NET_DT is not set
-# CONFIG_MACH_DB88F5281 is not set
-# CONFIG_MACH_DNS323 is not set
-# CONFIG_MACH_DT2 is not set
-# CONFIG_MACH_KUROBOX_PRO is not set
-# CONFIG_MACH_LINKSTATION_LSCHL is not set
-# CONFIG_MACH_LINKSTATION_LS_HGL is not set
-# CONFIG_MACH_LINKSTATION_MINI is not set
-# CONFIG_MACH_LINKSTATION_PRO is not set
-# CONFIG_MACH_MSS2_DT is not set
-# CONFIG_MACH_MV2120 is not set
-# CONFIG_MACH_NET2BIG is not set
-# CONFIG_MACH_RD88F5181L_FXO is not set
-# CONFIG_MACH_RD88F5181L_GE is not set
-# CONFIG_MACH_RD88F5182 is not set
-# CONFIG_MACH_RD88F5182_DT is not set
-# CONFIG_MACH_RD88F6183AP_GE is not set
-CONFIG_MACH_TERASTATION_PRO2=y
-# CONFIG_MACH_TS209 is not set
-# CONFIG_MACH_TS409 is not set
-# CONFIG_MACH_TS78XX is not set
-CONFIG_MACH_WN802T=y
-CONFIG_MACH_WNR854T=y
-CONFIG_MACH_WRT350N_V2=y
-CONFIG_MDIO_BOARDINFO=y
-CONFIG_MMC=y
-CONFIG_MMC_MVSDIO=y
-# CONFIG_MMC_TIFM_SD is not set
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MULTI_IRQ_HANDLER=y
-CONFIG_MV643XX_ETH=y
-CONFIG_MVEBU_MBUS=y
-CONFIG_MVMDIO=y
-# CONFIG_MVNETA is not set
-CONFIG_MV_XOR=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_KUSER_HELPERS=y
-CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NO_BOOTMEM=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_MTD=y
-CONFIG_OF_NET=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_RESERVED_MEM=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_ORION_WATCHDOG=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
-# CONFIG_PCI_DOMAINS_GENERIC is not set
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PHYLIB=y
-CONFIG_PLAT_ORION=y
-CONFIG_PLAT_ORION_LEGACY=y
-CONFIG_RATIONAL=y
-# CONFIG_RCU_EXPERT is not set
-# CONFIG_RCU_STALL_COMMON is not set
-CONFIG_RTC_CLASS=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_SCHED_INFO is not set
-# CONFIG_SCSI_DMA is not set
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
-CONFIG_SRAM=y
-CONFIG_SRCU=y
-CONFIG_SWIOTLB=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
-CONFIG_USB_SUPPORT=y
-CONFIG_USE_OF=y
-CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VFP is not set
-CONFIG_WATCHDOG_CORE=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/orion/generic/base-files/etc/uci-defaults/09_hardware b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware
deleted file mode 100644 (file)
index 751749d..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-#
-# This script sets system defaults for the hardware on firstboot
-#
-
-. /lib/functions.sh
-
-wrt350nv2_default() {
-# leds
-       uci batch <<__EOF
-set system.power_led=led
-set system.power_led.name='Power LED (green)'
-set system.power_led.sysfs='wrt350nv2:green:power'
-set system.power_led.default='1'
-set system.wifi_led=led
-set system.wifi_led.name='Wireless LED (green)'
-set system.wifi_led.sysfs='wrt350nv2:green:wireless'
-set system.wifi_led.trigger='netdev'
-set system.wifi_led.dev='wlan0'
-set system.wifi_led.mode='link tx rx'
-set system.wifi_led.default='0'
-commit system
-__EOF
-
-# add mac address from U-Boot partition to lan and wan devices
-       MTD=`grep -e 'u-boot' /proc/mtd`
-       MTD=`echo ${MTD} | sed 's/[a-z]*\([0-9]*\):.*/\1/'`
-       [ -n "${MTD}" ] && {
-               MACADDR=`dd if=/dev/mtdblock${MTD} bs=1 skip=262048 count=6 2>/dev/null | hexdump -e '1/1 "%02x"'`
-               MACADDR2=$(( 0x${MACADDR} + 1))
-               MACADDR2=`printf "%012x" ${MACADDR2}`
-
-               MACADDR=`echo ${MACADDR} | sed 's/\(..\)/\1:/g' | sed 's/:$//'`
-               MACADDR2=`echo ${MACADDR2} | sed 's/\(..\)/\1:/g' | sed 's/:$//'`
-
-               uci set network.eth0.macaddr=${MACADDR}
-               uci set network.lan.macaddr=${MACADDR}
-               uci set network.wan.macaddr=${MACADDR2}
-               uci commit network
-       }
-}
-
-case "$(board_name)" in
- 'Linksys WRT350N v2')
-       wrt350nv2_default
-       ;;
-esac
diff --git a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
deleted file mode 100644 (file)
index db23306..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2010-2011 OpenWrt.org
-#
-
-# use default "image" for PART_NAME
-# use default for platform_do_upgrade()
-
-platform_check_image() {
-       [ "${ARGC}" -gt 1 ] && { echo 'Too many arguments. Only flash file expected.'; return 1; }
-
-       local hardware="$(board_name)"
-       local magic="$(get_magic_word "$1")"
-       local magic_long="$(get_magic_long "$1")"
-
-       case "${hardware}" in
-        # hardware with a direct uImage partition
-        # image header format as described in U-Boot's include/image.h
-        # see http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/image.h
-        'Linksys WRT350N v2')
-               [ "${magic_long}" != '27051956' ] && {
-                       echo "Invalid image type ${magic_long}."
-                       return 1
-               }
-               return 0
-               ;;
-        # Netgear WNR854T (has uImage as file inside a JFFS2 partition)
-        'Netgear WNR854T')
-               [ "${magic}" != '8519' ] && {
-                       echo "Invalid image type ${magic}."
-                       return 1
-               }
-               return 0
-               ;;
-       esac
-
-       echo "Sysupgrade is not yet supported on ${hardware}."
-       return 1
-}
diff --git a/target/linux/orion/generic/target.mk b/target/linux/orion/generic/target.mk
deleted file mode 100644 (file)
index 7b054ed..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-BOARDNAME:=Generic
-FEATURES+=squashfs
-
-define Target/Description
-       Build firmware images for Marvell Orion based boards that boot from internal flash.
-       (e.g.: Linksys WRT350N v2, Netgear WNR854T, ...)
-endef
diff --git a/target/linux/orion/harddisk/config-default b/target/linux/orion/harddisk/config-default
deleted file mode 100644 (file)
index bf6cee1..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-CONFIG_ATA=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CRC16=y
-# CONFIG_DM_CRYPT is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_SNAPSHOT is not set
-CONFIG_EXT4_FS=y
-CONFIG_FS_MBCACHE=y
-CONFIG_HWMON=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_JBD2=y
-CONFIG_MACH_DT2=y
-CONFIG_MACH_NET2BIG=y
-# CONFIG_MACH_WN802T is not set
-# CONFIG_MACH_WNR854T is not set
-# CONFIG_MACH_WRT350N_V2 is not set
-CONFIG_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-# CONFIG_MD_MULTIPATH is not set
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-# CONFIG_MD_RAID10 is not set
-# CONFIG_MD_RAID456 is not set
-CONFIG_NLS=y
-CONFIG_RTC_CLASS=y
-CONFIG_SATA_MV=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_USB=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_ORION=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_UHCI_HCD is not set
diff --git a/target/linux/orion/harddisk/target.mk b/target/linux/orion/harddisk/target.mk
deleted file mode 100644 (file)
index 6096e69..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-BOARDNAME:=Internal Hard-Disk
-FEATURES+=targz
-DEVICE_TYPE:=nas
-
-define Target/Description
-       Build firmware images for Marvell Orion based boards that boot directly from internal disk storage.
-       (e.g.: Freecom DataTank 2, ...)
-endef
diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
deleted file mode 100644 (file)
index 058519f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-include $(SUBTARGET).mk
-
-$(eval $(call BuildImage))
diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk
deleted file mode 100644 (file)
index 22909ac..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-### DO NOT INDENT LINES CONTAINING $(call xyz) AS THIS MAY CHANGE THE CONTEXT
-### OF THE FIRST LINE IN THE CALLED VARIABLE (NOTE: variable!)
-### see http://www.gnu.org/software/make/manual/html_node/Call-Function.html#Call-Function
-### ACTUALLY IT IS A SIMPLE MACRO EXPANSION
-
-### use round brackets for make variables, and curly brackets for shell variables
-
-
-## Kernel mtd partition size in KiB
-KERNEL_MTD_SIZE:=1280
-
-# Netgear WNR854T: erase size is 128KiB = 0x00020000 = 131072
-ERASE_SIZE_128K:=128
-
-# Linksys WRT350N v2: erase size is 64KiB = 0x00010000 = 65536
-ERASE_SIZE_64K:=64
-
-# define JFFS2 sizes for include/image.mk
-JFFS2_BLOCKSIZE:=64k 128k
-
-
-###
-### Image/BuildKernel
-###
-
-define Image/BuildKernel
-### Dummy comment for indented calls of Image/BuildKernel
-
- ## Netgear WN802T: mach id 3306 (0x0cea)
-$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3")
-$(call Image/BuildKernel/ARM/uImage,wn802t)
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3",-initramfs)
-$(call Image/BuildKernel/ARM/uImage,wn802t,-initramfs)
-endif
- ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)  # nothing more to do for a ramdisk build
-$(call Image/BuildKernel/JFFS2uImage,wn802t,$(ERASE_SIZE_64K),uImage)
-$(call Image/Default/FileSizeCheck,$(KDIR)/wn802t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024))
- endif
-
- ## Netgear WNR854T: mach id 1801 (0x0709)
-$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3")
-$(call Image/BuildKernel/ARM/uImage,wnr854t)
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3",-initramfs)
-$(call Image/BuildKernel/ARM/uImage,wnr854t,-initramfs)
-endif
- ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)  # nothing more to do for a ramdisk build
-$(call Image/BuildKernel/JFFS2uImage,wnr854t,$(ERASE_SIZE_128K),uImage)
-$(call Image/Default/FileSizeCheck,$(KDIR)/wnr854t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024))
- endif
-
- ## Linksys WRT350N v2: mach id 1633 (0x0661)
-$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3")
-$(call Image/BuildKernel/ARM/uImage,wrt350nv2)
-ifeq ($($CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3",-initramfs)
-$(call Image/BuildKernel/ARM/uImage,wrt350nv2-initramfs)
-endif
- ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)  # nothing more to do for a ramdisk build
-$(call Image/Default/FileSizeCheck,$(KDIR)/wrt350nv2-uImage,$(shell expr $(KERNEL_MTD_SIZE) \* 1024))
- endif
-
- ## Buffalo Terastation Pro II/Live: mach id 1584 (0x0630)
-$(call Image/BuildKernel/ARM/zImage,terastation-pro2,"\x06\x1c\xa0\xe3\x30\x10\x81\xe3")
-$(call Image/BuildKernel/ARM/uImage,terastation-pro2)
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-$(call Image/BuildKernel/ARM/zImage,terastation-pro2,"\x06\x1c\xa0\xe3\x30\x10\x81\xe3",-initramfs)
-$(call Image/BuildKernel/ARM/uImage,terastation-pro2,-initramfs)
-endif
-endef
-
-define Image/BuildKernel/ARM/zImage
- # merge machine id and regular zImage into one file
- # parameters: 1 = machine name, 2 = machine id as string in quotes
-       # $(BOARD) kernel zImage for $(1)
-       echo -en $(2) > '$(KDIR)/$(1)-zImage$(3)'
-       cat '$(KDIR)/zImage$(3)' >> '$(KDIR)/$(1)-zImage$(3)'
-endef
-
-define Image/BuildKernel/ARM/uImage
- # create uImage from zImage
- # parameters: 1 = machine name
-       # $(BOARD) kernel uImage for $(1)
-       '$(STAGING_DIR_HOST)/bin/mkimage' -A arm -O linux -T kernel \
-       -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
-       -d '$(KDIR)/$(1)-zImage$(2)' '$(KDIR)/$(1)-uImage$(2)'
- ifeq ($(2),-initramfs) # only copy uImage for ramdisk build
-       cp '$(KDIR)/$(1)-uImage-initramfs' '$(BIN_DIR)/openwrt-$(1)-uImage-initramfs'
- endif
-endef
-
-define Image/BuildKernel/JFFS2uImage
- # create JFFS2 partition with uImage file (result is already padded to erase size)
- # parameters: 1 = machine name, 2 = erase size in KiB, 3 = uImage file name
-       # $(BOARD) kernel uImage for $(1) in JFFS2-$(2)k partition
-       rm -rf '$(TMP_DIR)/$(1)_jffs2_uimage'
-       mkdir '$(TMP_DIR)/$(1)_jffs2_uimage'
-       cp '$(KDIR)/$(1)-uImage' '$(TMP_DIR)/$(1)_jffs2_uimage/$(3)'
-       $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --compression-mode=none --pad --little-endian --squash -e $(2)KiB -o '$(KDIR)/$(1)-uImage.jffs2' -d '$(TMP_DIR)/$(1)_jffs2_uimage'
-       rm -rf '$(TMP_DIR)/$(1)_jffs2_uimage'
-endef
-
-define Image/Default/FileSizeCheck
- # parameters: 1 = file path, 2 = maximum size in bytes
-       [ `stat -c %s '$(1)'` -le $(2) ] || { echo '   ERROR: $(1) too big (> $(2) bytes)'; rm -f $(1); }
-endef
-
-
-###
-### Image/Build
-###
-
-define Image/Build
-### Dummy comment for indented calls of Image/Build with $(1)
-
- ## Prepare rootfs
-$(call Image/Build/$(1),$(1))
-
- ## Netgear WN802T
-$(call Image/Build/Default,$(1),wn802t,$(ERASE_SIZE_64K),$(KERNEL_MTD_SIZE),.jffs2,NG_WN802T)
-
- ## Netgear WNR854T
-$(call Image/Build/Default,$(1),wnr854t,$(ERASE_SIZE_128K),$(KERNEL_MTD_SIZE),.jffs2,NG_WNR854T)
-
- ## Linksys WRT350N v2
-$(call Image/Build/Linksys/wrt350nv2,$(1),wrt350nv2,$(ERASE_SIZE_64K),$(KERNEL_MTD_SIZE),)
-
- ## Buffalo Terastation Pro II/Live
-$(call Image/Build/Default,$(1),terastation-pro2,$(ERASE_SIZE_128K),$(KERNEL_MTD_SIZE),.jffs2,TERASTATION_PRO2)
-endef
-
-define Image/Build/squashfs
-$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-## generate defines for all JFFS2 block sizes
-define Image/Build/jffs2/sub
- $(eval define Image/Build/jffs2-$(1)
-       cp '$$(KDIR)/root.jffs2-$(1)' '$$(BIN_DIR)/$$(IMG_PREFIX)-root.jffs2-$(1)'
- endef)
-endef
-
-$(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/Build/jffs2/sub,$(SZ)))
-
-define Image/Build/Default
- # parameters: 1 = rootfs type, 2 = machine name, 3 = erase size in KiB, 4 = kernel mtd size in KiB, 5 = kernel file suffix, 6 = header
- ifeq ($(findstring jffs2-,$(1)),jffs2-)  # JFFS2: build only image fitting to erase size
-  ifeq ($(1),jffs2-$(3)k)
-$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5))
-$(call Image/Build/Default/factory,$(1),$(2),$(6))
-  endif
- else
-  ifeq ($(1),ext4)  # EXT4: ignore
-   # do nothing
-  else  # do all other images
-$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5))
-$(call Image/Build/Default/factory,$(1),$(2),$(6))
-  endif
- endif
-endef
-
-define Image/Build/Default/sysupgrade
- # parameters: 1 = rootfs type, 2 = machine name, 3 = pad size in KiB (kernel mtd size or erase size), 4 = kernel file suffix
-       # $(BOARD) $(1) sysupgrade image for $(2)
-       ( \
-               dd if='$(KDIR)/$(2)-uImage$(4)' bs=$(3)k conv=sync; \
-               dd if='$(KDIR)/root.$(1)'; \
-       ) > '$(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img'
-endef
-
-define Image/Build/Default/factory
- # parameters: 1 = rootfs type, 2 = machine name, 3 = header
-       # $(BOARD) $(1) factory upgrade image for $(2)
-       '$(STAGING_DIR_HOST)/bin/add_header' $(3) '$(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img'
-endef
-
-##
-## Image/Build/Linksys
-##
-
-define Image/Build/Linksys/wrt350nv2
- # parameters: 1 = rootfs type, 2 = machine name, 3 = erase size in KiB, 4 = kernel mtd size in KiB, 5 = kernel file suffix
- ifeq ($(findstring jffs2-,$(1)),jffs2-)  # JFFS2: build only image fitting to erase size
-  ifeq ($(1),jffs2-$(3)k)
-$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5))
-$(call Image/Build/Linksys/wrt350nv2-builder,$(1),$(2))
-  endif
- else
-  ifeq ($(1),ext4)  # EXT4: ignore
-   # do nothing
-  else  # do all other images
-$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5))
-$(call Image/Build/Linksys/wrt350nv2-builder,$(1),$(2))
-  endif
- endif
-endef
-
-define Image/Build/Linksys/wrt350nv2-builder
- # parameters: 1 = rootfs type, 2 = machine name
-       # $(BOARD) $(1) factory and recovery image for $(2) via wrt350nv2-builder
-       rm -rf '$(TMP_DIR)/$(2)_factory'
-       mkdir '$(TMP_DIR)/$(2)_factory'
- # create parameter file
-       echo ':image 0 $(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' > '$(TMP_DIR)/$(2)_factory/$(2).par'
-       [ ! -f '$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin' ] || ( \
-               echo ':u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin' >> '$(TMP_DIR)/$(2)_factory/$(2).par'; \
-       )
-       echo '#version 0x2020' >> '$(TMP_DIR)/$(2)_factory/$(2).par'
- # create bin file for recovery and factory image
-       -( \
-               cd '$(TMP_DIR)/$(2)_factory'; \
-               '$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -b '$(TMP_DIR)/$(2)_factory/$(2).par'; \
-       ) && $(CP) '$(TMP_DIR)/$(2)_factory/wrt350n.bin' '$(BIN_DIR)/openwrt-$(2)-$(1)-recovery.bin' && \
-       ( \
-               cd '$(TMP_DIR)/$(2)_factory'; \
-               zip 'wrt350n.zip' 'wrt350n.bin'; \
-       ) && '$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -z '$(TMP_DIR)/$(2)_factory/wrt350n.zip' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img'
-       rm -rf '$(TMP_DIR)/$(2)_factory'
-endef
-
-
-###
-### Image/PreReq
-###
-
-## Dependency for WRT350N v2 factory image
-$(eval $(call RequireCommand,zip, \
-       Please install zip. \
-))
diff --git a/target/linux/orion/image/harddisk.mk b/target/linux/orion/image/harddisk.mk
deleted file mode 100644 (file)
index fb2f351..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Image/BuildKernelMachId
-       echo -en "\x$(2)\x1c\xa0\xe3\x$(3)\x10\x81\xe3" > $(KDIR)/$(1)-zImage
-       cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/$(1)-zImage
-       $(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
-       -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
-       -d $(KDIR)/$(1)-zImage $(KDIR)/$(1)-uImage
-       cp $(KDIR)/$(1)-uImage $(BIN_DIR)/openwrt-$(1)-uImage
-endef
-
-define Image/BuildKernel
-       # Orion Kernel uImages
- # DT2: mach id 1514 (0x5EA)
-       $(call Image/BuildKernelMachId,dt2,05,ea)
- # LaCie 2big Network: mach id 2342 (0x926)
-       $(call Image/BuildKernelMachId,net2big,09,26)
-endef
-
-define Image/Build/Freecom
-       # Orion Freecom Images
- # backup unwanted files
-       rm -rf ${TMP_DIR}/$2_backup
-       mkdir ${TMP_DIR}/$2_backup
-       -mv $(TARGET_DIR)/{var,jffs,rom} ${TMP_DIR}/$2_backup
- # add extra files
-       $(INSTALL_DIR) $(TARGET_DIR)/boot
-       # TODO: Add special CMDLINE shim for webupgrade image here
-       $(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage
-       $(INSTALL_DIR) $(TARGET_DIR)/var
- # create image
-       $(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
-       $(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3)
- # remove extra files
-       rm -rf $(TARGET_DIR)/{boot,var}
- # recover unwanted files
-       -mv ${TMP_DIR}/$2_backup/* $(TARGET_DIR)/
-       rm -rf ${TMP_DIR}/$2_backup
-endef
-
-define Image/Build
-$(call Image/Build/$(1),$(1))
-$(call Image/Build/Freecom,$(1),dt2,DT,$(1))
-endef
-
-define Image/Build/squashfs
-$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-       ( \
-               dd if=$(KDIR)/uImage bs=1024k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
-endef
diff --git a/target/linux/orion/patches-4.9/000-arm_openwrt_machtypes.patch b/target/linux/orion/patches-4.9/000-arm_openwrt_machtypes.patch
deleted file mode 100644 (file)
index 764f992..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -1006,3 +1006,5 @@ eco5_bx2         MACH_ECO5_BX2           ECO5_BX2                4572
- eukrea_cpuimx28sd     MACH_EUKREA_CPUIMX28SD  EUKREA_CPUIMX28SD       4573
- domotab                       MACH_DOMOTAB            DOMOTAB                 4574
- pfla03                        MACH_PFLA03             PFLA03                  4575
-+dt2                   MACH_DT2                DT2                     1514
-+wn802t                        MACH_WN802T             WN802T                  3306
diff --git a/target/linux/orion/patches-4.9/100-wrt350nv2_openwrt_partition_map.patch b/target/linux/orion/patches-4.9/100-wrt350nv2_openwrt_partition_map.patch
deleted file mode 100644 (file)
index 89c2c94..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
-+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
-@@ -134,11 +134,11 @@ static struct mtd_partition wrt350n_v2_n
-       {
-               .name           = "kernel",
-               .offset         = 0x00000000,
--              .size           = 0x00760000,
-+              .size           = 0x00140000,   // change to kernel mtd size here (1/3)
-       }, {
-               .name           = "rootfs",
--              .offset         = 0x001a0000,
--              .size           = 0x005c0000,
-+              .offset         = 0x00140000,   // change to kernel mtd size here (2/3)
-+              .size           = 0x00610000,   // adopt to kernel mtd size here (3/3) = 0x00750000 - <kernel mtd size>
-       }, {
-               .name           = "lang",
-               .offset         = 0x00760000,
-@@ -151,6 +151,14 @@ static struct mtd_partition wrt350n_v2_n
-               .name           = "u-boot",
-               .offset         = 0x007c0000,
-               .size           = 0x00040000,
-+      }, {
-+              .name           = "eRcOmM_do_not_touch",
-+              .offset         = 0x00750000,
-+              .size           = 0x00010000,   // erasesize
-+      }, {
-+              .name           = "image",      // for sysupgrade
-+              .offset         = 0x00000000,
-+              .size           = 0x00750000,
-       },
- };
diff --git a/target/linux/orion/patches-4.9/101-wnr854t_partition_map.patch b/target/linux/orion/patches-4.9/101-wnr854t_partition_map.patch
deleted file mode 100644 (file)
index 881cfb7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/arch/arm/mach-orion5x/wnr854t-setup.c
-+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
-@@ -57,15 +57,19 @@ static struct mtd_partition wnr854t_nor_
-       {
-               .name           = "kernel",
-               .offset         = 0x00000000,
--              .size           = 0x00100000,
-+              .size           = 0x00140000,
-       }, {
-               .name           = "rootfs",
--              .offset         = 0x00100000,
--              .size           = 0x00660000,
-+              .offset         = 0x00140000,
-+              .size           = 0x00620000,
-       }, {
-               .name           = "uboot",
-               .offset         = 0x00760000,
-               .size           = 0x00040000,
-+      }, {
-+              .name           = "image",      // for sysupgrade
-+              .offset         = 0x00000000,
-+              .size           = 0x00760000,
-       },
- };
diff --git a/target/linux/orion/patches-4.9/200-dt2_board_support.patch b/target/linux/orion/patches-4.9/200-dt2_board_support.patch
deleted file mode 100644 (file)
index 5528069..0000000
+++ /dev/null
@@ -1,562 +0,0 @@
---- a/arch/arm/mach-orion5x/Kconfig
-+++ b/arch/arm/mach-orion5x/Kconfig
-@@ -48,6 +48,13 @@ config MACH_RD88F5182_DT
-         Say 'Y' here if you want your kernel to support the Marvell
-         Orion-NAS (88F5182) RD2, Flattened Device Tree.
-+config MACH_DT2
-+      bool "Freecom DataTank Gateway"
-+      select I2C_BOARDINFO
-+      help
-+        Say 'Y' here if you want your kernel to support the
-+        Freecom DataTank Gateway
-+
- config MACH_KUROBOX_PRO
-       bool "KuroBox Pro"
-       select I2C_BOARDINFO if I2C
---- a/arch/arm/mach-orion5x/Makefile
-+++ b/arch/arm/mach-orion5x/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_MACH_TS78XX)    += ts78xx-setu
- obj-$(CONFIG_MACH_MV2120)     += mv2120-setup.o
- obj-$(CONFIG_MACH_NET2BIG)    += net2big-setup.o
- obj-$(CONFIG_MACH_WNR854T)    += wnr854t-setup.o
-+obj-$(CONFIG_MACH_DT2)                += dt2-setup.o
- obj-$(CONFIG_MACH_RD88F5181L_GE)      += rd88f5181l-ge-setup.o
- obj-$(CONFIG_MACH_RD88F5181L_FXO)     += rd88f5181l-fxo-setup.o
- obj-$(CONFIG_MACH_RD88F6183AP_GE)     += rd88f6183ap-ge-setup.o
---- /dev/null
-+++ b/arch/arm/mach-orion5x/dt2-common.h
-@@ -0,0 +1,82 @@
-+#ifndef __INC_DT2_COMMON_H
-+#define __INC_DT2_COMMON_H
-+
-+#define ATAG_MV_UBOOT                 0x41000403
-+
-+struct tag_mv_uboot {
-+      u32 uboot_version;
-+      u32 tclk;
-+      u32 sysclk;
-+      u32 isUsbHost;
-+      u32 overEthAddr;
-+      u8  dt2_eeprom[256];
-+};
-+
-+#define DT2_EEPROM_ADDR               0x50
-+#define DT2_EEPROM_OFFSET             0
-+#define DT2_EEPROM_LENGTH             256
-+
-+#define DT2_SERIAL_NUMBER_DEFAULT     "run on default\0"
-+#define DT2_REVISION_DEFAULT_INIT     0xFF
-+#define DT2_CONFIG_FLAGS_DEFAULT      0x00
-+
-+#define _PACKED_      __attribute__((packed))
-+
-+struct DT2_EEPROM_SD_CONFIG {
-+      unsigned int    ram_1;
-+      unsigned int    ram_2;
-+      unsigned int    ram_3;
-+      unsigned int    ram_4;
-+      unsigned char   ram_5;
-+      unsigned char   ram_6;
-+      unsigned short  ram_7;
-+      unsigned int    magic_id;
-+      } _PACKED_;             // 24 Bytes in total
-+
-+struct DT2_EEPROM_FC_CONFIG {
-+      unsigned char   rtc_sts_mask;
-+      unsigned char   rtc_sts_init;
-+      unsigned char   rtc_int_mask;
-+      unsigned char   rtc_int_init;
-+      unsigned char   rtc_atrim_init;
-+      unsigned char   rtc_dtrim_init;
-+      unsigned char   dummy1;
-+      unsigned char   dummy2;
-+      unsigned char   dt2_config_flags;       /* 0x80 to load rtc_values to RTC */
-+      unsigned char   dt2_revision;           /* upper nibble is HW, lower nibble is FW */
-+      unsigned char   dt2_serial_number[16];  /* Serial number of DT-2 */
-+      } _PACKED_;             // 26 Bytes in total
-+
-+#define CFG_LOAD_RTC_VALUES   0x80
-+
-+struct DT2_EEPROM_GW_CONFIG {
-+      unsigned int    dummy1;
-+      unsigned int    dummy2;
-+      unsigned int    dummy3;
-+      unsigned char   dummy4;
-+      unsigned char   tos_video_val1;
-+      unsigned char   tos_video_val2;
-+      unsigned char   tos_voip_val;
-+      unsigned char   qos_igmp_cfg;
-+      unsigned char   num_of_ifs;
-+      unsigned short  vlan_ports_if[3];
-+      unsigned char   mac_addr[3][6];
-+      } _PACKED_;             // 42 Bytes in total
-+
-+#define _SIZE_OF_ALL_STRUCTS_ (sizeof(struct DT2_EEPROM_SD_CONFIG) + sizeof(struct DT2_EEPROM_FC_CONFIG) +  sizeof(struct DT2_EEPROM_GW_CONFIG))
-+
-+// MV = EEPROM - SD - FC - GW - CRC
-+struct DT2_EEPROM_MV_CONFIG {
-+      unsigned int reg_addr[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ - sizeof(unsigned int)) / (sizeof(unsigned int) * 2)];
-+      unsigned int reg_data[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ - sizeof(unsigned int)) / (sizeof(unsigned int) * 2)];
-+      } _PACKED_;
-+
-+struct DT2_EEPROM_STRUCT {
-+      struct DT2_EEPROM_MV_CONFIG mv;
-+      struct DT2_EEPROM_SD_CONFIG sd;
-+      struct DT2_EEPROM_FC_CONFIG fc;
-+      struct DT2_EEPROM_GW_CONFIG gw;
-+      unsigned int    crc;
-+      } _PACKED_;
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-orion5x/dt2-setup.c
-@@ -0,0 +1,448 @@
-+/*
-+ * arch/arm/mach-orion5x/dt2-setup.c
-+ *
-+ * Freecom DataTank Gateway Setup
-+ *
-+ * Copyright (C) 2009 Zintis Petersons <Zintis.Petersons@abcsolutions.lv>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/pci.h>
-+#include <linux/irq.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/ethtool.h>
-+#include <linux/if_ether.h>
-+#include <net/dsa.h>
-+#include <linux/ata_platform.h>
-+#include <linux/i2c.h>
-+#include <linux/reboot.h>
-+#include <linux/interrupt.h>
-+#include <asm/mach-types.h>
-+#include <asm/gpio.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/pci.h>
-+#include "orion5x.h"
-+#include "common.h"
-+#include "mpp.h"
-+
-+/*****************************************************************************
-+ * DT2 local
-+ ****************************************************************************/
-+#include <asm/setup.h>
-+#include "dt2-common.h"
-+
-+u32 mvUbootVer = 0;
-+u32 mvTclk = 166666667;
-+u32 mvSysclk = 200000000;
-+u32 mvIsUsbHost = 1;
-+u32 overEthAddr = 0;
-+u32 gBoardId = -1;
-+struct DT2_EEPROM_STRUCT dt2_eeprom;
-+
-+/*****************************************************************************
-+ * DT2 Info
-+ ****************************************************************************/
-+/*
-+ * PCI
-+ */
-+
-+#define DT2_PCI_SLOT0_OFFS    7
-+#define DT2_PCI_SLOT0_IRQ_A_PIN       3
-+#define DT2_PCI_SLOT0_IRQ_B_PIN       2
-+
-+#define DT2_PIN_GPIO_SYNC     25
-+#define DT2_PIN_GPIO_POWER    24
-+#define DT2_PIN_GPIO_UNPLUG1  23
-+#define DT2_PIN_GPIO_UNPLUG2  22
-+#define DT2_PIN_GPIO_RESET    4
-+
-+#define DT2_NOR_BOOT_BASE     0xf4000000
-+#define DT2_NOR_BOOT_SIZE     SZ_512K
-+
-+#define DT2_LEDS_BASE         0xfa000000
-+#define DT2_LEDS_SIZE         SZ_1K
-+
-+/*****************************************************************************
-+ * 512K NOR Flash on Device bus Boot CS
-+ ****************************************************************************/
-+
-+static struct mtd_partition dt2_partitions[] = {
-+      {
-+              .name   = "u-boot",
-+              .size   = 0x00080000,
-+              .offset = 0,
-+      },
-+};
-+
-+static struct physmap_flash_data dt2_nor_flash_data = {
-+      .width          = 1,            /* 8 bit bus width */
-+      .parts          = dt2_partitions,
-+      .nr_parts       = ARRAY_SIZE(dt2_partitions)
-+};
-+
-+static struct resource dt2_nor_flash_resource = {
-+      .flags          = IORESOURCE_MEM,
-+      .start          = DT2_NOR_BOOT_BASE,
-+      .end            = DT2_NOR_BOOT_BASE + DT2_NOR_BOOT_SIZE - 1,
-+};
-+
-+static struct platform_device dt2_nor_flash = {
-+      .name           = "physmap-flash",
-+      .id             = 0,
-+      .dev            = {
-+              .platform_data  = &dt2_nor_flash_data,
-+      },
-+      .resource       = &dt2_nor_flash_resource,
-+      .num_resources  = 1,
-+};
-+
-+/*****************************************************************************
-+ * PCI
-+ ****************************************************************************/
-+
-+void __init dt2_pci_preinit(void)
-+{
-+      int pin, irq;
-+
-+      /*
-+       * Configure PCI GPIO IRQ pins
-+       */
-+      pin = DT2_PCI_SLOT0_IRQ_A_PIN;
-+      if (gpio_request(pin, "PCI IntA") == 0) {
-+              if (gpio_direction_input(pin) == 0) {
-+                      irq = gpio_to_irq(pin);
-+                      irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW);
-+                      printk (KERN_INFO "PCI IntA IRQ: %d\n", irq);
-+              } else {
-+                      printk(KERN_ERR "dt2_pci_preinit failed to "
-+                                      "irq_set_irq_type pin %d\n", pin);
-+                      gpio_free(pin);
-+              }
-+      } else {
-+              printk(KERN_ERR "dt2_pci_preinit failed to request gpio %d\n", pin);
-+      }
-+
-+      pin = DT2_PCI_SLOT0_IRQ_B_PIN;
-+      if (gpio_request(pin, "PCI IntB") == 0) {
-+              if (gpio_direction_input(pin) == 0) {
-+                      irq = gpio_to_irq(pin);
-+                      irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW);
-+                      printk (KERN_INFO "PCI IntB IRQ: %d\n", irq);
-+              } else {
-+                      printk(KERN_ERR "dt2_pci_preinit failed to "
-+                                      "irq_set_irq_type pin %d\n", pin);
-+                      gpio_free(pin);
-+              }
-+      } else {
-+              printk(KERN_ERR "dt2_pci_preinit failed to gpio_request %d\n", pin);
-+      }
-+}
-+
-+static int __init dt2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+      int irq;
-+
-+      /*
-+       * Check for devices with hard-wired IRQs.
-+       */
-+      irq = orion5x_pci_map_irq(dev, slot, pin);
-+      if (irq != -1){
-+              printk(KERN_INFO "orion5x_pci_map_irq: %d\n", irq);
-+              return irq;
-+      }
-+
-+      /*
-+       * PCI IRQs are connected via GPIOs
-+       */
-+      switch (slot - DT2_PCI_SLOT0_OFFS) {
-+      case 0:
-+              if (pin == 1){
-+                      irq = gpio_to_irq(DT2_PCI_SLOT0_IRQ_A_PIN);
-+                      printk(KERN_INFO "dt2_pci_map_irq DT2_PCI_SLOT0_IRQ_A_PIN: %d\n", irq);
-+              }
-+              else {
-+                      irq = gpio_to_irq(DT2_PCI_SLOT0_IRQ_B_PIN);
-+                      printk(KERN_INFO "dt2_pci_map_irq DT2_PCI_SLOT0_IRQ_B_PIN: %d\n", irq);
-+              }
-+      default:
-+              irq = -1;
-+                      printk(KERN_INFO "dt2_pci_map_irq IRQ: %d\n", irq);
-+      }
-+
-+      return irq;
-+}
-+
-+static struct hw_pci dt2_pci __initdata = {
-+      .nr_controllers = 2,
-+      .preinit        = dt2_pci_preinit,
-+      .setup          = orion5x_pci_sys_setup,
-+      .scan           = orion5x_pci_sys_scan_bus,
-+      .map_irq        = dt2_pci_map_irq,
-+};
-+
-+static int __init dt2_pci_init(void)
-+{
-+      if (machine_is_dt2())
-+              pci_common_init(&dt2_pci);
-+
-+      return 0;
-+}
-+
-+subsys_initcall(dt2_pci_init);
-+
-+/*****************************************************************************
-+ * Ethernet
-+ ****************************************************************************/
-+
-+static struct mv643xx_eth_platform_data dt2_eth_data = {
-+      .phy_addr       = MV643XX_ETH_PHY_NONE,
-+      .speed          = SPEED_1000,
-+      .duplex         = DUPLEX_FULL,
-+};
-+
-+static struct dsa_chip_data dt2_switch_chip_data = {
-+      .port_names[0] = "wan",
-+      .port_names[1] = "lan1",
-+      .port_names[2] = "lan2",
-+      .port_names[3] = "cpu",
-+      .port_names[4] = "lan3",
-+      .port_names[5] = "lan4",
-+};
-+
-+static struct dsa_platform_data dt2_switch_plat_data = {
-+      .nr_chips       = 1,
-+      .chip           = &dt2_switch_chip_data,
-+};
-+
-+/*****************************************************************************
-+ * RTC ISL1208 on I2C bus
-+ ****************************************************************************/
-+static struct i2c_board_info __initdata dt2_i2c_rtc = {
-+      I2C_BOARD_INFO("isl1208", 0x6F),
-+};
-+
-+/*****************************************************************************
-+ * Sata
-+ ****************************************************************************/
-+static struct mv_sata_platform_data dt2_sata_data = {
-+      .n_ports        = 2,
-+};
-+
-+/*****************************************************************************
-+ * General Setup
-+ ****************************************************************************/
-+static unsigned int dt2_mpp_modes[] __initdata = {
-+      MPP0_GPIO,              // RTC interrupt
-+      MPP1_GPIO,              // 88e6131 interrupt
-+      MPP2_GPIO,              // PCI_intB
-+      MPP3_GPIO,              // PCI_intA
-+      MPP4_GPIO,              // reset button switch
-+      MPP5_GPIO,
-+      MPP6_GPIO,
-+      MPP7_GPIO,
-+      MPP8_GPIO,
-+      MPP9_GIGE,              /* GE_RXERR */
-+      MPP10_GPIO,             // usb
-+      MPP11_GPIO,             // usb
-+      MPP12_GIGE,             // GE_TXD[4]
-+      MPP13_GIGE,             // GE_TXD[5]
-+      MPP14_GIGE,             // GE_TXD[6]
-+      MPP15_GIGE,             // GE_TXD[7]
-+      MPP16_GIGE,             // GE_RXD[4]
-+      MPP17_GIGE,             // GE_RXD[5]
-+      MPP18_GIGE,             // GE_RXD[6]
-+      MPP19_GIGE,             // GE_RXD[7]
-+      0,
-+};
-+
-+/*****************************************************************************
-+ * LEDS
-+ ****************************************************************************/
-+static struct platform_device dt2_leds = {
-+      .name           = "dt2-led",
-+      .id             = -1,
-+};
-+
-+/****************************************************************************
-+ * GPIO key
-+ ****************************************************************************/
-+static irqreturn_t dt2_reset_handler(int irq, void *dev_id)
-+{
-+      /* This is the paper-clip reset which does an emergency reboot. */
-+      printk(KERN_INFO "Restarting system.\n");
-+      machine_restart(NULL);
-+
-+      /* This should never be reached. */
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t dt2_power_handler(int irq, void *dev_id)
-+{
-+      printk(KERN_INFO "Shutting down system.\n");
-+      machine_power_off();
-+      return IRQ_HANDLED;
-+}
-+
-+static void __init dt2_init(void)
-+{
-+      /*
-+       * Setup basic Orion functions. Need to be called early.
-+       */
-+      orion5x_init();
-+
-+      orion5x_mpp_conf(dt2_mpp_modes);
-+
-+      /*
-+       * Configure peripherals.
-+       */
-+
-+      orion5x_uart0_init();
-+      orion5x_ehci0_init();
-+      orion5x_ehci1_init();
-+      orion5x_i2c_init();
-+      orion5x_sata_init(&dt2_sata_data);
-+      orion5x_xor_init();
-+
-+      printk(KERN_INFO "U-Boot parameters:\n");
-+      printk(KERN_INFO "Sys Clk = %d, Tclk = %d, BoardID = 0x%02x\n", mvSysclk, mvTclk, gBoardId);
-+
-+      printk(KERN_INFO "Serial: %s\n", dt2_eeprom.fc.dt2_serial_number);
-+      printk(KERN_INFO "Revision: %016x\n", dt2_eeprom.fc.dt2_revision);
-+      printk(KERN_INFO "DT2: Using MAC address %pM for port 0\n",
-+             dt2_eeprom.gw.mac_addr[0]);
-+      printk(KERN_INFO "DT2: Using MAC address %pM for port 1\n",
-+             dt2_eeprom.gw.mac_addr[1]);
-+
-+      orion5x_eth_init(&dt2_eth_data);
-+      memcpy(dt2_eth_data.mac_addr, dt2_eeprom.gw.mac_addr[0], 6);
-+      orion5x_eth_switch_init(&dt2_switch_plat_data);
-+
-+      i2c_register_board_info(0, &dt2_i2c_rtc, 1);
-+
-+      mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
-+                                  ORION_MBUS_DEVBUS_BOOT_ATTR,
-+                                  DT2_NOR_BOOT_BASE, DT2_NOR_BOOT_SIZE);
-+
-+      platform_device_register(&dt2_nor_flash);
-+
-+      mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(0),
-+                                  ORION_MBUS_DEVBUS_ATTR(0),
-+                                  DT2_LEDS_BASE, DT2_LEDS_SIZE);
-+      platform_device_register(&dt2_leds);
-+
-+      if (request_irq(gpio_to_irq(DT2_PIN_GPIO_RESET), &dt2_reset_handler,
-+                      IRQF_TRIGGER_LOW,
-+                      "DT2: Reset button", NULL) < 0) {
-+
-+              printk("DT2: Reset Button IRQ %d not available\n",
-+                      gpio_to_irq(DT2_PIN_GPIO_RESET));
-+      }
-+
-+      if (request_irq(gpio_to_irq(DT2_PIN_GPIO_POWER), &dt2_power_handler,
-+                      IRQF_TRIGGER_LOW,
-+                      "DT2: Power button", NULL) < 0) {
-+
-+              printk(KERN_DEBUG "DT2: Power Button IRQ %d not available\n",
-+                      gpio_to_irq(DT2_PIN_GPIO_POWER));
-+      }
-+}
-+
-+static int __init parse_tag_dt2_uboot(const struct tag *t)
-+{
-+      struct tag_mv_uboot *mv_uboot;
-+
-+      // Get pointer to our block
-+      mv_uboot = (struct tag_mv_uboot*)&t->u;
-+      mvTclk = mv_uboot->tclk;
-+      mvSysclk = mv_uboot->sysclk;
-+      mvUbootVer = mv_uboot->uboot_version;
-+      mvIsUsbHost = mv_uboot->isUsbHost;
-+
-+      // Some clock fixups
-+      if(mvTclk == 166000000) mvTclk = 166666667;
-+      else if(mvTclk == 133000000) mvTclk = 133333333;
-+      else if(mvSysclk == 166000000) mvSysclk = 166666667;
-+
-+      gBoardId =  (mvUbootVer & 0xff);
-+
-+      //DT2 specific data
-+      memcpy(&dt2_eeprom, mv_uboot->dt2_eeprom, sizeof(struct DT2_EEPROM_STRUCT));
-+
-+      return 0;
-+}
-+__tagtable(ATAG_MV_UBOOT, parse_tag_dt2_uboot);
-+
-+/*
-+ * This is OpenWrt specific fixup. It includes code from original "tag_fixup_mem32" to
-+ * fixup bogus memory tags and also fixes kernel cmdline by adding " init=/etc/preinit"
-+ * at the end. It is important to flash OpenWrt image from original Freecom firmware.
-+ *
-+ * Vanilla kernel should use "tag_fixup_mem32" function.
-+ */
-+static void __init openwrt_fixup(struct tag *t, char **from)
-+{
-+      char *p = NULL;
-+      static char openwrt_init_tag[] __initdata = " init=/etc/preinit";
-+
-+      for (; t->hdr.size; t = tag_next(t)){
-+              /* Locate the Freecom cmdline */
-+              if (t->hdr.tag == ATAG_CMDLINE) {
-+                      p = t->u.cmdline.cmdline;
-+                      printk("%s(%d): Found cmdline '%s' at 0x%0lx\n",
-+                             __FUNCTION__, __LINE__, p, (unsigned long)p);
-+              }
-+              /*
-+               * Many orion-based systems have buggy bootloader implementations.
-+               * This is a common fixup for bogus memory tags.
-+               */
-+              if (t->hdr.tag == ATAG_MEM &&
-+                  (!t->u.mem.size || t->u.mem.size & ~PAGE_MASK ||
-+                   t->u.mem.start & ~PAGE_MASK)) {
-+                      printk(KERN_WARNING
-+                             "Clearing invalid memory bank %dKB@0x%08x\n",
-+                             t->u.mem.size / 1024, t->u.mem.start);
-+                      t->hdr.tag = 0;
-+              }
-+      }
-+
-+      printk("%s(%d): End of table at 0x%0lx\n", __FUNCTION__, __LINE__, (unsigned long)t);
-+
-+      /* Overwrite the end of the table with a new cmdline tag. */
-+      t->hdr.tag = ATAG_CMDLINE;
-+      t->hdr.size =
-+              (sizeof (struct tag_header) +
-+               strlen(p) + strlen(openwrt_init_tag) + 1 + 4) >> 2;
-+
-+      strlcpy(t->u.cmdline.cmdline, p, COMMAND_LINE_SIZE);
-+      strlcpy(t->u.cmdline.cmdline + strlen(p), openwrt_init_tag,
-+              COMMAND_LINE_SIZE - strlen(p));
-+
-+      printk("%s(%d): New cmdline '%s' at 0x%0lx\n",
-+             __FUNCTION__, __LINE__,
-+             t->u.cmdline.cmdline, (unsigned long)t->u.cmdline.cmdline);
-+
-+      t = tag_next(t);
-+
-+      printk("%s(%d): New end of table at 0x%0lx\n", __FUNCTION__, __LINE__, (unsigned long)t);
-+
-+      t->hdr.tag = ATAG_NONE;
-+      t->hdr.size = 0;
-+}
-+
-+/* Warning: Freecom uses their own custom bootloader with mach-type (=1500) */
-+MACHINE_START(DT2, "Freecom DataTank Gateway")
-+      /* Maintainer: Zintis Petersons <Zintis.Petersons@abcsolutions.lv> */
-+      .atag_offset    = 0x100,
-+      .init_machine   = dt2_init,
-+      .map_io         = orion5x_map_io,
-+      .init_irq       = orion5x_init_irq,
-+      .init_time      = orion5x_timer_init,
-+      .fixup          = openwrt_fixup, //tag_fixup_mem32,
-+MACHINE_END
diff --git a/target/linux/orion/patches-4.9/210-wn802t_support.patch b/target/linux/orion/patches-4.9/210-wn802t_support.patch
deleted file mode 100644 (file)
index a274bee..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/arch/arm/mach-orion5x/Kconfig
-+++ b/arch/arm/mach-orion5x/Kconfig
-@@ -159,10 +159,13 @@ config MACH_MSS2_DT
-         Maxtor Shared Storage II platform.
- config MACH_WNR854T
--      bool "Netgear WNR854T"
-+      bool "Netgear WNR854T / WN802T"
-       help
-         Say 'Y' here if you want your kernel to support the
--        Netgear WNR854T platform.
-+        Netgear WNR854T or WN802T platform.
-+
-+config MACH_WN802T
-+      def_bool MACH_WNR854T
- config MACH_RD88F5181L_GE
-       bool "Marvell Orion-VoIP GE Reference Design"
---- a/arch/arm/mach-orion5x/wnr854t-setup.c
-+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
-@@ -115,6 +115,15 @@ static struct dsa_platform_data __initda
-       .chip           = &wnr854t_switch_chip_data,
- };
-+static struct dsa_chip_data wn802t_switch_chip_data = {
-+      .port_names[2] = "wan",
-+      .port_names[3] = "cpu",
-+};
-+
-+static struct dsa_platform_data wn802t_switch_plat_data = {
-+      .nr_chips       = 1,
-+      .chip           = &wn802t_switch_chip_data,
-+};
- static void __init wnr854t_init(void)
- {
-       /*
-@@ -128,7 +137,10 @@ static void __init wnr854t_init(void)
-        * Configure peripherals.
-        */
-       orion5x_eth_init(&wnr854t_eth_data);
--      orion5x_eth_switch_init(&wnr854t_switch_plat_data);
-+      if (machine_is_wn802t())
-+              orion5x_eth_switch_init(&wn802t_switch_plat_data);
-+      else
-+              orion5x_eth_switch_init(&wnr854t_switch_plat_data);
-       orion5x_uart0_init();
-       mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
-@@ -168,7 +180,7 @@ static struct hw_pci wnr854t_pci __initd
- static int __init wnr854t_pci_init(void)
- {
--      if (machine_is_wnr854t())
-+      if (machine_is_wnr854t() || machine_is_wn802t())
-               pci_common_init(&wnr854t_pci);
-       return 0;
-@@ -187,3 +199,15 @@ MACHINE_START(WNR854T, "Netgear WNR854T"
-       .fixup          = tag_fixup_mem32,
-       .restart        = orion5x_restart,
- MACHINE_END
-+
-+MACHINE_START(WN802T, "Netgear WN802T")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-+      .atag_offset    = 0x100,
-+      .init_machine   = wnr854t_init,
-+      .map_io         = orion5x_map_io,
-+      .init_early     = orion5x_init_early,
-+      .init_irq       = orion5x_init_irq,
-+      .init_time      = orion5x_timer_init,
-+      .fixup          = tag_fixup_mem32,
-+      .restart        = orion5x_restart,
-+MACHINE_END
index aae7df1b443d3a84d99d91a3d3c653e1799f0ce4..8d09d4e9397ce459b11d648e6735f218151a8069 100644 (file)
@@ -15,7 +15,6 @@ SUBTARGETS:=cortexa8 cortexa7 cortexa53
 MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER := 4.19
 KERNELNAME:=zImage dtbs
 
 # A10: Cortex-A8
diff --git a/target/linux/sunxi/patches-4.19/101-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch b/target/linux/sunxi/patches-4.19/101-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch
deleted file mode 100644 (file)
index ef7867a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 55ec26d6a4241363fa94f15377ebd8f1116fbfd7 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 12 Jan 2019 20:17:19 -0600
-Subject: [PATCH] arm64: dts: allwinner: a64: Enable A64 timer workaround
-
-As instability in the architectural timer has been observed on multiple
-devices using this SoC, inluding the Pine64 and the Orange Pi Win,
-enable the workaround in the SoC's device tree.
-
-Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Signed-off-by: Chen-Yu Tsai <wens@csie.org>
----
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -159,6 +159,7 @@
-       timer {
-               compatible = "arm,armv8-timer";
-+              allwinner,erratum-unknown1;
-               interrupts = <GIC_PPI 13
-                       (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
-                            <GIC_PPI 14
diff --git a/target/linux/sunxi/patches-4.19/301-orangepi_pc2_usb_otg_to_host_key_power.patch b/target/linux/sunxi/patches-4.19/301-orangepi_pc2_usb_otg_to_host_key_power.patch
deleted file mode 100644 (file)
index af243ca..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
-@@ -98,7 +98,7 @@
-               sw4 {
-                       label = "sw4";
--                      linux,code = <BTN_0>;
-+                      linux,code = <KEY_POWER>;
-                       gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
-               };
-       };
-@@ -238,7 +238,7 @@
- };
- &usb_otg {
--      dr_mode = "otg";
-+      dr_mode = "host";
-       status = "okay";
- };
diff --git a/target/linux/sunxi/patches-4.19/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch b/target/linux/sunxi/patches-4.19/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch
deleted file mode 100644 (file)
index 1d58b7b..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From 49cd9ea6dc8d68eb519ccd9f31c9730dec8a181a Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Thu, 8 Mar 2018 22:14:50 +0100
-Subject: [PATCH] Revert "ARM: dts: sun7i: Add BCM53125 switch nodes to the
- lamobo-r1 board"
-
-This reverts the changes needed for the upstream b53 DSA switch driver 
-to use the OpenWrt b43 swconfig switch driver.
-
-This reverts commit 0cdefd5b5485ee6eb3512a75739d09a4090176ed.
-This reverts commit d7b9eaff5f0ca00726336b4c0c3c29decf30412a.
----
- arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 60 ++-----------------------------
- 1 file changed, 3 insertions(+), 57 deletions(-)
-
---- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
-+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
-@@ -124,67 +124,13 @@
- &gmac {
-       pinctrl-names = "default";
-       pinctrl-0 = <&gmac_pins_rgmii_a>;
-+      phy = <&phy1>;
-       phy-mode = "rgmii";
-       phy-supply = <&reg_gmac_3v3>;
-       status = "okay";
--      fixed-link {
--              speed = <1000>;
--              full-duplex;
--      };
--
--      mdio {
--              compatible = "snps,dwmac-mdio";
--              #address-cells = <1>;
--              #size-cells = <0>;
--
--              switch: ethernet-switch@1e {
--                      compatible = "brcm,bcm53125";
--                      reg = <30>;
--                      #address-cells = <1>;
--                      #size-cells = <0>;
--
--                      ports {
--                              #address-cells = <1>;
--                              #size-cells = <0>;
--
--                              port0: port@0 {
--                                      reg = <0>;
--                                      label = "lan2";
--                              };
--
--                              port1: port@1 {
--                                      reg = <1>;
--                                      label = "lan3";
--                              };
--
--                              port2: port@2 {
--                                      reg = <2>;
--                                      label = "lan4";
--                              };
--
--                              port3: port@3 {
--                                      reg = <3>;
--                                      label = "wan";
--                              };
--
--                              port4: port@4 {
--                                      reg = <4>;
--                                      label = "lan1";
--                              };
--
--                              port8: port@8 {
--                                      reg = <8>;
--                                      label = "cpu";
--                                      ethernet = <&gmac>;
--                                      phy-mode = "rgmii-txid";
--                                      fixed-link {
--                                              speed = <1000>;
--                                              full-duplex;
--                                      };
--                              };
--                      };
--              };
-+      phy1: ethernet-phy@1 {
-+              reg = <1>;
-       };
- };
diff --git a/target/linux/sunxi/patches-4.19/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch b/target/linux/sunxi/patches-4.19/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch
deleted file mode 100644 (file)
index ee70abe..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7d87d3dafc4b1ea5659eb71ee6c5fd5308490d1f Mon Sep 17 00:00:00 2001
-From: Oskari Lemmela <oskari@lemmela.net>
-Date: Mon, 31 Dec 2018 07:44:49 +0200
-Subject: [PATCH] arm64: allwinner: a64-sopine: Add Sopine flash partitions.
-
-First 896kB to u-boot. Enough space for SPL, u-boot and ATF.
-Next 128kB to u-boot environment and rest to firmware.
-
-Firmware partition is compatible FIT image dynamic splitting.
-
-Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
----
- .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 22 +++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
-@@ -78,6 +78,28 @@
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <40000000>;
-+
-+              partitions {
-+                      compatible = "fixed-partitions";
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+
-+                      partition@0 {
-+                              label = "u-boot";
-+                              reg = <0x000000 0x0E0000>;
-+                      };
-+
-+                      partition@e0000 {
-+                              label = "u-boot-env";
-+                              reg = <0x0E0000 0x020000>;
-+                      };
-+
-+                      partition@100000 {
-+                              compatible = "denx,fit";
-+                              label = "firmware";
-+                              reg = <0x100000 0xF00000>;
-+                      };
-+              };
-       };
- };
index 8a611e29abb4814ce7ed4d55b46b7afab2b74c85..57cb902cfd52bbe06191263534a2d4dda324476e 100644 (file)
@@ -15,7 +15,6 @@ CPU_SUBTYPE := vfpv3
 MAINTAINER := Tomasz Maciej Nowak <tomek_n@o2.pl>
 
 KERNEL_PATCHVER := 4.14
-KERNEL_TESTING_PATCHVER := 4.19
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/tegra/patches-4.19/100-serial8250-on-tegra-hsuart-recover-from-spurious-interrupts-due-to-tegra2-silicon-bug.patch b/target/linux/tegra/patches-4.19/100-serial8250-on-tegra-hsuart-recover-from-spurious-interrupts-due-to-tegra2-silicon-bug.patch
deleted file mode 100644 (file)
index 9e8c331..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From patchwork Fri Jul 13 11:32:42 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: serial8250 on tegra hsuart: recover from spurious interrupts due to
- tegra2 silicon bug
-X-Patchwork-Submitter: "David R. Piegdon" <lkml@p23q.org>
-X-Patchwork-Id: 943440
-Message-Id: <4676ea34-69ce-5422-1ded-94218b89f7d9@p23q.org>
-To: linux-tegra@vger.kernel.org
-Date: Fri, 13 Jul 2018 11:32:42 +0000
-From: "David R. Piegdon" <lkml@p23q.org>
-List-Id: <linux-tegra.vger.kernel.org>
-
-Hi,
-a while back I sent a few mails regarding spurious interrupts in the
-UARTA (hsuart) block of the Tegra2 SoC, when using the 8250 driver for
-it instead of the hsuart driver. After going down a pretty deep
-debugging/testing hole, I think I found a patch that fixes the issue. So
-far testing in a reboot-cycle suggests that the error frequency dropped
-from >3% of all reboots to at least <0.05% of all reboots. Tests
-continue to run over the weekend.
-
-The patch below already is a second iteration; the first did not reset
-the MCR or contain the lines below '// clear interrupts'. This resulted
-in no more spurious interrupts, but in a few % of spurious interrupts
-that were recovered the UART block did not receive any characters any
-more. So further resetting was required to fully reacquire operational
-state of the UART block.
-
-I'd love any comments/suggestions on this!
-
-Cheers,
-
-David
-
---- a/drivers/tty/serial/8250/8250_core.c
-+++ b/drivers/tty/serial/8250/8250_core.c
-@@ -136,6 +136,38 @@ static irqreturn_t serial8250_interrupt(
-                               "serial8250: too much work for irq%d\n", irq);
-                       break;
-               }
-+
-+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
-+              if (!handled && (port->type == PORT_TEGRA)) {
-+                      /*
-+                       * Fix Tegra 2 CPU silicon bug where sometimes
-+                       * "TX holding register empty" interrupts result in a
-+                       * bad (metastable?) state in Tegras HSUART IP core.
-+                       * Only way to recover seems to be to reset all
-+                       * interrupts as well as the TX queue and the MCR.
-+                       * But we don't want to loose any outgoing characters,
-+                       * so only do it if the RX and TX queues are empty.
-+                       */
-+                      unsigned char lsr = port->serial_in(port, UART_LSR);
-+                      const unsigned char fifo_empty_mask =
-+                                              (UART_LSR_TEMT | UART_LSR_THRE);
-+                      if (((lsr & (UART_LSR_DR | fifo_empty_mask)) ==
-+                                                      fifo_empty_mask)) {
-+                              port->serial_out(port, UART_IER, 0);
-+                              port->serial_out(port, UART_MCR, 0);
-+                              serial8250_clear_and_reinit_fifos(up);
-+                              port->serial_out(port, UART_MCR, up->mcr);
-+                              port->serial_out(port, UART_IER, up->ier);
-+                              // clear interrupts
-+                              serial_port_in(port, UART_LSR);
-+                              serial_port_in(port, UART_RX);
-+                              serial_port_in(port, UART_IIR);
-+                              serial_port_in(port, UART_MSR);
-+                              up->lsr_saved_flags = 0;
-+                              up->msr_saved_flags = 0;
-+                      }
-+              }
-+#endif
-       } while (l != end);
-       spin_unlock(&i->lock);
diff --git a/target/linux/tegra/patches-4.19/101-ARM-dtc-tegra-enable-front-panel-leds-in-TrimSlice.patch b/target/linux/tegra/patches-4.19/101-ARM-dtc-tegra-enable-front-panel-leds-in-TrimSlice.patch
deleted file mode 100644 (file)
index ae48e8d..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/arch/arm/boot/dts/tegra20-trimslice.dts
-+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
-@@ -200,16 +200,17 @@
-                       conf_ata {
-                               nvidia,pins = "ata", "atc", "atd", "ate",
-                                       "crtp", "dap2", "dap3", "dap4", "dta",
--                                      "dtb", "dtc", "dtd", "dte", "gmb",
--                                      "gme", "i2cp", "pta", "slxc", "slxd",
--                                      "spdi", "spdo", "uda";
-+                                      "dtb", "dtc", "dtd", "gmb", "gme",
-+                                      "i2cp", "pta", "slxc", "slxd", "spdi",
-+                                      "spdo", "uda";
-                               nvidia,pull = <TEGRA_PIN_PULL_NONE>;
-                               nvidia,tristate = <TEGRA_PIN_ENABLE>;
-                       };
-                       conf_atb {
-                               nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
--                                      "gma", "gmc", "gmd", "gpu", "gpu7",
--                                      "gpv", "sdio1", "slxa", "slxk", "uac";
-+                                      "dte", "gma", "gmc", "gmd", "gpu",
-+                                      "gpu7", "gpv", "sdio1", "slxa", "slxk",
-+                                      "uac";
-                               nvidia,pull = <TEGRA_PIN_PULL_NONE>;
-                               nvidia,tristate = <TEGRA_PIN_DISABLE>;
-                       };
-@@ -402,6 +403,20 @@
-               };
-       };
-+      gpio-leds {
-+              compatible = "gpio-leds";
-+
-+              ds2 {
-+                      label = "trimslice:green:right";
-+                      gpios = <&gpio TEGRA_GPIO(D, 2) GPIO_ACTIVE_LOW>;
-+              };
-+
-+              ds3 {
-+                      label = "trimslice:green:left";
-+                      gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+
-       poweroff {
-               compatible = "gpio-poweroff";
-               gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
index 509ccb47a2a677fbdd2ac46da81a0641337435a8..533c0e524807ec452175fbdafcedfc05e1c28c83 100644 (file)
@@ -14,7 +14,6 @@ SUBTARGETS:=generic legacy geode 64
 MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER:=4.19
 
 KERNELNAME:=bzImage
 
diff --git a/target/linux/x86/patches-4.19/011-tune_lzma_options.patch b/target/linux/x86/patches-4.19/011-tune_lzma_options.patch
deleted file mode 100644 (file)
index e680f9c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -324,7 +324,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--      lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+      lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-       (rm -f $@ ; false)
- quiet_cmd_lzo = LZO     $@
---- a/arch/x86/include/asm/boot.h
-+++ b/arch/x86/include/asm/boot.h
-@@ -24,7 +24,7 @@
- # error "Invalid value for CONFIG_PHYSICAL_ALIGN"
- #endif
--#ifdef CONFIG_KERNEL_BZIP2
-+#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA)
- # define BOOT_HEAP_SIZE               0x400000
- #else /* !CONFIG_KERNEL_BZIP2 */
- # define BOOT_HEAP_SIZE                0x10000
diff --git a/target/linux/x86/patches-4.19/100-fix_cs5535_clockevt.patch b/target/linux/x86/patches-4.19/100-fix_cs5535_clockevt.patch
deleted file mode 100644 (file)
index c3a7fce..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/clocksource/cs5535-clockevt.c
-+++ b/drivers/clocksource/cs5535-clockevt.c
-@@ -130,7 +130,8 @@ static irqreturn_t mfgpt_tick(int irq, v
-               cs5535_mfgpt_write(cs5535_event_clock, MFGPT_REG_SETUP,
-                               MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
--      cs5535_clockevent.event_handler(&cs5535_clockevent);
-+      if (cs5535_clockevent.event_handler)
-+              cs5535_clockevent.event_handler(&cs5535_clockevent);
-       return IRQ_HANDLED;
- }
diff --git a/target/linux/x86/patches-4.19/200-pcengines-apu2-reboot.patch b/target/linux/x86/patches-4.19/200-pcengines-apu2-reboot.patch
deleted file mode 100644 (file)
index 1426140..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/arch/x86/kernel/reboot.c
-+++ b/arch/x86/kernel/reboot.c
-@@ -469,6 +469,16 @@ static const struct dmi_system_id reboot
-               },
-       },
-+      /* PC Engines */
-+      {       /* Handle problems with rebooting on PC Engines apu2 */
-+              .callback = set_pci_reboot,
-+              .ident = "PC Engines apu2",
-+              .matches = {
-+                      DMI_MATCH(DMI_BOARD_VENDOR, "PC Engines"),
-+                      DMI_MATCH(DMI_BOARD_NAME, "apu2"),
-+              },
-+      },
-+
-       /* Sony */
-       {       /* Handle problems with rebooting on Sony VGN-Z540N */
-               .callback = set_bios_reboot,
diff --git a/target/linux/x86/patches-4.19/800-hwmon-w83627ehf-dont-claim-nct677x.patch b/target/linux/x86/patches-4.19/800-hwmon-w83627ehf-dont-claim-nct677x.patch
deleted file mode 100644 (file)
index ef2e133..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/hwmon/w83627ehf.c
-+++ b/drivers/hwmon/w83627ehf.c
-@@ -2717,8 +2717,8 @@ static int __init w83627ehf_find(int sio
-       static const char sio_name_W83627UHG[] __initconst = "W83627UHG";
-       static const char sio_name_W83667HG[] __initconst = "W83667HG";
-       static const char sio_name_W83667HG_B[] __initconst = "W83667HG-B";
--      static const char sio_name_NCT6775[] __initconst = "NCT6775F";
--      static const char sio_name_NCT6776[] __initconst = "NCT6776F";
-+/*    static const char sio_name_NCT6775[] __initconst = "NCT6775F";
-+      static const char sio_name_NCT6776[] __initconst = "NCT6776F"; */
-       u16 val;
-       const char *sio_name;
-@@ -2762,14 +2762,14 @@ static int __init w83627ehf_find(int sio
-               sio_data->kind = w83667hg_b;
-               sio_name = sio_name_W83667HG_B;
-               break;
--      case SIO_NCT6775_ID:
-+/*    case SIO_NCT6775_ID:
-               sio_data->kind = nct6775;
-               sio_name = sio_name_NCT6775;
-               break;
-       case SIO_NCT6776_ID:
-               sio_data->kind = nct6776;
-               sio_name = sio_name_NCT6776;
--              break;
-+              break; */
-       default:
-               if (val != 0xffff)
-                       pr_debug("unsupported chip ID: 0x%04x\n", val);