From 6f81f9b85d46a9c4ce3dcfb4234d56ae989171ac Mon Sep 17 00:00:00 2001 From: USAVault Date: Wed, 15 Jul 2026 14:40:38 +0300 Subject: [PATCH 1/3] Fix early return in sky1_pinconf_group_dbg_show --- patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch | 6 +++++- patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch | 4 ++++ patches-7.1/0048-pinctrl-sky1-add-acpi-support.patch | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch b/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch index b90afad..9a2b45a 100644 --- a/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch +++ b/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch @@ -31,7 +31,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1-base.c b/drivers/pinctrl/cix/pinct index 111111111111..222222222222 100644 --- a/drivers/pinctrl/cix/pinctrl-sky1-base.c +++ b/drivers/pinctrl/cix/pinctrl-sky1-base.c -@@ -1,503 +1,711 @@ +@@ -1,503 +1,719 @@ // SPDX-License-Identifier: GPL-2.0+ // // Author: Jerry Zhu @@ -594,6 +594,9 @@ index 111111111111..222222222222 100644 { - return ARRAY_SIZE(sky1_gpio_functions); + struct sky1_pinctrl *spctl = pinctrl_dev_get_drvdata(pctldev); ++ ++ if (spctl->pin_regs[pin_id] == -1) ++ return -EINVAL; + *config = readl(spctl->base + spctl->pin_regs[pin_id]); + + return 0; @@ -675,6 +678,7 @@ index 111111111111..222222222222 100644 + + name = pin_get_name(pctldev, pin_id); + ret = sky1_pinconf_get(pctldev, pin_id, &config); ++ if (ret) + return; + seq_printf(s, " %s: 0x%lx\n", name, config); + } diff --git a/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch b/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch index 6ac6219..352ac39 100644 --- a/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch +++ b/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch @@ -594,6 +594,9 @@ index 111111111111..222222222222 100644 { - return ARRAY_SIZE(sky1_gpio_functions); + struct sky1_pinctrl *spctl = pinctrl_dev_get_drvdata(pctldev); ++ ++ if (spctl->pin_regs[pin_id] == -1) ++ return -EINVAL; + *config = readl(spctl->base + spctl->pin_regs[pin_id]); + + return 0; @@ -675,6 +678,7 @@ index 111111111111..222222222222 100644 + + name = pin_get_name(pctldev, pin_id); + ret = sky1_pinconf_get(pctldev, pin_id, &config); ++ if (ret) + return; + seq_printf(s, " %s: 0x%lx\n", name, config); + } diff --git a/patches-7.1/0048-pinctrl-sky1-add-acpi-support.patch b/patches-7.1/0048-pinctrl-sky1-add-acpi-support.patch index 4dc9e3e..157a598 100644 --- a/patches-7.1/0048-pinctrl-sky1-add-acpi-support.patch +++ b/patches-7.1/0048-pinctrl-sky1-add-acpi-support.patch @@ -31,7 +31,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1-base.c b/drivers/pinctrl/cix/pinct index 111111111111..222222222222 100644 --- a/drivers/pinctrl/cix/pinctrl-sky1-base.c +++ b/drivers/pinctrl/cix/pinctrl-sky1-base.c -@@ -1,503 +1,711 @@ +@@ -1,503 +1,715 @@ // SPDX-License-Identifier: GPL-2.0+ // // Author: Jerry Zhu @@ -594,6 +594,9 @@ index 111111111111..222222222222 100644 { - return ARRAY_SIZE(sky1_gpio_functions); + struct sky1_pinctrl *spctl = pinctrl_dev_get_drvdata(pctldev); ++ ++ if (spctl->pin_regs[pin_id] == -1) ++ return -EINVAL; + *config = readl(spctl->base + spctl->pin_regs[pin_id]); + + return 0; @@ -675,6 +678,7 @@ index 111111111111..222222222222 100644 + + name = pin_get_name(pctldev, pin_id); + ret = sky1_pinconf_get(pctldev, pin_id, &config); ++ if (ret) + return; + seq_printf(s, " %s: 0x%lx\n", name, config); + } From 08c27f0e4875aa3a0581b24515170966faf66c98 Mon Sep 17 00:00:00 2001 From: USAVault Date: Wed, 15 Jul 2026 15:02:01 +0300 Subject: [PATCH 2/3] Update patch metadata line counts (+N/-N) --- patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch | 2 +- patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch b/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch index 9a2b45a..8a94bbc 100644 --- a/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch +++ b/patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch @@ -31,7 +31,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1-base.c b/drivers/pinctrl/cix/pinct index 111111111111..222222222222 100644 --- a/drivers/pinctrl/cix/pinctrl-sky1-base.c +++ b/drivers/pinctrl/cix/pinctrl-sky1-base.c -@@ -1,503 +1,719 @@ +@@ -1,503 +1,715 @@ // SPDX-License-Identifier: GPL-2.0+ // // Author: Jerry Zhu diff --git a/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch b/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch index 352ac39..4228446 100644 --- a/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch +++ b/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch @@ -1203,7 +1203,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1.c b/drivers/pinctrl/cix/pinctrl-sk index 111111111111..222222222222 100644 --- a/drivers/pinctrl/cix/pinctrl-sky1.c +++ b/drivers/pinctrl/cix/pinctrl-sky1.c -@@ -1,494 +1,437 @@ +@@ -1,494 +1,441 @@ // SPDX-License-Identifier: GPL-2.0 -// -// Author: Jerry Zhu From 8850d86a05a63cd318d9e19cb303b7c9852e234e Mon Sep 17 00:00:00 2001 From: USAVault Date: Wed, 15 Jul 2026 15:03:32 +0300 Subject: [PATCH 3/3] Update patch metadata line counts (+N/-N) --- patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch b/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch index 4228446..e86993e 100644 --- a/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch +++ b/patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch @@ -31,7 +31,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1-base.c b/drivers/pinctrl/cix/pinct index 111111111111..222222222222 100644 --- a/drivers/pinctrl/cix/pinctrl-sky1-base.c +++ b/drivers/pinctrl/cix/pinctrl-sky1-base.c -@@ -1,503 +1,711 @@ +@@ -1,503 +1,715 @@ // SPDX-License-Identifier: GPL-2.0+ // // Author: Jerry Zhu @@ -1203,7 +1203,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1.c b/drivers/pinctrl/cix/pinctrl-sk index 111111111111..222222222222 100644 --- a/drivers/pinctrl/cix/pinctrl-sky1.c +++ b/drivers/pinctrl/cix/pinctrl-sky1.c -@@ -1,494 +1,441 @@ +@@ -1,494 +1,437 @@ // SPDX-License-Identifier: GPL-2.0 -// -// Author: Jerry Zhu