diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-06 19:09:16 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-06 19:09:16 +0200 |
| commit | af26150342238f850c54fe65f02fb36a915cbfbb (patch) | |
| tree | 95ae2ffed75ecbf61851b047138015117d89e58c | |
| parent | 1a69709ad2fc768e55a656a89c381d0ac91ccef0 (diff) | |
| parent | bf7ea1ba8a713b02719b74ad55d12b84d9081678 (diff) | |
| download | kernel-4.13.0-0.rc0.git2.1.vanilla.knurd.1.fc26.tar.gz kernel-4.13.0-0.rc0.git2.1.vanilla.knurd.1.fc26.tar.xz kernel-4.13.0-0.rc0.git2.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc0.git2.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc0.git2.1.vanilla.knurd.1.fc25
45 files changed, 372 insertions, 1589 deletions
diff --git a/AllWinner-net-emac.patch b/AllWinner-net-emac.patch index 6e7438200..e19dfdd4f 100644 --- a/AllWinner-net-emac.patch +++ b/AllWinner-net-emac.patch @@ -1,1430 +1,3 @@ -From patchwork Mon May 1 12:45:01 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v5, - 01/20] net: stmmac: export stmmac_set_mac_addr/stmmac_get_mac_addr -From: Corentin LABBE <clabbe.montjoie@gmail.com> -X-Patchwork-Id: 9706455 -Message-Id: <20170501124520.3769-2-clabbe.montjoie@gmail.com> -To: robh+dt@kernel.org, mark.rutland@arm.com, - maxime.ripard@free-electrons.com, wens@csie.org, - linux@armlinux.org.uk, catalin.marinas@arm.com, - will.deacon@arm.com, peppe.cavallaro@st.com, alexandre.torgue@st.com -Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, - netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, - Corentin Labbe <clabbe.montjoie@gmail.com> -Date: Mon, 1 May 2017 14:45:01 +0200 - -Thoses symbol will be needed for the dwmac-sun8i ethernet driver. -For letting it to be build as module, they need to be exported. - -Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> ---- - drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c -index 38f9430..67af0bd 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c -+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c -@@ -248,6 +248,7 @@ void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6], - data = (addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) | addr[0]; - writel(data, ioaddr + low); - } -+EXPORT_SYMBOL_GPL(stmmac_set_mac_addr); - - /* Enable disable MAC RX/TX */ - void stmmac_set_mac(void __iomem *ioaddr, bool enable) -@@ -279,4 +280,4 @@ void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr, - addr[4] = hi_addr & 0xff; - addr[5] = (hi_addr >> 8) & 0xff; - } -- -+EXPORT_SYMBOL_GPL(stmmac_get_mac_addr); - -From patchwork Mon May 1 12:45:02 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v5,02/20] net: stmmac: add optional setup function -From: Corentin LABBE <clabbe.montjoie@gmail.com> -X-Patchwork-Id: 9706501 -Message-Id: <20170501124520.3769-3-clabbe.montjoie@gmail.com> -To: robh+dt@kernel.org, mark.rutland@arm.com, - maxime.ripard@free-electrons.com, wens@csie.org, - linux@armlinux.org.uk, catalin.marinas@arm.com, - will.deacon@arm.com, peppe.cavallaro@st.com, alexandre.torgue@st.com -Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, - netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, - Corentin Labbe <clabbe.montjoie@gmail.com> -Date: Mon, 1 May 2017 14:45:02 +0200 - -Instead of adding more ifthen logic for adding a new mac_device_info -setup function, it is easier to add a function pointer to the function -needed. - -Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> ---- - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +++- - include/linux/stmmac.h | 1 + - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index cd8c601..b82ab64 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -3947,7 +3947,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv) - struct mac_device_info *mac; - - /* Identify the MAC HW device */ -- if (priv->plat->has_gmac) { -+ if (priv->plat->setup) { -+ mac = priv->plat->setup(priv); -+ } else if (priv->plat->has_gmac) { - priv->dev->priv_flags |= IFF_UNICAST_FLT; - mac = dwmac1000_setup(priv->ioaddr, - priv->plat->multicast_filter_bins, -diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index 3921cb9..8bb550b 100644 ---- a/include/linux/stmmac.h -+++ b/include/linux/stmmac.h -@@ -177,6 +177,7 @@ struct plat_stmmacenet_data { - void (*fix_mac_speed)(void *priv, unsigned int speed); - int (*init)(struct platform_device *pdev, void *priv); - void (*exit)(struct platform_device *pdev, void *priv); -+ struct mac_device_info *(*setup)(void *priv); - void *bsp_priv; - struct clk *stmmac_clk; - struct clk *pclk; - -From patchwork Mon May 1 12:45:03 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v5, - 03/20] dt-bindings: net: Add DT bindings documentation for Allwinner - dwmac-sun8i -From: Corentin LABBE <clabbe.montjoie@gmail.com> -X-Patchwork-Id: 9706457 -Message-Id: <20170501124520.3769-4-clabbe.montjoie@gmail.com> -To: robh+dt@kernel.org, mark.rutland@arm.com, - maxime.ripard@free-electrons.com, wens@csie.org, - linux@armlinux.org.uk, catalin.marinas@arm.com, - will.deacon@arm.com, peppe.cavallaro@st.com, alexandre.torgue@st.com -Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, - netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, - Corentin Labbe <clabbe.montjoie@gmail.com> -Date: Mon, 1 May 2017 14:45:03 +0200 - -This patch adds documentation for Device-Tree bindings for the -Allwinner dwmac-sun8i driver. - -Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> -Acked-by: Rob Herring <robh@kernel.org> ---- - .../devicetree/bindings/net/dwmac-sun8i.txt | 77 ++++++++++++++++++++++ - 1 file changed, 77 insertions(+) - create mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt - -diff --git a/Documentation/devicetree/bindings/net/dwmac-sun8i.txt b/Documentation/devicetree/bindings/net/dwmac-sun8i.txt -new file mode 100644 -index 0000000..05cd067 ---- /dev/null -+++ b/Documentation/devicetree/bindings/net/dwmac-sun8i.txt -@@ -0,0 +1,77 @@ -+* Allwinner sun8i GMAC ethernet controller -+ -+This device is a platform glue layer for stmmac. -+Please see stmmac.txt for the other unchanged properties. -+ -+Required properties: -+- compatible: should be one of the following string: -+ "allwinner,sun8i-a83t-emac" -+ "allwinner,sun8i-h3-emac" -+ "allwinner,sun50i-a64-emac" -+- reg: address and length of the register for the device. -+- interrupts: interrupt for the device -+- interrupt-names: should be "macirq" -+- clocks: A phandle to the reference clock for this device -+- clock-names: should be "stmmaceth" -+- resets: A phandle to the reset control for this device -+- reset-names: should be "stmmaceth" -+- phy-mode: See ethernet.txt -+- phy-handle: See ethernet.txt -+- #address-cells: shall be 1 -+- #size-cells: shall be 0 -+- syscon: A phandle to the syscon of the SoC with one of the following -+ compatible string: -+ - allwinner,sun8i-h3-system-controller -+ - allwinner,sun50i-a64-system-controller -+ - allwinner,sun8i-a83t-system-controller -+ -+Optional properties: -+- allwinner,tx-delay-ps: TX clock delay chain value in ps. Range value is 0-700. Default is 0) -+- allwinner,rx-delay-ps: RX clock delay chain value in ps. Range value is 0-3100. Default is 0) -+Both delay properties need to be a multiple of 100. -+ -+Optional properties for "allwinner,sun8i-h3-emac": -+- allwinner,leds-active-low: EPHY LEDs are active low -+ -+Required child node of emac: -+- mdio bus node: should be named mdio -+ -+Required properties of the mdio node: -+- #address-cells: shall be 1 -+- #size-cells: shall be 0 -+ -+The device node referenced by "phy" or "phy-handle" should be a child node -+of the mdio node. See phy.txt for the generic PHY bindings. -+ -+Required properties of the phy node with "allwinner,sun8i-h3-emac": -+- clocks: a phandle to the reference clock for the EPHY -+- resets: a phandle to the reset control for the EPHY -+ -+Example: -+ -+emac: ethernet@1c0b000 { -+ compatible = "allwinner,sun8i-h3-emac"; -+ syscon = <&syscon>; -+ reg = <0x01c0b000 0x104>; -+ interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; -+ interrupt-names = "macirq"; -+ resets = <&ccu RST_BUS_EMAC>; -+ reset-names = "stmmaceth"; -+ clocks = <&ccu CLK_BUS_EMAC>; -+ clock-names = "stmmaceth"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ phy = <&int_mii_phy>; -+ phy-mode = "mii"; -+ allwinner,leds-active-low; -+ mdio: mdio { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ int_mii_phy: ethernet-phy@1 { -+ reg = <1>; -+ clocks = <&ccu CLK_BUS_EPHY>; -+ resets = <&ccu RST_BUS_EPHY>; -+ }; -+ }; -+}; - -From patchwork Mon May 1 12:45:04 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v5, 04/20] dt-bindings: syscon: Add DT bindings documentation for - Allwinner syscon -From: Corentin LABBE <clabbe.montjoie@gmail.com> -X-Patchwork-Id: 9706469 -Message-Id: <20170501124520.3769-5-clabbe.montjoie@gmail.com> -To: robh+dt@kernel.org, mark.rutland@arm.com, - maxime.ripard@free-electrons.com, wens@csie.org, - linux@armlinux.org.uk, catalin.marinas@arm.com, - will.deacon@arm.com, peppe.cavallaro@st.com, alexandre.torgue@st.com -Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, - netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, - Corentin Labbe <clabbe.montjoie@gmail.com> -Date: Mon, 1 May 2017 14:45:04 +0200 - -This patch adds documentation for Device-Tree bindings for the -syscon present in allwinner devices. - -Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> ---- - .../devicetree/bindings/misc/allwinner,syscon.txt | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - create mode 100644 Documentation/devicetree/bindings/misc/allwinner,syscon.txt - -diff --git a/Documentation/devicetree/bindings/misc/allwinner,syscon.txt b/Documentation/devicetree/bindings/misc/allwinner,syscon.txt -new file mode 100644 -index 0000000..cb57691 ---- /dev/null -+++ b/Documentation/devicetree/bindings/misc/allwinner,syscon.txt -@@ -0,0 +1,19 @@ -+* Allwinner sun8i system controller -+ -+This file describes the bindings for the system controller present in -+Allwinner SoC H3, A83T and A64. -+The principal function of this syscon is to control EMAC PHY choice and -+config. -+ -+Required properties for the system controller: -+- reg: address and length of the register for the device. -+- compatible: should be "syscon" and one of the following string: -+ "allwinner,sun8i-h3-system-controller" -+ "allwinner,sun50i-a64-system-controller" -+ "allwinner,sun8i-a83t-system-controller" -+ -+Example: -+syscon: syscon@1c00000 { -+ compatible = "allwinner,sun8i-h3-system-controller", "syscon"; -+ reg = <0x01c00000 0x1000>; -+}; - -From patchwork Mon May 1 12:45:05 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v5,05/20] net: stmmac: Add dwmac-sun8i -From: Corentin LABBE <clabbe.montjoie@gmail.com> -X-Patchwork-Id: 9706473 -Message-Id: <20170501124520.3769-6-clabbe.montjoie@gmail.com> -To: robh+dt@kernel.org, mark.rutland@arm.com, - maxime.ripard@free-electrons.com, wens@csie.org, - linux@armlinux.org.uk, catalin.marinas@arm.com, - will.deacon@arm.com, peppe.cavallaro@st.com, alexandre.torgue@st.com -Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, - netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, - Corentin Labbe <clabbe.montjoie@gmail.com> -Date: Mon, 1 May 2017 14:45:05 +0200 - -The dwmac-sun8i is a heavy hacked version of stmmac hardware by -allwinner. -In fact the only common part is the descriptor management and the first -register function. - -Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> ---- - drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 + - drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + - drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 973 +++++++++++++++++++++ - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 29 + - .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 +- - include/linux/stmmac.h | 1 + - 6 files changed, 1022 insertions(+), 2 deletions(-) - create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c - -diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig -index cfbe363..85c0e41 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/Kconfig -+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig -@@ -145,6 +145,17 @@ config DWMAC_SUNXI - This selects Allwinner SoC glue layer support for the - stmmac device driver. This driver is used for A20/A31 - GMAC ethernet controller. -+ -+config DWMAC_SUN8I -+ tristate "Allwinner sun8i GMAC support" -+ default ARCH_SUNXI -+ depends on OF && (ARCH_SUNXI || COMPILE_TEST) -+ ---help--- -+ Support for Allwinner H3 A83T A64 EMAC ethernet controllers. -+ -+ This selects Allwinner SoC glue layer support for the -+ stmmac device driver. This driver is used for H3/A83T/A64 -+ EMAC ethernet controller. - endif - - config STMMAC_PCI -diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile -index 700c603..fd4937a 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/Makefile -+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_DWMAC_SOCFPGA) += dwmac-altr-socfpga.o - obj-$(CONFIG_DWMAC_STI) += dwmac-sti.o - obj-$(CONFIG_DWMAC_STM32) += dwmac-stm32.o - obj-$(CONFIG_DWMAC_SUNXI) += dwmac-sunxi.o -+obj-$(CONFIG_DWMAC_SUN8I) += dwmac-sun8i.o - obj-$(CONFIG_DWMAC_DWC_QOS_ETH) += dwmac-dwc-qos-eth.o - obj-$(CONFIG_DWMAC_GENERIC) += dwmac-generic.o - stmmac-platform-objs:= stmmac_platform.o -diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -new file mode 100644 -index 0000000..66eb980 ---- /dev/null -+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -0,0 +1,973 @@ -+/* -+ * dwmac-sun8i.c - Allwinner sun8i DWMAC specific glue layer -+ * -+ * Copyright (C) 2017 Corentin Labbe <clabbe.montjoie@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. -+ */ -+ -+#include <linux/clk.h> -+#include <linux/io.h> -+#include <linux/iopoll.h> -+#include <linux/mfd/syscon.h> -+#include <linux/module.h> -+#include <linux/of_device.h> -+#include <linux/of_mdio.h> -+#include <linux/of_net.h> -+#include <linux/phy.h> -+#include <linux/platform_device.h> -+#include <linux/regulator/consumer.h> -+#include <linux/regmap.h> -+#include <linux/stmmac.h> -+ -+#include "stmmac.h" -+#include "stmmac_platform.h" -+ -+/* General notes on dwmac-sun8i: -+ * Locking: no locking is necessary in this file because all necessary locking -+ * is done in the "stmmac files" -+ */ -+ -+/* struct emac_variant - Descrive dwmac-sun8i hardware variant -+ * @default_syscon_value: The default value of the EMAC register in syscon -+ * This value is used for disabling properly EMAC -+ * and used as a good starting value in case of the -+ * boot process(uboot) leave some stuff. -+ * @internal_phy: Does the MAC embed an internal PHY -+ * @support_mii: Does the MAC handle MII -+ * @support_rmii: Does the MAC handle RMII -+ * @support_rgmii: Does the MAC handle RGMII -+ */ -+struct emac_variant { -+ u32 default_syscon_value; -+ int internal_phy; -+ bool support_mii; -+ bool support_rmii; -+ bool support_rgmii; -+}; -+ -+/* struct sunxi_priv_data - hold all sunxi private data -+ * @tx_clk: reference to MAC TX clock -+ * @ephy_clk: reference to the optional EPHY clock for the internal PHY -+ * @regulator: reference to the optional regulator -+ * @rst_ephy: reference to the optional EPHY reset for the internal PHY -+ * @variant: reference to the current board variant -+ * @regmap: regmap for using the syscon -+ * @use_internal_phy: Does the current PHY choice imply using the internal PHY -+ */ -+struct sunxi_priv_data { -+ struct clk *tx_clk; -+ struct clk *ephy_clk; -+ struct regulator *regulator; -+ struct reset_control *rst_ephy; -+ const struct emac_variant *variant; -+ struct regmap *regmap; -+ bool use_internal_phy; -+}; -+ -+static const struct emac_variant emac_variant_h3 = { -+ .default_syscon_value = 0x58000, -+ .internal_phy = PHY_INTERFACE_MODE_MII, -+ .support_mii = true, -+ .support_rmii = true, -+ .support_rgmii = true -+}; -+ -+static const struct emac_variant emac_variant_a83t = { -+ .default_syscon_value = 0, -+ .internal_phy = 0, -+ .support_mii = true, -+ .support_rgmii = true -+}; -+ -+static const struct emac_variant emac_variant_a64 = { -+ .default_syscon_value = 0, -+ .internal_phy = 0, -+ .support_mii = true, -+ .support_rmii = true, -+ .support_rgmii = true -+}; -+ -+#define EMAC_BASIC_CTL0 0x00 -+#define EMAC_BASIC_CTL1 0x04 -+#define EMAC_INT_STA 0x08 -+#define EMAC_INT_EN 0x0C -+#define EMAC_TX_CTL0 0x10 -+#define EMAC_TX_CTL1 0x14 -+#define EMAC_TX_FLOW_CTL 0x1C -+#define EMAC_TX_DESC_LIST 0x20 -+#define EMAC_RX_CTL0 0x24 -+#define EMAC_RX_CTL1 0x28 -+#define EMAC_RX_DESC_LIST 0x34 -+#define EMAC_RX_FRM_FLT 0x38 -+#define EMAC_MDIO_CMD 0x48 -+#define EMAC_MDIO_DATA 0x4C -+#define EMAC_MACADDR_HI(reg) (0x50 + (reg) * 8) -+#define EMAC_MACADDR_LO(reg) (0x54 + (reg) * 8) -+#define EMAC_TX_DMA_STA 0xB0 -+#define EMAC_TX_CUR_DESC 0xB4 -+#define EMAC_TX_CUR_BUF 0xB8 -+#define EMAC_RX_DMA_STA 0xC0 -+#define EMAC_RX_CUR_DESC 0xC4 -+#define EMAC_RX_CUR_BUF 0xC8 -+ -+/* Use in EMAC_BASIC_CTL1 */ -+#define EMAC_BURSTLEN_SHIFT 24 -+ -+/* Used in EMAC_RX_FRM_FLT */ -+#define EMAC_FRM_FLT_RXALL BIT(0) -+#define EMAC_FRM_FLT_CTL BIT(13) -+#define EMAC_FRM_FLT_MULTICAST BIT(16) -+ -+/* Used in RX_CTL1*/ -+#define EMAC_RX_MD BIT(1) -+#define EMAC_RX_TH_MASK GENMASK(4, 5) -+#define EMAC_RX_TH_32 0 -+#define EMAC_RX_TH_64 (0x1 << 4) -+#define EMAC_RX_TH_96 (0x2 << 4) -+#define EMAC_RX_TH_128 (0x3 << 4) -+#define EMAC_RX_DMA_EN BIT(30) -+#define EMAC_RX_DMA_START BIT(31) -+ -+/* Used in TX_CTL1*/ -+#define EMAC_TX_MD BIT(1) -+#define EMAC_TX_NEXT_FRM BIT(2) -+#define EMAC_TX_TH_MASK GENMASK(8, 10) -+#define EMAC_TX_TH_64 0 -+#define EMAC_TX_TH_128 (0x1 << 8) -+#define EMAC_TX_TH_192 (0x2 << 8) -+#define EMAC_TX_TH_256 (0x3 << 8) -+#define EMAC_TX_DMA_EN BIT(30) -+#define EMAC_TX_DMA_START BIT(31) -+ -+/* Used in RX_CTL0 */ -+#define EMAC_RX_RECEIVER_EN BIT(31) -+#define EMAC_RX_DO_CRC BIT(27) -+#define EMAC_RX_FLOW_CTL_EN BIT(16) -+ -+/* Used in TX_CTL0 */ -+#define EMAC_TX_TRANSMITTER_EN BIT(31) -+ -+/* Used in EMAC_TX_FLOW_CTL */ -+#define EMAC_TX_FLOW_CTL_EN BIT(0) -+ -+/* Used in EMAC_INT_STA */ -+#define EMAC_TX_INT BIT(0) -+#define EMAC_TX_DMA_STOP_INT BIT(1) -+#define EMAC_TX_BUF_UA_INT BIT(2) -+#define EMAC_TX_TIMEOUT_INT BIT(3) -+#define EMAC_TX_UNDERFLOW_INT BIT(4) -+#define EMAC_TX_EARLY_INT BIT(5) -+#define EMAC_RX_INT BIT(8) -+#define EMAC_RX_BUF_UA_INT BIT(9) -+#define EMAC_RX_DMA_STOP_INT BIT(10) -+#define EMAC_RX_TIMEOUT_INT BIT(11) -+#define EMAC_RX_OVERFLOW_INT BIT(12) -+#define EMAC_RX_EARLY_INT BIT(13) -+#define EMAC_RGMII_STA_INT BIT(16) -+ -+#define MAC_ADDR_TYPE_DST BIT(31) -+ -+/* H3 specific bits for EPHY */ -+#define H3_EPHY_ADDR_SHIFT 20 -+#define H3_EPHY_LED_POL BIT(17) /* 1: active low, 0: active high */ -+#define H3_EPHY_SHUTDOWN BIT(16) /* 1: shutdown, 0: power up */ -+#define H3_EPHY_SELECT BIT(15) /* 1: internal PHY, 0: external PHY */ -+ -+/* H3/A64 specific bits */ -+#define SYSCON_RMII_EN BIT(13) /* 1: enable RMII (overrides EPIT) */ -+ -+/* Generic system control EMAC_CLK bits */ -+#define SYSCON_ETXDC_MASK GENMASK(2, 0) -+#define SYSCON_ETXDC_SHIFT 10 -+#define SYSCON_ERXDC_MASK GENMASK(4, 0) -+#define SYSCON_ERXDC_SHIFT 5 -+/* EMAC PHY Interface Type */ -+#define SYSCON_EPIT BIT(2) /* 1: RGMII, 0: MII */ -+#define SYSCON_ETCS_MASK GENMASK(1, 0) -+#define SYSCON_ETCS_MII 0x0 -+#define SYSCON_ETCS_EXT_GMII 0x1 -+#define SYSCON_ETCS_INT_GMII 0x2 -+#define SYSCON_EMAC_REG 0x30 -+ -+/* sun8i_dwmac_dma_reset() - reset the EMAC -+ * Called from stmmac via stmmac_dma_ops->reset -+ */ -+static int sun8i_dwmac_dma_reset(void __iomem *ioaddr) -+{ -+ writel(0, ioaddr + EMAC_RX_CTL1); -+ writel(0, ioaddr + EMAC_TX_CTL1); -+ writel(0, ioaddr + EMAC_RX_FRM_FLT); -+ writel(0, ioaddr + EMAC_RX_DESC_LIST); -+ writel(0, ioaddr + EMAC_TX_DESC_LIST); -+ writel(0, ioaddr + EMAC_INT_EN); -+ writel(0x1FFFFFF, ioaddr + EMAC_INT_STA); -+ return 0; -+} -+ -+/* sun8i_dwmac_dma_init() - initialize the EMAC -+ * Called from stmmac via stmmac_dma_ops->init -+ */ -+static void sun8i_dwmac_dma_init(void __iomem *ioaddr, -+ struct stmmac_dma_cfg *dma_cfg, -+ u32 dma_tx, u32 dma_rx, int atds) -+{ -+ /* Write TX and RX descriptors address */ -+ writel(dma_rx, ioaddr + EMAC_RX_DESC_LIST); -+ writel(dma_tx, ioaddr + EMAC_TX_DESC_LIST); -+ -+ writel(EMAC_RX_INT | EMAC_TX_INT, ioaddr + EMAC_INT_EN); -+ writel(0x1FFFFFF, ioaddr + EMAC_INT_STA); -+} -+ -+/* sun8i_dwmac_dump_regs() - Dump EMAC address space -+ * Called from stmmac_dma_ops->dump_regs -+ * Used for ethtool -+ */ -+static void sun8i_dwmac_dump_regs(void __iomem *ioaddr, u32 *reg_space) -+{ -+ int i; -+ -+ for (i = 0; i < 0xC8; i += 4) { -+ if (i == 0x32 || i == 0x3C) -+ continue; -+ reg_space[i / 4] = readl(ioaddr + i); -+ } -+} -+ -+/* sun8i_dwmac_dump_mac_regs() - Dump EMAC address space -+ * Called from stmmac_ops->dump_regs -+ * Used for ethtool -+ */ -+static void sun8i_dwmac_dump_mac_regs(struct mac_device_info *hw, -+ u32 *reg_space) -+{ -+ int i; -+ void __iomem *ioaddr = hw->pcsr; -+ -+ for (i = 0; i < 0xC8; i += 4) { -+ if (i == 0x32 || i == 0x3C) -+ continue; -+ reg_space[i / 4] = readl(ioaddr + i); -+ } -+} -+ -+static void sun8i_dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan) -+{ -+ writel(EMAC_RX_INT | EMAC_TX_INT, ioaddr + EMAC_INT_EN); -+} -+ -+static void sun8i_dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan) -+{ -+ writel(0, ioaddr + EMAC_INT_EN); -+} -+ -+static void sun8i_dwmac_dma_start_tx(void __iomem *ioaddr, u32 chan) -+{ -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_TX_CTL1); -+ v |= EMAC_TX_DMA_START; -+ v |= EMAC_TX_DMA_EN; -+ writel(v, ioaddr + EMAC_TX_CTL1); -+} -+ -+static void sun8i_dwmac_enable_dma_transmission(void __iomem *ioaddr) -+{ -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_TX_CTL1); -+ v |= EMAC_TX_DMA_START; -+ v |= EMAC_TX_DMA_EN; -+ writel(v, ioaddr + EMAC_TX_CTL1); -+} -+ -+static void sun8i_dwmac_dma_stop_tx(void __iomem *ioaddr, u32 chan) -+{ -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_TX_CTL1); -+ v &= ~EMAC_TX_DMA_EN; -+ writel(v, ioaddr + EMAC_TX_CTL1); -+} -+ -+static void sun8i_dwmac_dma_start_rx(void __iomem *ioaddr, u32 chan) -+{ -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_RX_CTL1); -+ v |= EMAC_RX_DMA_START; -+ v |= EMAC_RX_DMA_EN; -+ writel(v, ioaddr + EMAC_RX_CTL1); -+} -+ -+static void sun8i_dwmac_dma_stop_rx(void __iomem *ioaddr, u32 chan) -+{ -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_RX_CTL1); -+ v &= ~EMAC_RX_DMA_EN; -+ writel(v, ioaddr + EMAC_RX_CTL1); -+} -+ -+static int sun8i_dwmac_dma_interrupt(void __iomem *ioaddr, -+ struct stmmac_extra_stats *x, u32 chan) -+{ -+ u32 v; -+ int ret = 0; -+ -+ v = readl(ioaddr + EMAC_INT_STA); -+ -+ if (v & EMAC_TX_INT) { -+ ret |= handle_tx; -+ x->tx_normal_irq_n++; -+ } -+ -+ if (v & EMAC_TX_DMA_STOP_INT) -+ x->tx_process_stopped_irq++; -+ -+ if (v & EMAC_TX_BUF_UA_INT) -+ x->tx_process_stopped_irq++; -+ -+ if (v & EMAC_TX_TIMEOUT_INT) -+ ret |= tx_hard_error; -+ -+ if (v & EMAC_TX_UNDERFLOW_INT) { -+ ret |= tx_hard_error; -+ x->tx_undeflow_irq++; -+ } -+ -+ if (v & EMAC_TX_EARLY_INT) -+ x->tx_early_irq++; -+ -+ if (v & EMAC_RX_INT) { -+ ret |= handle_rx; -+ x->rx_normal_irq_n++; -+ } -+ -+ if (v & EMAC_RX_BUF_UA_INT) -+ x->rx_buf_unav_irq++; -+ -+ if (v & EMAC_RX_DMA_STOP_INT) -+ x->rx_process_stopped_irq++; -+ -+ if (v & EMAC_RX_TIMEOUT_INT) -+ ret |= tx_hard_error; -+ -+ if (v & EMAC_RX_OVERFLOW_INT) { -+ ret |= tx_hard_error; -+ x->rx_overflow_irq++; -+ } -+ -+ if (v & EMAC_RX_EARLY_INT) -+ x->rx_early_irq++; -+ -+ if (v & EMAC_RGMII_STA_INT) -+ x->irq_rgmii_n++; -+ -+ writel(v, ioaddr + EMAC_INT_STA); -+ -+ return ret; -+} -+ -+static void sun8i_dwmac_dma_operation_mode(void __iomem *ioaddr, int txmode, -+ int rxmode, int rxfifosz) -+{ -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_TX_CTL1); -+ if (txmode == SF_DMA_MODE) { -+ v |= EMAC_TX_MD; -+ /* Undocumented bit (called TX_NEXT_FRM in BSP), the original -+ * comment is -+ * "Operating on second frame increase the performance -+ * especially when transmit store-and-forward is used." -+ */ -+ v |= EMAC_TX_NEXT_FRM; -+ } else { -+ v &= ~EMAC_TX_MD; -+ v &= ~EMAC_TX_TH_MASK; -+ if (txmode < 64) -+ v |= EMAC_TX_TH_64; -+ else if (txmode < 128) -+ v |= EMAC_TX_TH_128; -+ else if (txmode < 192) -+ v |= EMAC_TX_TH_192; -+ else if (txmode < 256) -+ v |= EMAC_TX_TH_256; -+ } -+ writel(v, ioaddr + EMAC_TX_CTL1); -+ -+ v = readl(ioaddr + EMAC_RX_CTL1); -+ if (rxmode == SF_DMA_MODE) { -+ v |= EMAC_RX_MD; -+ } else { -+ v &= ~EMAC_RX_MD; -+ v &= ~EMAC_RX_TH_MASK; -+ if (rxmode < 32) -+ v |= EMAC_RX_TH_32; -+ else if (rxmode < 64) -+ v |= EMAC_RX_TH_64; -+ else if (rxmode < 96) -+ v |= EMAC_RX_TH_96; -+ else if (rxmode < 128) -+ v |= EMAC_RX_TH_128; -+ } -+ writel(v, ioaddr + EMAC_RX_CTL1); -+} -+ -+static const struct stmmac_dma_ops sun8i_dwmac_dma_ops = { -+ .reset = sun8i_dwmac_dma_reset, -+ .init = sun8i_dwmac_dma_init, -+ .dump_regs = sun8i_dwmac_dump_regs, -+ .dma_mode = sun8i_dwmac_dma_operation_mode, -+ .enable_dma_transmission = sun8i_dwmac_enable_dma_transmission, -+ .enable_dma_irq = sun8i_dwmac_enable_dma_irq, -+ .disable_dma_irq = sun8i_dwmac_disable_dma_irq, -+ .start_tx = sun8i_dwmac_dma_start_tx, -+ .stop_tx = sun8i_dwmac_dma_stop_tx, -+ .start_rx = sun8i_dwmac_dma_start_rx, -+ .stop_rx = sun8i_dwmac_dma_stop_rx, -+ .dma_interrupt = sun8i_dwmac_dma_interrupt, -+}; -+ -+static int sun8i_dwmac_init(struct platform_device *pdev, void *priv) -+{ -+ struct sunxi_priv_data *gmac = priv; -+ int ret; -+ -+ if (gmac->regulator) { -+ ret = regulator_enable(gmac->regulator); -+ if (ret) { -+ dev_err(&pdev->dev, "Fail to enable regulator\n"); -+ return ret; -+ } -+ } -+ -+ ret = clk_prepare_enable(gmac->tx_clk); -+ if (ret) { -+ if (gmac->regulator) -+ regulator_disable(gmac->regulator); -+ dev_err(&pdev->dev, "Could not enable AHB clock\n"); -+ return ret; -+ } -+ -+ return 0; -+} -+ -+static void sun8i_dwmac_core_init(struct mac_device_info *hw, int mtu) -+{ -+ void __iomem *ioaddr = hw->pcsr; -+ u32 v; -+ -+ v = (8 << EMAC_BURSTLEN_SHIFT); /* burst len */ -+ writel(v, ioaddr + EMAC_BASIC_CTL1); -+} -+ -+static void sun8i_dwmac_set_mac(void __iomem *ioaddr, bool enable) -+{ -+ u32 t, r; -+ -+ t = readl(ioaddr + EMAC_TX_CTL0); -+ r = readl(ioaddr + EMAC_RX_CTL0); -+ if (enable) { -+ t |= EMAC_TX_TRANSMITTER_EN; -+ r |= EMAC_RX_RECEIVER_EN; -+ } else { -+ t &= ~EMAC_TX_TRANSMITTER_EN; -+ r &= ~EMAC_RX_RECEIVER_EN; -+ } -+ writel(t, ioaddr + EMAC_TX_CTL0); -+ writel(r, ioaddr + EMAC_RX_CTL0); -+} -+ -+/* Set MAC address at slot reg_n -+ * All slot > 0 need to be enabled with MAC_ADDR_TYPE_DST -+ * If addr is NULL, clear the slot -+ */ -+static void sun8i_dwmac_set_umac_addr(struct mac_device_info *hw, -+ unsigned char *addr, -+ unsigned int reg_n) -+{ -+ void __iomem *ioaddr = hw->pcsr; -+ u32 v; -+ -+ if (!addr) { -+ writel(0, ioaddr + EMAC_MACADDR_HI(reg_n)); -+ return; -+ } -+ -+ stmmac_set_mac_addr(ioaddr, addr, EMAC_MACADDR_HI(reg_n), -+ EMAC_MACADDR_LO(reg_n)); -+ if (reg_n > 0) { -+ v = readl(ioaddr + EMAC_MACADDR_HI(reg_n)); -+ v |= MAC_ADDR_TYPE_DST; -+ writel(v, ioaddr + EMAC_MACADDR_HI(reg_n)); -+ } -+} -+ -+static void sun8i_dwmac_get_umac_addr(struct mac_device_info *hw, -+ unsigned char *addr, -+ unsigned int reg_n) -+{ -+ void __iomem *ioaddr = hw->pcsr; -+ -+ stmmac_get_mac_addr(ioaddr, addr, EMAC_MACADDR_HI(reg_n), -+ EMAC_MACADDR_LO(reg_n)); -+} -+ -+/* caution this function must return non 0 to work */ -+static int sun8i_dwmac_rx_ipc_enable(struct mac_device_info *hw) -+{ -+ void __iomem *ioaddr = hw->pcsr; -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_RX_CTL0); -+ v |= EMAC_RX_DO_CRC; -+ writel(v, ioaddr + EMAC_RX_CTL0); -+ -+ return 1; -+} -+ -+static void sun8i_dwmac_set_filter(struct mac_device_info *hw, -+ struct net_device *dev) -+{ -+ void __iomem *ioaddr = hw->pcsr; -+ u32 v; -+ int i = 1; -+ struct netdev_hw_addr *ha; -+ int macaddrs = netdev_uc_count(dev) + netdev_mc_count(dev) + 1; -+ -+ v = EMAC_FRM_FLT_CTL; -+ -+ if (dev->flags & IFF_PROMISC) { -+ v = EMAC_FRM_FLT_RXALL; -+ } else if (dev->flags & IFF_ALLMULTI) { -+ v |= EMAC_FRM_FLT_MULTICAST; -+ } else if (macaddrs <= hw->unicast_filter_entries) { -+ if (!netdev_mc_empty(dev)) { -+ netdev_for_each_mc_addr(ha, dev) { -+ sun8i_dwmac_set_umac_addr(hw, ha->addr, i); -+ i++; -+ } -+ } -+ if (!netdev_uc_empty(dev)) { -+ netdev_for_each_uc_addr(ha, dev) { -+ sun8i_dwmac_set_umac_addr(hw, ha->addr, i); -+ i++; -+ } -+ } -+ } else { -+ netdev_info(dev, "Too many address, switching to promiscuous\n"); -+ v = EMAC_FRM_FLT_RXALL; -+ } -+ -+ /* Disable unused address filter slots */ -+ while (i < hw->unicast_filter_entries) -+ sun8i_dwmac_set_umac_addr(hw, NULL, i++); -+ -+ writel(v, ioaddr + EMAC_RX_FRM_FLT); -+} -+ -+static void sun8i_dwmac_flow_ctrl(struct mac_device_info *hw, -+ unsigned int duplex, unsigned int fc, -+ unsigned int pause_time, u32 tx_cnt) -+{ -+ void __iomem *ioaddr = hw->pcsr; -+ u32 v; -+ -+ v = readl(ioaddr + EMAC_RX_CTL0); -+ if (fc == FLOW_AUTO) -+ v |= EMAC_RX_FLOW_CTL_EN; -+ else -+ v &= ~EMAC_RX_FLOW_CTL_EN; -+ writel(v, ioaddr + EMAC_RX_CTL0); -+ -+ v = readl(ioaddr + EMAC_TX_FLOW_CTL); -+ if (fc == FLOW_AUTO) -+ v |= EMAC_TX_FLOW_CTL_EN; -+ else -+ v &= ~EMAC_TX_FLOW_CTL_EN; -+ writel(v, ioaddr + EMAC_TX_FLOW_CTL); -+} -+ -+static int sun8i_dwmac_reset(struct stmmac_priv *priv) -+{ -+ u32 v; -+ int err; -+ -+ v = readl(priv->ioaddr + EMAC_BASIC_CTL1); -+ writel(v | 0x01, priv->ioaddr + EMAC_BASIC_CTL1); -+ -+ err = readl_poll_timeout(priv->ioaddr + EMAC_BASIC_CTL1, v, -+ !(v & 0x01), 100, 10000); -+ -+ if (err) { -+ dev_err(priv->device, "EMAC reset timeout\n"); -+ return -EFAULT; -+ } -+ return 0; -+} -+ -+static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv) -+{ -+ struct sunxi_priv_data *gmac = priv->plat->bsp_priv; -+ struct device_node *node = priv->device->of_node; -+ int ret; -+ u32 reg, val; -+ -+ regmap_read(gmac->regmap, SYSCON_EMAC_REG, &val); -+ reg = gmac->variant->default_syscon_value; -+ if (reg != val) -+ dev_warn(priv->device, -+ "Current syscon value is not the default %x (expect %x)\n", -+ val, reg); -+ -+ if (gmac->variant->internal_phy) { -+ if (!gmac->use_internal_phy) { -+ /* switch to external PHY interface */ -+ reg &= ~H3_EPHY_SELECT; -+ } else { -+ reg |= H3_EPHY_SELECT; -+ reg &= ~H3_EPHY_SHUTDOWN; -+ dev_dbg(priv->device, "Select internal_phy %x\n", reg); -+ -+ if (of_property_read_bool(priv->plat->phy_node, -+ "allwinner,leds-active-low")) -+ reg |= H3_EPHY_LED_POL; -+ else -+ reg &= ~H3_EPHY_LED_POL; -+ -+ ret = of_mdio_parse_addr(priv->device, -+ priv->plat->phy_node); -+ if (ret < 0) { -+ dev_err(priv->device, "Could not parse MDIO addr\n"); -+ return ret; -+ } -+ /* of_mdio_parse_addr returns a valid (0 ~ 31) PHY -+ * address. No need to mask it again. -+ */ -+ reg |= ret << H3_EPHY_ADDR_SHIFT; -+ } -+ } -+ -+ if (!of_property_read_u32(node, "allwinner,tx-delay-ps", &val)) { -+ if (val % 100) { -+ dev_err(priv->device, "tx-delay must be a multiple of 100\n"); -+ return -EINVAL; -+ } -+ val /= 100; -+ dev_dbg(priv->device, "set tx-delay to %x\n", val); -+ if (val <= SYSCON_ETXDC_MASK) { -+ reg &= ~(SYSCON_ETXDC_MASK << SYSCON_ETXDC_SHIFT); -+ reg |= (val << SYSCON_ETXDC_SHIFT); -+ } else { -+ dev_err(priv->device, "Invalid TX clock delay: %d\n", -+ val); -+ return -EINVAL; -+ } -+ } -+ -+ if (!of_property_read_u32(node, "allwinner,rx-delay-ps", &val)) { -+ if (val % 100) { -+ dev_err(priv->device, "rx-delay must be a multiple of 100\n"); -+ return -EINVAL; -+ } -+ val /= 100; -+ dev_dbg(priv->device, "set rx-delay to %x\n", val); -+ if (val <= SYSCON_ERXDC_MASK) { -+ reg &= ~(SYSCON_ERXDC_MASK << SYSCON_ERXDC_SHIFT); -+ reg |= (val << SYSCON_ERXDC_SHIFT); -+ } else { -+ dev_err(priv->device, "Invalid RX clock delay: %d\n", -+ val); -+ return -EINVAL; -+ } -+ } -+ -+ /* Clear interface mode bits */ -+ reg &= ~(SYSCON_ETCS_MASK | SYSCON_EPIT); -+ if (gmac->variant->support_rmii) -+ reg &= ~SYSCON_RMII_EN; -+ -+ switch (priv->plat->interface) { -+ case PHY_INTERFACE_MODE_MII: -+ /* default */ -+ break; -+ case PHY_INTERFACE_MODE_RGMII: -+ reg |= SYSCON_EPIT | SYSCON_ETCS_INT_GMII; -+ break; -+ case PHY_INTERFACE_MODE_RMII: -+ reg |= SYSCON_RMII_EN | SYSCON_ETCS_EXT_GMII; -+ break; -+ default: -+ dev_err(priv->device, "Unsupported interface mode: %s", -+ phy_modes(priv->plat->interface)); -+ return -EINVAL; -+ } -+ -+ regmap_write(gmac->regmap, SYSCON_EMAC_REG, reg); -+ -+ return 0; -+} -+ -+static void sun8i_dwmac_unset_syscon(struct sunxi_priv_data *gmac) -+{ -+ u32 reg = gmac->variant->default_syscon_value; -+ -+ regmap_write(gmac->regmap, SYSCON_EMAC_REG, reg); -+} -+ -+static int sun8i_dwmac_power_internal_phy(struct stmmac_priv *priv) -+{ -+ struct sunxi_priv_data *gmac = priv->plat->bsp_priv; -+ int ret; -+ -+ if (!gmac->use_internal_phy) -+ return 0; -+ -+ ret = clk_prepare_enable(gmac->ephy_clk); -+ if (ret) { -+ dev_err(priv->device, "Cannot enable ephy\n"); -+ return ret; -+ } -+ -+ ret = reset_control_deassert(gmac->rst_ephy); -+ if (ret) { -+ dev_err(priv->device, "Cannot deassert ephy\n"); -+ clk_disable_unprepare(gmac->ephy_clk); -+ return ret; -+ } -+ -+ return 0; -+} -+ -+static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) -+{ -+ if (!gmac->use_internal_phy) -+ return 0; -+ -+ clk_disable_unprepare(gmac->ephy_clk); -+ reset_control_assert(gmac->rst_ephy); -+ return 0; -+} -+ -+static int sun8i_power_phy(struct stmmac_priv *priv) -+{ -+ struct sunxi_priv_data *gmac = priv->plat->bsp_priv; -+ int ret; -+ -+ ret = sun8i_dwmac_power_internal_phy(priv); -+ if (ret) -+ return ret; -+ -+ ret = sun8i_dwmac_set_syscon(priv); -+ if (ret) -+ goto error_phy; -+ -+ ret = sun8i_dwmac_reset(priv); -+ if (ret) -+ goto error_phy; -+ return 0; -+ -+error_phy: -+ sun8i_dwmac_unset_syscon(gmac); -+ sun8i_dwmac_unpower_internal_phy(gmac); -+ return ret; -+} -+ -+static void sun8i_unpower_phy(struct sunxi_priv_data *gmac) -+{ -+ sun8i_dwmac_unset_syscon(gmac); -+ sun8i_dwmac_unpower_internal_phy(gmac); -+} -+ -+static void sun8i_dwmac_exit(struct platform_device *pdev, void *priv) -+{ -+ struct sunxi_priv_data *gmac = priv; -+ -+ sun8i_unpower_phy(gmac); -+ -+ clk_disable_unprepare(gmac->tx_clk); -+ -+ if (gmac->regulator) -+ regulator_disable(gmac->regulator); -+} -+ -+static const struct stmmac_ops sun8i_dwmac_ops = { -+ .core_init = sun8i_dwmac_core_init, -+ .set_mac = sun8i_dwmac_set_mac, -+ .dump_regs = sun8i_dwmac_dump_mac_regs, -+ .rx_ipc = sun8i_dwmac_rx_ipc_enable, -+ .set_filter = sun8i_dwmac_set_filter, -+ .flow_ctrl = sun8i_dwmac_flow_ctrl, -+ .set_umac_addr = sun8i_dwmac_set_umac_addr, -+ .get_umac_addr = sun8i_dwmac_get_umac_addr, -+}; -+ -+static struct mac_device_info *sun8i_dwmac_setup(void *ppriv) -+{ -+ struct mac_device_info *mac; -+ struct stmmac_priv *priv = ppriv; -+ int ret; -+ -+ mac = devm_kzalloc(priv->device, sizeof(*mac), GFP_KERNEL); -+ if (!mac) -+ return NULL; -+ -+ ret = sun8i_power_phy(priv); -+ if (ret) -+ return NULL; -+ -+ mac->pcsr = priv->ioaddr; -+ mac->mac = &sun8i_dwmac_ops; -+ mac->dma = &sun8i_dwmac_dma_ops; -+ -+ mac->link.port = 0; -+ mac->link.duplex = BIT(0); -+ mac->link.speed = 1; -+ mac->mii.addr = EMAC_MDIO_CMD; -+ mac->mii.data = EMAC_MDIO_DATA; -+ mac->mii.reg_shift = 4; -+ mac->mii.reg_mask = GENMASK(8, 4); -+ mac->mii.addr_shift = 12; -+ mac->mii.addr_mask = GENMASK(16, 12); -+ mac->mii.clk_csr_shift = 20; -+ mac->mii.clk_csr_mask = GENMASK(22, 20); -+ mac->unicast_filter_entries = 8; -+ -+ /* Synopsys Id is not available */ -+ priv->synopsys_id = 0; -+ -+ return mac; -+} -+ -+static int sun8i_dwmac_probe(struct platform_device *pdev) -+{ -+ struct plat_stmmacenet_data *plat_dat; -+ struct stmmac_resources stmmac_res; -+ struct sunxi_priv_data *gmac; -+ struct device *dev = &pdev->dev; -+ int ret; -+ -+ ret = stmmac_get_platform_resources(pdev, &stmmac_res); -+ if (ret) -+ return ret; -+ -+ plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac); -+ if (IS_ERR(plat_dat)) -+ return PTR_ERR(plat_dat); -+ -+ gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL); -+ if (!gmac) -+ return -ENOMEM; -+ -+ gmac->variant = of_device_get_match_data(&pdev->dev); -+ if (!gmac->variant) { -+ dev_err(&pdev->dev, "Missing dwmac-sun8i variant\n"); -+ return -EINVAL; -+ } -+ -+ gmac->tx_clk = devm_clk_get(dev, "stmmaceth"); -+ if (IS_ERR(gmac->tx_clk)) { -+ dev_err(dev, "Could not get TX clock\n"); -+ return PTR_ERR(gmac->tx_clk); -+ } -+ -+ /* Optional regulator for PHY */ -+ gmac->regulator = devm_regulator_get_optional(dev, "phy"); -+ if (IS_ERR(gmac->regulator)) { -+ if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER) -+ return -EPROBE_DEFER; -+ dev_info(dev, "No regulator found\n"); -+ gmac->regulator = NULL; -+ } -+ -+ gmac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, -+ "syscon"); -+ if (IS_ERR(gmac->regmap)) { -+ ret = PTR_ERR(gmac->regmap); -+ dev_err(&pdev->dev, "Unable to map syscon: %d\n", ret); -+ return ret; -+ } -+ -+ plat_dat->interface = of_get_phy_mode(dev->of_node); -+ if (plat_dat->interface == gmac->variant->internal_phy) { -+ dev_info(&pdev->dev, "Will use internal PHY\n"); -+ gmac->use_internal_phy = true; -+ gmac->ephy_clk = of_clk_get(plat_dat->phy_node, 0); -+ if (IS_ERR(gmac->ephy_clk)) { -+ ret = PTR_ERR(gmac->ephy_clk); -+ dev_err(&pdev->dev, "Cannot get EPHY clock: %d\n", ret); -+ return -EINVAL; -+ } -+ -+ gmac->rst_ephy = of_reset_control_get(plat_dat->phy_node, NULL); -+ if (IS_ERR(gmac->rst_ephy)) { -+ ret = PTR_ERR(gmac->rst_ephy); -+ if (ret == -EPROBE_DEFER) -+ return ret; -+ dev_err(&pdev->dev, "No EPHY reset control found %d\n", -+ ret); -+ return -EINVAL; -+ } -+ } else { -+ dev_info(&pdev->dev, "Will use external PHY\n"); -+ gmac->use_internal_phy = false; -+ } -+ -+ /* platform data specifying hardware features and callbacks. -+ * hardware features were copied from Allwinner drivers. -+ */ -+ plat_dat->rx_coe = STMMAC_RX_COE_TYPE2; -+ plat_dat->tx_coe = 1; -+ plat_dat->has_sun8i = true; -+ plat_dat->bsp_priv = gmac; -+ plat_dat->init = sun8i_dwmac_init; -+ plat_dat->exit = sun8i_dwmac_exit; -+ plat_dat->setup = sun8i_dwmac_setup; -+ -+ ret = sun8i_dwmac_init(pdev, plat_dat->bsp_priv); -+ if (ret) -+ return ret; -+ -+ ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); -+ if (ret) -+ sun8i_dwmac_exit(pdev, plat_dat->bsp_priv); -+ -+ return ret; -+} -+ -+static const struct of_device_id sun8i_dwmac_match[] = { -+ { .compatible = "allwinner,sun8i-h3-emac", -+ .data = &emac_variant_h3 }, -+ { .compatible = "allwinner,sun8i-a83t-emac", -+ .data = &emac_variant_a83t }, -+ { .compatible = "allwinner,sun50i-a64-emac", -+ .data = &emac_variant_a64 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(of, sun8i_dwmac_match); -+ -+static struct platform_driver sun8i_dwmac_driver = { -+ .probe = sun8i_dwmac_probe, -+ .remove = stmmac_pltfr_remove, -+ .driver = { -+ .name = "dwmac-sun8i", -+ .pm = &stmmac_pltfr_pm_ops, -+ .of_match_table = sun8i_dwmac_match, -+ }, -+}; -+module_platform_driver(sun8i_dwmac_driver); -+ -+MODULE_AUTHOR("Corentin Labbe <clabbe.montjoie@gmail.com>"); -+MODULE_DESCRIPTION("Allwinner sun8i DWMAC specific glue layer"); -+MODULE_LICENSE("GPL"); -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index b82ab64..39777a7 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -235,6 +235,17 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv) - else if ((clk_rate >= CSR_F_250M) && (clk_rate < CSR_F_300M)) - priv->clk_csr = STMMAC_CSR_250_300M; - } -+ -+ if (priv->plat->has_sun8i) { -+ if (clk_rate > 160000000) -+ priv->clk_csr = 0x03; -+ else if (clk_rate > 80000000) -+ priv->clk_csr = 0x02; -+ else if (clk_rate > 40000000) -+ priv->clk_csr = 0x01; -+ else -+ priv->clk_csr = 0; -+ } - } - - static void print_pkt(unsigned char *buf, int len) -@@ -784,6 +795,14 @@ static void stmmac_adjust_link(struct net_device *dev) - if (phydev->link) { - u32 ctrl = readl(priv->ioaddr + MAC_CTRL_REG); - -+ /* dwmac-sun8i handle loopback in MAC_CTRL_REG */ -+ if (priv->plat->has_sun8i) { -+ if (dev->features & NETIF_F_LOOPBACK) -+ ctrl |= BIT(1); -+ else -+ ctrl &= ~BIT(1); -+ } -+ - /* Now we make sure that we can be in full duplex mode. - * If not, we operate in half-duplex mode. */ - if (phydev->duplex != priv->oldduplex) { -@@ -800,6 +819,8 @@ static void stmmac_adjust_link(struct net_device *dev) - - if (phydev->speed != priv->speed) { - new_state = 1; -+ if (priv->plat->has_sun8i) -+ ctrl &= ~GENMASK(3, 2); - switch (phydev->speed) { - case 1000: - if (priv->plat->has_gmac || -@@ -811,6 +832,8 @@ static void stmmac_adjust_link(struct net_device *dev) - priv->plat->has_gmac4) { - ctrl |= priv->hw->link.port; - ctrl |= priv->hw->link.speed; -+ } else if (priv->plat->has_sun8i) { -+ ctrl |= 3 << 2; - } else { - ctrl &= ~priv->hw->link.port; - } -@@ -820,6 +843,8 @@ static void stmmac_adjust_link(struct net_device *dev) - priv->plat->has_gmac4) { - ctrl |= priv->hw->link.port; - ctrl &= ~(priv->hw->link.speed); -+ } else if (priv->plat->has_sun8i) { -+ ctrl |= 2 << 2; - } else { - ctrl &= ~priv->hw->link.port; - } -@@ -3969,6 +3994,10 @@ static int stmmac_hw_init(struct stmmac_priv *priv) - - priv->hw = mac; - -+ /* dwmac-sun8i only work in chain mode */ -+ if (priv->plat->has_sun8i) -+ chain_mode = 1; -+ - /* To use the chained or ring mode */ - if (priv->synopsys_id >= DWMAC_CORE_4_00) { - priv->hw->mode = &dwmac4_ring_mode_ops; -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -index 7fc3a1e..3840529 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -@@ -309,6 +309,12 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, - struct device_node *np, struct device *dev) - { - bool mdio = true; -+ static const struct of_device_id need_mdio_ids[] = { -+ { .compatible = "snps,dwc-qos-ethernet-4.10" }, -+ { .compatible = "allwinner,sun8i-a83t-emac" }, -+ { .compatible = "allwinner,sun8i-h3-emac" }, -+ { .compatible = "allwinner,sun50i-a64-emac" }, -+ }; - - /* If phy-handle property is passed from DT, use it as the PHY */ - plat->phy_node = of_parse_phandle(np, "phy-handle", 0); -@@ -325,8 +331,7 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, - mdio = false; - } - -- /* exception for dwmac-dwc-qos-eth glue logic */ -- if (of_device_is_compatible(np, "snps,dwc-qos-ethernet-4.10")) { -+ if (of_match_node(need_mdio_ids, np)) { - plat->mdio_node = of_get_child_by_name(np, "mdio"); - } else { - /** -diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index 8bb550b..108739f 100644 ---- a/include/linux/stmmac.h -+++ b/include/linux/stmmac.h -@@ -186,6 +186,7 @@ struct plat_stmmacenet_data { - struct reset_control *stmmac_rst; - struct stmmac_axi *axi; - int has_gmac4; -+ bool has_sun8i; - bool tso_en; - int mac_port_sel_speed; - bool en_tx_lpi_clockgating; - From patchwork Mon May 1 12:45:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 diff --git a/RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch b/RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch deleted file mode 100644 index d79fd256f..000000000 --- a/RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch +++ /dev/null @@ -1,156 +0,0 @@ -From patchwork Thu Jun 15 15:28:58 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [RFC] audit: fix a race condition with the auditd tracking code -From: Paul Moore <pmoore@redhat.com> -X-Patchwork-Id: 9789009 -Message-Id: <149754053819.11365.5047864735077505545.stgit@sifl> -To: linux-audit@redhat.com -Cc: Dusty Mabe <dustymabe@redhat.com> -Date: Thu, 15 Jun 2017 11:28:58 -0400 - -From: Paul Moore <paul@paul-moore.com> - -Originally reported by Adam and Dusty, it appears we have a small -race window in kauditd_thread(), as documented in the Fedora BZ: - - * https://bugzilla.redhat.com/show_bug.cgi?id=1459326#c35 - - "This issue is partly due to the read-copy nature of RCU, and - partly due to how we sync the auditd_connection state across - kauditd_thread and the audit control channel. The kauditd_thread - thread is always running so it can service the record queues and - emit the multicast messages, if it happens to be just past the - "main_queue" label, but before the "if (sk == NULL || ...)" - if-statement which calls auditd_reset() when the new auditd - connection is registered it could end up resetting the auditd - connection, regardless of if it is valid or not. This is a rather - small window and the variable nature of multi-core scheduling - explains why this is proving rather difficult to reproduce." - -The fix is to have functions only call auditd_reset() when they -believe that the kernel/auditd connection is still valid, e.g. -non-NULL, and to have these callers pass their local copy of the -auditd_connection pointer to auditd_reset() where it can be compared -with the current connection state before resetting. If the caller -has a stale state tracking pointer then the reset is ignored. - -We also make a small change to kauditd_thread() so that if the -kernel/auditd connection is dead we skip the retry queue and send the -records straight to the hold queue. This is necessary as we used to -rely on auditd_reset() to occasionally purge the retry queue but we -are going to be calling the reset function much less now and we want -to make sure the retry queue doesn't grow unbounded. - -Reported-by: Adam Williamson <awilliam@redhat.com> -Reported-by: Dusty Mabe <dustymabe@redhat.com> -Signed-off-by: Paul Moore <paul@paul-moore.com> -Reviewed-by: Richard Guy Briggs <rgb@redhat.com> ---- - kernel/audit.c | 36 +++++++++++++++++++++++------------- - 1 file changed, 23 insertions(+), 13 deletions(-) - - --- -Linux-audit mailing list -Linux-audit@redhat.com -https://www.redhat.com/mailman/listinfo/linux-audit - -diff --git a/kernel/audit.c b/kernel/audit.c -index b2e877100242..e1e2b3abfb93 100644 ---- a/kernel/audit.c -+++ b/kernel/audit.c -@@ -575,12 +575,16 @@ static void kauditd_retry_skb(struct sk_buff *skb) - - /** - * auditd_reset - Disconnect the auditd connection -+ * @ac: auditd connection state - * - * Description: - * Break the auditd/kauditd connection and move all the queued records into the -- * hold queue in case auditd reconnects. -+ * hold queue in case auditd reconnects. It is important to note that the @ac -+ * pointer should never be dereferenced inside this function as it may be NULL -+ * or invalid, you can only compare the memory address! If @ac is NULL then -+ * the connection will always be reset. - */ --static void auditd_reset(void) -+static void auditd_reset(const struct auditd_connection *ac) - { - unsigned long flags; - struct sk_buff *skb; -@@ -590,6 +594,11 @@ static void auditd_reset(void) - spin_lock_irqsave(&auditd_conn_lock, flags); - ac_old = rcu_dereference_protected(auditd_conn, - lockdep_is_held(&auditd_conn_lock)); -+ if (ac && ac != ac_old) { -+ /* someone already registered a new auditd connection */ -+ spin_unlock_irqrestore(&auditd_conn_lock, flags); -+ return; -+ } - rcu_assign_pointer(auditd_conn, NULL); - spin_unlock_irqrestore(&auditd_conn_lock, flags); - -@@ -649,8 +658,8 @@ static int auditd_send_unicast_skb(struct sk_buff *skb) - return rc; - - err: -- if (rc == -ECONNREFUSED) -- auditd_reset(); -+ if (ac && rc == -ECONNREFUSED) -+ auditd_reset(ac); - return rc; - } - -@@ -795,9 +804,9 @@ static int kauditd_thread(void *dummy) - rc = kauditd_send_queue(sk, portid, - &audit_hold_queue, UNICAST_RETRIES, - NULL, kauditd_rehold_skb); -- if (rc < 0) { -+ if (ac && rc < 0) { - sk = NULL; -- auditd_reset(); -+ auditd_reset(ac); - goto main_queue; - } - -@@ -805,9 +814,9 @@ static int kauditd_thread(void *dummy) - rc = kauditd_send_queue(sk, portid, - &audit_retry_queue, UNICAST_RETRIES, - NULL, kauditd_hold_skb); -- if (rc < 0) { -+ if (ac && rc < 0) { - sk = NULL; -- auditd_reset(); -+ auditd_reset(ac); - goto main_queue; - } - -@@ -815,12 +824,13 @@ static int kauditd_thread(void *dummy) - /* process the main queue - do the multicast send and attempt - * unicast, dump failed record sends to the retry queue; if - * sk == NULL due to previous failures we will just do the -- * multicast send and move the record to the retry queue */ -+ * multicast send and move the record to the hold queue */ - rc = kauditd_send_queue(sk, portid, &audit_queue, 1, - kauditd_send_multicast_skb, -- kauditd_retry_skb); -- if (sk == NULL || rc < 0) -- auditd_reset(); -+ (sk ? -+ kauditd_retry_skb : kauditd_hold_skb)); -+ if (ac && rc < 0) -+ auditd_reset(ac); - sk = NULL; - - /* drop our netns reference, no auditd sends past this line */ -@@ -1230,7 +1240,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - auditd_pid, 1); - - /* unregister the auditd connection */ -- auditd_reset(); -+ auditd_reset(NULL); - } - } - if (s.mask & AUDIT_STATUS_RATE_LIMIT) { diff --git a/baseconfig/CONFIG_ATH10K_SDIO b/baseconfig/CONFIG_ATH10K_SDIO new file mode 100644 index 000000000..9ddf1123b --- /dev/null +++ b/baseconfig/CONFIG_ATH10K_SDIO @@ -0,0 +1 @@ +CONFIG_ATH10K_SDIO=m diff --git a/baseconfig/CONFIG_CORTINA_PHY b/baseconfig/CONFIG_CORTINA_PHY new file mode 100644 index 000000000..87341d40e --- /dev/null +++ b/baseconfig/CONFIG_CORTINA_PHY @@ -0,0 +1 @@ +CONFIG_CORTINA_PHY=m diff --git a/baseconfig/CONFIG_CRYPTO_DEV_NITROX_CNN55XX b/baseconfig/CONFIG_CRYPTO_DEV_NITROX_CNN55XX new file mode 100644 index 000000000..47ee7d9bc --- /dev/null +++ b/baseconfig/CONFIG_CRYPTO_DEV_NITROX_CNN55XX @@ -0,0 +1 @@ +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m diff --git a/baseconfig/CONFIG_MACB_USE_HWSTAMP b/baseconfig/CONFIG_MACB_USE_HWSTAMP new file mode 100644 index 000000000..ab817484b --- /dev/null +++ b/baseconfig/CONFIG_MACB_USE_HWSTAMP @@ -0,0 +1 @@ +CONFIG_MACB_USE_HWSTAMP=y diff --git a/baseconfig/CONFIG_MARVELL_10G_PHY b/baseconfig/CONFIG_MARVELL_10G_PHY new file mode 100644 index 000000000..6dadd98ff --- /dev/null +++ b/baseconfig/CONFIG_MARVELL_10G_PHY @@ -0,0 +1 @@ +CONFIG_MARVELL_10G_PHY=m diff --git a/baseconfig/CONFIG_MICROCHIP_KSZ b/baseconfig/CONFIG_MICROCHIP_KSZ new file mode 100644 index 000000000..83147cf6f --- /dev/null +++ b/baseconfig/CONFIG_MICROCHIP_KSZ @@ -0,0 +1 @@ +CONFIG_MICROCHIP_KSZ=m diff --git a/baseconfig/CONFIG_MICROCHIP_KSZ_SPI_DRIVER b/baseconfig/CONFIG_MICROCHIP_KSZ_SPI_DRIVER new file mode 100644 index 000000000..f5a713178 --- /dev/null +++ b/baseconfig/CONFIG_MICROCHIP_KSZ_SPI_DRIVER @@ -0,0 +1 @@ +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m diff --git a/baseconfig/CONFIG_MLX5_EN_IPSEC b/baseconfig/CONFIG_MLX5_EN_IPSEC new file mode 100644 index 000000000..99e6ad7ff --- /dev/null +++ b/baseconfig/CONFIG_MLX5_EN_IPSEC @@ -0,0 +1 @@ +CONFIG_MLX5_EN_IPSEC=y diff --git a/baseconfig/CONFIG_MLX5_FPGA b/baseconfig/CONFIG_MLX5_FPGA new file mode 100644 index 000000000..bac6b305d --- /dev/null +++ b/baseconfig/CONFIG_MLX5_FPGA @@ -0,0 +1 @@ +CONFIG_MLX5_FPGA=y diff --git a/baseconfig/CONFIG_MLXFW b/baseconfig/CONFIG_MLXFW new file mode 100644 index 000000000..5b4751806 --- /dev/null +++ b/baseconfig/CONFIG_MLXFW @@ -0,0 +1 @@ +CONFIG_MLXFW=m diff --git a/baseconfig/CONFIG_NFP_APP_FLOWER b/baseconfig/CONFIG_NFP_APP_FLOWER new file mode 100644 index 000000000..d9ff8a178 --- /dev/null +++ b/baseconfig/CONFIG_NFP_APP_FLOWER @@ -0,0 +1 @@ +CONFIG_NFP_APP_FLOWER=y diff --git a/baseconfig/CONFIG_QCA7000_SPI b/baseconfig/CONFIG_QCA7000_SPI new file mode 100644 index 000000000..9e9088849 --- /dev/null +++ b/baseconfig/CONFIG_QCA7000_SPI @@ -0,0 +1 @@ +# CONFIG_QCA7000_SPI is not set diff --git a/baseconfig/CONFIG_QCA7000_UART b/baseconfig/CONFIG_QCA7000_UART new file mode 100644 index 000000000..fc691586b --- /dev/null +++ b/baseconfig/CONFIG_QCA7000_UART @@ -0,0 +1 @@ +# CONFIG_QCA7000_UART is not set diff --git a/baseconfig/CONFIG_QTNFMAC_PEARL_PCIE b/baseconfig/CONFIG_QTNFMAC_PEARL_PCIE new file mode 100644 index 000000000..f67981f77 --- /dev/null +++ b/baseconfig/CONFIG_QTNFMAC_PEARL_PCIE @@ -0,0 +1 @@ +CONFIG_QTNFMAC_PEARL_PCIE=m diff --git a/baseconfig/CONFIG_SECURITY_INFINIBAND b/baseconfig/CONFIG_SECURITY_INFINIBAND new file mode 100644 index 000000000..393c3f5f8 --- /dev/null +++ b/baseconfig/CONFIG_SECURITY_INFINIBAND @@ -0,0 +1 @@ +CONFIG_SECURITY_INFINIBAND=y diff --git a/baseconfig/CONFIG_TLS b/baseconfig/CONFIG_TLS new file mode 100644 index 000000000..1d627c36a --- /dev/null +++ b/baseconfig/CONFIG_TLS @@ -0,0 +1 @@ +CONFIG_TLS=m diff --git a/baseconfig/CONFIG_WLAN_VENDOR_QUANTENNA b/baseconfig/CONFIG_WLAN_VENDOR_QUANTENNA new file mode 100644 index 000000000..94a9969d7 --- /dev/null +++ b/baseconfig/CONFIG_WLAN_VENDOR_QUANTENNA @@ -0,0 +1 @@ +CONFIG_WLAN_VENDOR_QUANTENNA=y diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_MEMORY_FAILURE b/baseconfig/arm/arm64/CONFIG_ACPI_APEI_MEMORY_FAILURE new file mode 100644 index 000000000..46aa1579f --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_ACPI_APEI_MEMORY_FAILURE @@ -0,0 +1 @@ +CONFIG_ACPI_APEI_MEMORY_FAILURE=y diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_SEA b/baseconfig/arm/arm64/CONFIG_ACPI_APEI_SEA new file mode 100644 index 000000000..db573ffb8 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_ACPI_APEI_SEA @@ -0,0 +1 @@ +CONFIG_ACPI_APEI_SEA=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP new file mode 100644 index 000000000..98ff565f8 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP @@ -0,0 +1 @@ +CONFIG_CRYPTO_DEV_OMAP=m @@ -1 +1 @@ -19964541c23156cc8f814a2137df6b833ccdbf12 +9b51f04424e17051a89ab32d892ca66b2a104825 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index aca26c693..edcb854c2 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -43,7 +43,9 @@ CONFIG_ACPI_ALS=m # CONFIG_ACPI_APEI_EINJ is not set # CONFIG_ACPI_APEI_ERST_DEBUG is not set CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_SEA=y CONFIG_ACPI_APEI=y CONFIG_ACPI_BGRT=y CONFIG_ACPI_BUTTON=m @@ -326,6 +328,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -904,6 +907,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -991,6 +995,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MV_CESA=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_SAFEXCEL=m @@ -2796,6 +2801,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MAC_PARTITION=y @@ -2810,6 +2816,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -3012,6 +3019,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -3039,9 +3048,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3624,6 +3636,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4147,6 +4160,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCA7000_UART is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_CLK_RPM=m @@ -4195,6 +4210,7 @@ CONFIG_QLGE=m # CONFIG_QORIQ_THERMAL is not set # CONFIG_QRTR is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4680,6 +4696,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5576,6 +5593,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set # CONFIG_TLAN is not set +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set CONFIG_TMP006=m # CONFIG_TMP007 is not set @@ -6339,6 +6357,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 157c5eade..287ce9754 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -43,7 +43,9 @@ CONFIG_ACPI_ALS=m # CONFIG_ACPI_APEI_EINJ is not set # CONFIG_ACPI_APEI_ERST_DEBUG is not set CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_SEA=y CONFIG_ACPI_APEI=y CONFIG_ACPI_BGRT=y CONFIG_ACPI_BUTTON=m @@ -326,6 +328,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -904,6 +907,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -990,6 +994,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MV_CESA=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_SAFEXCEL=m @@ -2777,6 +2782,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MAC_PARTITION=y @@ -2791,6 +2797,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -2992,6 +2999,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -3019,9 +3028,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3603,6 +3615,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4125,6 +4138,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCA7000_UART is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_CLK_RPM=m @@ -4173,6 +4188,7 @@ CONFIG_QLGE=m # CONFIG_QORIQ_THERMAL is not set # CONFIG_QRTR is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4658,6 +4674,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5553,6 +5570,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set # CONFIG_TLAN is not set +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set CONFIG_TMP006=m # CONFIG_TMP007 is not set @@ -6316,6 +6334,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index ad24c14b0..dee6021b9 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -359,6 +359,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -947,6 +948,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -1042,8 +1044,10 @@ CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MV_CESA=m # CONFIG_CRYPTO_DEV_MXC_SCC is not set # CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_OMAP_DES=m +CONFIG_CRYPTO_DEV_OMAP=m CONFIG_CRYPTO_DEV_OMAP_SHAM=m # CONFIG_CRYPTO_DEV_PICOXCELL is not set CONFIG_CRYPTO_DEV_QCE=m @@ -2977,6 +2981,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y @@ -3013,6 +3018,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -3216,6 +3222,8 @@ CONFIG_MFD_WM8994=m # CONFIG_MG_DISK is not set CONFIG_MICREL_KS8995MA=m CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -3243,9 +3251,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3872,6 +3883,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4470,6 +4482,8 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m CONFIG_PXA_DMA=y # CONFIG_QCA7000 is not set +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCA7000_UART is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=m CONFIG_QCOM_CLK_RPM=m @@ -4514,6 +4528,7 @@ CONFIG_QLGE=m # CONFIG_QORIQ_THERMAL is not set # CONFIG_QRTR is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -5042,6 +5057,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -6080,6 +6096,7 @@ CONFIG_TI_SYSCON_RESET=m CONFIG_TI_THERMAL=y # CONFIG_TI_TLC4541 is not set # CONFIG_TLAN is not set +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set CONFIG_TMP006=m # CONFIG_TMP007 is not set @@ -6906,6 +6923,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index aa3ded8d8..741fbcd50 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -345,6 +345,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -916,6 +917,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -998,6 +1000,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MV_CESA=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_S5P=m CONFIG_CRYPTO_DEV_SUN4I_SS=m @@ -2843,6 +2846,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y @@ -2872,6 +2876,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -3071,6 +3076,8 @@ CONFIG_MFD_WM8994=m # CONFIG_MG_DISK is not set CONFIG_MICREL_KS8995MA=m CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -3098,9 +3105,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3699,6 +3709,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4222,6 +4233,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCA7000_UART is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set @@ -4246,6 +4259,7 @@ CONFIG_QLGE=m # CONFIG_QORIQ_THERMAL is not set # CONFIG_QRTR is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4743,6 +4757,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5679,6 +5694,7 @@ CONFIG_TI_SYSCON_RESET=m CONFIG_TI_THERMAL=y # CONFIG_TI_TLC4541 is not set # CONFIG_TLAN is not set +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set CONFIG_TMP006=m # CONFIG_TMP007 is not set @@ -6458,6 +6474,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index c9120404c..78b0570df 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -344,6 +344,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -915,6 +916,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -996,6 +998,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MV_CESA=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_S5P=m CONFIG_CRYPTO_DEV_SUN4I_SS=m @@ -2824,6 +2827,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y @@ -2853,6 +2857,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -3051,6 +3056,8 @@ CONFIG_MFD_WM8994=m # CONFIG_MG_DISK is not set CONFIG_MICREL_KS8995MA=m CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -3078,9 +3085,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3678,6 +3688,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4200,6 +4211,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCA7000_UART is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set @@ -4224,6 +4237,7 @@ CONFIG_QLGE=m # CONFIG_QORIQ_THERMAL is not set # CONFIG_QRTR is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4721,6 +4735,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5656,6 +5671,7 @@ CONFIG_TI_SYSCON_RESET=m CONFIG_TI_THERMAL=y # CONFIG_TI_TLC4541 is not set # CONFIG_TLAN is not set +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set CONFIG_TMP006=m # CONFIG_TMP007 is not set @@ -6435,6 +6451,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index d75e1db3a..1b8b95de4 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -358,6 +358,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -946,6 +947,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -1040,8 +1042,10 @@ CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MV_CESA=m # CONFIG_CRYPTO_DEV_MXC_SCC is not set # CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_OMAP_DES=m +CONFIG_CRYPTO_DEV_OMAP=m CONFIG_CRYPTO_DEV_OMAP_SHAM=m # CONFIG_CRYPTO_DEV_PICOXCELL is not set CONFIG_CRYPTO_DEV_QCE=m @@ -2958,6 +2962,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y @@ -2994,6 +2999,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -3196,6 +3202,8 @@ CONFIG_MFD_WM8994=m # CONFIG_MG_DISK is not set CONFIG_MICREL_KS8995MA=m CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -3223,9 +3231,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3851,6 +3862,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4448,6 +4460,8 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m CONFIG_PXA_DMA=y # CONFIG_QCA7000 is not set +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCA7000_UART is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=m CONFIG_QCOM_CLK_RPM=m @@ -4492,6 +4506,7 @@ CONFIG_QLGE=m # CONFIG_QORIQ_THERMAL is not set # CONFIG_QRTR is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -5020,6 +5035,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -6057,6 +6073,7 @@ CONFIG_TI_SYSCON_RESET=m CONFIG_TI_THERMAL=y # CONFIG_TI_TLC4541 is not set # CONFIG_TLAN is not set +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set CONFIG_TMP006=m # CONFIG_TMP007 is not set @@ -6883,6 +6900,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 38485dae7..65c4a3516 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -250,6 +250,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -778,6 +779,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPA_DEBUG is not set # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -850,6 +852,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m @@ -2710,6 +2713,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2725,6 +2729,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2909,6 +2914,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y @@ -2942,9 +2949,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y # CONFIG_MLX5_INFINIBAND is not set # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3499,6 +3509,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3973,6 +3984,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3992,6 +4005,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4406,6 +4420,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5248,6 +5263,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5955,6 +5971,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index d2ce85e74..154cad97f 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -251,6 +251,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -779,6 +780,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPA_DEBUG is not set # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -852,6 +854,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m @@ -2730,6 +2733,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2745,6 +2749,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2929,6 +2934,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y @@ -2962,9 +2969,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y # CONFIG_MLX5_INFINIBAND is not set # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3519,6 +3529,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3994,6 +4005,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -4013,6 +4026,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4427,6 +4441,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5270,6 +5285,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5977,6 +5993,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 9e490855b..17c8942b9 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -251,6 +251,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -779,6 +780,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPA_DEBUG is not set # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -852,6 +854,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m @@ -2730,6 +2733,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2745,6 +2749,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2929,6 +2934,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y @@ -2962,9 +2969,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y # CONFIG_MLX5_INFINIBAND is not set # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3519,6 +3529,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3994,6 +4005,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -4013,6 +4026,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4427,6 +4441,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5270,6 +5285,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5977,6 +5993,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-i686.config b/kernel-i686.config index 5c86fb30c..2a842c4f4 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -250,6 +250,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -778,6 +779,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPA_DEBUG is not set # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -850,6 +852,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m @@ -2710,6 +2713,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2725,6 +2729,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2909,6 +2914,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y @@ -2942,9 +2949,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y # CONFIG_MLX5_INFINIBAND is not set # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3499,6 +3509,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3973,6 +3984,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3992,6 +4005,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4406,6 +4420,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5248,6 +5263,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5955,6 +5971,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index eb2d56026..68b29b93c 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -200,6 +200,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -766,6 +767,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -834,6 +836,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m # CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m @@ -2577,6 +2580,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2592,6 +2596,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2777,6 +2782,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MGCOGE is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2804,9 +2811,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3346,6 +3356,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3818,6 +3829,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3837,6 +3850,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4256,6 +4270,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5063,6 +5078,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5771,6 +5787,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index b2d4b144f..71afd59a9 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -199,6 +199,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -765,6 +766,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -832,6 +834,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m # CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m @@ -2557,6 +2560,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2572,6 +2576,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2756,6 +2761,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MGCOGE is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2783,9 +2790,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3324,6 +3334,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3795,6 +3806,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3814,6 +3827,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4233,6 +4247,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5039,6 +5054,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5747,6 +5763,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 05b71fe7f..1b2f37fe8 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -194,6 +194,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -723,6 +724,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -789,6 +791,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m # CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m @@ -2523,6 +2526,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m # CONFIG_MACINTOSH_DRIVERS is not set @@ -2538,6 +2542,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2723,6 +2728,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MGCOGE is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2750,9 +2757,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3291,6 +3301,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3758,6 +3769,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3777,6 +3790,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4196,6 +4210,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -4992,6 +5007,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5694,6 +5710,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 92c33fbf8..b9e74a6b6 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -193,6 +193,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -722,6 +723,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -787,6 +789,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m # CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m @@ -2503,6 +2506,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m # CONFIG_MACINTOSH_DRIVERS is not set @@ -2518,6 +2522,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2702,6 +2707,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MGCOGE is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2729,9 +2736,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3269,6 +3279,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3735,6 +3746,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3754,6 +3767,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4173,6 +4187,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -4968,6 +4983,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5670,6 +5686,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 1f7bf5ee4..5e0e1b601 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -194,6 +194,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -723,6 +724,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -789,6 +791,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m # CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m @@ -2522,6 +2525,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m # CONFIG_MACINTOSH_DRIVERS is not set @@ -2537,6 +2541,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2722,6 +2727,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MGCOGE is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2749,9 +2756,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3290,6 +3300,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3757,6 +3768,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3776,6 +3789,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4195,6 +4209,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -4991,6 +5006,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5693,6 +5709,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 94c45d013..435c2d948 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -193,6 +193,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -722,6 +723,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -787,6 +789,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m # CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m @@ -2502,6 +2505,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m # CONFIG_MACINTOSH_DRIVERS is not set @@ -2517,6 +2521,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set # CONFIG_MAX1027 is not set @@ -2701,6 +2706,8 @@ CONFIG_MFD_WL1273_CORE=m # CONFIG_MGCOGE is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2728,9 +2735,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_THERMAL=y @@ -3268,6 +3278,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3734,6 +3745,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3753,6 +3766,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4172,6 +4186,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -4967,6 +4982,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5669,6 +5685,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index ef83e2237..e56708bae 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -196,6 +196,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -720,6 +721,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -786,6 +788,7 @@ CONFIG_CRYPTO_DES_S390=m CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y @@ -2462,6 +2465,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m # CONFIG_MAC_PARTITION is not set @@ -2477,6 +2481,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m CONFIG_MARCH_ZEC12=y +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -2660,6 +2665,8 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2687,9 +2694,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y # CONFIG_MLXSW_CORE is not set CONFIG_MLXSW_CORE_THERMAL=y @@ -3220,6 +3230,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3646,6 +3657,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3670,6 +3683,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4098,6 +4112,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -4885,6 +4900,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5586,6 +5602,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 699236e91..48c409fc5 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -195,6 +195,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -719,6 +720,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPUFREQ_DT is not set @@ -784,6 +786,7 @@ CONFIG_CRYPTO_DES_S390=m CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y @@ -2442,6 +2445,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m # CONFIG_MAC_PARTITION is not set @@ -2457,6 +2461,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m CONFIG_MARCH_ZEC12=y +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -2639,6 +2644,8 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_WM8994 is not set # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m CONFIG_MIGRATION=y @@ -2666,9 +2673,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLXSW_CORE_HWMON=y # CONFIG_MLXSW_CORE is not set CONFIG_MLXSW_CORE_THERMAL=y @@ -3198,6 +3208,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -3623,6 +3634,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -3647,6 +3660,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4075,6 +4089,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -4861,6 +4876,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -5562,6 +5578,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index e0299ca00..470f626e8 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -250,6 +250,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -792,6 +793,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y # CONFIG_CONTEXT_TRACKING_FORCE is not set CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPA_DEBUG is not set # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -873,6 +875,7 @@ CONFIG_CRYPTO_DEV_CCP=y CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m @@ -2772,6 +2775,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2787,6 +2791,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -2973,6 +2978,8 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MIC_COSM=m # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y @@ -3004,9 +3011,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLX_PLATFORM=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m @@ -3553,6 +3563,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4027,6 +4038,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -4046,6 +4059,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4462,6 +4476,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5313,6 +5328,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -6024,6 +6040,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 5d19b3390..10c4c2af9 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -249,6 +249,7 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_TRACING is not set CONFIG_ATH5K_DEBUG=y CONFIG_ATH5K=m @@ -791,6 +792,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y # CONFIG_CONTEXT_TRACKING_FORCE is not set CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_CORTINA_PHY=m # CONFIG_CPA_DEBUG is not set # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -871,6 +873,7 @@ CONFIG_CRYPTO_DEV_CCP=y CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m @@ -2752,6 +2755,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m CONFIG_MACB=m CONFIG_MACB_PCI=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MACHZ_WDT=m CONFIG_MACINTOSH_DRIVERS=y @@ -2767,6 +2771,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_MANTIS_CORE=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set @@ -2953,6 +2958,8 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MIC_COSM=m # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y @@ -2984,9 +2991,12 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m +CONFIG_MLXFW=m CONFIG_MLX_PLATFORM=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE=m @@ -3533,6 +3543,7 @@ CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_NAT=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m # CONFIG_NFP_NET_DEBUG is not set @@ -4006,6 +4017,8 @@ CONFIG_PWRSEQ_EMMC=m # CONFIG_PWRSEQ_SD8787 is not set CONFIG_PWRSEQ_SIMPLE=m # 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_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -4025,6 +4038,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -4441,6 +4455,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITYFS=y +CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK=y @@ -5291,6 +5306,7 @@ CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m +CONFIG_TLS=m # CONFIG_TMD_HERMES is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set @@ -6002,6 +6018,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN_VENDOR_RSI=y diff --git a/kernel.spec b/kernel.spec index 5c0ed2c9d..029d370d8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -635,9 +635,6 @@ Patch316: qcom-msm89xx-fixes.patch # CVE-2017-7477 rhbz 1445207 1445208 Patch502: CVE-2017-7477.patch -# rhbz 1459326 -Patch504: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch - # 600 - Patches for improved Bay and Cherry Trail device support # Below patches are pending in -next: Patch602: 0002-mfd-Add-Cherry-Trail-Whiskey-Cove-PMIC-driver.patch @@ -2215,6 +2212,9 @@ fi # # %changelog +* Thu Jul 06 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc0.git2.1 +- Linux v4.12-6090-g9b51f04 + * Wed Jul 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc0.git1.1 - Linux v4.12-3441-g1996454 @@ -1,3 +1,3 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 -SHA512 (patch-4.12-git1.xz) = ac4417feda098e6fc91965c9fe2e456cb91c2b1e079b36247040eb47fad2f50c2d990a945c58bbde1c702998507d051f2cd884d6d8fb985741170aa9e3f572ed +SHA512 (patch-4.12-git2.xz) = c87df1053832d0684002bb78b4376cbbfef533cb17ba3b1a4a685e7912abcfda41911723ded5f8bb94f668359be086cba49aed93777ec89a8f4e45af16615ce2 |