kernel: bump 5.15 to 5.15.158
Removed because they are upstream:
   generic/backport-5.15/702-v5.19-01-arm64-dts-mediatek-mt7622-add-support-for-coherent-D.patch
   https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=506ac5538498717fce699feaddb2ed97ae1c3ca7
   generic/backport-5.15/702-v5.19-04-arm64-dts-mediatek-mt7622-introduce-nodes-for-Wirele.patch
   https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=2f83d3d2cc3c0df89f833cd8c09989187f0c3ce1
Manually adapted:
   generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 1fae75ebd9)
			
			
This commit is contained in:
		| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.15 = .157 | LINUX_VERSION-5.15 = .158 | ||||||
| LINUX_KERNEL_HASH-5.15.157 = aff22351d34d69a16762dcf1fd51fe228da55d4b96b67247bdd598a86cc7a414 | LINUX_KERNEL_HASH-5.15.158 = f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ Subject: [PATCH 210/210] b44: register adm switch | |||||||
|   |   | ||||||
|  #include <linux/uaccess.h> |  #include <linux/uaccess.h> | ||||||
|  #include <asm/io.h> |  #include <asm/io.h> | ||||||
| @@ -2245,6 +2247,69 @@ static void b44_adjust_link(struct net_d | @@ -2247,6 +2249,69 @@ static void b44_adjust_link(struct net_d | ||||||
|  	} |  	} | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -89,7 +89,7 @@ Subject: [PATCH 210/210] b44: register adm switch | |||||||
|  static int b44_register_phy_one(struct b44 *bp) |  static int b44_register_phy_one(struct b44 *bp) | ||||||
|  { |  { | ||||||
|  	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; |  	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; | ||||||
| @@ -2281,6 +2346,9 @@ static int b44_register_phy_one(struct b | @@ -2283,6 +2348,9 @@ static int b44_register_phy_one(struct b | ||||||
|  	if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) && |  	if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) && | ||||||
|  	    (sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) { |  	    (sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) { | ||||||
|   |   | ||||||
| @@ -99,7 +99,7 @@ Subject: [PATCH 210/210] b44: register adm switch | |||||||
|  		dev_info(sdev->dev, |  		dev_info(sdev->dev, | ||||||
|  			 "could not find PHY at %i, use fixed one\n", |  			 "could not find PHY at %i, use fixed one\n", | ||||||
|  			 bp->phy_addr); |  			 bp->phy_addr); | ||||||
| @@ -2475,6 +2543,7 @@ static void b44_remove_one(struct ssb_de | @@ -2477,6 +2545,7 @@ static void b44_remove_one(struct ssb_de | ||||||
|  	unregister_netdev(dev); |  	unregister_netdev(dev); | ||||||
|  	if (bp->flags & B44_FLAG_EXTERNAL_PHY) |  	if (bp->flags & B44_FLAG_EXTERNAL_PHY) | ||||||
|  		b44_unregister_phy_one(bp); |  		b44_unregister_phy_one(bp); | ||||||
|   | |||||||
| @@ -43,7 +43,7 @@ | |||||||
|   |   | ||||||
|  	if (bp->flags & B44_FLAG_EXTERNAL_PHY) |  	if (bp->flags & B44_FLAG_EXTERNAL_PHY) | ||||||
|  		return 0; |  		return 0; | ||||||
| @@ -2175,6 +2200,8 @@ static int b44_get_invariants(struct b44 | @@ -2177,6 +2202,8 @@ static int b44_get_invariants(struct b44 | ||||||
|  	 * valid PHY address. */ |  	 * valid PHY address. */ | ||||||
|  	bp->phy_addr &= 0x1F; |  	bp->phy_addr &= 0x1F; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -73,7 +73,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  |  | ||||||
| --- a/arch/Kconfig | --- a/arch/Kconfig | ||||||
| +++ b/arch/Kconfig | +++ b/arch/Kconfig | ||||||
| @@ -1299,6 +1299,14 @@ config ARCH_HAS_ELFCORE_COMPAT | @@ -1307,6 +1307,14 @@ config ARCH_HAS_ELFCORE_COMPAT | ||||||
|  config ARCH_HAS_PARANOID_L1D_FLUSH |  config ARCH_HAS_PARANOID_L1D_FLUSH | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
| @@ -90,7 +90,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  source "scripts/gcc-plugins/Kconfig" |  source "scripts/gcc-plugins/Kconfig" | ||||||
| --- a/arch/x86/Kconfig | --- a/arch/x86/Kconfig | ||||||
| +++ b/arch/x86/Kconfig | +++ b/arch/x86/Kconfig | ||||||
| @@ -85,6 +85,7 @@ config X86 | @@ -86,6 +86,7 @@ config X86 | ||||||
|  	select ARCH_HAS_PMEM_API		if X86_64 |  	select ARCH_HAS_PMEM_API		if X86_64 | ||||||
|  	select ARCH_HAS_PTE_DEVMAP		if X86_64 |  	select ARCH_HAS_PTE_DEVMAP		if X86_64 | ||||||
|  	select ARCH_HAS_PTE_SPECIAL |  	select ARCH_HAS_PTE_SPECIAL | ||||||
|   | |||||||
| @@ -552,7 +552,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
| --- a/kernel/bounds.c | --- a/kernel/bounds.c | ||||||
| +++ b/kernel/bounds.c | +++ b/kernel/bounds.c | ||||||
| @@ -22,6 +22,11 @@ int main(void) | @@ -22,6 +22,11 @@ int main(void) | ||||||
|  	DEFINE(NR_CPUS_BITS, bits_per(CONFIG_NR_CPUS)); |  	DEFINE(NR_CPUS_BITS, order_base_2(CONFIG_NR_CPUS)); | ||||||
|  #endif |  #endif | ||||||
|  	DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t)); |  	DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t)); | ||||||
| +#ifdef CONFIG_LRU_GEN | +#ifdef CONFIG_LRU_GEN | ||||||
|   | |||||||
| @@ -1,30 +0,0 @@ | |||||||
| From: Felix Fietkau <nbd@nbd.name> |  | ||||||
| Date: Mon, 7 Feb 2022 10:27:22 +0100 |  | ||||||
| Subject: [PATCH] arm64: dts: mediatek: mt7622: add support for coherent |  | ||||||
|  DMA |  | ||||||
|  |  | ||||||
| It improves performance by eliminating the need for a cache flush on rx and tx |  | ||||||
|  |  | ||||||
| Signed-off-by: Felix Fietkau <nbd@nbd.name> |  | ||||||
| --- |  | ||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi |  | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi |  | ||||||
| @@ -357,7 +357,7 @@ |  | ||||||
|  		}; |  | ||||||
|   |  | ||||||
|  		cci_control2: slave-if@5000 { |  | ||||||
| -			compatible = "arm,cci-400-ctrl-if"; |  | ||||||
| +			compatible = "arm,cci-400-ctrl-if", "syscon"; |  | ||||||
|  			interface-type = "ace"; |  | ||||||
|  			reg = <0x5000 0x1000>; |  | ||||||
|  		}; |  | ||||||
| @@ -938,6 +938,8 @@ |  | ||||||
|  		power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>; |  | ||||||
|  		mediatek,ethsys = <ðsys>; |  | ||||||
|  		mediatek,sgmiisys = <&sgmiisys>; |  | ||||||
| +		mediatek,cci-control = <&cci_control2>; |  | ||||||
| +		dma-coherent; |  | ||||||
|  		#address-cells = <1>; |  | ||||||
|  		#size-cells = <0>; |  | ||||||
|  		status = "disabled"; |  | ||||||
| @@ -1,62 +0,0 @@ | |||||||
| From: Felix Fietkau <nbd@nbd.name> |  | ||||||
| Date: Sat, 5 Feb 2022 18:36:36 +0100 |  | ||||||
| Subject: [PATCH] arm64: dts: mediatek: mt7622: introduce nodes for |  | ||||||
|  Wireless Ethernet Dispatch |  | ||||||
|  |  | ||||||
| Introduce wed0 and wed1 nodes in order to enable offloading forwarding |  | ||||||
| between ethernet and wireless devices on the mt7622 chipset. |  | ||||||
|  |  | ||||||
| Signed-off-by: Felix Fietkau <nbd@nbd.name> |  | ||||||
| --- |  | ||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi |  | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi |  | ||||||
| @@ -894,6 +894,11 @@ |  | ||||||
|  		}; |  | ||||||
|  	}; |  | ||||||
|   |  | ||||||
| +	hifsys: syscon@1af00000 { |  | ||||||
| +		compatible = "mediatek,mt7622-hifsys", "syscon"; |  | ||||||
| +		reg = <0 0x1af00000 0 0x70>; |  | ||||||
| +	}; |  | ||||||
| + |  | ||||||
|  	ethsys: syscon@1b000000 { |  | ||||||
|  		compatible = "mediatek,mt7622-ethsys", |  | ||||||
|  			     "syscon"; |  | ||||||
| @@ -912,6 +917,26 @@ |  | ||||||
|  		#dma-cells = <1>; |  | ||||||
|  	}; |  | ||||||
|   |  | ||||||
| +	pcie_mirror: pcie-mirror@10000400 { |  | ||||||
| +		compatible = "mediatek,mt7622-pcie-mirror", |  | ||||||
| +			     "syscon"; |  | ||||||
| +		reg = <0 0x10000400 0 0x10>; |  | ||||||
| +	}; |  | ||||||
| + |  | ||||||
| +	wed0: wed@1020a000 { |  | ||||||
| +		compatible = "mediatek,mt7622-wed", |  | ||||||
| +			     "syscon"; |  | ||||||
| +		reg = <0 0x1020a000 0 0x1000>; |  | ||||||
| +		interrupts = <GIC_SPI 214 IRQ_TYPE_LEVEL_LOW>; |  | ||||||
| +	}; |  | ||||||
| + |  | ||||||
| +	wed1: wed@1020b000 { |  | ||||||
| +		compatible = "mediatek,mt7622-wed", |  | ||||||
| +			     "syscon"; |  | ||||||
| +		reg = <0 0x1020b000 0 0x1000>; |  | ||||||
| +		interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_LOW>; |  | ||||||
| +	}; |  | ||||||
| + |  | ||||||
|  	eth: ethernet@1b100000 { |  | ||||||
|  		compatible = "mediatek,mt7622-eth", |  | ||||||
|  			     "mediatek,mt2701-eth", |  | ||||||
| @@ -939,6 +964,9 @@ |  | ||||||
|  		mediatek,ethsys = <ðsys>; |  | ||||||
|  		mediatek,sgmiisys = <&sgmiisys>; |  | ||||||
|  		mediatek,cci-control = <&cci_control2>; |  | ||||||
| +		mediatek,wed = <&wed0>, <&wed1>; |  | ||||||
| +		mediatek,pcie-mirror = <&pcie_mirror>; |  | ||||||
| +		mediatek,hifsys = <&hifsys>; |  | ||||||
|  		dma-coherent; |  | ||||||
|  		#address-cells = <1>; |  | ||||||
|  		#size-cells = <0>; |  | ||||||
| @@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -963,7 +963,7 @@ | @@ -957,7 +957,7 @@ | ||||||
|  		power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>; |  		power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>; | ||||||
|  		mediatek,ethsys = <ðsys>; |  		mediatek,ethsys = <ðsys>; | ||||||
|  		mediatek,sgmiisys = <&sgmiisys>; |  		mediatek,sgmiisys = <&sgmiisys>; | ||||||
|   | |||||||
| @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|   |   | ||||||
|  	ax88179_reset(dev); |  	ax88179_reset(dev); | ||||||
|   |   | ||||||
| @@ -1507,17 +1508,19 @@ ax88179_tx_fixup(struct usbnet *dev, str | @@ -1502,17 +1503,19 @@ ax88179_tx_fixup(struct usbnet *dev, str | ||||||
|  { |  { | ||||||
|  	u32 tx_hdr1, tx_hdr2; |  	u32 tx_hdr1, tx_hdr2; | ||||||
|  	int frame_size = dev->maxpacket; |  	int frame_size = dev->maxpacket; | ||||||
| @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	if ((skb_header_cloned(skb) || headroom < 0) && |  	if ((skb_header_cloned(skb) || headroom < 0) && | ||||||
|  	    pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) { |  	    pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) { | ||||||
|  		dev_kfree_skb_any(skb); |  		dev_kfree_skb_any(skb); | ||||||
| @@ -1528,6 +1531,8 @@ ax88179_tx_fixup(struct usbnet *dev, str | @@ -1523,6 +1526,8 @@ ax88179_tx_fixup(struct usbnet *dev, str | ||||||
|  	put_unaligned_le32(tx_hdr1, ptr); |  	put_unaligned_le32(tx_hdr1, ptr); | ||||||
|  	put_unaligned_le32(tx_hdr2, ptr + 4); |  	put_unaligned_le32(tx_hdr2, ptr + 4); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org> | |||||||
|  |  | ||||||
| --- a/drivers/bluetooth/btusb.c | --- a/drivers/bluetooth/btusb.c | ||||||
| +++ b/drivers/bluetooth/btusb.c | +++ b/drivers/bluetooth/btusb.c | ||||||
| @@ -2287,6 +2287,23 @@ struct btmtk_section_map { | @@ -2289,6 +2289,23 @@ struct btmtk_section_map { | ||||||
|  	}; |  	}; | ||||||
|  } __packed; |  } __packed; | ||||||
|   |   | ||||||
| @@ -41,7 +41,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org> | |||||||
|  static void btusb_mtk_wmt_recv(struct urb *urb) |  static void btusb_mtk_wmt_recv(struct urb *urb) | ||||||
|  { |  { | ||||||
|  	struct hci_dev *hdev = urb->context; |  	struct hci_dev *hdev = urb->context; | ||||||
| @@ -3941,6 +3958,7 @@ static int btusb_probe(struct usb_interf | @@ -3943,6 +3960,7 @@ static int btusb_probe(struct usb_interf | ||||||
|  		hdev->shutdown = btusb_mtk_shutdown; |  		hdev->shutdown = btusb_mtk_shutdown; | ||||||
|  		hdev->manufacturer = 70; |  		hdev->manufacturer = 70; | ||||||
|  		hdev->cmd_timeout = btusb_mtk_cmd_timeout; |  		hdev->cmd_timeout = btusb_mtk_cmd_timeout; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org> | |||||||
|  |  | ||||||
| --- a/drivers/bluetooth/btusb.c | --- a/drivers/bluetooth/btusb.c | ||||||
| +++ b/drivers/bluetooth/btusb.c | +++ b/drivers/bluetooth/btusb.c | ||||||
| @@ -2292,7 +2292,7 @@ static int btusb_set_bdaddr_mtk(struct h | @@ -2294,7 +2294,7 @@ static int btusb_set_bdaddr_mtk(struct h | ||||||
|  	struct sk_buff *skb; |  	struct sk_buff *skb; | ||||||
|  	long ret; |  	long ret; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -58,7 +58,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org> | |||||||
|  |  | ||||||
| --- a/drivers/bluetooth/btusb.c | --- a/drivers/bluetooth/btusb.c | ||||||
| +++ b/drivers/bluetooth/btusb.c | +++ b/drivers/bluetooth/btusb.c | ||||||
| @@ -476,6 +476,9 @@ static const struct usb_device_id blackl | @@ -478,6 +478,9 @@ static const struct usb_device_id blackl | ||||||
|  	{ USB_DEVICE(0x13d3, 0x3564), .driver_info = BTUSB_MEDIATEK | |  	{ USB_DEVICE(0x13d3, 0x3564), .driver_info = BTUSB_MEDIATEK | | ||||||
|  						     BTUSB_WIDEBAND_SPEECH | |  						     BTUSB_WIDEBAND_SPEECH | | ||||||
|  						     BTUSB_VALID_LE_STATES }, |  						     BTUSB_VALID_LE_STATES }, | ||||||
|   | |||||||
| @@ -56,7 +56,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org> | |||||||
|  |  | ||||||
| --- a/drivers/bluetooth/btusb.c | --- a/drivers/bluetooth/btusb.c | ||||||
| +++ b/drivers/bluetooth/btusb.c | +++ b/drivers/bluetooth/btusb.c | ||||||
| @@ -467,6 +467,9 @@ static const struct usb_device_id blackl | @@ -469,6 +469,9 @@ static const struct usb_device_id blackl | ||||||
|  						     BTUSB_VALID_LE_STATES }, |  						     BTUSB_VALID_LE_STATES }, | ||||||
|   |   | ||||||
|  	/* Additional MediaTek MT7921 Bluetooth devices */ |  	/* Additional MediaTek MT7921 Bluetooth devices */ | ||||||
|   | |||||||
| @@ -54,7 +54,7 @@ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | |||||||
|  |  | ||||||
| --- a/drivers/bluetooth/btusb.c | --- a/drivers/bluetooth/btusb.c | ||||||
| +++ b/drivers/bluetooth/btusb.c | +++ b/drivers/bluetooth/btusb.c | ||||||
| @@ -485,6 +485,9 @@ static const struct usb_device_id blackl | @@ -487,6 +487,9 @@ static const struct usb_device_id blackl | ||||||
|  	{ USB_DEVICE(0x0489, 0xe0cd), .driver_info = BTUSB_MEDIATEK | |  	{ USB_DEVICE(0x0489, 0xe0cd), .driver_info = BTUSB_MEDIATEK | | ||||||
|  						     BTUSB_WIDEBAND_SPEECH | |  						     BTUSB_WIDEBAND_SPEECH | | ||||||
|  						     BTUSB_VALID_LE_STATES }, |  						     BTUSB_VALID_LE_STATES }, | ||||||
|   | |||||||
| @@ -136,14 +136,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  /** |  /** | ||||||
|   * eth_type_trans - determine the packet's protocol ID. |   * eth_type_trans - determine the packet's protocol ID. | ||||||
|   * @skb: received socket data |   * @skb: received socket data | ||||||
| @@ -173,6 +185,10 @@ __be16 eth_type_trans(struct sk_buff *sk | @@ -165,6 +177,10 @@ __be16 eth_type_trans(struct sk_buff *sk | ||||||
|  		} else { |  | ||||||
|  			skb->pkt_type = PACKET_OTHERHOST; |  | ||||||
|  		} |  | ||||||
| + |  | ||||||
| +		if (eth_check_local_mask(eth->h_dest, dev->dev_addr, |  | ||||||
| +					 dev->local_addr_mask)) |  | ||||||
| +			skb->gro_skip = 1; |  | ||||||
|  	} |  | ||||||
|   |   | ||||||
|  |  	eth_skb_pkt_type(skb, dev); | ||||||
|  |   | ||||||
|  | +	if (unlikely(!ether_addr_equal_64bits(eth->h_dest, dev->dev_addr)) && | ||||||
|  | +	    eth_check_local_mask(eth->h_dest, dev->dev_addr, dev->local_addr_mask)) | ||||||
|  | +		skb->gro_skip = 1; | ||||||
|  | + | ||||||
|  	/* |  	/* | ||||||
|  |  	 * Some variants of DSA tagging don't have an ethertype field | ||||||
|  |  	 * at all, so we check here whether one of those tagging | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -559,6 +559,7 @@ | @@ -556,6 +556,7 @@ | ||||||
|  		compatible = "mediatek,mt7622-nor", |  		compatible = "mediatek,mt7622-nor", | ||||||
|  			     "mediatek,mt8173-nor"; |  			     "mediatek,mt8173-nor"; | ||||||
|  		reg = <0 0x11014000 0 0xe0>; |  		reg = <0 0x11014000 0 0xe0>; | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -553,6 +553,18 @@ | @@ -550,6 +550,18 @@ | ||||||
|  		status = "disabled"; |  		status = "disabled"; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -95,7 +95,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> | |||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -339,7 +339,7 @@ | @@ -337,7 +337,7 @@ | ||||||
|  		#interrupt-cells = <3>; |  		#interrupt-cells = <3>; | ||||||
|  		interrupt-parent = <&gic>; |  		interrupt-parent = <&gic>; | ||||||
|  		reg = <0 0x10310000 0 0x1000>, |  		reg = <0 0x10310000 0 0x1000>, | ||||||
|   | |||||||
| @@ -112,7 +112,7 @@ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -942,6 +942,7 @@ | @@ -938,6 +938,7 @@ | ||||||
|  		clock-names = "hsdma"; |  		clock-names = "hsdma"; | ||||||
|  		power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>; |  		power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>; | ||||||
|  		#dma-cells = <1>; |  		#dma-cells = <1>; | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi | ||||||
| @@ -915,64 +915,67 @@ | @@ -916,64 +916,67 @@ | ||||||
|  		}; |  		}; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
| @@ -194,7 +194,7 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> | |||||||
|  &pio { |  &pio { | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -809,75 +809,83 @@ | @@ -804,75 +804,83 @@ | ||||||
|  		#reset-cells = <1>; |  		#reset-cells = <1>; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -849,6 +849,12 @@ | @@ -844,6 +844,12 @@ | ||||||
|  			#address-cells = <0>; |  			#address-cells = <0>; | ||||||
|  			#interrupt-cells = <1>; |  			#interrupt-cells = <1>; | ||||||
|  		}; |  		}; | ||||||
| @@ -13,7 +13,7 @@ | |||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|  	pcie1: pcie@1a145000 { |  	pcie1: pcie@1a145000 { | ||||||
| @@ -887,6 +893,12 @@ | @@ -882,6 +888,12 @@ | ||||||
|  			#address-cells = <0>; |  			#address-cells = <0>; | ||||||
|  			#interrupt-cells = <1>; |  			#interrupt-cells = <1>; | ||||||
|  		}; |  		}; | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi | ||||||
| @@ -837,6 +837,9 @@ | @@ -832,6 +832,9 @@ | ||||||
|  		bus-range = <0x00 0xff>; |  		bus-range = <0x00 0xff>; | ||||||
|  		ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x8000000>; |  		ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x8000000>; | ||||||
|  		status = "disabled"; |  		status = "disabled"; | ||||||
| @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
|  		#interrupt-cells = <1>; |  		#interrupt-cells = <1>; | ||||||
|  		interrupt-map-mask = <0 0 0 7>; |  		interrupt-map-mask = <0 0 0 7>; | ||||||
| @@ -881,6 +884,9 @@ | @@ -876,6 +879,9 @@ | ||||||
|  		bus-range = <0x00 0xff>; |  		bus-range = <0x00 0xff>; | ||||||
|  		ranges = <0x82000000 0 0x28000000 0x0 0x28000000 0 0x8000000>; |  		ranges = <0x82000000 0 0x28000000 0x0 0x28000000 0 0x8000000>; | ||||||
|  		status = "disabled"; |  		status = "disabled"; | ||||||
|   | |||||||
| @@ -58,6 +58,7 @@ CONFIG_CPU_IBRS_ENTRY=y | |||||||
| # CONFIG_SLS is not set | # CONFIG_SLS is not set | ||||||
| CONFIG_CPU_IDLE=y | CONFIG_CPU_IDLE=y | ||||||
| CONFIG_CPU_IDLE_GOV_LADDER=y | CONFIG_CPU_IDLE_GOV_LADDER=y | ||||||
|  | CONFIG_CPU_MITIGATIONS=y | ||||||
| CONFIG_CPU_SUP_AMD=y | CONFIG_CPU_SUP_AMD=y | ||||||
| CONFIG_CPU_SUP_CENTAUR=y | CONFIG_CPU_SUP_CENTAUR=y | ||||||
| CONFIG_CPU_SUP_CYRIX_32=y | CONFIG_CPU_SUP_CYRIX_32=y | ||||||
| @@ -329,7 +330,6 @@ CONFIG_SG_POOL=y | |||||||
| # CONFIG_SMSC_SCH311X_WDT is not set | # CONFIG_SMSC_SCH311X_WDT is not set | ||||||
| CONFIG_SPARSEMEM_STATIC=y | CONFIG_SPARSEMEM_STATIC=y | ||||||
| CONFIG_SPARSE_IRQ=y | CONFIG_SPARSE_IRQ=y | ||||||
| CONFIG_SPECULATION_MITIGATIONS=y |  | ||||||
| CONFIG_SRCU=y | CONFIG_SRCU=y | ||||||
| # CONFIG_STATIC_CALL_SELFTEST is not set | # CONFIG_STATIC_CALL_SELFTEST is not set | ||||||
| CONFIG_SYSCTL_EXCEPTION_TRACE=y | CONFIG_SYSCTL_EXCEPTION_TRACE=y | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Hauke Mehrtens
					Hauke Mehrtens