sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6.1.y: Rebase prjc, bcachefs and acs-overrides against 6.1.43 changes and update defconfig

Browse Source 
Fixes https://github.com/Frogging-Family/linux-tkg/issues/787
This commit is contained in:
Tk-Glitch
2023-08-07 09:16:57 +02:00
parent 9815727037
commit 53cf25acf9
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linux-tkg-config/6.1/config.x86_64
View File

@@ -7366,6 +7366,7 @@ CONFIG_SND_SOC_RT1019=m
CONFIG_SND_SOC_RT1308=m CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m CONFIG_SND_SOC_RT1316_SDW=m
CONFIG_SND_SOC_RT1318_SDW=m
CONFIG_SND_SOC_RT5514=m CONFIG_SND_SOC_RT5514=m
CONFIG_SND_SOC_RT5514_SPI=m CONFIG_SND_SOC_RT5514_SPI=m
CONFIG_SND_SOC_RT5616=m CONFIG_SND_SOC_RT5616=m
@@ -8844,6 +8845,7 @@ CONFIG_AMILO_RFKILL=m
CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m
CONFIG_FUJITSU_TABLET=m CONFIG_FUJITSU_TABLET=m
CONFIG_GPD_POCKET_FAN=m CONFIG_GPD_POCKET_FAN=m
CONFIG_X86_PLATFORM_DRIVERS_HP=y
CONFIG_HP_ACCEL=m CONFIG_HP_ACCEL=m
CONFIG_WIRELESS_HOTKEY=m CONFIG_WIRELESS_HOTKEY=m
CONFIG_HP_WMI=m CONFIG_HP_WMI=m

5
linux-tkg-patches/6.1/0006-add-acs-overrides_iommu.patch
View File

@@ -183,11 +183,10 @@ index 4700d24e5d55..8f7a3d7fd9c1 100644
* Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset. * Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset.
* The device will throw a Link Down error on AER-capable systems and * The device will throw a Link Down error on AER-capable systems and
@@ -4513,6 +4613,7 @@ static const struct pci_dev_acs_enabled { @@ -4513,6 +4613,7 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
/* Zhaoxin Root/Downstream Ports */
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
/* Wangxun nics */
{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, + { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
{ 0 } { 0 }
}; };

4
linux-tkg-patches/6.1/0008-6.1-bcachefs.patch
View File

@@ -90877,9 +90877,9 @@ index c3b582d19b62..9caa3eb8c6f7 100644
size = synth_field_size(field->type); size = synth_field_size(field->type);
if (size < 0) { if (size < 0) {
@@ -698,23 +687,15 @@ static struct synth_field *parse_synth_field(int argc, char **argv, @@ -698,23 +687,15 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
goto free;
} else if (size == 0) { } else if (size == 0) {
if (synth_field_is_string(field->type)) { if (synth_field_is_string(field->type) ||
synth_field_is_stack(field->type)) {
- char *type; - char *type;
- -
- len = sizeof("__data_loc ") + strlen(field->type) + 1; - len = sizeof("__data_loc ") + strlen(field->type) + 1;

33
linux-tkg-patches/6.1/0009-prjc_v6.1-r1.patch
View File

@@ -551,23 +551,26 @@ diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 7779ee8abc2a..5b9893cdfb1b 100644 index 7779ee8abc2a..5b9893cdfb1b 100644
--- a/kernel/locking/rtmutex.c --- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c
@@ -300,21 +300,25 @@ static __always_inline void @@ -343,7 +343,7 @@ waiter_update_prio(struct rt_mutex_waite
waiter_update_prio(struct rt_mutex_waiter *waiter, struct task_struct *task) lockdep_assert(RB_EMPTY_NODE(&waiter->tree.entry));
{
waiter->prio = __waiter_prio(task); waiter->tree.prio = __waiter_prio(task);
- waiter->deadline = task->dl.deadline; - waiter->tree.deadline = task->dl.deadline;
+ waiter->deadline = __tsk_deadline(task); + waiter->tree.deadline = __tsk_deadline(task);
} }
/* /*
* Only use with rt_mutex_waiter_{less,equal}() @@ -364,16 +364,20 @@ waiter_clone_prio(struct rt_mutex_waiter
* Only use with rt_waiter_node_{less,equal}()
*/ */
#define task_to_waiter_node(p) \
- &(struct rt_waiter_node){ .prio = __waiter_prio(p), .deadline = (p)->dl.deadline }
+ &(struct rt_waiter_node){ .prio = __waiter_prio(p), .deadline = __tsk_deadline(p) }
#define task_to_waiter(p) \ #define task_to_waiter(p) \
- &(struct rt_mutex_waiter){ .prio = __waiter_prio(p), .deadline = (p)->dl.deadline } &(struct rt_mutex_waiter){ .tree = *task_to_waiter_node(p) }
+ &(struct rt_mutex_waiter){ .prio = __waiter_prio(p), .deadline = __tsk_deadline(p) }
static __always_inline int rt_mutex_waiter_less(struct rt_mutex_waiter *left, static __always_inline int rt_waiter_node_less(struct rt_waiter_node *left,
struct rt_mutex_waiter *right) struct rt_waiter_node *right)
{ {
+#ifdef CONFIG_SCHED_PDS +#ifdef CONFIG_SCHED_PDS
+ return (left->deadline < right->deadline); + return (left->deadline < right->deadline);
@@ -579,7 +582,7 @@ index 7779ee8abc2a..5b9893cdfb1b 100644
/* /*
* If both waiters have dl_prio(), we check the deadlines of the * If both waiters have dl_prio(), we check the deadlines of the
* associated tasks. * associated tasks.
@@ -323,16 +327,22 @@ static __always_inline int rt_mutex_waiter_less(struct rt_mutex_waiter *left, @@ -382,16 +386,22 @@ static __always_inline int rt_waiter_nod
*/ */
if (dl_prio(left->prio)) if (dl_prio(left->prio))
return dl_time_before(left->deadline, right->deadline); return dl_time_before(left->deadline, right->deadline);
@@ -589,8 +592,8 @@ index 7779ee8abc2a..5b9893cdfb1b 100644
+#endif +#endif
} }
static __always_inline int rt_mutex_waiter_equal(struct rt_mutex_waiter *left, static __always_inline int rt_waiter_node_equal(struct rt_waiter_node *left,
struct rt_mutex_waiter *right) struct rt_waiter_node *right)
{ {
+#ifdef CONFIG_SCHED_PDS +#ifdef CONFIG_SCHED_PDS
+ return (left->deadline == right->deadline); + return (left->deadline == right->deadline);
@@ -602,7 +605,7 @@ index 7779ee8abc2a..5b9893cdfb1b 100644
/* /*
* If both waiters have dl_prio(), we check the deadlines of the * If both waiters have dl_prio(), we check the deadlines of the
* associated tasks. * associated tasks.
@@ -341,8 +351,10 @@ static __always_inline int rt_mutex_waiter_equal(struct rt_mutex_waiter *left, @@ -400,8 +410,10 @@ static __always_inline int rt_waiter_nod
*/ */
if (dl_prio(left->prio)) if (dl_prio(left->prio))
return left->deadline == right->deadline; return left->deadline == right->deadline;