-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
Showing
15 changed files
with
27 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-5.15 = .157 | ||
LINUX_KERNEL_HASH-5.15.157 = aff22351d34d69a16762dcf1fd51fe228da55d4b96b67247bdd598a86cc7a414 | ||
LINUX_VERSION-5.15 = .158 | ||
LINUX_KERNEL_HASH-5.15.158 = f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,7 +73,7 @@ Signed-off-by: Andrew Morton <[email protected]> | |
|
||
--- a/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 | ||
bool | ||
|
||
|
@@ -90,7 +90,7 @@ Signed-off-by: Andrew Morton <[email protected]> | |
source "scripts/gcc-plugins/Kconfig" | ||
--- a/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_PTE_DEVMAP if X86_64 | ||
select ARCH_HAS_PTE_SPECIAL | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -552,7 +552,7 @@ Signed-off-by: Andrew Morton <[email protected]> | |
--- a/kernel/bounds.c | ||
+++ b/kernel/bounds.c | ||
@@ -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 | ||
DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t)); | ||
+#ifdef CONFIG_LRU_GEN | ||
|
30 changes: 0 additions & 30 deletions
30
...ric/backport-5.15/702-v5.19-01-arm64-dts-mediatek-mt7622-add-support-for-coherent-D.patch
This file was deleted.
Oops, something went wrong.
62 changes: 0 additions & 62 deletions
62
...ric/backport-5.15/702-v5.19-04-arm64-dts-mediatek-mt7622-introduce-nodes-for-Wirele.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
--- a/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>; | ||
mediatek,ethsys = <ðsys>; | ||
mediatek,sgmiisys = <&sgmiisys>; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
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; | ||
int frame_size = dev->maxpacket; | ||
|
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
if ((skb_header_cloned(skb) || headroom < 0) && | ||
pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) { | ||
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_hdr2, ptr + 4); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ Signed-off-by: Marcel Holtmann <[email protected]> | |
|
||
--- a/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; | ||
|
||
|
@@ -41,7 +41,7 @@ Signed-off-by: Marcel Holtmann <[email protected]> | |
static void btusb_mtk_wmt_recv(struct urb *urb) | ||
{ | ||
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->manufacturer = 70; | ||
hdev->cmd_timeout = btusb_mtk_cmd_timeout; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann <[email protected]> | |
|
||
--- a/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; | ||
long ret; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,7 +58,7 @@ Signed-off-by: Marcel Holtmann <[email protected]> | |
|
||
--- a/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 | | ||
BTUSB_WIDEBAND_SPEECH | | ||
BTUSB_VALID_LE_STATES }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,7 +56,7 @@ Signed-off-by: Marcel Holtmann <[email protected]> | |
|
||
--- a/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 }, | ||
|
||
/* Additional MediaTek MT7921 Bluetooth devices */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,7 +54,7 @@ Signed-off-by: Luiz Augusto von Dentz <[email protected]> | |
|
||
--- a/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 | | ||
BTUSB_WIDEBAND_SPEECH | | ||
BTUSB_VALID_LE_STATES }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -136,14 +136,14 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
/** | ||
* eth_type_trans - determine the packet's protocol ID. | ||
* @skb: received socket data | ||
@@ -173,6 +185,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; | ||
} | ||
@@ -165,6 +177,10 @@ __be16 eth_type_trans(struct sk_buff *sk | ||
|
||
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 |