diff --git a/patches/6.1/0001-surface3-oemb.patch b/patches/6.1/0001-surface3-oemb.patch index 9d93d4846..339788fa6 100644 --- a/patches/6.1/0001-surface3-oemb.patch +++ b/patches/6.1/0001-surface3-oemb.patch @@ -40,7 +40,7 @@ Patchset: surface3-oemb 3 files changed, 24 insertions(+) diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c -index ca4602bcc7de..490b9731068a 100644 +index ca4602bcc7dea..490b9731068ae 100644 --- a/drivers/platform/surface/surface3-wmi.c +++ b/drivers/platform/surface/surface3-wmi.c @@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = { @@ -58,7 +58,7 @@ index ca4602bcc7de..490b9731068a 100644 { } }; diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c -index 620ecbfa4a7a..b07d06d2971a 100644 +index 620ecbfa4a7a8..b07d06d2971a8 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3717,6 +3717,15 @@ static const struct dmi_system_id dmi_platform_data[] = { @@ -78,7 +78,7 @@ index 620ecbfa4a7a..b07d06d2971a 100644 /* * Match for the GPDwin which unfortunately uses somewhat diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -index 6beb00858c33..d82d77387a0a 100644 +index 6beb00858c33f..d82d77387a0a6 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c @@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = { diff --git a/patches/6.1/0002-mwifiex.patch b/patches/6.1/0002-mwifiex.patch index 9f8583c52..4ef599f70 100644 --- a/patches/6.1/0002-mwifiex.patch +++ b/patches/6.1/0002-mwifiex.patch @@ -32,7 +32,7 @@ Patchset: mwifiex 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c -index 5dcf61761a16..84be9289caa6 100644 +index 5dcf61761a165..84be9289caa63 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -1762,9 +1762,21 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb) @@ -58,7 +58,7 @@ index 5dcf61761a16..84be9289caa6 100644 if (mwifiex_write_reg(adapter, reg->rx_rdptr, card->rxbd_rdptr | tx_wrap)) { diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c -index dd6d21f1dbfd..f46b06f8d643 100644 +index dd6d21f1dbfd7..f46b06f8d6435 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c @@ -13,7 +13,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = { @@ -151,7 +151,7 @@ index dd6d21f1dbfd..f46b06f8d643 100644 static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h -index d6ff964aec5b..5d30ae39d65e 100644 +index d6ff964aec5bf..5d30ae39d65ec 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h @@ -4,6 +4,7 @@ @@ -187,7 +187,7 @@ Patchset: mwifiex 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c -index 84be9289caa6..98be0d3cc41c 100644 +index 84be9289caa63..98be0d3cc41cf 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -368,6 +368,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev, @@ -212,7 +212,7 @@ index 84be9289caa6..98be0d3cc41c 100644 } diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c -index f46b06f8d643..99b024ecbade 100644 +index f46b06f8d6435..99b024ecbadea 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c @@ -14,7 +14,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = { @@ -306,7 +306,7 @@ index f46b06f8d643..99b024ecbade 100644 static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h -index 5d30ae39d65e..c14eb56eb911 100644 +index 5d30ae39d65ec..c14eb56eb9118 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h @@ -5,6 +5,7 @@ @@ -356,7 +356,7 @@ Patchset: mwifiex 1 file changed, 15 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 952dc9d2404e..b455885cdc0d 100644 +index 952dc9d2404ed..b455885cdc0d8 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -64,6 +64,7 @@ static struct usb_driver btusb_driver; diff --git a/patches/6.1/0003-ath10k.patch b/patches/6.1/0003-ath10k.patch index 6da999a04..535518e6e 100644 --- a/patches/6.1/0003-ath10k.patch +++ b/patches/6.1/0003-ath10k.patch @@ -20,7 +20,7 @@ Patchset: ath10k 1 file changed, 58 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c -index 5eb131ab916f..67f074a126d1 100644 +index 5eb131ab916fd..67f074a126d1f 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -38,6 +38,9 @@ static bool fw_diag_log; diff --git a/patches/6.1/0004-ipts.patch b/patches/6.1/0004-ipts.patch index 5acefbe14..d054bc2ef 100644 --- a/patches/6.1/0004-ipts.patch +++ b/patches/6.1/0004-ipts.patch @@ -10,7 +10,7 @@ Patchset: ipts 2 files changed, 2 insertions(+) diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h -index bdc65d50b945..08723c01d727 100644 +index bdc65d50b945f..08723c01d7275 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -92,6 +92,7 @@ @@ -22,7 +22,7 @@ index bdc65d50b945..08723c01d727 100644 #define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */ diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c -index 5bf0d50d55a0..c13864512229 100644 +index 5bf0d50d55a00..c13864512229f 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -97,6 +97,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { @@ -58,7 +58,7 @@ Patchset: ipts 1 file changed, 24 insertions(+) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index d4b5d20bd6dd..3965979c7bd4 100644 +index d4b5d20bd6dda..3965979c7bd41 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -37,6 +37,8 @@ @@ -195,7 +195,7 @@ Patchset: ipts create mode 100644 drivers/hid/ipts/thread.h diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig -index 185a077d59cd..1523ccdf73b5 100644 +index 185a077d59cdd..1523ccdf73b51 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -1290,4 +1290,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig" @@ -206,7 +206,7 @@ index 185a077d59cd..1523ccdf73b5 100644 + endmenu diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile -index e8014c1a2f8b..e48300bcea9b 100644 +index e8014c1a2f8b6..e48300bcea9be 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -164,3 +164,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/ @@ -217,7 +217,7 @@ index e8014c1a2f8b..e48300bcea9b 100644 +obj-$(CONFIG_HID_IPTS) += ipts/ diff --git a/drivers/hid/ipts/Kconfig b/drivers/hid/ipts/Kconfig new file mode 100644 -index 000000000000..297401bd388d +index 0000000000000..297401bd388dd --- /dev/null +++ b/drivers/hid/ipts/Kconfig @@ -0,0 +1,14 @@ @@ -237,7 +237,7 @@ index 000000000000..297401bd388d + module will be called ipts. diff --git a/drivers/hid/ipts/Makefile b/drivers/hid/ipts/Makefile new file mode 100644 -index 000000000000..0fe655bccdc0 +index 0000000000000..0fe655bccdc0f --- /dev/null +++ b/drivers/hid/ipts/Makefile @@ -0,0 +1,14 @@ @@ -257,7 +257,7 @@ index 000000000000..0fe655bccdc0 +ipts-objs += thread.o diff --git a/drivers/hid/ipts/cmd.c b/drivers/hid/ipts/cmd.c new file mode 100644 -index 000000000000..7fd69271ccd5 +index 0000000000000..7fd69271ccd52 --- /dev/null +++ b/drivers/hid/ipts/cmd.c @@ -0,0 +1,62 @@ @@ -325,7 +325,7 @@ index 000000000000..7fd69271ccd5 +} diff --git a/drivers/hid/ipts/cmd.h b/drivers/hid/ipts/cmd.h new file mode 100644 -index 000000000000..924758ffee67 +index 0000000000000..924758ffee671 --- /dev/null +++ b/drivers/hid/ipts/cmd.h @@ -0,0 +1,61 @@ @@ -392,7 +392,7 @@ index 000000000000..924758ffee67 +#endif /* IPTS_CMD_H */ diff --git a/drivers/hid/ipts/context.h b/drivers/hid/ipts/context.h new file mode 100644 -index 000000000000..3450a95e66ee +index 0000000000000..3450a95e66ee8 --- /dev/null +++ b/drivers/hid/ipts/context.h @@ -0,0 +1,51 @@ @@ -449,7 +449,7 @@ index 000000000000..3450a95e66ee +#endif /* IPTS_CONTEXT_H */ diff --git a/drivers/hid/ipts/control.c b/drivers/hid/ipts/control.c new file mode 100644 -index 000000000000..2f61500b5119 +index 0000000000000..2f61500b5119c --- /dev/null +++ b/drivers/hid/ipts/control.c @@ -0,0 +1,495 @@ @@ -950,7 +950,7 @@ index 000000000000..2f61500b5119 +} diff --git a/drivers/hid/ipts/control.h b/drivers/hid/ipts/control.h new file mode 100644 -index 000000000000..744bb92d682a +index 0000000000000..744bb92d682a0 --- /dev/null +++ b/drivers/hid/ipts/control.h @@ -0,0 +1,127 @@ @@ -1083,7 +1083,7 @@ index 000000000000..744bb92d682a +#endif /* IPTS_CONTROL_H */ diff --git a/drivers/hid/ipts/desc.h b/drivers/hid/ipts/desc.h new file mode 100644 -index 000000000000..c058974a03a1 +index 0000000000000..c058974a03a1e --- /dev/null +++ b/drivers/hid/ipts/desc.h @@ -0,0 +1,81 @@ @@ -1170,7 +1170,7 @@ index 000000000000..c058974a03a1 +#endif /* IPTS_DESC_H */ diff --git a/drivers/hid/ipts/hid.c b/drivers/hid/ipts/hid.c new file mode 100644 -index 000000000000..6782394e8dde +index 0000000000000..6782394e8dde3 --- /dev/null +++ b/drivers/hid/ipts/hid.c @@ -0,0 +1,348 @@ @@ -1524,7 +1524,7 @@ index 000000000000..6782394e8dde +} diff --git a/drivers/hid/ipts/hid.h b/drivers/hid/ipts/hid.h new file mode 100644 -index 000000000000..62bf3cd48608 +index 0000000000000..62bf3cd486081 --- /dev/null +++ b/drivers/hid/ipts/hid.h @@ -0,0 +1,22 @@ @@ -1552,7 +1552,7 @@ index 000000000000..62bf3cd48608 +#endif /* IPTS_HID_H */ diff --git a/drivers/hid/ipts/main.c b/drivers/hid/ipts/main.c new file mode 100644 -index 000000000000..0f20c6c08c38 +index 0000000000000..0f20c6c08c38c --- /dev/null +++ b/drivers/hid/ipts/main.c @@ -0,0 +1,127 @@ @@ -1685,7 +1685,7 @@ index 000000000000..0f20c6c08c38 +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/ipts/mei.c b/drivers/hid/ipts/mei.c new file mode 100644 -index 000000000000..26666fd99b0c +index 0000000000000..26666fd99b0c7 --- /dev/null +++ b/drivers/hid/ipts/mei.c @@ -0,0 +1,189 @@ @@ -1880,7 +1880,7 @@ index 000000000000..26666fd99b0c +} diff --git a/drivers/hid/ipts/mei.h b/drivers/hid/ipts/mei.h new file mode 100644 -index 000000000000..eadacae54c40 +index 0000000000000..eadacae54c400 --- /dev/null +++ b/drivers/hid/ipts/mei.h @@ -0,0 +1,67 @@ @@ -1953,7 +1953,7 @@ index 000000000000..eadacae54c40 +#endif /* IPTS_MEI_H */ diff --git a/drivers/hid/ipts/receiver.c b/drivers/hid/ipts/receiver.c new file mode 100644 -index 000000000000..77234f9e0e17 +index 0000000000000..77234f9e0e178 --- /dev/null +++ b/drivers/hid/ipts/receiver.c @@ -0,0 +1,249 @@ @@ -2208,7 +2208,7 @@ index 000000000000..77234f9e0e17 +} diff --git a/drivers/hid/ipts/receiver.h b/drivers/hid/ipts/receiver.h new file mode 100644 -index 000000000000..96070f34fbca +index 0000000000000..96070f34fbcaa --- /dev/null +++ b/drivers/hid/ipts/receiver.h @@ -0,0 +1,17 @@ @@ -2231,7 +2231,7 @@ index 000000000000..96070f34fbca +#endif /* IPTS_RECEIVER_H */ diff --git a/drivers/hid/ipts/resources.c b/drivers/hid/ipts/resources.c new file mode 100644 -index 000000000000..80ba5885bb55 +index 0000000000000..80ba5885bb55d --- /dev/null +++ b/drivers/hid/ipts/resources.c @@ -0,0 +1,108 @@ @@ -2345,7 +2345,7 @@ index 000000000000..80ba5885bb55 +} diff --git a/drivers/hid/ipts/resources.h b/drivers/hid/ipts/resources.h new file mode 100644 -index 000000000000..6cbb24a8a054 +index 0000000000000..6cbb24a8a0543 --- /dev/null +++ b/drivers/hid/ipts/resources.h @@ -0,0 +1,39 @@ @@ -2390,7 +2390,7 @@ index 000000000000..6cbb24a8a054 +#endif /* IPTS_RESOURCES_H */ diff --git a/drivers/hid/ipts/spec-data.h b/drivers/hid/ipts/spec-data.h new file mode 100644 -index 000000000000..e8dd98895a7e +index 0000000000000..e8dd98895a7ee --- /dev/null +++ b/drivers/hid/ipts/spec-data.h @@ -0,0 +1,100 @@ @@ -2496,7 +2496,7 @@ index 000000000000..e8dd98895a7e +#endif /* IPTS_SPEC_DATA_H */ diff --git a/drivers/hid/ipts/spec-device.h b/drivers/hid/ipts/spec-device.h new file mode 100644 -index 000000000000..93f673d981f7 +index 0000000000000..93f673d981f7f --- /dev/null +++ b/drivers/hid/ipts/spec-device.h @@ -0,0 +1,285 @@ @@ -2787,7 +2787,7 @@ index 000000000000..93f673d981f7 +#endif /* IPTS_SPEC_DEVICE_H */ diff --git a/drivers/hid/ipts/spec-hid.h b/drivers/hid/ipts/spec-hid.h new file mode 100644 -index 000000000000..ea70f29ff00c +index 0000000000000..ea70f29ff00cb --- /dev/null +++ b/drivers/hid/ipts/spec-hid.h @@ -0,0 +1,35 @@ @@ -2828,7 +2828,7 @@ index 000000000000..ea70f29ff00c +#endif /* IPTS_SPEC_HID_H */ diff --git a/drivers/hid/ipts/thread.c b/drivers/hid/ipts/thread.c new file mode 100644 -index 000000000000..8b46f775c107 +index 0000000000000..8b46f775c1070 --- /dev/null +++ b/drivers/hid/ipts/thread.c @@ -0,0 +1,85 @@ @@ -2919,7 +2919,7 @@ index 000000000000..8b46f775c107 +} diff --git a/drivers/hid/ipts/thread.h b/drivers/hid/ipts/thread.h new file mode 100644 -index 000000000000..a314843599fc +index 0000000000000..a314843599fc3 --- /dev/null +++ b/drivers/hid/ipts/thread.h @@ -0,0 +1,60 @@ diff --git a/patches/6.1/0005-ithc.patch b/patches/6.1/0005-ithc.patch index 8202fdafa..3f484aaca 100644 --- a/patches/6.1/0005-ithc.patch +++ b/patches/6.1/0005-ithc.patch @@ -10,7 +10,7 @@ Patchset: ithc 1 file changed, 16 insertions(+) diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c -index 5962bb5027d0..86fa129d10d4 100644 +index 5962bb5027d06..86fa129d10d40 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -396,6 +396,22 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev) @@ -72,7 +72,7 @@ Patchset: ithc create mode 100644 drivers/hid/ithc/ithc.h diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig -index 1523ccdf73b5..b7030071ac0c 100644 +index 1523ccdf73b51..b7030071ac0c0 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -1292,4 +1292,6 @@ source "drivers/hid/surface-hid/Kconfig" @@ -83,7 +83,7 @@ index 1523ccdf73b5..b7030071ac0c 100644 + endmenu diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile -index e48300bcea9b..8ef7308b0f9d 100644 +index e48300bcea9be..8ef7308b0f9d7 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -166,3 +166,4 @@ obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/ @@ -93,7 +93,7 @@ index e48300bcea9b..8ef7308b0f9d 100644 +obj-$(CONFIG_HID_ITHC) += ithc/ diff --git a/drivers/hid/ithc/Kbuild b/drivers/hid/ithc/Kbuild new file mode 100644 -index 000000000000..aea83f2ac07b +index 0000000000000..aea83f2ac07b4 --- /dev/null +++ b/drivers/hid/ithc/Kbuild @@ -0,0 +1,6 @@ @@ -105,7 +105,7 @@ index 000000000000..aea83f2ac07b + diff --git a/drivers/hid/ithc/Kconfig b/drivers/hid/ithc/Kconfig new file mode 100644 -index 000000000000..ede713023609 +index 0000000000000..ede7130236096 --- /dev/null +++ b/drivers/hid/ithc/Kconfig @@ -0,0 +1,12 @@ @@ -123,7 +123,7 @@ index 000000000000..ede713023609 + module will be called ithc. diff --git a/drivers/hid/ithc/ithc-debug.c b/drivers/hid/ithc/ithc-debug.c new file mode 100644 -index 000000000000..57bf125c45bd +index 0000000000000..57bf125c45bd5 --- /dev/null +++ b/drivers/hid/ithc/ithc-debug.c @@ -0,0 +1,96 @@ @@ -225,7 +225,7 @@ index 000000000000..57bf125c45bd + diff --git a/drivers/hid/ithc/ithc-dma.c b/drivers/hid/ithc/ithc-dma.c new file mode 100644 -index 000000000000..7e89b3496918 +index 0000000000000..7e89b3496918d --- /dev/null +++ b/drivers/hid/ithc/ithc-dma.c @@ -0,0 +1,258 @@ @@ -489,7 +489,7 @@ index 000000000000..7e89b3496918 + diff --git a/drivers/hid/ithc/ithc-dma.h b/drivers/hid/ithc/ithc-dma.h new file mode 100644 -index 000000000000..d9f2c19a13f3 +index 0000000000000..d9f2c19a13f3a --- /dev/null +++ b/drivers/hid/ithc/ithc-dma.h @@ -0,0 +1,67 @@ @@ -562,7 +562,7 @@ index 000000000000..d9f2c19a13f3 + diff --git a/drivers/hid/ithc/ithc-main.c b/drivers/hid/ithc/ithc-main.c new file mode 100644 -index 000000000000..09512b9cb4d3 +index 0000000000000..09512b9cb4d31 --- /dev/null +++ b/drivers/hid/ithc/ithc-main.c @@ -0,0 +1,534 @@ @@ -1102,7 +1102,7 @@ index 000000000000..09512b9cb4d3 + diff --git a/drivers/hid/ithc/ithc-regs.c b/drivers/hid/ithc/ithc-regs.c new file mode 100644 -index 000000000000..85d567b05761 +index 0000000000000..85d567b05761f --- /dev/null +++ b/drivers/hid/ithc/ithc-regs.c @@ -0,0 +1,64 @@ @@ -1172,7 +1172,7 @@ index 000000000000..85d567b05761 + diff --git a/drivers/hid/ithc/ithc-regs.h b/drivers/hid/ithc/ithc-regs.h new file mode 100644 -index 000000000000..1a96092ed7ee +index 0000000000000..1a96092ed7eed --- /dev/null +++ b/drivers/hid/ithc/ithc-regs.h @@ -0,0 +1,186 @@ @@ -1364,7 +1364,7 @@ index 000000000000..1a96092ed7ee + diff --git a/drivers/hid/ithc/ithc.h b/drivers/hid/ithc/ithc.h new file mode 100644 -index 000000000000..6a9b0d480bc1 +index 0000000000000..6a9b0d480bc15 --- /dev/null +++ b/drivers/hid/ithc/ithc.h @@ -0,0 +1,60 @@ diff --git a/patches/6.1/0006-surface-sam.patch b/patches/6.1/0006-surface-sam.patch index e535bc11a..91ba62b11 100644 --- a/patches/6.1/0006-surface-sam.patch +++ b/patches/6.1/0006-surface-sam.patch @@ -29,7 +29,7 @@ Patchset: surface-sam 7 files changed, 64 insertions(+), 47 deletions(-) diff --git a/Documentation/driver-api/surface_aggregator/client.rst b/Documentation/driver-api/surface_aggregator/client.rst -index 27f95abdbe99..9d7411223a84 100644 +index 27f95abdbe997..9d7411223a848 100644 --- a/Documentation/driver-api/surface_aggregator/client.rst +++ b/Documentation/driver-api/surface_aggregator/client.rst @@ -191,7 +191,7 @@ data received from it is converted from little-endian to host endianness. @@ -51,7 +51,7 @@ index 27f95abdbe99..9d7411223a84 100644 .instance_id = 0x00, }); diff --git a/Documentation/driver-api/surface_aggregator/ssh.rst b/Documentation/driver-api/surface_aggregator/ssh.rst -index bf007d6c9873..18fd0f0aee84 100644 +index bf007d6c98732..18fd0f0aee84b 100644 --- a/Documentation/driver-api/surface_aggregator/ssh.rst +++ b/Documentation/driver-api/surface_aggregator/ssh.rst @@ -13,6 +13,7 @@ @@ -115,7 +115,7 @@ index bf007d6c9873..18fd0f0aee84 100644 Limitations and Observations diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c -index c6537a1b3a2e..2c99f51ccd4e 100644 +index c6537a1b3a2ec..2c99f51ccd4ec 100644 --- a/drivers/platform/surface/aggregator/controller.c +++ b/drivers/platform/surface/aggregator/controller.c @@ -994,7 +994,7 @@ static void ssam_handle_event(struct ssh_rtl *rtl, @@ -169,7 +169,7 @@ index c6537a1b3a2e..2c99f51ccd4e 100644 .instance_id = 0x00, }); diff --git a/drivers/platform/surface/aggregator/ssh_msgb.h b/drivers/platform/surface/aggregator/ssh_msgb.h -index f3ecad92eefd..438873e06098 100644 +index f3ecad92eefd8..438873e060986 100644 --- a/drivers/platform/surface/aggregator/ssh_msgb.h +++ b/drivers/platform/surface/aggregator/ssh_msgb.h @@ -189,8 +189,8 @@ static inline void msgb_push_cmd(struct msgbuf *msgb, u8 seq, u16 rqid, @@ -184,7 +184,7 @@ index f3ecad92eefd..438873e06098 100644 __msgb_push_u16(msgb, rqid); /* Request ID. */ __msgb_push_u8(msgb, rqst->command_id); /* Command ID. */ diff --git a/drivers/platform/surface/aggregator/ssh_request_layer.c b/drivers/platform/surface/aggregator/ssh_request_layer.c -index 69132976d297..90634dcacabf 100644 +index 69132976d297e..90634dcacabf2 100644 --- a/drivers/platform/surface/aggregator/ssh_request_layer.c +++ b/drivers/platform/surface/aggregator/ssh_request_layer.c @@ -920,13 +920,14 @@ static void ssh_rtl_rx_command(struct ssh_ptl *p, const struct ssam_span *data) @@ -208,7 +208,7 @@ index 69132976d297..90634dcacabf 100644 } diff --git a/include/linux/surface_aggregator/controller.h b/include/linux/surface_aggregator/controller.h -index d11a1c6e3186..8932bc0bae18 100644 +index d11a1c6e3186a..8932bc0bae187 100644 --- a/include/linux/surface_aggregator/controller.h +++ b/include/linux/surface_aggregator/controller.h @@ -912,10 +912,10 @@ enum ssam_event_mask { @@ -225,7 +225,7 @@ index d11a1c6e3186..8932bc0bae18 100644 #define SSAM_EVENT_REGISTRY_REG(tid)\ SSAM_EVENT_REGISTRY(SSAM_SSH_TC_REG, tid, 0x01, 0x02) diff --git a/include/linux/surface_aggregator/serial_hub.h b/include/linux/surface_aggregator/serial_hub.h -index 45501b6e54e8..5c4ae1a26183 100644 +index 45501b6e54e8a..5c4ae1a261831 100644 --- a/include/linux/surface_aggregator/serial_hub.h +++ b/include/linux/surface_aggregator/serial_hub.h @@ -83,23 +83,21 @@ enum ssh_payload_type { @@ -314,7 +314,7 @@ Patchset: surface-sam 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/drivers/platform/surface/aggregator/trace.h b/drivers/platform/surface/aggregator/trace.h -index 2a2c17771d01..55cc61bba1da 100644 +index 2a2c17771d014..55cc61bba1da6 100644 --- a/drivers/platform/surface/aggregator/trace.h +++ b/drivers/platform/surface/aggregator/trace.h @@ -96,6 +96,7 @@ TRACE_DEFINE_ENUM(SSAM_SSH_TC_POS); @@ -505,7 +505,7 @@ Patchset: surface-sam 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c -index 43061514be38..62f27cdb6ca8 100644 +index 43061514be382..62f27cdb6ca8f 100644 --- a/drivers/platform/surface/surface_aggregator_hub.c +++ b/drivers/platform/surface/surface_aggregator_hub.c @@ -214,7 +214,7 @@ static void ssam_hub_remove(struct ssam_device *sdev) @@ -548,7 +548,7 @@ Patchset: surface-sam 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c -index 27d95a6a7851..bd8cd453c393 100644 +index 27d95a6a78513..bd8cd453c393a 100644 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c @@ -247,7 +247,7 @@ static bool ssam_kip_cover_state_is_tablet_mode(struct ssam_tablet_sw *sw, u32 s @@ -600,7 +600,7 @@ Patchset: surface-sam 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c -index ed36944467f9..0de76a784a35 100644 +index ed36944467f9f..0de76a784a35f 100644 --- a/drivers/platform/surface/surface_dtx.c +++ b/drivers/platform/surface/surface_dtx.c @@ -71,63 +71,63 @@ static_assert(sizeof(struct ssam_bas_base_info) == 2); @@ -698,7 +698,7 @@ Patchset: surface-sam 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/surface-hid/surface_kbd.c b/drivers/hid/surface-hid/surface_kbd.c -index 0635341bc517..42933bf3e925 100644 +index 0635341bc5174..42933bf3e925f 100644 --- a/drivers/hid/surface-hid/surface_kbd.c +++ b/drivers/hid/surface-hid/surface_kbd.c @@ -250,7 +250,7 @@ static int surface_kbd_probe(struct platform_device *pdev) @@ -747,7 +747,7 @@ Patchset: surface-sam 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c -index d4aa8c81903a..aa80d83a83d1 100644 +index d4aa8c81903ae..aa80d83a83d1b 100644 --- a/drivers/hid/surface-hid/surface_hid.c +++ b/drivers/hid/surface-hid/surface_hid.c @@ -230,7 +230,7 @@ static void surface_hid_remove(struct ssam_device *sdev) @@ -760,7 +760,7 @@ index d4aa8c81903a..aa80d83a83d1 100644 }; MODULE_DEVICE_TABLE(ssam, surface_hid_match); diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c -index 62f27cdb6ca8..6abd1efe2088 100644 +index 62f27cdb6ca8f..6abd1efe20883 100644 --- a/drivers/platform/surface/surface_aggregator_hub.c +++ b/drivers/platform/surface/surface_aggregator_hub.c @@ -348,8 +348,8 @@ static const struct ssam_hub_desc kip_hub = { @@ -775,7 +775,7 @@ index 62f27cdb6ca8..6abd1efe2088 100644 }; MODULE_DEVICE_TABLE(ssam, ssam_hub_match); diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c -index bd8cd453c393..6147aa887939 100644 +index bd8cd453c393a..6147aa8879391 100644 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c @@ -510,8 +510,8 @@ static const struct ssam_tablet_sw_desc ssam_pos_sw_desc = { @@ -790,7 +790,7 @@ index bd8cd453c393..6147aa887939 100644 }; MODULE_DEVICE_TABLE(ssam, ssam_tablet_sw_match); diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c -index 0de76a784a35..30cbde278c59 100644 +index 0de76a784a35f..30cbde278c599 100644 --- a/drivers/platform/surface/surface_dtx.c +++ b/drivers/platform/surface/surface_dtx.c @@ -1214,7 +1214,7 @@ static void surface_dtx_ssam_remove(struct ssam_device *sdev) @@ -803,7 +803,7 @@ index 0de76a784a35..30cbde278c59 100644 }; MODULE_DEVICE_TABLE(ssam, surface_dtx_ssam_match); diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c -index fbf2e11fd6ce..f433a13c3689 100644 +index fbf2e11fd6ce7..f433a13c3689a 100644 --- a/drivers/platform/surface/surface_platform_profile.c +++ b/drivers/platform/surface/surface_platform_profile.c @@ -169,7 +169,7 @@ static void surface_platform_profile_remove(struct ssam_device *sdev) @@ -816,7 +816,7 @@ index fbf2e11fd6ce..f433a13c3689 100644 }; MODULE_DEVICE_TABLE(ssam, ssam_platform_profile_match); diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c -index 540707882bb0..19d2f8834e56 100644 +index 540707882bb0a..19d2f8834e56d 100644 --- a/drivers/power/supply/surface_battery.c +++ b/drivers/power/supply/surface_battery.c @@ -852,8 +852,8 @@ static const struct spwr_psy_properties spwr_psy_props_bat2_sb3 = { @@ -831,7 +831,7 @@ index 540707882bb0..19d2f8834e56 100644 }; MODULE_DEVICE_TABLE(ssam, surface_battery_match); diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c -index 59182d55742d..cabdd8da12d0 100644 +index 59182d55742d0..cabdd8da12d08 100644 --- a/drivers/power/supply/surface_charger.c +++ b/drivers/power/supply/surface_charger.c @@ -260,7 +260,7 @@ static const struct spwr_psy_properties spwr_psy_props_adp1 = { @@ -844,7 +844,7 @@ index 59182d55742d..cabdd8da12d0 100644 }; MODULE_DEVICE_TABLE(ssam, surface_ac_match); diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h -index 46c45d1b6368..4da20b7a0ee5 100644 +index 46c45d1b63682..4da20b7a0ee5e 100644 --- a/include/linux/surface_aggregator/device.h +++ b/include/linux/surface_aggregator/device.h @@ -68,9 +68,9 @@ struct ssam_device_uid { @@ -976,7 +976,7 @@ Patchset: surface-sam 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c -index 6abd1efe2088..8b8b80228c14 100644 +index 6abd1efe20883..8b8b80228c147 100644 --- a/drivers/platform/surface/surface_aggregator_hub.c +++ b/drivers/platform/surface/surface_aggregator_hub.c @@ -349,7 +349,7 @@ static const struct ssam_hub_desc kip_hub = { @@ -989,7 +989,7 @@ index 6abd1efe2088..8b8b80228c14 100644 }; MODULE_DEVICE_TABLE(ssam, ssam_hub_match); diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c -index 023f126121d7..296f72d52e6a 100644 +index 023f126121d7d..296f72d52e6a6 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c @@ -46,7 +46,7 @@ static const struct software_node ssam_node_hub_kip = { @@ -1060,7 +1060,7 @@ Patchset: surface-sam 10 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Documentation/driver-api/surface_aggregator/client.rst b/Documentation/driver-api/surface_aggregator/client.rst -index 9d7411223a84..e100ab0a24cc 100644 +index 9d7411223a848..e100ab0a24cc4 100644 --- a/Documentation/driver-api/surface_aggregator/client.rst +++ b/Documentation/driver-api/surface_aggregator/client.rst @@ -19,7 +19,7 @@ @@ -1097,7 +1097,7 @@ index 9d7411223a84..e100ab0a24cc 100644 implementation and documentation for more details. diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c -index aa80d83a83d1..61e5814b0ad7 100644 +index aa80d83a83d1b..61e5814b0ad7d 100644 --- a/drivers/hid/surface-hid/surface_hid.c +++ b/drivers/hid/surface-hid/surface_hid.c @@ -80,7 +80,7 @@ static int ssam_hid_get_descriptor(struct surface_hid_device *shid, u8 entry, u8 @@ -1128,7 +1128,7 @@ index aa80d83a83d1..61e5814b0ad7 100644 static u32 ssam_hid_event_fn(struct ssam_event_notifier *nf, const struct ssam_event *event) diff --git a/drivers/hid/surface-hid/surface_kbd.c b/drivers/hid/surface-hid/surface_kbd.c -index 42933bf3e925..4fbce201db6a 100644 +index 42933bf3e925f..4fbce201db6a1 100644 --- a/drivers/hid/surface-hid/surface_kbd.c +++ b/drivers/hid/surface-hid/surface_kbd.c @@ -49,7 +49,7 @@ static int ssam_kbd_get_descriptor(struct surface_hid_device *shid, u8 entry, u8 @@ -1159,7 +1159,7 @@ index 42933bf3e925..4fbce201db6a 100644 return status; diff --git a/drivers/platform/surface/aggregator/bus.c b/drivers/platform/surface/aggregator/bus.c -index de539938896e..7004eb4a63a2 100644 +index de539938896e2..7004eb4a63a28 100644 --- a/drivers/platform/surface/aggregator/bus.c +++ b/drivers/platform/surface/aggregator/bus.c @@ -136,9 +136,9 @@ int ssam_device_add(struct ssam_device *sdev) @@ -1176,7 +1176,7 @@ index de539938896e..7004eb4a63a2 100644 * Note that for this to work, the controller has to be a parent device. * If it is not a direct parent, care has to be taken that the device is diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c -index 2c99f51ccd4e..535581c0471c 100644 +index 2c99f51ccd4ec..535581c0471c5 100644 --- a/drivers/platform/surface/aggregator/controller.c +++ b/drivers/platform/surface/aggregator/controller.c @@ -1674,7 +1674,7 @@ int ssam_request_sync_submit(struct ssam_controller *ctrl, @@ -1259,7 +1259,7 @@ index 2c99f51ccd4e..535581c0471c 100644 return status < 0 ? status : buf; diff --git a/drivers/platform/surface/surface_acpi_notify.c b/drivers/platform/surface/surface_acpi_notify.c -index 50500e562963..897cdd9c3aae 100644 +index 50500e562963d..897cdd9c3aae8 100644 --- a/drivers/platform/surface/surface_acpi_notify.c +++ b/drivers/platform/surface/surface_acpi_notify.c @@ -590,7 +590,7 @@ static acpi_status san_rqst(struct san_data *d, struct gsb_buffer *buffer) @@ -1272,7 +1272,7 @@ index 50500e562963..897cdd9c3aae 100644 if (!status) { diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c -index 492c82e69182..07f0ed658369 100644 +index 492c82e691827..07f0ed658369b 100644 --- a/drivers/platform/surface/surface_aggregator_cdev.c +++ b/drivers/platform/surface/surface_aggregator_cdev.c @@ -302,8 +302,8 @@ static long ssam_cdev_request(struct ssam_cdev_client *client, struct ssam_cdev_ @@ -1296,7 +1296,7 @@ index 492c82e69182..07f0ed658369 100644 goto out; diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c -index 6147aa887939..9fed800c7cc0 100644 +index 6147aa8879391..9fed800c7cc09 100644 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c @@ -382,7 +382,7 @@ static int ssam_pos_get_sources_list(struct ssam_tablet_sw *sw, struct ssam_sour @@ -1309,7 +1309,7 @@ index 6147aa887939..9fed800c7cc0 100644 return status; diff --git a/include/linux/surface_aggregator/controller.h b/include/linux/surface_aggregator/controller.h -index 8932bc0bae18..cb7980805920 100644 +index 8932bc0bae187..cb7980805920a 100644 --- a/include/linux/surface_aggregator/controller.h +++ b/include/linux/surface_aggregator/controller.h @@ -207,17 +207,17 @@ static inline int ssam_request_sync_wait(struct ssam_request_sync *rqst) @@ -1509,7 +1509,7 @@ index 8932bc0bae18..cb7980805920 100644 return status; \ \ diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h -index 4da20b7a0ee5..1545e5567b15 100644 +index 4da20b7a0ee5e..1545e5567b152 100644 --- a/include/linux/surface_aggregator/device.h +++ b/include/linux/surface_aggregator/device.h @@ -456,7 +456,7 @@ static inline int ssam_device_register_clients(struct ssam_device *sdev) @@ -1570,7 +1570,7 @@ Patchset: surface-sam 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/platform/surface/surface_hotplug.c b/drivers/platform/surface/surface_hotplug.c -index f004a2495201..7b6d887dccdb 100644 +index f004a24952013..7b6d887dccdbf 100644 --- a/drivers/platform/surface/surface_hotplug.c +++ b/drivers/platform/surface/surface_hotplug.c @@ -101,18 +101,12 @@ static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type @@ -1634,7 +1634,7 @@ Patchset: surface-sam 1 file changed, 84 insertions(+), 39 deletions(-) diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c -index 9fed800c7cc0..e8682f52558f 100644 +index 9fed800c7cc09..e8682f52558f3 100644 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c @@ -20,16 +20,23 @@ @@ -1931,7 +1931,7 @@ Patchset: surface-sam 1 file changed, 57 insertions(+) diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c -index e8682f52558f..8f52b62d1c19 100644 +index e8682f52558f3..8f52b62d1c195 100644 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c @@ -325,9 +325,18 @@ MODULE_PARM_DESC(tablet_mode_in_slate_state, "Enable tablet mode in slate device @@ -2048,7 +2048,7 @@ Patchset: surface-sam 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c -index 296f72d52e6a..0fe5be539652 100644 +index 296f72d52e6a6..0fe5be5396525 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c @@ -305,7 +305,7 @@ static const struct software_node *ssam_node_group_sp9[] = { diff --git a/patches/6.1/0007-surface-sam-over-hid.patch b/patches/6.1/0007-surface-sam-over-hid.patch index ed0f59f87..0f0339dfd 100644 --- a/patches/6.1/0007-surface-sam-over-hid.patch +++ b/patches/6.1/0007-surface-sam-over-hid.patch @@ -55,7 +55,7 @@ Patchset: surface-sam-over-hid 1 file changed, 35 insertions(+) diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c -index 4dd777cc0c89..b2338618163a 100644 +index 4dd777cc0c89f..b2338618163ad 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -639,6 +639,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client, @@ -133,7 +133,7 @@ Patchset: surface-sam-over-hid create mode 100644 drivers/platform/surface/surfacebook1_dgpu_switch.c diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig -index b629e82af97c..68656e8f309e 100644 +index b629e82af97c0..68656e8f309ed 100644 --- a/drivers/platform/surface/Kconfig +++ b/drivers/platform/surface/Kconfig @@ -149,6 +149,13 @@ config SURFACE_AGGREGATOR_TABLET_SWITCH @@ -151,7 +151,7 @@ index b629e82af97c..68656e8f309e 100644 tristate "Surface DTX (Detachment System) Driver" depends on SURFACE_AGGREGATOR diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile -index 53344330939b..7efcd0cdb532 100644 +index 53344330939bf..7efcd0cdb5329 100644 --- a/drivers/platform/surface/Makefile +++ b/drivers/platform/surface/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o @@ -164,7 +164,7 @@ index 53344330939b..7efcd0cdb532 100644 obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c new file mode 100644 -index 000000000000..8b816ed8f35c +index 0000000000000..8b816ed8f35c6 --- /dev/null +++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c @@ -0,0 +1,162 @@ diff --git a/patches/6.1/0008-surface-button.patch b/patches/6.1/0008-surface-button.patch index b47cfaa20..23cd09156 100644 --- a/patches/6.1/0008-surface-button.patch +++ b/patches/6.1/0008-surface-button.patch @@ -20,7 +20,7 @@ Patchset: surface-button 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c -index 09489380afda..0f02411a60f1 100644 +index 09489380afda7..0f02411a60f1c 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -507,8 +507,8 @@ static const struct soc_device_data soc_device_MSHW0028 = { @@ -96,7 +96,7 @@ Patchset: surface-button 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c -index 242fb690dcaf..30eea54dbb47 100644 +index 242fb690dcaf7..30eea54dbb477 100644 --- a/drivers/platform/surface/surfacepro3_button.c +++ b/drivers/platform/surface/surfacepro3_button.c @@ -149,7 +149,8 @@ static int surface_button_resume(struct device *dev) diff --git a/patches/6.1/0009-surface-typecover.patch b/patches/6.1/0009-surface-typecover.patch index 737654390..3647addb2 100644 --- a/patches/6.1/0009-surface-typecover.patch +++ b/patches/6.1/0009-surface-typecover.patch @@ -23,7 +23,7 @@ Patchset: surface-typecover 1 file changed, 3 insertions(+) diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 934b3d997702..2c6604c6e8e1 100644 +index 934b3d997702e..2c6604c6e8e12 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -220,6 +220,9 @@ static const struct usb_device_id usb_quirk_list[] = { @@ -75,7 +75,7 @@ Patchset: surface-typecover 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index e31be0cb8b85..63fd042aba6b 100644 +index e31be0cb8b850..63fd042aba6ba 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -34,7 +34,10 @@ @@ -301,7 +301,7 @@ Patchset: surface-typecover 1 file changed, 122 insertions(+), 26 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 63fd042aba6b..508a250ff4bf 100644 +index 63fd042aba6ba..508a250ff4bf1 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -77,6 +77,7 @@ MODULE_LICENSE("GPL"); diff --git a/patches/6.1/0010-surface-shutdown.patch b/patches/6.1/0010-surface-shutdown.patch index 380c4e93b..aac213911 100644 --- a/patches/6.1/0010-surface-shutdown.patch +++ b/patches/6.1/0010-surface-shutdown.patch @@ -1,4 +1,4 @@ -From 8290c084adf9877eedd09435dc056b055fbdfa6c Mon Sep 17 00:00:00 2001 +From a1d8dbed4b776b6b979deeb0f8c3010bd19369fe Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 22:12:24 +0100 Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod @@ -23,7 +23,7 @@ Patchset: surface-shutdown 3 files changed, 40 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index f47a3b10bf50..9ea4352aac56 100644 +index f47a3b10bf504..9ea4352aac56c 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -507,6 +507,9 @@ static void pci_device_shutdown(struct device *dev) @@ -37,7 +37,7 @@ index f47a3b10bf50..9ea4352aac56 100644 if (drv && drv->shutdown) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 494fa46f5767..106fb2ff855b 100644 +index 494fa46f57671..106fb2ff855b2 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -6015,3 +6015,39 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size); @@ -81,7 +81,7 @@ index 494fa46f5767..106fb2ff855b 100644 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x466d, quirk_no_shutdown); // Thunderbolt 4 NHI +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x46a8, quirk_no_shutdown); // GPU diff --git a/include/linux/pci.h b/include/linux/pci.h -index cb538bc57971..409925d303ed 100644 +index cb538bc579710..409925d303ed7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -462,6 +462,7 @@ struct pci_dev { diff --git a/patches/6.1/0011-surface-gpe.patch b/patches/6.1/0011-surface-gpe.patch new file mode 100644 index 000000000..202ca6c3b --- /dev/null +++ b/patches/6.1/0011-surface-gpe.patch @@ -0,0 +1,51 @@ +From 23fb72a959d8cb8842ea87ee7705427e3c1d6ab9 Mon Sep 17 00:00:00 2001 +From: Maximilian Luz +Date: Sun, 12 Mar 2023 01:41:57 +0100 +Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9 + +Add the lid GPE used by the Surface Pro 9. + +Signed-off-by: Maximilian Luz +Patchset: surface-gpe +--- + drivers/platform/surface/surface_gpe.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c +index c219b840d491a..69c4352e8406b 100644 +--- a/drivers/platform/surface/surface_gpe.c ++++ b/drivers/platform/surface/surface_gpe.c +@@ -41,6 +41,11 @@ static const struct property_entry lid_device_props_l4F[] = { + {}, + }; + ++static const struct property_entry lid_device_props_l52[] = { ++ PROPERTY_ENTRY_U32("gpe", 0x52), ++ {}, ++}; ++ + static const struct property_entry lid_device_props_l57[] = { + PROPERTY_ENTRY_U32("gpe", 0x57), + {}, +@@ -107,6 +112,18 @@ static const struct dmi_system_id dmi_lid_device_table[] = { + }, + .driver_data = (void *)lid_device_props_l4B, + }, ++ { ++ /* ++ * We match for SKU here due to product name clash with the ARM ++ * version. ++ */ ++ .ident = "Surface Pro 9", ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_9_2038"), ++ }, ++ .driver_data = (void *)lid_device_props_l52, ++ }, + { + .ident = "Surface Book 1", + .matches = { +-- +2.39.2 + diff --git a/patches/6.1/0011-cameras.patch b/patches/6.1/0012-cameras.patch similarity index 96% rename from patches/6.1/0011-cameras.patch rename to patches/6.1/0012-cameras.patch index 8fce66ecb..5c0a32d5b 100644 --- a/patches/6.1/0011-cameras.patch +++ b/patches/6.1/0012-cameras.patch @@ -1,4 +1,4 @@ -From 1fc86cf70c0be7dffca0a90b919a4c9bab085cfb Mon Sep 17 00:00:00 2001 +From 033ef8c5b7ad4308e3ac076e35256488491046e3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:56:57 +0200 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an @@ -58,7 +58,7 @@ Patchset: cameras 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index dbfa58e799e2..ccbd3f8b523e 100644 +index dbfa58e799e28..ccbd3f8b523e8 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2106,6 +2106,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used, @@ -74,7 +74,7 @@ index dbfa58e799e2..ccbd3f8b523e 100644 -- 2.39.2 -From 6aa38f9b5d2efe02e362638fed73356c9884d413 Mon Sep 17 00:00:00 2001 +From 0b559e61d232d1fd2dfd6ebcf3a1626a1f434531 Mon Sep 17 00:00:00 2001 From: zouxiaoh Date: Fri, 25 Jun 2021 08:52:59 +0800 Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs @@ -100,7 +100,7 @@ Patchset: cameras 1 file changed, 30 insertions(+) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index 3965979c7bd4..509cfb9f6695 100644 +index 3965979c7bd41..509cfb9f66954 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -37,6 +37,12 @@ @@ -191,7 +191,7 @@ index 3965979c7bd4..509cfb9f6695 100644 -- 2.39.2 -From 2abcd954ebd5459a85f9d61c16de5f98a284c68b Mon Sep 17 00:00:00 2001 +From 26b6001d2f0738dc69212b714b4cfe5ad5c769da Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 10 Oct 2021 20:57:02 +0200 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain @@ -208,7 +208,7 @@ Patchset: cameras 1 file changed, 7 insertions(+) diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c -index 5b8d1a9620a5..6a0ff035cf20 100644 +index 5b8d1a9620a5d..6a0ff035cf209 100644 --- a/drivers/platform/x86/intel/int3472/tps68470.c +++ b/drivers/platform/x86/intel/int3472/tps68470.c @@ -46,6 +46,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap) @@ -228,7 +228,7 @@ index 5b8d1a9620a5..6a0ff035cf20 100644 -- 2.39.2 -From 994f44aea704d6f20246baf722ae653002c7dcdf Mon Sep 17 00:00:00 2001 +From b71265fab43356eada571af1390deb3ac5fc238a Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 28 Oct 2021 21:55:16 +0100 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM @@ -247,7 +247,7 @@ Patchset: cameras create mode 100644 drivers/media/i2c/dw9719.c diff --git a/MAINTAINERS b/MAINTAINERS -index 350d7e3ba94f..ce7d8d9c83cb 100644 +index 350d7e3ba94f9..ce7d8d9c83cb1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6286,6 +6286,13 @@ T: git git://linuxtv.org/media_tree.git @@ -265,7 +265,7 @@ index 350d7e3ba94f..ce7d8d9c83cb 100644 M: Dongchun Zhu L: linux-media@vger.kernel.org diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 7806d4b81716..98d081efeef7 100644 +index 7806d4b81716e..98d081efeef7f 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -821,6 +821,17 @@ config VIDEO_DW9714 @@ -287,7 +287,7 @@ index 7806d4b81716..98d081efeef7 100644 tristate "DW9768 lens voice coil support" depends on I2C && VIDEO_DEV diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 0a2933103dd9..b82a07c76388 100644 +index 0a2933103dd92..b82a07c763880 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_VIDEO_CS5345) += cs5345.o @@ -300,7 +300,7 @@ index 0a2933103dd9..b82a07c76388 100644 obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/ diff --git a/drivers/media/i2c/dw9719.c b/drivers/media/i2c/dw9719.c new file mode 100644 -index 000000000000..180b04d2a6b3 +index 0000000000000..180b04d2a6b3a --- /dev/null +++ b/drivers/media/i2c/dw9719.c @@ -0,0 +1,425 @@ @@ -732,7 +732,7 @@ index 000000000000..180b04d2a6b3 -- 2.39.2 -From eac26515eef7fb40327a63942277d20151438e2c Mon Sep 17 00:00:00 2001 +From 0ee02b001c6e806cca3e7eeef5bf0608e7580436 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 4 May 2022 23:21:45 +0100 Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to @@ -751,7 +751,7 @@ Patchset: cameras 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c -index 3b76a9d0383a..38f9f4da1922 100644 +index 3b76a9d0383a8..38f9f4da1922e 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c @@ -1383,7 +1383,10 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier, @@ -847,7 +847,7 @@ index 3b76a9d0383a..38f9f4da1922 100644 -- 2.39.2 -From 26ec7b45471dfa544f6de44cd6ba2626193b387c Mon Sep 17 00:00:00 2001 +From a7a074d5023e76983ca0325eb8dedca224a858b8 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 2 Jun 2022 22:15:56 +0100 Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2 @@ -865,7 +865,7 @@ Patchset: cameras 1 file changed, 9 insertions(+) diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c -index 38f9f4da1922..82681df7d794 100644 +index 38f9f4da1922e..82681df7d794f 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c @@ -1430,9 +1430,18 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier, @@ -890,7 +890,7 @@ index 38f9f4da1922..82681df7d794 100644 -- 2.39.2 -From c3a02d14946e3027616c94f1b5444d455d1cb651 Mon Sep 17 00:00:00 2001 +From c4a0681b762a438e7ab1df93fe1ba0bb5f14d799 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 15 Jul 2022 23:48:00 +0200 Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies @@ -904,7 +904,7 @@ Patchset: cameras 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 98d081efeef7..c67966cafe10 100644 +index 98d081efeef7f..c67966cafe109 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -823,7 +823,7 @@ config VIDEO_DW9714 @@ -919,7 +919,7 @@ index 98d081efeef7..c67966cafe10 100644 -- 2.39.2 -From beaa07c24d763346e0ca8defb03ed5620e3edb30 Mon Sep 17 00:00:00 2001 +From d3903b5c3021fb0874d2313cd23097931b08b801 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 24 Feb 2023 14:03:41 +0000 Subject: [PATCH] platform/x86: int3472: Add GPIOs to Surface Go 3 Board data @@ -935,7 +935,7 @@ Patchset: cameras 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel/int3472/tps68470_board_data.c b/drivers/platform/x86/intel/int3472/tps68470_board_data.c -index 309eab9c0558..322237e056f3 100644 +index 309eab9c05588..322237e056f32 100644 --- a/drivers/platform/x86/intel/int3472/tps68470_board_data.c +++ b/drivers/platform/x86/intel/int3472/tps68470_board_data.c @@ -159,9 +159,10 @@ static const struct int3472_tps68470_board_data surface_go_tps68470_board_data = @@ -954,7 +954,7 @@ index 309eab9c0558..322237e056f3 100644 -- 2.39.2 -From 82435a77cc3a683f4b478bdc59af565c37903251 Mon Sep 17 00:00:00 2001 +From 0fc904dd6658824c7624a27618cf280c7afeeeb4 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 2 Mar 2023 12:59:39 +0000 Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E @@ -976,7 +976,7 @@ Patchset: cameras 1 file changed, 14 insertions(+) diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c -index c42c3faa2c32..6f4b8e24eb56 100644 +index c42c3faa2c32d..6f4b8e24eb56c 100644 --- a/drivers/platform/x86/intel/int3472/discrete.c +++ b/drivers/platform/x86/intel/int3472/discrete.c @@ -108,6 +108,9 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347 diff --git a/patches/6.1/0012-amd-gpio.patch b/patches/6.1/0013-amd-gpio.patch similarity index 93% rename from patches/6.1/0012-amd-gpio.patch rename to patches/6.1/0013-amd-gpio.patch index ae3070324..63b0a71de 100644 --- a/patches/6.1/0012-amd-gpio.patch +++ b/patches/6.1/0013-amd-gpio.patch @@ -1,4 +1,4 @@ -From 4fcc68c7948876a50ab0280f5f75797e25253ac5 Mon Sep 17 00:00:00 2001 +From 7739b393ccba091cac6d21776f65aa2490d45a91 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sat, 29 May 2021 17:47:38 +1000 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7 @@ -21,7 +21,7 @@ Patchset: amd-gpio 1 file changed, 17 insertions(+) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c -index 518bda50068c..7706380d825a 100644 +index 518bda50068cb..7706380d825a3 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -22,6 +22,7 @@ @@ -65,7 +65,7 @@ index 518bda50068c..7706380d825a 100644 -- 2.39.2 -From 6d1972ae15bd5a3eb7110873235c1af8f73750a7 Mon Sep 17 00:00:00 2001 +From 09ed2994012b6aafb79e8e48080f8ad9f3a4b17e Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 3 Jun 2021 14:04:26 +0200 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override @@ -80,7 +80,7 @@ Patchset: amd-gpio 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c -index 7706380d825a..e26c38ddc601 100644 +index 7706380d825a3..e26c38ddc601d 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1250,12 +1250,19 @@ static void __init mp_config_acpi_legacy_irqs(void) diff --git a/patches/6.1/0013-rtc.patch b/patches/6.1/0014-rtc.patch similarity index 97% rename from patches/6.1/0013-rtc.patch rename to patches/6.1/0014-rtc.patch index 36bf83d21..9e755f401 100644 --- a/patches/6.1/0013-rtc.patch +++ b/patches/6.1/0014-rtc.patch @@ -1,4 +1,4 @@ -From 05286de70a31b918296037b3e5f1d8c00fb7c3a5 Mon Sep 17 00:00:00 2001 +From 8ddc376b24ac53d198df35cbbc0034e3a7e9bcf1 Mon Sep 17 00:00:00 2001 From: "Bart Groeneveld | GPX Solutions B.V" Date: Mon, 5 Dec 2022 16:08:46 +0100 Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms @@ -21,7 +21,7 @@ Patchset: rtc 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c -index e9b8e8305e23..944276934e7e 100644 +index e9b8e8305e23e..944276934e7ec 100644 --- a/drivers/acpi/acpi_tad.c +++ b/drivers/acpi/acpi_tad.c @@ -432,6 +432,14 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr, diff --git a/patches/6.1/0014-intel-thread-director.patch b/patches/6.1/0015-intel-thread-director.patch similarity index 96% rename from patches/6.1/0014-intel-thread-director.patch rename to patches/6.1/0015-intel-thread-director.patch index 88eae6ea2..7a7cb8551 100644 --- a/patches/6.1/0014-intel-thread-director.patch +++ b/patches/6.1/0015-intel-thread-director.patch @@ -1,4 +1,4 @@ -From 439eb42408933a32f905445cfb06c8c1e8cf029c Mon Sep 17 00:00:00 2001 +From 8cb6f5bf4f355b0169e3f60c559a5e2203c1a988 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Tue, 18 Oct 2022 04:22:40 -0700 Subject: [PATCH] thermal: intel: hfi: Improve the type of @@ -21,7 +21,7 @@ Patchset: intel-thread-director 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index a0640f762dc5..239afe02e518 100644 +index a0640f762dc5d..239afe02e5182 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -137,7 +137,7 @@ struct hfi_instance { @@ -36,7 +36,7 @@ index a0640f762dc5..239afe02e518 100644 -- 2.39.2 -From b96f1c42e4bdb0cc16845a6ba8c5d67a5bc46c64 Mon Sep 17 00:00:00 2001 +From 8f590ad883a1330a99f0bbd18d76c4631d7fddbb Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:29 -0800 Subject: [PATCH] sched/fair: Generalize asym_packing logic for SMT cores @@ -72,7 +72,7 @@ Patchset: intel-thread-director 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 2c3d0d49c80e..8b5fc8e86add 100644 +index 2c3d0d49c80ea..8b5fc8e86addb 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9042,13 +9042,11 @@ group_type group_classify(unsigned int imbalance_pct, @@ -145,7 +145,7 @@ index 2c3d0d49c80e..8b5fc8e86add 100644 -- 2.39.2 -From 42b06178e3d666bd6fda756fb2d0e38274b1ef6e Mon Sep 17 00:00:00 2001 +From 5a3b5eb5f79e51634f5fd173c0949c5293c93566 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:30 -0800 Subject: [PATCH] sched/fair: Move is_core_idle() out of CONFIG_NUMA @@ -173,7 +173,7 @@ Patchset: intel-thread-director 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 8b5fc8e86add..98c64f1db20e 100644 +index 8b5fc8e86addb..98c64f1db20e0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1049,6 +1049,23 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se) @@ -227,7 +227,7 @@ index 8b5fc8e86add..98c64f1db20e 100644 -- 2.39.2 -From c1e95f40533de025522b139810a7ca88c8126c9a Mon Sep 17 00:00:00 2001 +From d4ba60a8be784dc7ed866fb52ff94519eb9d1586 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:31 -0800 Subject: [PATCH] sched/fair: Only do asym_packing load balancing from fully @@ -265,7 +265,7 @@ Patchset: intel-thread-director 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 98c64f1db20e..f74777fc78d7 100644 +index 98c64f1db20e0..f74777fc78d7d 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9038,12 +9038,14 @@ group_type group_classify(unsigned int imbalance_pct, @@ -342,7 +342,7 @@ index 98c64f1db20e..f74777fc78d7 100644 -- 2.39.2 -From 5ea946c735924906fa9e37a5c810d32f2a469f05 Mon Sep 17 00:00:00 2001 +From 20641917bc6bad6f81bafe1bac213c1c3e70ed09 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:32 -0800 Subject: [PATCH] sched/fair: Let low-priority cores help high-priority busy @@ -383,7 +383,7 @@ Patchset: intel-thread-director 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index f74777fc78d7..24183e3eb3d4 100644 +index f74777fc78d7d..24183e3eb3d47 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -10224,11 +10224,20 @@ static struct rq *find_busiest_queue(struct lb_env *env, @@ -436,7 +436,7 @@ index f74777fc78d7..24183e3eb3d4 100644 -- 2.39.2 -From bb0718989560dfdd690ed25f4b5f190cbbb72245 Mon Sep 17 00:00:00 2001 +From c1e77e8eea55b2d16b80c6dde3bcb3cf7e232aa5 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:33 -0800 Subject: [PATCH] sched/fair: Keep a fully_busy SMT sched group as busiest @@ -465,7 +465,7 @@ Patchset: intel-thread-director 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 24183e3eb3d4..30b0e8476d1c 100644 +index 24183e3eb3d47..30b0e8476d1c6 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9302,10 +9302,22 @@ static bool update_sd_pick_busiest(struct lb_env *env, @@ -496,7 +496,7 @@ index 24183e3eb3d4..30b0e8476d1c 100644 -- 2.39.2 -From 5b3a6ed10f5a9b6cd3113aa4384986a37c069f0f Mon Sep 17 00:00:00 2001 +From a6d2b260d711873add514001a4eca293ff40c860 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:34 -0800 Subject: [PATCH] sched/fair: Use the prefer_sibling flag of the current sched @@ -542,7 +542,7 @@ Patchset: intel-thread-director 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 30b0e8476d1c..9e98cfcf1e48 100644 +index 30b0e8476d1c6..9e98cfcf1e48b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9792,7 +9792,6 @@ static void update_idle_cpu_scan(struct lb_env *env, @@ -579,7 +579,7 @@ index 30b0e8476d1c..9e98cfcf1e48 100644 -- 2.39.2 -From b058c8929bb49036a41e96e30628edfd891781f9 Mon Sep 17 00:00:00 2001 +From 08ff98c145516a1013cc5cc4f1d9b0d36388ec90 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:35 -0800 Subject: [PATCH] sched/fair: Do not even the number of busy CPUs via @@ -613,7 +613,7 @@ Patchset: intel-thread-director 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 9e98cfcf1e48..635e8b41a87c 100644 +index 9e98cfcf1e48b..635e8b41a87c9 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9035,20 +9035,15 @@ group_type group_classify(unsigned int imbalance_pct, @@ -679,7 +679,7 @@ index 9e98cfcf1e48..635e8b41a87c 100644 -- 2.39.2 -From aaa0172f77c8a5ea09246be2114a2475f5e9b5f9 Mon Sep 17 00:00:00 2001 +From f70e8d703a3703327fea540de41d6b4df922a85d Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:36 -0800 Subject: [PATCH] sched/topology: Remove SHARED_CHILD from ASYM_PACKING @@ -721,7 +721,7 @@ Patchset: intel-thread-director 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/linux/sched/sd_flags.h b/include/linux/sched/sd_flags.h -index 57bde66d95f7..800238854ba5 100644 +index 57bde66d95f7a..800238854ba54 100644 --- a/include/linux/sched/sd_flags.h +++ b/include/linux/sched/sd_flags.h @@ -132,12 +132,9 @@ SD_FLAG(SD_SERIALIZE, SDF_SHARED_PARENT | SDF_NEEDS_GROUPS) @@ -741,7 +741,7 @@ index 57bde66d95f7..800238854ba5 100644 -- 2.39.2 -From d8cd9b8324778a117e3cddcea0dcc683184bc7ce Mon Sep 17 00:00:00 2001 +From fa1585eecfadd43f866f50951bbe106c09e1f79f Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:37 -0800 Subject: [PATCH] x86/sched: Remove SD_ASYM_PACKING from the SMT domain flags @@ -769,7 +769,7 @@ Patchset: intel-thread-director 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c -index 3f3ea0287f69..c3de98224cb4 100644 +index 3f3ea0287f694..c3de98224cb4f 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -545,7 +545,7 @@ static int x86_core_flags(void) @@ -784,7 +784,7 @@ index 3f3ea0287f69..c3de98224cb4 100644 -- 2.39.2 -From aedfafc32900df349aac26afd432ef69e1383c91 Mon Sep 17 00:00:00 2001 +From 5f0150f15f343e543bc257bca1db30f3481ed474 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:38 -0800 Subject: [PATCH] x86/sched/itmt: Give all SMT siblings of a core the same @@ -815,7 +815,7 @@ Patchset: intel-thread-director 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/itmt.c b/arch/x86/kernel/itmt.c -index 9ff480e94511..6510883c5e81 100644 +index 9ff480e94511b..6510883c5e817 100644 --- a/arch/x86/kernel/itmt.c +++ b/arch/x86/kernel/itmt.c @@ -174,32 +174,19 @@ int arch_asym_cpu_priority(int cpu) @@ -859,7 +859,7 @@ index 9ff480e94511..6510883c5e81 100644 -- 2.39.2 -From c08208402174106bdbe84cd7c36aa597c0ca4a6b Mon Sep 17 00:00:00 2001 +From 59c32bf713f2d1c52fedb38ceeef07375736dbbc Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:42 -0800 Subject: [PATCH] sched/task_struct: Introduce IPC classes of tasks @@ -907,7 +907,7 @@ Patchset: intel-thread-director 2 files changed, 22 insertions(+) diff --git a/include/linux/sched.h b/include/linux/sched.h -index ffb6eb55cd13..ca0c32bf796f 100644 +index ffb6eb55cd135..ca0c32bf796fb 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -127,6 +127,8 @@ struct task_group; @@ -935,7 +935,7 @@ index ffb6eb55cd13..ca0c32bf796f 100644 * New fields for task_struct should be added above here, so that * they are included in the randomized portion of task_struct. diff --git a/init/Kconfig b/init/Kconfig -index 0c214af99085..0ddda55fde6a 100644 +index 0c214af99085d..0ddda55fde6a6 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -865,6 +865,18 @@ config UCLAMP_BUCKETS_COUNT @@ -960,7 +960,7 @@ index 0c214af99085..0ddda55fde6a 100644 -- 2.39.2 -From 966e422a1007668dd02df05c88edf662906e79c0 Mon Sep 17 00:00:00 2001 +From c4738d1d773b0e4066f30875c6393adb77d55837 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:43 -0800 Subject: [PATCH] sched: Add interfaces for IPC classes @@ -1006,7 +1006,7 @@ Patchset: intel-thread-director 3 files changed, 81 insertions(+) diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h -index 816df6cc444e..5b084d3c9ad1 100644 +index 816df6cc444e1..5b084d3c9ad12 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -280,4 +280,10 @@ static inline int task_node(const struct task_struct *p) @@ -1021,7 +1021,7 @@ index 816df6cc444e..5b084d3c9ad1 100644 + #endif /* _LINUX_SCHED_TOPOLOGY_H */ diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index d6d488e8eb55..a3b2b66e077d 100644 +index d6d488e8eb554..a3b2b66e077d9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2511,6 +2511,72 @@ void arch_scale_freq_tick(void) @@ -1098,7 +1098,7 @@ index d6d488e8eb55..a3b2b66e077d 100644 /** * arch_scale_freq_capacity - get the frequency scale factor of a given CPU. diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c -index 8739c2a5a54e..60e03d15f58c 100644 +index 8739c2a5a54ea..60e03d15f58ca 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -670,6 +670,15 @@ DEFINE_PER_CPU(struct sched_domain __rcu *, sd_asym_packing); @@ -1120,7 +1120,7 @@ index 8739c2a5a54e..60e03d15f58c 100644 -- 2.39.2 -From 3857594e8ecb942a38e7884035210a94a10ca5c4 Mon Sep 17 00:00:00 2001 +From 021e8196d4ef87aa80fae8024b8055a6bca5b9c4 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:44 -0800 Subject: [PATCH] sched/core: Initialize the IPC class of a new task @@ -1151,7 +1151,7 @@ Patchset: intel-thread-director 1 file changed, 3 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index f730b6fe94a7..7b63bf90430b 100644 +index f730b6fe94a7f..7b63bf90430bb 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4377,6 +4377,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) @@ -1167,7 +1167,7 @@ index f730b6fe94a7..7b63bf90430b 100644 -- 2.39.2 -From cdc7a5f13c092fcfd85b6b03c3f374f4ff0a8b4c Mon Sep 17 00:00:00 2001 +From ef293bd0404885577a038daf0c011a57eeece3de Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:45 -0800 Subject: [PATCH] sched/core: Add user_tick as argument to scheduler_tick() @@ -1200,7 +1200,7 @@ Patchset: intel-thread-director 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h -index ca0c32bf796f..e58dc7503864 100644 +index ca0c32bf796fb..e58dc7503864c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -293,7 +293,7 @@ enum { @@ -1213,7 +1213,7 @@ index ca0c32bf796f..e58dc7503864 100644 #define MAX_SCHEDULE_TIMEOUT LONG_MAX diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 7b63bf90430b..0a8558421eba 100644 +index 7b63bf90430bb..0a8558421eba2 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5492,7 +5492,7 @@ static inline u64 cpu_resched_latency(struct rq *rq) { return 0; } @@ -1226,7 +1226,7 @@ index 7b63bf90430b..0a8558421eba 100644 int cpu = smp_processor_id(); struct rq *rq = cpu_rq(cpu); diff --git a/kernel/time/timer.c b/kernel/time/timer.c -index 717fcb9fb14a..b444b6f5f585 100644 +index 717fcb9fb14aa..b444b6f5f585b 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1841,7 +1841,7 @@ void update_process_times(int user_tick) @@ -1241,7 +1241,7 @@ index 717fcb9fb14a..b444b6f5f585 100644 -- 2.39.2 -From b0ac9c58fda7efb09dc204bfdcdc3ccdce5dc95f Mon Sep 17 00:00:00 2001 +From 45a0511c0378f765cc26fb1faaddc3080ab2e179 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:46 -0800 Subject: [PATCH] sched/core: Update the IPC class of the current task @@ -1273,7 +1273,7 @@ Patchset: intel-thread-director 1 file changed, 3 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 0a8558421eba..4782b1359eb8 100644 +index 0a8558421eba2..4782b1359eb89 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5504,6 +5504,9 @@ void scheduler_tick(bool user_tick) @@ -1289,7 +1289,7 @@ index 0a8558421eba..4782b1359eb8 100644 -- 2.39.2 -From 276e5c024c496a95ce704f259716af384b7b42db Mon Sep 17 00:00:00 2001 +From b88b78dd46cf545386f984768597179451f2bdf0 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:47 -0800 Subject: [PATCH] sched/fair: Collect load-balancing stats for IPC classes @@ -1330,7 +1330,7 @@ Patchset: intel-thread-director 1 file changed, 61 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 635e8b41a87c..86f779d9d2a9 100644 +index 635e8b41a87c9..86f779d9d2a90 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8751,6 +8751,11 @@ struct sg_lb_stats { @@ -1425,7 +1425,7 @@ index 635e8b41a87c..86f779d9d2a9 100644 -- 2.39.2 -From f3d9976cb54befe3d8d4881673be31cf74e63fca Mon Sep 17 00:00:00 2001 +From ba3c46567c032ee843d8ab5f576ddc78df1a56bf Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:48 -0800 Subject: [PATCH] sched/fair: Compute IPC class scores for load balancing @@ -1469,7 +1469,7 @@ Patchset: intel-thread-director 1 file changed, 68 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 86f779d9d2a9..3b84fb72891b 100644 +index 86f779d9d2a90..3b84fb72891bc 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8755,6 +8755,8 @@ struct sg_lb_stats { @@ -1571,7 +1571,7 @@ index 86f779d9d2a9..3b84fb72891b 100644 -- 2.39.2 -From eba8bbe0c10d1db01e1e41a1ce694b61704f87fb Mon Sep 17 00:00:00 2001 +From 98664eb2ae97aaf9b290077ef9e6629a7c1d7d79 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:49 -0800 Subject: [PATCH] sched/fair: Use IPCC stats to break ties between asym_packing @@ -1610,7 +1610,7 @@ Patchset: intel-thread-director 1 file changed, 72 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 3b84fb72891b..89a13ae0185e 100644 +index 3b84fb72891bc..89a13ae0185e6 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9133,6 +9133,60 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, @@ -1709,7 +1709,7 @@ index 3b84fb72891b..89a13ae0185e 100644 -- 2.39.2 -From bd2d5d5504a3ff39d0386097b7234aba20ad14b7 Mon Sep 17 00:00:00 2001 +From a4b0646c23237cc67703ed40bdde243d78bb7910 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:50 -0800 Subject: [PATCH] sched/fair: Use IPCC stats to break ties between fully_busy @@ -1750,7 +1750,7 @@ Patchset: intel-thread-director 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 89a13ae0185e..4f75e9964e8c 100644 +index 89a13ae0185e6..4f75e9964e8ca 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9203,6 +9203,12 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, @@ -1794,7 +1794,7 @@ index 89a13ae0185e..4f75e9964e8c 100644 -- 2.39.2 -From 06f77e42c3de120e16182297954c93176b41f655 Mon Sep 17 00:00:00 2001 +From cc96548bd32f891b0cdf162cdde5f8ca2ba98404 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:51 -0800 Subject: [PATCH] sched/fair: Use IPCC scores to select a busiest runqueue @@ -1829,7 +1829,7 @@ Patchset: intel-thread-director 1 file changed, 64 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 4f75e9964e8c..fc42b58f1ba4 100644 +index 4f75e9964e8ca..fc42b58f1ba42 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9187,6 +9187,37 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, @@ -1929,7 +1929,7 @@ index 4f75e9964e8c..fc42b58f1ba4 100644 -- 2.39.2 -From 35edaa18d67e2a7f95fb7b7fbb02ec8ec65ef9c2 Mon Sep 17 00:00:00 2001 +From 8435406d47c8fb7c349f7615ebb1cd0a812afc90 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:52 -0800 Subject: [PATCH] thermal: intel: hfi: Introduce Intel Thread Director classes @@ -1964,7 +1964,7 @@ Patchset: intel-thread-director 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index 239afe02e518..ae7eec197f68 100644 +index 239afe02e5182..ae7eec197f680 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -79,7 +79,7 @@ union cpuid6_edx { @@ -2055,7 +2055,7 @@ index 239afe02e518..ae7eec197f68 100644 -- 2.39.2 -From a3a5e23a790815cc34bf2d60c5078907a5c4b412 Mon Sep 17 00:00:00 2001 +From 78b14aa7d839c69d3073e92c54445a085b22df4f Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:53 -0800 Subject: [PATCH] x86/cpufeatures: Add the Intel Thread Director feature @@ -2094,7 +2094,7 @@ Patchset: intel-thread-director 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h -index 92729c38853d..02f10cd5c753 100644 +index 92729c38853d1..02f10cd5c7536 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -342,6 +342,7 @@ @@ -2106,7 +2106,7 @@ index 92729c38853d..02f10cd5c753 100644 /* AMD SVM Feature Identification, CPUID level 0x8000000a (EDX), word 15 */ #define X86_FEATURE_NPT (15*32+ 0) /* Nested Page Table support */ diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h -index 33d2cd04d254..7a668f6d0502 100644 +index 33d2cd04d2544..7a668f6d0502d 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -87,6 +87,12 @@ @@ -2132,7 +2132,7 @@ index 33d2cd04d254..7a668f6d0502 100644 #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \ DISABLE_ENQCMD) diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c -index c881bcafba7d..f6f8a3cd4f2c 100644 +index c881bcafba7d7..f6f8a3cd4f2ce 100644 --- a/arch/x86/kernel/cpu/cpuid-deps.c +++ b/arch/x86/kernel/cpu/cpuid-deps.c @@ -78,6 +78,7 @@ static const struct cpuid_dep cpuid_deps[] = { @@ -2146,7 +2146,7 @@ index c881bcafba7d..f6f8a3cd4f2c 100644 -- 2.39.2 -From db0f0403cd5ad3fa0b6aea4661c1985b9f8b4c87 Mon Sep 17 00:00:00 2001 +From b4ce6b73c21395712049b4eeb71e55bf617be6f2 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:54 -0800 Subject: [PATCH] thermal: intel: hfi: Store per-CPU IPCC scores @@ -2183,7 +2183,7 @@ Patchset: intel-thread-director 1 file changed, 46 insertions(+) diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index ae7eec197f68..e84dcfbef0dd 100644 +index ae7eec197f680..e84dcfbef0dd9 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -29,6 +29,7 @@ @@ -2265,7 +2265,7 @@ index ae7eec197f68..e84dcfbef0dd 100644 -- 2.39.2 -From 6dc203371a1a6320ddceb55c0bc36a5304aa89ea Mon Sep 17 00:00:00 2001 +From 8826c8ac9227c660003590b333f80a0d144cba2e Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:55 -0800 Subject: [PATCH] thermal: intel: hfi: Update the IPC class of the current task @@ -2297,7 +2297,7 @@ Patchset: intel-thread-director 2 files changed, 38 insertions(+) diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h -index 458c891a8273..ffcdac3f398f 100644 +index 458c891a82736..ffcdac3f398f0 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -227,4 +227,10 @@ void init_freq_invariance_cppc(void); @@ -2312,7 +2312,7 @@ index 458c891a8273..ffcdac3f398f 100644 + #endif /* _ASM_X86_TOPOLOGY_H */ diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index e84dcfbef0dd..f2de597b3118 100644 +index e84dcfbef0dd9..f2de597b3118a 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -74,6 +74,17 @@ union cpuid6_edx { @@ -2364,7 +2364,7 @@ index e84dcfbef0dd..f2de597b3118 100644 -- 2.39.2 -From 208b99a89f9e1a01e505457f9012d109921e3ec6 Mon Sep 17 00:00:00 2001 +From e6c5f3a62bb1fc563887cca4df785b49f77ef0af Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:56 -0800 Subject: [PATCH] thermal: intel: hfi: Report the IPC class score of a CPU @@ -2397,7 +2397,7 @@ Patchset: intel-thread-director 2 files changed, 29 insertions(+) diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h -index ffcdac3f398f..c4fcd9c3c634 100644 +index ffcdac3f398f0..c4fcd9c3c634f 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -229,8 +229,10 @@ void init_freq_invariance_cppc(void); @@ -2412,7 +2412,7 @@ index ffcdac3f398f..c4fcd9c3c634 100644 #endif /* _ASM_X86_TOPOLOGY_H */ diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index f2de597b3118..e8ad2be47e82 100644 +index f2de597b3118a..e8ad2be47e82f 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -208,6 +208,33 @@ void intel_hfi_update_ipcc(struct task_struct *curr) @@ -2452,7 +2452,7 @@ index f2de597b3118..e8ad2be47e82 100644 -- 2.39.2 -From 6729e55ba4f0aacc3198e9ca194a253c11f0eedd Mon Sep 17 00:00:00 2001 +From 502fea0f97180e7e5a9fb1a88d31659d30813348 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:57 -0800 Subject: [PATCH] thermal: intel: hfi: Define a default class for unclassified @@ -2492,7 +2492,7 @@ Patchset: intel-thread-director 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index e8ad2be47e82..0f6935705e55 100644 +index e8ad2be47e82f..0f6935705e559 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -187,6 +187,19 @@ static struct workqueue_struct *hfi_updates_wq; @@ -2527,7 +2527,7 @@ index e8ad2be47e82..0f6935705e55 100644 -- 2.39.2 -From 006082ac988bdb80f0ffb60a308e794a25efbe7e Mon Sep 17 00:00:00 2001 +From 5c8a8a9dc0da32f5cb1321e5cd86e68c7221af74 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:58 -0800 Subject: [PATCH] thermal: intel: hfi: Enable the Intel Thread Director @@ -2564,7 +2564,7 @@ Patchset: intel-thread-director 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h -index 117e4e977b55..b4a5de303b88 100644 +index 117e4e977b55d..b4a5de303b88a 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1089,6 +1089,8 @@ @@ -2577,7 +2577,7 @@ index 117e4e977b55..b4a5de303b88 100644 /* x2APIC locked status */ #define MSR_IA32_XAPIC_DISABLE_STATUS 0xBD diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index 0f6935705e55..21a0d246ca50 100644 +index 0f6935705e559..21a0d246ca501 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -50,6 +50,8 @@ @@ -2660,7 +2660,7 @@ index 0f6935705e55..21a0d246ca50 100644 -- 2.39.2 -From 5ea4d57e4f82436470fc58f7dd18ed7fee18c6e6 Mon Sep 17 00:00:00 2001 +From 721e6a04633384f5f0a837ee1347e99ba9f2357d Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:59 -0800 Subject: [PATCH] sched/task_struct: Add helpers for IPC classification @@ -2697,7 +2697,7 @@ Patchset: intel-thread-director 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/linux/sched.h b/include/linux/sched.h -index e58dc7503864..63c2f88f0168 100644 +index e58dc7503864c..63c2f88f0168a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1535,7 +1535,17 @@ struct task_struct { @@ -2722,7 +2722,7 @@ index e58dc7503864..63c2f88f0168 100644 -- 2.39.2 -From 3ffc9b1704b67a114df71309e3bb18c2564d624a Mon Sep 17 00:00:00 2001 +From afb386225a0c507949d96ea5122003edce813bb0 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:00 -0800 Subject: [PATCH] sched/core: Initialize helpers of task classification @@ -2753,7 +2753,7 @@ Patchset: intel-thread-director 1 file changed, 2 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 4782b1359eb8..d9a026845d51 100644 +index 4782b1359eb89..d9a026845d51c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4379,6 +4379,8 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) @@ -2768,7 +2768,7 @@ index 4782b1359eb8..d9a026845d51 100644 -- 2.39.2 -From e5d28c0c8257a1db80abe4b2ece99073b8dcf7ef Mon Sep 17 00:00:00 2001 +From 20d6343c567733d5a2704e1f4bb437acd115683e Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:01 -0800 Subject: [PATCH] sched/fair: Introduce sched_smt_siblings_idle() @@ -2800,7 +2800,7 @@ Patchset: intel-thread-director 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h -index 63c2f88f0168..b049584f4c1a 100644 +index 63c2f88f0168a..b049584f4c1a5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2446,4 +2446,6 @@ static inline void sched_core_fork(struct task_struct *p) { } @@ -2811,7 +2811,7 @@ index 63c2f88f0168..b049584f4c1a 100644 + #endif diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index fc42b58f1ba4..ff1fd953258b 100644 +index fc42b58f1ba42..ff1fd953258bd 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1049,7 +1049,14 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se) @@ -2880,7 +2880,7 @@ index fc42b58f1ba4..ff1fd953258b 100644 -- 2.39.2 -From b5c172f0298612c8db38e689ff50a315b3315696 Mon Sep 17 00:00:00 2001 +From 0a346e6136d9ca6c52ef6061e5d24b231629cd67 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:02 -0800 Subject: [PATCH] thermal: intel: hfi: Implement model-specific checks for task @@ -2916,7 +2916,7 @@ Patchset: intel-thread-director 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c -index 21a0d246ca50..751b84b6b8fd 100644 +index 21a0d246ca501..751b84b6b8fda 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -40,6 +40,7 @@ @@ -3006,7 +3006,7 @@ index 21a0d246ca50..751b84b6b8fd 100644 -- 2.39.2 -From 6a4a037394f0d18703a904a85eaab09ec866b9a2 Mon Sep 17 00:00:00 2001 +From 0ae9abd0c6e2109c538599229c213539fb1386ca Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:03 -0800 Subject: [PATCH] x86/cpufeatures: Add feature bit for HRESET @@ -3040,7 +3040,7 @@ Patchset: intel-thread-director 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h -index 02f10cd5c753..2fc261302f5c 100644 +index 02f10cd5c7536..2fc261302f5cc 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -307,6 +307,7 @@ @@ -3052,7 +3052,7 @@ index 02f10cd5c753..2fc261302f5c 100644 /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */ diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h -index b4a5de303b88..4ef01ce8eadb 100644 +index b4a5de303b88a..4ef01ce8eadb5 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1092,6 +1092,9 @@ @@ -3072,7 +3072,7 @@ index b4a5de303b88..4ef01ce8eadb 100644 - #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c -index fc01f81f6e2a..b8ad312d3694 100644 +index fc01f81f6e2a3..b8ad312d36949 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -28,6 +28,7 @@ static const struct cpuid_bit cpuid_bits[] = { @@ -3086,7 +3086,7 @@ index fc01f81f6e2a..b8ad312d3694 100644 -- 2.39.2 -From 7af55487a8073e7c202ff515d19f7a5177a81af7 Mon Sep 17 00:00:00 2001 +From dcf0f4ab904b1ef3090f2de141f55ff42bf9b0f2 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:04 -0800 Subject: [PATCH] x86/hreset: Configure history reset @@ -3117,7 +3117,7 @@ Patchset: intel-thread-director 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index c34bdba57993..98b48cf80ec2 100644 +index c34bdba57993a..98b48cf80ec21 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -411,6 +411,26 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c) @@ -3163,7 +3163,7 @@ index c34bdba57993..98b48cf80ec2 100644 -- 2.39.2 -From aaa9a1dee1f2f0df048c5d409c68a3b33712dab0 Mon Sep 17 00:00:00 2001 +From d562f8856447bb5019dad771dab745821b383939 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:05 -0800 Subject: [PATCH] x86/process: Reset hardware history in context switch @@ -3200,7 +3200,7 @@ Patchset: intel-thread-director diff --git a/arch/x86/include/asm/hreset.h b/arch/x86/include/asm/hreset.h new file mode 100644 -index 000000000000..d68ca2fb8642 +index 0000000000000..d68ca2fb8642b --- /dev/null +++ b/arch/x86/include/asm/hreset.h @@ -0,0 +1,30 @@ @@ -3235,7 +3235,7 @@ index 000000000000..d68ca2fb8642 + +#endif /* _ASM_X86_HRESET_H */ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 98b48cf80ec2..67bf6fbae082 100644 +index 98b48cf80ec21..67bf6fbae082a 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -52,6 +52,7 @@ @@ -3260,7 +3260,7 @@ index 98b48cf80ec2..67bf6fbae082 100644 { if (!cpu_feature_enabled(X86_FEATURE_HRESET)) diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c -index ceab14b6118f..888cdb7624dc 100644 +index ceab14b6118f7..888cdb7624dcd 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -52,6 +52,7 @@ @@ -3281,7 +3281,7 @@ index ceab14b6118f..888cdb7624dc 100644 } diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c -index 7f94dbbc397b..d0d3c3323747 100644 +index 7f94dbbc397b7..d0d3c33237475 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -53,6 +53,7 @@