diff --git a/srcpkgs/linux6.10/files/arm64-dotconfig b/srcpkgs/linux6.10/files/arm64-dotconfig index 167f9d05a7f..16f4048643e 100644 --- a/srcpkgs/linux6.10/files/arm64-dotconfig +++ b/srcpkgs/linux6.10/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.10.0 Kernel Configuration +# Linux/arm64 6.10.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.10/files/i386-dotconfig b/srcpkgs/linux6.10/files/i386-dotconfig index 6da4b3aeb44..ee1d7259b15 100644 --- a/srcpkgs/linux6.10/files/i386-dotconfig +++ b/srcpkgs/linux6.10/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.10.0 Kernel Configuration +# Linux/i386 6.10.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.10/files/x86_64-dotconfig b/srcpkgs/linux6.10/files/x86_64-dotconfig index e1e8fb4dc0c..4d760a76ec9 100644 --- a/srcpkgs/linux6.10/files/x86_64-dotconfig +++ b/srcpkgs/linux6.10/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.10.0 Kernel Configuration +# Linux/x86_64 6.10.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.10/patches/soc-qcom-add-in-kernel-pd-mapper-implementation.patch b/srcpkgs/linux6.10/patches/soc-qcom-add-in-kernel-pd-mapper-implementation.patch index 794ac2f2d77..162dbc29135 100644 --- a/srcpkgs/linux6.10/patches/soc-qcom-add-in-kernel-pd-mapper-implementation.patch +++ b/srcpkgs/linux6.10/patches/soc-qcom-add-in-kernel-pd-mapper-implementation.patch @@ -2,104 +2,6 @@ https://patchwork.kernel.org/project/linux-arm-msm/cover/20240622-qcom-pd-mapper accepted upstream, expected mainline in 6.11 -From: Dmitry Baryshkov -Date: Sat, 22 Jun 2024 01:03:40 +0300 -Subject: [PATCH v9 1/5] soc: qcom: pdr: protect locator_addr with the main - mutex - -If the service locator server is restarted fast enough, the PDR can -rewrite locator_addr fields concurrently. Protect them by placing -modification of those fields under the main pdr->lock. - -Fixes: fbe639b44a82 ("soc: qcom: Introduce Protection Domain Restart helpers") -Tested-by: Neil Armstrong # on SM8550-QRD -Tested-by: Steev Klimaszewski -Tested-by: Alexey Minnekhanov -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Chris Lew ---- - drivers/soc/qcom/pdr_interface.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/soc/qcom/pdr_interface.c b/drivers/soc/qcom/pdr_interface.c -index a1b6a4081dea..76a62c2ecc58 100644 ---- a/drivers/soc/qcom/pdr_interface.c -+++ b/drivers/soc/qcom/pdr_interface.c -@@ -76,12 +76,12 @@ static int pdr_locator_new_server(struct qmi_handle *qmi, - locator_hdl); - struct pdr_service *pds; - -+ mutex_lock(&pdr->lock); - /* Create a local client port for QMI communication */ - pdr->locator_addr.sq_family = AF_QIPCRTR; - pdr->locator_addr.sq_node = svc->node; - pdr->locator_addr.sq_port = svc->port; - -- mutex_lock(&pdr->lock); - pdr->locator_init_complete = true; - mutex_unlock(&pdr->lock); - -@@ -104,10 +104,10 @@ static void pdr_locator_del_server(struct qmi_handle *qmi, - - mutex_lock(&pdr->lock); - pdr->locator_init_complete = false; -- mutex_unlock(&pdr->lock); - - pdr->locator_addr.sq_node = 0; - pdr->locator_addr.sq_port = 0; -+ mutex_unlock(&pdr->lock); - } - - static const struct qmi_ops pdr_locator_ops = { -@@ -365,12 +365,14 @@ static int pdr_get_domain_list(struct servreg_get_domain_list_req *req, - if (ret < 0) - return ret; - -+ mutex_lock(&pdr->lock); - ret = qmi_send_request(&pdr->locator_hdl, - &pdr->locator_addr, - &txn, SERVREG_GET_DOMAIN_LIST_REQ, - SERVREG_GET_DOMAIN_LIST_REQ_MAX_LEN, - servreg_get_domain_list_req_ei, - req); -+ mutex_unlock(&pdr->lock); - if (ret < 0) { - qmi_txn_cancel(&txn); - return ret; - -From: Dmitry Baryshkov -Date: Sat, 22 Jun 2024 01:03:41 +0300 -Subject: [PATCH v9 2/5] soc: qcom: pdr: fix parsing of domains lists - -While parsing the domains list, start offsets from 0 rather than from -domains_read. The domains_read is equal to the total count of the -domains we have seen, while the domains list in the message starts from -offset 0. - -Fixes: fbe639b44a82 ("soc: qcom: Introduce Protection Domain Restart helpers") -Tested-by: Steev Klimaszewski -Tested-by: Alexey Minnekhanov -Reviewed-by: Chris Lew -Tested-by: Neil Armstrong # on SM8550-QRD -Signed-off-by: Dmitry Baryshkov ---- - drivers/soc/qcom/pdr_interface.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/soc/qcom/pdr_interface.c b/drivers/soc/qcom/pdr_interface.c -index 76a62c2ecc58..216166e98fae 100644 ---- a/drivers/soc/qcom/pdr_interface.c -+++ b/drivers/soc/qcom/pdr_interface.c -@@ -417,7 +417,7 @@ static int pdr_locate_service(struct pdr_handle *pdr, struct pdr_service *pds) - if (ret < 0) - goto out; - -- for (i = domains_read; i < resp->domain_list_len; i++) { -+ for (i = 0; i < resp->domain_list_len; i++) { - entry = &resp->domain_list[i]; - - if (strnlen(entry->name, sizeof(entry->name)) == sizeof(entry->name)) - From: Dmitry Baryshkov Date: Sat, 22 Jun 2024 01:03:42 +0300 Subject: [PATCH v9 3/5] soc: qcom: pdr: extract PDR message marshalling diff --git a/srcpkgs/linux6.10/template b/srcpkgs/linux6.10/template index 4c43d79c36a..97fab6dacef 100644 --- a/srcpkgs/linux6.10/template +++ b/srcpkgs/linux6.10/template @@ -1,6 +1,6 @@ # Template file for 'linux6.10' pkgname=linux6.10 -version=6.10.2 +version=6.10.3 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 - f3166b9b9f6a7dbae9ed7e92e373c8ddb672c5bd2da3991207aa30f52ceda7fa" + ccde554363cfbd3d2533d1cc2506f397dd1dd278809b1041deb929c5534e8b4f" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR.