From: Frank Li To: Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas , Krzysztof Kozlowski , Conor Dooley , linux-pci@vger.kernel.org (open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Cc: imx@lists.linux.dev Subject: [PATCH v3 1/1] dt-bindings: PCI: layerscape-pci: Fix property 'fsl,pcie-scfg' type Date: Mon, 1 Jul 2024 18:16:12 -0400 Message-Id: <20240701221612.2112668-1-Frank.Li@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264707 org.kernel.vger.linux-pci:144765 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail fsl,pcie-scfg actually need an argument when there are more than one PCIe instances. Change it to phandle-array and use items to describe each field means. Fix below warning. arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dtb: pcie@3400000: fsl,pcie-scfg:0: [22, 0] is too long from schema $id: http://devicetree.org/schemas/pci/fsl,layerscape-pcie.yaml# Signed-off-by: Frank Li --- Change form v2 to v3 - remove minItems because all dts use one argument. Change from v1 to v2 - update commit message. --- .../devicetree/bindings/pci/fsl,layerscape-pcie.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml index 793986c5af7ff..741b96defcc95 100644 --- a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml @@ -43,10 +43,15 @@ properties: - const: config fsl,pcie-scfg: - $ref: /schemas/types.yaml#/definitions/phandle + $ref: /schemas/types.yaml#/definitions/phandle-array description: A phandle to the SCFG device node. The second entry is the physical PCIe controller index starting from '0'. This is used to get SCFG PEXN registers. + items: + items: + - description: A phandle to the SCFG device node + - description: PCIe controller index starting from '0' + maxItems: 1 big-endian: $ref: /schemas/types.yaml#/definitions/flag -- 2.34.1 . Date: Mon, 1 Jul 2024 22:25:11 +0000 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: <20240701222508.1.I872f9412fdb7cdc20d7c6e98b93daa014f3616dc@changeid> Subject: [PATCH] platform/x86:intel/pmc: Enable the ACPI PM Timer to be turned off when suspended From: Marek Maslanka To: LKML Cc: Marek Maslanka , David E Box , Hans de Goede , "=?UTF-8?q?Ilpo=20J=C3=A4rvinen?=" , Rajneesh Bhardwaj , platform-driver-x86@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264710 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.platform-driver-x86 Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Allow to disable ACPI PM Timer on suspend and enable on resume. A disabled timer helps optimise power consumption when the system is suspended. On resume the timer is only reactivated if it was activated prior to suspend, so unless the ACPI PM timer is enabled in the BIOS, this won't change anything. Signed-off-by: Marek Maslanka --- drivers/platform/x86/intel/pmc/Kconfig | 13 ++++++++ drivers/platform/x86/intel/pmc/adl.c | 4 +++ drivers/platform/x86/intel/pmc/cnp.c | 4 +++ drivers/platform/x86/intel/pmc/core.c | 43 ++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 14 +++++++++ drivers/platform/x86/intel/pmc/icl.c | 4 +++ drivers/platform/x86/intel/pmc/mtl.c | 4 +++ drivers/platform/x86/intel/pmc/spt.c | 4 +++ drivers/platform/x86/intel/pmc/tgl.c | 4 +++ 9 files changed, 94 insertions(+) diff --git a/drivers/platform/x86/intel/pmc/Kconfig b/drivers/platform/x86/intel/pmc/Kconfig index d2f651fbec2cf..3a563db8eba6a 100644 --- a/drivers/platform/x86/intel/pmc/Kconfig +++ b/drivers/platform/x86/intel/pmc/Kconfig @@ -24,3 +24,16 @@ config INTEL_PMC_CORE - SLPS0 Debug registers (Cannonlake/Icelake PCH) - Low Power Mode registers (Tigerlake and beyond) - PMC quirks as needed to enable SLPS0/S0ix + +config DISABLE_ACPI_PM_TIMER_ON_SUSPEND + bool "Disable ACPI PM Timer on suspend" + default n + depends on INTEL_PMC_CORE + help + Disable ACPI Power Management Timer on entering to suspend and enable it + on resume. This helps optimize energy consumption while the system is + suspend. + + This is only applicable if the ACPI PM timer is enabled by the BIOS. + + Say N if unsure. diff --git a/drivers/platform/x86/intel/pmc/adl.c b/drivers/platform/x86/intel/pmc/adl.c index e7878558fd909..8859e0d275288 100644 --- a/drivers/platform/x86/intel/pmc/adl.c +++ b/drivers/platform/x86/intel/pmc/adl.c @@ -295,6 +295,10 @@ const struct pmc_reg_map adl_reg_map = { .ppfear_buckets = CNP_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, .lpm_num_modes = ADL_LPM_NUM_MODES, .lpm_num_maps = ADL_LPM_NUM_MAPS, diff --git a/drivers/platform/x86/intel/pmc/cnp.c b/drivers/platform/x86/intel/pmc/cnp.c index dd72974bf71e2..e92157aa3c9f1 100644 --- a/drivers/platform/x86/intel/pmc/cnp.c +++ b/drivers/platform/x86/intel/pmc/cnp.c @@ -200,6 +200,10 @@ const struct pmc_reg_map cnp_reg_map = { .ppfear_buckets = CNP_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ .ltr_ignore_max = CNP_NUM_IP_IGN_ALLOWED, .etr3_offset = ETR3_OFFSET, }; diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index 10c96c1a850af..a3e56c524308f 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -1171,6 +1171,37 @@ static bool pmc_core_is_pson_residency_enabled(struct pmc_dev *pmcdev) return val == 1; } +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND +/* + * Enable or disable APCI PM Timer + * + * @return: Previous APCI PM Timer enabled state + */ +static bool pmc_core_enable_apci_pm_timer(struct pmc_dev *pmcdev, bool enable) +{ + struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN]; + const struct pmc_reg_map *map = pmc->map; + bool state; + u32 reg; + + if (!map->acpi_pm_tmr_ctl_offset) + return false; + + mutex_lock(&pmcdev->lock); + + reg = pmc_core_reg_read(pmc, map->acpi_pm_tmr_ctl_offset); + state = !(reg & map->acpi_pm_tmr_disable_bit); + if (enable) + reg &= ~map->acpi_pm_tmr_disable_bit; + else + reg |= map->acpi_pm_tmr_disable_bit; + pmc_core_reg_write(pmc, map->acpi_pm_tmr_ctl_offset, reg); + + mutex_unlock(&pmcdev->lock); + + return state; +} +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ static void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev) { @@ -1446,6 +1477,12 @@ static __maybe_unused int pmc_core_suspend(struct device *dev) if (pmcdev->suspend) pmcdev->suspend(pmcdev); +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + /* Disable APCI PM Timer */ + pmcdev->enable_acpi_pm_timer_on_resume = + pmc_core_enable_apci_pm_timer(pmcdev, false); +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ + /* Check if the syspend will actually use S0ix */ if (pm_suspend_via_firmware()) return 0; @@ -1500,6 +1537,12 @@ int pmc_core_resume_common(struct pmc_dev *pmcdev) int offset = pmc->map->lpm_status_offset; int i; +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + /* Enable APCI PM Timer */ + if (pmcdev->enable_acpi_pm_timer_on_resume) + pmc_core_enable_apci_pm_timer(pmcdev, true); +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ + /* Check if the syspend used S0ix */ if (pm_suspend_via_firmware()) return 0; diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h index 83504c49a0e31..4d5983d741433 100644 --- a/drivers/platform/x86/intel/pmc/core.h +++ b/drivers/platform/x86/intel/pmc/core.h @@ -67,6 +67,10 @@ struct telem_endpoint; #define SPT_PMC_LTR_SCC 0x3A0 #define SPT_PMC_LTR_ISH 0x3A4 +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND +#define SPT_PMC_ACPI_PM_TMR_CTL_OFFSET 0x18FC +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ + /* Sunrise Point: PGD PFET Enable Ack Status Registers */ enum ppfear_regs { SPT_PMC_XRAM_PPFEAR0A = 0x590, @@ -147,6 +151,10 @@ enum ppfear_regs { #define SPT_PMC_VRIC1_SLPS0LVEN BIT(13) #define SPT_PMC_VRIC1_XTALSDQDIS BIT(22) +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND +#define SPT_PMC_BIT_ACPI_PM_TMR_DISABLE BIT(1) +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ + /* Cannonlake Power Management Controller register offsets */ #define CNP_PMC_SLPS0_DBG_OFFSET 0x10B4 #define CNP_PMC_PM_CFG_OFFSET 0x1818 @@ -344,6 +352,8 @@ struct pmc_reg_map { const u8 *lpm_reg_index; const u32 pson_residency_offset; const u32 pson_residency_counter_step; + const u32 acpi_pm_tmr_ctl_offset; + const u32 acpi_pm_tmr_disable_bit; }; /** @@ -417,6 +427,10 @@ struct pmc_dev { u32 die_c6_offset; struct telem_endpoint *punit_ep; struct pmc_info *regmap_list; + +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + bool enable_acpi_pm_timer_on_resume; +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ }; enum pmc_index { diff --git a/drivers/platform/x86/intel/pmc/icl.c b/drivers/platform/x86/intel/pmc/icl.c index 71b0fd6cb7d84..8b5c782e71ebd 100644 --- a/drivers/platform/x86/intel/pmc/icl.c +++ b/drivers/platform/x86/intel/pmc/icl.c @@ -46,6 +46,10 @@ const struct pmc_reg_map icl_reg_map = { .ppfear_buckets = ICL_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ .ltr_ignore_max = ICL_NUM_IP_IGN_ALLOWED, .etr3_offset = ETR3_OFFSET, }; diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c index c7d15d864039d..c726ef8f1d5a9 100644 --- a/drivers/platform/x86/intel/pmc/mtl.c +++ b/drivers/platform/x86/intel/pmc/mtl.c @@ -462,6 +462,10 @@ const struct pmc_reg_map mtl_socm_reg_map = { .ppfear_buckets = MTL_SOCM_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ .lpm_num_maps = ADL_LPM_NUM_MAPS, .ltr_ignore_max = MTL_SOCM_NUM_IP_IGN_ALLOWED, .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, diff --git a/drivers/platform/x86/intel/pmc/spt.c b/drivers/platform/x86/intel/pmc/spt.c index ab993a69e33ee..4832e953d0403 100644 --- a/drivers/platform/x86/intel/pmc/spt.c +++ b/drivers/platform/x86/intel/pmc/spt.c @@ -130,6 +130,10 @@ const struct pmc_reg_map spt_reg_map = { .ppfear_buckets = SPT_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT, +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ .ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED, .pm_vric1_offset = SPT_PMC_VRIC1_OFFSET, }; diff --git a/drivers/platform/x86/intel/pmc/tgl.c b/drivers/platform/x86/intel/pmc/tgl.c index e0580de180773..4742b84fe226e 100644 --- a/drivers/platform/x86/intel/pmc/tgl.c +++ b/drivers/platform/x86/intel/pmc/tgl.c @@ -197,6 +197,10 @@ const struct pmc_reg_map tgl_reg_map = { .ppfear_buckets = ICL_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, +#ifdef CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, +#endif /* CONFIG_DISABLE_ACPI_PM_TIMER_ON_SUSPEND */ .ltr_ignore_max = TGL_NUM_IP_IGN_ALLOWED, .lpm_num_maps = TGL_LPM_NUM_MAPS, .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, -- 2.45.2.803.g4e1b14247a-goog . From: Michael Roth To: CC: , , , , , , , , , , , Subject: [PATCH v3 0/3] SEV-SNP: Add KVM support for attestation Date: Mon, 1 Jul 2024 17:31:45 -0500 Message-ID: <20240701223148.3798365-1-michael.roth@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264711 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-coco,org.kernel.vger.kvm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patchset is also available at: https://github.com/amdese/linux/commits/snp-guest-req-v3 and is based on top of kvm-coco-queue (ace0c64d8975): https://git.kernel.org/pub/scm/virt/kvm/kvm.git/log/?h=kvm-coco-queue As discussed on the PUCK call a few weeks backs, I'm re-submitting as a separate patchset the SNP guest request support that was originally part of the SNP KVM base support patchset that's now in kvm/next and will be in kernel 6.11. This support is needed to ensure fully compliance with GHCB 2.0 specification and to support attestation in general, so I'm hoping it can also make it into 6.11. I've dropped patches 4-5 from v1 of this series that implemented KVM_EXIT_COCO and handling for userspace-provided certificate data so that there's more time to get the API ironed out. Overview -------- The GHCB 2.0 specification defines 2 GHCB request types to allow SNP guests to send encrypted messages/requests to firmware: SNP Guest Requests and SNP Extended Guest Requests. These encrypted messages are used for things like servicing attestation requests issued by the guest. Implementing support for these is required to be fully GHCB-compliant. For the most part, KVM only needs to handle forwarding these requests to firmware (to be issued via the SNP_GUEST_REQUEST firmware command defined in the SEV-SNP Firmware ABI), and then forwarding the encrypted response to the guest. However, in the case of SNP Extended Guest Requests, the host is also able to provide the certificate data corresponding to the endorsement key used by firmware to sign attestation report requests. This certificate data is provided by userspace because: 1) It allows for different keys/key types to be used for each particular guest with requiring any sort of KVM API to configure the certificate table in advance on a per-guest basis. 2) It provides additional flexibility with how attestation requests might be handled during live migration where the certificate data for source/dest might be different. 3) It allows all synchronization between certificates and firmware/signing key updates to be handled purely by userspace rather than requiring some in-kernel mechanism to facilitate it. [1] To support fetching certificate data from userspace, a new KVM exit type will be needed to handle fetching the certificate from userspace. An attempt to define a new KVM_EXIT_COCO/KVM_EXIT_COCO_REQ_CERTS exit type to handle this was introduced in v1 of this patchset, but is still being discussed by community, so for now this patchset only implements a stub version of SNP Extended Guest Requests that does not provide certificate data, but is still enough to provide compliance with the GHCB 2.0 spec. [1] https://lore.kernel.org/kvm/ZS614OSoritrE1d2@google.com/ Any feedback/review is appreciated. Thanks! -Mike Changes since v2: * Re-add 4K-alignment checks for req/resp GPAs, introduce an additional check that req/resp GPAs are not identical (Tom) * Relocate these to checks earlier to the common sev_es_validate_vmgexit() helper for consistency and to reduce duplication. * Slight clarifications and grammar fixes in commits/comments. Changes since v1: * Fix cleanup path when handling firmware error (Liam, Sean) * Use bounce-pages for interacting with firmware rather than passing in the guest-provided pages directly. (Sean) * Drop SNP_GUEST_VMM_ERR_GENERIC and rely solely on firmware-provided error code to report any firmware error to the guest. (Sean) * Use kvm_clear_guest() to handle writing empty certificate table instead of kvm_write_guest() (Sean) * Add additional comments in commit messages and throughout code to better explain the interactions with firmware/guest. (Sean) * Drop 4K-alignment restrictions on the guest-provided req/resp buffers, since the GHCB-spec only specifically requires they fit within 4K, not necessarily that they be 4K-aligned. Additionally, the bounce pages passed to firmware will be 4K-aligned regardless. Changes since splitting this off from v15 SNP KVM patchset: * Address clang-reported warnings regarding uninitialized variables * Address a memory leak of the request/response buffer pages, and refactor the code based on Sean's suggestions: https://lore.kernel.org/kvm/ZktbBRLXeOp9X6aH@google.com/ * Fix SNP Extended Guest Request handling to only attempt to fetch certificates if handling MSG_REQ_REPORT (attestation) message types * Drop KVM_EXIT_VMGEXIT and introduce KVM_EXIT_COCO events instead * Refactor patch layout for easier handling/review ---------------------------------------------------------------- Brijesh Singh (1): KVM: SEV: Provide support for SNP_GUEST_REQUEST NAE event Michael Roth (2): x86/sev: Move sev_guest.h into common SEV header KVM: SEV: Provide support for SNP_EXTENDED_GUEST_REQUEST NAE event arch/x86/include/asm/sev.h | 48 ++++++++ arch/x86/kvm/svm/sev.c | 190 ++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.h | 3 + drivers/virt/coco/sev-guest/sev-guest.c | 2 - drivers/virt/coco/sev-guest/sev-guest.h | 63 ----------- include/uapi/linux/sev-guest.h | 3 + 6 files changed, 244 insertions(+), 65 deletions(-) delete mode 100644 drivers/virt/coco/sev-guest/sev-guest.h . From: Aleksandr Mishin To: , Greg Kroah-Hartman CC: Aleksandr Mishin , Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Graf Yang , Mike Frysinger , , , , Subject: [PATCH 5.10/5.15/6.1 0/1] staging: iio: resolver: ad2s1210: remove call to spi_setup() Date: Tue, 2 Jul 2024 02:43:23 +0300 Message-ID: <20240701234324.20811-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186263 [Jul 02 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, t-argos.ru:7.1.1;127.0.0.199:7.1.2;mx1.t-argos.ru.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/01 22:18:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/01 17:38:00 #25803542 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264731 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-staging,org.kernel.vger.linux-iio,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This removes the call to spi_setup() in the ad2s1210 driver. Setting MODE_3 was incorrect. It should be MODE_1 but we can let the device tree select this and avoid the need to call spi_setup(). This issue has been fixed by the following patch which can be cleanly applied to the 5.10/5.15/6.1.y branches. . Date: Mon, 1 Jul 2024 16:48:42 -0700 From: Dmitry Torokhov To: Thomas Bogendoerfer Cc: Arnd Bergmann , Martin Schiller , Linus Walleij , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] MIPS: Alchemy: switch to use software nodes for GPIOs Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264735 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-mips Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Switch to use software nodes/properties to describe GPIOs for the ADS7846 touchscreen and the SPI controller (away from using GPIO lookup tables). This allows removing use of ADS7846 platform data, which will be going away. Signed-off-by: Dmitry Torokhov --- Compiled only, as I do not have access to the hardware. However I would very much like to get rid of ads7846_platform_data from the kernel/ads7846 driver, and this is one of the last 3 users of it. arch/mips/alchemy/devboards/db1000.c | 80 +++++++++++++++------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c index 7b9f91db227f..6984cd5169b5 100644 --- a/arch/mips/alchemy/devboards/db1000.c +++ b/arch/mips/alchemy/devboards/db1000.c @@ -10,15 +10,16 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include -#include #include #include #include @@ -374,22 +375,20 @@ static struct platform_device db1100_mmc1_dev = { /******************************************************************************/ -static struct ads7846_platform_data db1100_touch_pd = { - .model = 7846, - .vref_mv = 3300, +static const struct software_node db1100_alchemy2_gpiochip = { + .name = "alchemy-gpio2", }; -static struct spi_gpio_platform_data db1100_spictl_pd = { - .num_chipselect = 1, +static const struct property_entry db1100_ads7846_properties[] = { + PROPERTY_ENTRY_U16("ti,vref_min", 3300), + PROPERTY_ENTRY_GPIO("pendown-gpios", + &db1100_alchemy2_gpiochip, 21, GPIO_ACTIVE_LOW), + { } }; -static struct gpiod_lookup_table db1100_touch_gpio_table = { - .dev_id = "spi0.0", - .table = { - GPIO_LOOKUP("alchemy-gpio2", 21, - "pendown", GPIO_ACTIVE_LOW), - { } - }, +static const struct software_node db1100_ads7846_swnode = { + .name = "ads7846", + .properties = db1100_ads7846_properties, }; static struct spi_board_info db1100_spi_info[] __initdata = { @@ -400,37 +399,37 @@ static struct spi_board_info db1100_spi_info[] __initdata = { .chip_select = 0, .mode = 0, .irq = AU1100_GPIO21_INT, - .platform_data = &db1100_touch_pd, + .swnode = &db1100_ads7846_swnode, }, }; -static struct platform_device db1100_spi_dev = { - .name = "spi_gpio", - .id = 0, - .dev = { - .platform_data = &db1100_spictl_pd, - .dma_mask = &au1xxx_all_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(32), - }, +static const struct spi_gpio_platform_data db1100_spictl_pd __initconst = { + .num_chipselect = 1, }; /* * Alchemy GPIO 2 has its base at 200 so the GPIO lines * 207 thru 210 are GPIOs at offset 7 thru 10 at this chip. */ -static struct gpiod_lookup_table db1100_spi_gpiod_table = { - .dev_id = "spi_gpio", - .table = { - GPIO_LOOKUP("alchemy-gpio2", 9, - "sck", GPIO_ACTIVE_HIGH), - GPIO_LOOKUP("alchemy-gpio2", 8, - "mosi", GPIO_ACTIVE_HIGH), - GPIO_LOOKUP("alchemy-gpio2", 7, - "miso", GPIO_ACTIVE_HIGH), - GPIO_LOOKUP("alchemy-gpio2", 10, - "cs", GPIO_ACTIVE_HIGH), - { }, - }, +static const struct property_entry db1100_spi_dev_properties[] __initconst = { + PROPERTY_ENTRY_GPIO("miso-gpios", + &db1100_alchemy2_gpiochip, 7, GPIO_ACTIVE_HIGH), + PROPERTY_ENTRY_GPIO("mosi-gpios", + &db1100_alchemy2_gpiochip, 8, GPIO_ACTIVE_HIGH), + PROPERTY_ENTRY_GPIO("sck-gpios", + &db1100_alchemy2_gpiochip, 9, GPIO_ACTIVE_HIGH), + PROPERTY_ENTRY_GPIO("cs-gpios", + &db1100_alchemy2_gpiochip, 10, GPIO_ACTIVE_HIGH), + { } +}; + +static const struct platform_device_info db1100_spi_dev_info __initconst = { + .name = "spi_gpio", + .id = 0, + .data = &db1100_spictl_pd, + .size_data = sizeof(db1100_spictl_pd), + .dma_mask = DMA_BIT_MASK(32), + .properties = db1100_spi_dev_properties, }; static struct platform_device *db1x00_devs[] = { @@ -452,8 +451,10 @@ int __init db1000_dev_setup(void) { int board = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)); int c0, c1, d0, d1, s0, s1, flashsize = 32, twosocks = 1; + int err; unsigned long pfc; struct clk *c, *p; + struct platform_device *spi_dev; if (board == BCSR_WHOAMI_DB1500) { c0 = AU1500_GPIO2_INT; @@ -480,7 +481,7 @@ int __init db1000_dev_setup(void) pfc |= (1 << 0); /* SSI0 pins as GPIOs */ alchemy_wrsys(pfc, AU1000_SYS_PINFUNC); - gpiod_add_lookup_table(&db1100_touch_gpio_table); + software_node_register(&db1100_alchemy2_gpiochip); spi_register_board_info(db1100_spi_info, ARRAY_SIZE(db1100_spi_info)); @@ -497,8 +498,11 @@ int __init db1000_dev_setup(void) clk_put(p); platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs)); - gpiod_add_lookup_table(&db1100_spi_gpiod_table); - platform_device_register(&db1100_spi_dev); + + spi_dev = platform_device_register_full(&db1100_spi_dev_info); + err = PTR_ERR_OR_ZERO(spi_dev); + if (err) + pr_err("failed to register SPI controller: %d\n", err); } else if (board == BCSR_WHOAMI_DB1000) { c0 = AU1000_GPIO2_INT; c1 = AU1000_GPIO5_INT; -- 2.45.2.803.g4e1b14247a-goog -- Dmitry . From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , cgroups@vger.kernel.org, Vipin Sharma , Tejun Heo , Zefan Li , Johannes Weiner Subject: [PATCH] cgroup_misc: add kernel-doc comments for enum misc_res_type Date: Mon, 1 Jul 2024 16:49:37 -0700 Message-ID: <20240701234937.8234-1-rdunlap@infradead.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264736 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Fully document enum misc_res_type with kernel-doc comments to prevent kernel-doc warnings: misc_cgroup.h:12: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst * Types of misc cgroup entries supported by the host. misc_cgroup.h:12: warning: missing initial short description on line: * Types of misc cgroup entries supported by the host. Fixes: a72232eabdfc ("cgroup: Add misc cgroup controller") Signed-off-by: Randy Dunlap Cc: cgroups@vger.kernel.org --- Cc: Vipin Sharma Cc: Tejun Heo Cc: Zefan Li Cc: Johannes Weiner include/linux/misc_cgroup.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -- a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h --- a/include/linux/misc_cgroup.h +++ b/include/linux/misc_cgroup.h @@ -9,15 +9,16 @@ #define _MISC_CGROUP_H_ /** - * Types of misc cgroup entries supported by the host. + * enum misc_res_type - Types of misc cgroup entries supported by the host. */ enum misc_res_type { #ifdef CONFIG_KVM_AMD_SEV - /* AMD SEV ASIDs resource */ + /** @MISC_CG_RES_SEV: AMD SEV ASIDs resource */ MISC_CG_RES_SEV, - /* AMD SEV-ES ASIDs resource */ + /** @MISC_CG_RES_SEV_ES: AMD SEV-ES ASIDs resource */ MISC_CG_RES_SEV_ES, #endif + /** @MISC_CG_RES_TYPES: count of enum misc_res_type constants */ MISC_CG_RES_TYPES }; . From: Brian Norris To: Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Thomas Richter , Josh Poimboeuf , Peter Zijlstra Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kbuild@vger.kernel.org, Masahiro Yamada , Brian Norris Subject: [PATCH 0/3] tools build: Incorrect fixdep dependencies Date: Mon, 1 Jul 2024 17:29:14 -0700 Message-ID: <20240702003119.3641219-1-briannorris@chromium.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264749 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf,org.kernel.vger.linux-kbuild Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi all, The following series consists of a few bugfixes on the topic of "misuse of fixdep in the tools/ build tree." There is no listed maintainer for tools/build, but there are for tools/bpf and tools/objtool, which are the main pieces that affect most users, because they're built as part of the main kernel build. I've addressed this series to a selection of those maintainers, and those that have previously applied build changes in tools/. I hope one of you can apply this series, pending favorable review. Or feel free to point me to a different set of maintainers. This patch series came out of poking around some build errors seen by me and my coworkers, and I found that there were rather similar reports a while back here: Subject: possible dependency error? https://lore.kernel.org/all/ZGVi9HbI43R5trN8@bhelgaas/ I reported some findings to that thread; see also subsequent discussion: https://lore.kernel.org/all/Zk-C5Eg84yt6_nml@google.com/ One element of that discussion: these problems are already solved consistently in Kbuild. tools/build purposely borrows some from Kbuild, but also purposely does not actually use Kbuild. While it'd make my life easier if tools/ would just adopt Kbuild (at least for the tools which are built during kernel builds), I've chosen a path that I hope will yield less resistance -- simply hacking up the existing tools/ build without major changes to its design. NB: I've also CC'd Kbuild folks, since Masahiro has already been so helpful here, but note that this is not really a "kbuild" patch series. Regards, Brian Brian Norris (3): tools build: Correct libsubcmd fixdep dependencies tools build: Avoid circular .fixdep-in.o.cmd issues tools build: Correct bpf fixdep dependencies tools/build/Makefile | 11 ++--------- tools/build/Makefile.include | 10 +++++++++- tools/lib/bpf/Makefile | 6 +++++- tools/lib/subcmd/Makefile | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) -- 2.45.2.803.g4e1b14247a-goog . From: Xiu Jianfeng To: , , , , , CC: , , Subject: [PATCH v2 -next] cgroup/misc: Introduce misc.peak Date: Tue, 2 Jul 2024 00:41:08 +0000 Message-ID: <20240702004108.2645587-1-xiujianfeng@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264753 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kernel.vger.linux-doc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Introduce misc.peak to record the historical maximum usage of the resource, as in some scenarios the value of misc.max could be adjusted based on the peak usage of the resource. Signed-off-by: Xiu Jianfeng --- v2: use cmpxchg to update the watermark --- Documentation/admin-guide/cgroup-v2.rst | 9 ++++++ include/linux/misc_cgroup.h | 2 ++ kernel/cgroup/misc.c | 39 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index ae0fdb6fc618..468a95379009 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -2646,6 +2646,15 @@ Miscellaneous controller provides 3 interface files. If two misc resources (res_ res_a 3 res_b 0 + misc.peak + A read-only flat-keyed file shown in all cgroups. It shows the + historical maximum usage of the resources in the cgroup and its + children.:: + + $ cat misc.peak + res_a 10 + res_b 8 + misc.max A read-write flat-keyed file shown in the non root cgroups. Allowed maximum usage of the resources in the cgroup and its children.:: diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h index e799b1f8d05b..faf72a537596 100644 --- a/include/linux/misc_cgroup.h +++ b/include/linux/misc_cgroup.h @@ -30,11 +30,13 @@ struct misc_cg; /** * struct misc_res: Per cgroup per misc type resource * @max: Maximum limit on the resource. + * @watermark: Historical maximum usage of the resource. * @usage: Current usage of the resource. * @events: Number of times, the resource limit exceeded. */ struct misc_res { u64 max; + u64 watermark; atomic64_t usage; atomic64_t events; }; diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c index 79a3717a5803..42642a96f4dc 100644 --- a/kernel/cgroup/misc.c +++ b/kernel/cgroup/misc.c @@ -121,6 +121,17 @@ static void misc_cg_cancel_charge(enum misc_res_type type, struct misc_cg *cg, misc_res_name[type]); } +static void misc_cg_update_watermark(struct misc_res *res, u64 new_usage) +{ + u64 old; + + do { + old = READ_ONCE(res->watermark); + if (cmpxchg(&res->watermark, old, new_usage) == old) + break; + } while (0); +} + /** * misc_cg_try_charge() - Try charging the misc cgroup. * @type: Misc res type to charge. @@ -159,6 +170,7 @@ int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg, u64 amount) ret = -EBUSY; goto err_charge; } + misc_cg_update_watermark(res, new_usage); } return 0; @@ -307,6 +319,29 @@ static int misc_cg_current_show(struct seq_file *sf, void *v) return 0; } +/** + * misc_cg_peak_show() - Show the peak usage of the misc cgroup. + * @sf: Interface file + * @v: Arguments passed + * + * Context: Any context. + * Return: 0 to denote successful print. + */ +static int misc_cg_peak_show(struct seq_file *sf, void *v) +{ + int i; + u64 watermark; + struct misc_cg *cg = css_misc(seq_css(sf)); + + for (i = 0; i < MISC_CG_RES_TYPES; i++) { + watermark = READ_ONCE(cg->res[i].watermark); + if (READ_ONCE(misc_res_capacity[i]) || watermark) + seq_printf(sf, "%s %llu\n", misc_res_name[i], watermark); + } + + return 0; +} + /** * misc_cg_capacity_show() - Show the total capacity of misc res on the host. * @sf: Interface file @@ -357,6 +392,10 @@ static struct cftype misc_cg_files[] = { .name = "current", .seq_show = misc_cg_current_show, }, + { + .name = "peak", + .seq_show = misc_cg_peak_show, + }, { .name = "capacity", .seq_show = misc_cg_capacity_show, -- 2.34.1 . From: Xiu Jianfeng To: , , , , , CC: , , Subject: [PATCH v3 -next] cgroup/misc: Introduce misc.peak Date: Tue, 2 Jul 2024 00:48:20 +0000 Message-ID: <20240702004820.2645868-1-xiujianfeng@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264757 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kernel.vger.linux-doc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Introduce misc.peak to record the historical maximum usage of the resource, as in some scenarios the value of misc.max could be adjusted based on the peak usage of the resource. Signed-off-by: Xiu Jianfeng --- v3: fix while (0) v2: use cmpxchg to update the watermark --- Documentation/admin-guide/cgroup-v2.rst | 9 ++++++ include/linux/misc_cgroup.h | 2 ++ kernel/cgroup/misc.c | 39 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index ae0fdb6fc618..468a95379009 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -2646,6 +2646,15 @@ Miscellaneous controller provides 3 interface files. If two misc resources (res_ res_a 3 res_b 0 + misc.peak + A read-only flat-keyed file shown in all cgroups. It shows the + historical maximum usage of the resources in the cgroup and its + children.:: + + $ cat misc.peak + res_a 10 + res_b 8 + misc.max A read-write flat-keyed file shown in the non root cgroups. Allowed maximum usage of the resources in the cgroup and its children.:: diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h index e799b1f8d05b..faf72a537596 100644 --- a/include/linux/misc_cgroup.h +++ b/include/linux/misc_cgroup.h @@ -30,11 +30,13 @@ struct misc_cg; /** * struct misc_res: Per cgroup per misc type resource * @max: Maximum limit on the resource. + * @watermark: Historical maximum usage of the resource. * @usage: Current usage of the resource. * @events: Number of times, the resource limit exceeded. */ struct misc_res { u64 max; + u64 watermark; atomic64_t usage; atomic64_t events; }; diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c index 79a3717a5803..7f5180a8f461 100644 --- a/kernel/cgroup/misc.c +++ b/kernel/cgroup/misc.c @@ -121,6 +121,17 @@ static void misc_cg_cancel_charge(enum misc_res_type type, struct misc_cg *cg, misc_res_name[type]); } +static void misc_cg_update_watermark(struct misc_res *res, u64 new_usage) +{ + u64 old; + + do { + old = READ_ONCE(res->watermark); + if (cmpxchg(&res->watermark, old, new_usage) == old) + break; + } while (1); +} + /** * misc_cg_try_charge() - Try charging the misc cgroup. * @type: Misc res type to charge. @@ -159,6 +170,7 @@ int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg, u64 amount) ret = -EBUSY; goto err_charge; } + misc_cg_update_watermark(res, new_usage); } return 0; @@ -307,6 +319,29 @@ static int misc_cg_current_show(struct seq_file *sf, void *v) return 0; } +/** + * misc_cg_peak_show() - Show the peak usage of the misc cgroup. + * @sf: Interface file + * @v: Arguments passed + * + * Context: Any context. + * Return: 0 to denote successful print. + */ +static int misc_cg_peak_show(struct seq_file *sf, void *v) +{ + int i; + u64 watermark; + struct misc_cg *cg = css_misc(seq_css(sf)); + + for (i = 0; i < MISC_CG_RES_TYPES; i++) { + watermark = READ_ONCE(cg->res[i].watermark); + if (READ_ONCE(misc_res_capacity[i]) || watermark) + seq_printf(sf, "%s %llu\n", misc_res_name[i], watermark); + } + + return 0; +} + /** * misc_cg_capacity_show() - Show the total capacity of misc res on the host. * @sf: Interface file @@ -357,6 +392,10 @@ static struct cftype misc_cg_files[] = { .name = "current", .seq_show = misc_cg_current_show, }, + { + .name = "peak", + .seq_show = misc_cg_peak_show, + }, { .name = "capacity", .seq_show = misc_cg_capacity_show, -- 2.34.1 . From: Zhiquan Li To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, kirill.shutemov@linux.intel.com, x86@kernel.org Cc: rafael@kernel.org, hpa@zytor.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, zhiquan1.li@intel.com Subject: [PATCH v3] x86/acpi: fix panic while AP online later with kernel parameter maxcpus=1 Date: Tue, 2 Jul 2024 08:58:00 +0800 Message-Id: <20240702005800.622910-1-zhiquan1.li@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264758 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-acpi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The issue was found on the platform that using "Multiprocessor Wakeup Structure"[1] to startup secondary CPU, which is usually used by encrypted guest. When restrict boot time CPU to 1 with the kernel parameter "maxcpus=1" and bring other CPUs online later, there will be a kernel panic. The variable acpi_mp_wake_mailbox, which holds the virtual address of the MP Wakeup Structure mailbox, will be set as read-only after init. If the first AP gets online later, after init, the attempt to update the variable results in panic. The memremap() call that initializes the variable cannot be moved into acpi_parse_mp_wake() because memremap() is not functional at that point in the boot process. [1] Details about the MP Wakeup structure can be found in ACPI v6.4, in the "Multiprocessor Wakeup Structure" section. Signed-off-by: Zhiquan Li Reviewed-by: Kirill A. Shutemov --- V2: https://lore.kernel.org/all/20240628082119.357735-1-zhiquan1.li@intel.com/ Changes since V2: - Modify the commit log as suggested by Kirill. - Add Kirill's Reviewed-by tag. V1: https://lore.kernel.org/all/20240626073920.176471-1-zhiquan1.li@intel.com/ Changes since V1: - Amend the commit message as per Kirill's comments. --- arch/x86/kernel/acpi/madt_wakeup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c index 6cfe762be28b..d5ef6215583b 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -19,7 +19,7 @@ static u64 acpi_mp_wake_mailbox_paddr __ro_after_init; /* Virtual address of the Multiprocessor Wakeup Structure mailbox */ -static struct acpi_madt_multiproc_wakeup_mailbox *acpi_mp_wake_mailbox __ro_after_init; +static struct acpi_madt_multiproc_wakeup_mailbox *acpi_mp_wake_mailbox; static u64 acpi_mp_pgd __ro_after_init; static u64 acpi_mp_reset_vector_paddr __ro_after_init; base-commit: ec6574a634db84f25e4eee6698d76fed5649e3bd -- 2.25.1 . From: Cristian Ciocaltea Date: Tue, 02 Jul 2024 04:04:24 +0300 Subject: [PATCH] drm/rockchip: Unregister platform drivers in reverse order X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240702-rk-drm-fix-unreg-v1-1-5bd325ed42b4@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sean Paul , Jeffy Chen , Andrzej Hajda , Mark Yao Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264761 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Move rockchip_drm_platform_driver unregistration after its sub-drivers, which ensures all drivers are unregistered in the reverse order used when they were registered. Fixes: 8820b68bd378 ("drm/rockchip: Refactor the component match logic.") Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 44d769d9234d..ca7b07503fbe 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -528,10 +528,9 @@ static int __init rockchip_drm_init(void) static void __exit rockchip_drm_fini(void) { - platform_driver_unregister(&rockchip_drm_platform_driver); - platform_unregister_drivers(rockchip_sub_drivers, num_rockchip_sub_drivers); + platform_driver_unregister(&rockchip_drm_platform_driver); } module_init(rockchip_drm_init); --- base-commit: 1eb586a9782cde8e5091b9de74603e0a8386b09e change-id: 20240702-rk-drm-fix-unreg-9f3f29996a00 . From: Cristian Ciocaltea Date: Tue, 02 Jul 2024 04:12:52 +0300 Subject: [PATCH] arm64: dts: rockchip: Add missing power-domains for rk356x vop_mmu X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240702-rk356x-fix-vop-mmu-v1-1-a66d1a0c45ea@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sascha Hauer Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264765 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The iommu@fe043e00 on RK356x SoC shares the VOP power domain, but the power-domains property was not provided when the node has been added. The consequence is that an attempt to reload the rockchipdrm module will freeze the entire system. That is because on probe time, pm_runtime_get_suppliers() gets called for vop@fe040000, which blocks when pm_runtime_get_sync() is being invoked for iommu@fe043e00. Fix the issue by adding the missing property. Fixes: 9d6c6d978f97 ("arm64: dts: rockchip: rk356x: Add VOP2 nodes") Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index d8543b5557ee..3e2a8bfcafea 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -790,6 +790,7 @@ vop_mmu: iommu@fe043e00 { clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; clock-names = "aclk", "iface"; #iommu-cells = <0>; + power-domains = <&power RK3568_PD_VO>; status = "disabled"; }; --- base-commit: 1eb586a9782cde8e5091b9de74603e0a8386b09e change-id: 20240702-rk356x-fix-vop-mmu-a235d68a734a . Message-ID: <912f0f5fe2c02157edb47b1e9c730d1dbc563c55.camel@HansenPartnership.com> Subject: [GIT PULL] SCSI fixes for 6.10-rc6 From: James Bottomley To: Andrew Morton , Linus Torvalds Cc: linux-scsi , linux-kernel Date: Mon, 01 Jul 2024 22:26:43 -0400 Content-Type: text/plain; charset="UTF-8" X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264777 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-scsi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail A couple of error leg problems, one affecting scsi_debug and the other affecting pure SAS (i.e. not SATA) SCSI expanders. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Ming Lei (1): scsi: scsi_debug: Fix create target debugfs failure Xingui Yang (1): scsi: libsas: Fix exp-attached device scan after probe failure scanned in again after probe failed And the diffstat drivers/scsi/libsas/sas_internal.h | 14 ++++++++++++++ drivers/scsi/scsi_debug.c | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) With full diff below James --- diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index 85948963fb97..03d6ec1eb970 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -145,6 +145,20 @@ static inline void sas_fail_probe(struct domain_device *dev, const char *func, i func, dev->parent ? "exp-attached" : "direct-attached", SAS_ADDR(dev->sas_addr), err); + + /* + * If the device probe failed, the expander phy attached address + * needs to be reset so that the phy will not be treated as flutter + * in the next revalidation + */ + if (dev->parent && !dev_is_expander(dev->dev_type)) { + struct sas_phy *phy = dev->phy; + struct domain_device *parent = dev->parent; + struct ex_phy *ex_phy = &parent->ex_dev.ex_phy[phy->number]; + + memset(ex_phy->attached_sas_addr, 0, SAS_ADDR_SIZE); + } + sas_unregister_dev(dev->port, dev); } diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index acf0592d63da..91f022fb8d0c 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -926,6 +926,7 @@ static const int device_qfull_result = static const int condition_met_result = SAM_STAT_CONDITION_MET; static struct dentry *sdebug_debugfs_root; +static ASYNC_DOMAIN_EXCLUSIVE(sdebug_async_domain); static void sdebug_err_free(struct rcu_head *head) { @@ -1148,6 +1149,8 @@ static int sdebug_target_alloc(struct scsi_target *starget) if (!targetip) return -ENOMEM; + async_synchronize_full_domain(&sdebug_async_domain); + targetip->debugfs_entry = debugfs_create_dir(dev_name(&starget->dev), sdebug_debugfs_root); @@ -1174,7 +1177,8 @@ static void sdebug_target_destroy(struct scsi_target *starget) targetip = (struct sdebug_target_info *)starget->hostdata; if (targetip) { starget->hostdata = NULL; - async_schedule(sdebug_tartget_cleanup_async, targetip); + async_schedule_domain(sdebug_tartget_cleanup_async, targetip, + &sdebug_async_domain); } } . From: Chen Ridong To: , , , CC: , Subject: [PATCH v2 -next] cgroup/rstat: add force idle show helper Date: Tue, 2 Jul 2024 02:28:22 +0000 Message-ID: <20240702022822.1032693-1-chenridong@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264779 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In the function cgroup_base_stat_cputime_show, there are five instances of #ifdef, which makes the code not concise. To address this, add the function cgroup_force_idle_show to make the code more succinct. Signed-off-by: Chen Ridong --- kernel/cgroup/rstat.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index fb8b49437573..22bb4e9050f0 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -594,49 +594,47 @@ static void root_cgroup_cputime(struct cgroup_base_stat *bstat) } } + +static void cgroup_force_idle_show(struct seq_file *seq, struct cgroup_base_stat *bstat) +{ +#ifdef CONFIG_SCHED_CORE + u64 forceidle_time = bstat->forceidle_sum; + + do_div(forceidle_time, NSEC_PER_USEC); + seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time); +#endif +} + void cgroup_base_stat_cputime_show(struct seq_file *seq) { struct cgroup *cgrp = seq_css(seq)->cgroup; u64 usage, utime, stime; struct cgroup_base_stat bstat; -#ifdef CONFIG_SCHED_CORE - u64 forceidle_time; -#endif if (cgroup_parent(cgrp)) { cgroup_rstat_flush_hold(cgrp); usage = cgrp->bstat.cputime.sum_exec_runtime; cputime_adjust(&cgrp->bstat.cputime, &cgrp->prev_cputime, &utime, &stime); -#ifdef CONFIG_SCHED_CORE - forceidle_time = cgrp->bstat.forceidle_sum; -#endif + bstat = cgrp->bstat; cgroup_rstat_flush_release(cgrp); } else { root_cgroup_cputime(&bstat); usage = bstat.cputime.sum_exec_runtime; utime = bstat.cputime.utime; stime = bstat.cputime.stime; -#ifdef CONFIG_SCHED_CORE - forceidle_time = bstat.forceidle_sum; -#endif } do_div(usage, NSEC_PER_USEC); do_div(utime, NSEC_PER_USEC); do_div(stime, NSEC_PER_USEC); -#ifdef CONFIG_SCHED_CORE - do_div(forceidle_time, NSEC_PER_USEC); -#endif seq_printf(seq, "usage_usec %llu\n" "user_usec %llu\n" "system_usec %llu\n", usage, utime, stime); -#ifdef CONFIG_SCHED_CORE - seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time); -#endif + cgroup_force_idle_show(seq, &bstat); } /* Add bpf kfuncs for cgroup_rstat_updated() and cgroup_rstat_flush() */ -- 2.34.1 . From: "Bang Li" To: ughd@google.com, akpm@linux-foundation.org Cc: , , , , , , , , "Bang Li" Subject: [PATCH v2] mm: thp: support "THPeligible" semantics for mTHP with anonymous shmem Date: Tue, 02 Jul 2024 10:34:01 +0800 Message-Id: <20240702023401.41553-1-libang.li@antgroup.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264780 org.kvack.linux-mm:202095 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail After the commit 7fb1b252afb5 ("mm: shmem: add mTHP support for anonymous shmem"), we can configure different policies through the multi-size THP sysfs interface for anonymous shmem. But currently "THPeligible" indicates only whether the mapping is eligible for allocating THP-pages as well as the THP is PMD mappable or not for anonymous shmem, we need to support semantics for mTHP with anonymous shmem similar to those for mTHP with anonymous memory. Signed-off-by: Bang Li --- Changes since v1 [1]: - Put anonymous shmem mthp related logic into thp_vma_allowable_orders() (per David) [1] https://lore.kernel.org/linux-mm/20240628104926.34209-1-libang.li@antgroup.com/ --- include/linux/huge_mm.h | 11 +++++++++++ mm/huge_memory.c | 13 +++++++++---- mm/shmem.c | 9 +-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 212cca384d7e..f87136f38aa1 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -267,6 +267,10 @@ unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, return __thp_vma_allowable_orders(vma, vm_flags, tva_flags, orders); } +unsigned long shmem_allowable_huge_orders(struct inode *inode, + struct vm_area_struct *vma, pgoff_t index, + bool global_huge); + struct thpsize { struct kobject kobj; struct list_head node; @@ -460,6 +464,13 @@ static inline unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, return 0; } +static inline unsigned long shmem_allowable_huge_orders(struct inode *inode, + struct vm_area_struct *vma, pgoff_t index, + bool global_huge) +{ + return 0; +} + #define transparent_hugepage_flags 0UL #define thp_get_unmapped_area NULL diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c7ce28f6b7f3..ea377bb4af91 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -151,10 +151,15 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, * Must be done before hugepage flags check since shmem has its * own flags. */ - if (!in_pf && shmem_file(vma->vm_file)) - return shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, - !enforce_sysfs, vma->vm_mm, vm_flags) - ? orders : 0; + if (!in_pf && shmem_file(vma->vm_file)) { + bool global_huge = shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, + !enforce_sysfs, vma->vm_mm, vm_flags); + + if (!vma_is_anon_shmem(vma)) + return global_huge? orders : 0; + return shmem_allowable_huge_orders(file_inode(vma->vm_file), + vma, vma->vm_pgoff, global_huge); + } if (!vma_is_anonymous(vma)) { /* diff --git a/mm/shmem.c b/mm/shmem.c index d495c0701a83..aa85df9c662a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1622,7 +1622,7 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) } #ifdef CONFIG_TRANSPARENT_HUGEPAGE -static unsigned long shmem_allowable_huge_orders(struct inode *inode, +unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, bool global_huge) { @@ -1707,13 +1707,6 @@ static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault return orders; } #else -static unsigned long shmem_allowable_huge_orders(struct inode *inode, - struct vm_area_struct *vma, pgoff_t index, - bool global_huge) -{ - return 0; -} - static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault *vmf, struct address_space *mapping, pgoff_t index, unsigned long orders) -- 2.19.1.6.gb485710b . Date: Tue, 2 Jul 2024 02:47:28 +0000 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: <20240702024735.1152293-1-ipylypiv@google.com> Subject: [PATCH v5 0/7] ATA PASS-THROUGH sense data fixes From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264784 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-ide Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch series is fixing a few ATA PASS-THROUGH issues: 1. Not reporting "ATA Status Return sense data descriptor" / "Fixed format sense data" when ATA_QCFLAG_SENSE_VALID is set. 2. Generating "fake" sk/asc/ascq based on ATA status/error registers when ATA_QCFLAG_SENSE_VALID is set and CK_COND=1. 3. Fixed format sense data was using incorrect field offsets for ATA PASS-THROUGH commands. 4. Using qc->result_tf in ATA sense data generation functions without checking if qc->result_tf contains a valid data. Changes since v1: Thanks Damien and Niklas for the reviews! - Squashed two v1 patches 2/4 and 3/4 into one patch with a different implementation. - Added 'Cc: stable@vger.kernel.org' tags to patches that are fixing bugs. - Reordered patches with the 'Cc: stable@vger.kernel.org' tag to be applied first in order to simplify backports to stable releases. - Restored the buffer memset in atapi_eh_request_sense(). - Updated declaration order in v1 patch 4/4. - Added a patch to cleanup unused ATA device id in ata_to_sense_error(). - Updated fill_result_tf() to set ATA_QCFLAG_RTF_FILLED after populating the result taskfile. Removed now redundant flag sets/checks from ahci. - Updated ATA sense data generation functions to return early if result_tf is not filled. Added WARN_ON_ONCE checks to generate a warning when ATA_QCFLAG_RTF_FILLED is not set and libata needs to generate sense data. Changes since v2: - Moved v2 2/6 patch (fixed ATA PT offsets) to be the first one in v3. - Removed unused variable 'sb' from ata_gen_passthru_sense(). - Removed WARN_ON_ONCE checks and added ata_dev_dbg() logs instead. - Removed the Fixes tag from v2 4/6 patch because the patch is doing a cleanup and is not fixing any bugs. Changes since v3: - Changed "RTF" to "result TF" in the log messages to make it more clear. Removed capitalization and punctuation to be consistent with existing logs. - Marked the stable tag of the v3 2/6 patch with the 4.19+ LTS version. - Added a patch to honour the D_SENSE bit for CK_COND=1 and no error commands. - Fixed a bug in the v3 5/6 patch which caused the qc->result_tf.flags field assignment to be skipped if ahci_qc_ncq_fill_rtf() was executed. - Added a patch proposed by Niklas to improve the readability of the complex ATA PASS-THROUGH handling in ata_scsi_qc_complete(). Changes since v4: - Squashed v4 2/8 and 8/8 patches into one. Both patches modified the same function. Combining these related patches makes it easier to backport the changes to stable releases. - Reworded the commit message in v4 3/8 to make it more clear. Igor Pylypiv (7): ata: libata-scsi: Fix offsets for the fixed format sense data ata: libata-scsi: Do not overwrite valid sense data when CK_COND=1 ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error ata: libata-scsi: Remove redundant sense_buffer memsets ata: libata-scsi: Do not pass ATA device id to ata_to_sense_error() ata: libata-core: Set ATA_QCFLAG_RTF_FILLED in fill_result_tf() ata: libata-scsi: Check ATA_QCFLAG_RTF_FILLED before using result_tf drivers/ata/libahci.c | 12 +-- drivers/ata/libata-core.c | 8 ++ drivers/ata/libata-scsi.c | 209 +++++++++++++++++++++----------------- 3 files changed, 128 insertions(+), 101 deletions(-) -- 2.45.2.803.g4e1b14247a-goog . From: Felix Kaechele To: Daniel Beer , Liam Girdwood , Mark Brown , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: tas5805m: demystify DSP volume control coefficients Date: Mon, 1 Jul 2024 22:46:54 -0400 Message-ID: <20240702024709.626009-1-felix@kaechele.ca> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264793 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The original manufacturer sample driver code uses direct DSP register writes to control digital volume on this amplifier without further context as to why it's not using the documented DIG_VOL_CTRL register. A thread in the manufacturer's forums [1] suggests this might have been done to work around volume ramping being used when controlling the volume through the DIG_VOL_CTRL register. When volume is controlled through this register, reading and/or writing any register is blocked until the volume ramping has concluded and the setpoint is reached. Additionally, the sample code uses a lookup table to map decibel values to 9.23 formatted coefficients. For posterity, add references to where this is documented and why a lookup table may be used. Signed-off-by: Felix Kaechele [1]: https://e2e.ti.com/support/audio-group/audio/f/audio-forum/1165952/tas5805m-linux-driver-for-tas58xx-family --- sound/soc/codecs/tas5805m.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index 3b53eba38a0b..59536c8b8e38 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -67,6 +67,14 @@ static const uint8_t dsp_cfg_preboot[] = { 0x00, 0x00, 0x7f, 0x00, 0x03, 0x02, }; +/* + * Lookup table for DSP volume coefficients. + * The formula uses floating point math, so a lookup table is used + * instead of computing values on the fly. + * Formula: round(10^(volume in dB/20)*2^23) + * The 9.23 format used here is documented in + * SLAA894 - "General Tuning Guide for TAS58xx Family" + */ static const uint32_t tas5805m_volume[] = { 0x0000001B, /* 0, -110dB */ 0x0000001E, /* 1, -109dB */ 0x00000021, /* 2, -108dB */ 0x00000025, /* 3, -107dB */ @@ -196,9 +204,13 @@ static void tas5805m_refresh(struct tas5805m_priv *tas5805m) regmap_write(rm, REG_BOOK, 0x8c); regmap_write(rm, REG_PAGE, 0x2a); - /* Refresh volume. The actual volume control documented in the - * datasheet doesn't seem to work correctly. This is a pair of - * DSP registers which are *not* documented in the datasheet. + /* Refresh volume. This writes the volume coefficients from + * the lookup table directly into the DSP registers. + * Digital volume control on this chip involves ramping which + * blocks register reads and writes until the desired setpoint + * is reached. + * The DSP memory maps are documented in + * SLOA263A - "TAS5805M, TAS5806M and TAS5806MD Process Flows" */ set_dsp_scale(rm, 0x24, tas5805m->vol[0]); set_dsp_scale(rm, 0x28, tas5805m->vol[1]); base-commit: 9fa5527b19b21848dfb09928ee66af1aac4a5700 -- 2.45.2 . From: Chen Ni To: laurent.pinchart@ideasonboard.com, paul.elder@ideasonboard.com, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Chen Ni Subject: [PATCH] media: i2c: thp7312: Convert comma to semicolon Date: Tue, 2 Jul 2024 10:57:11 +0800 Message-Id: <20240702025711.1411715-1-nichen@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264795 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Replace a comma between expression statements by a semicolon. Signed-off-by: Chen Ni --- drivers/media/i2c/thp7312.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/thp7312.c b/drivers/media/i2c/thp7312.c index 19bd923a7315..75225ff5eff6 100644 --- a/drivers/media/i2c/thp7312.c +++ b/drivers/media/i2c/thp7312.c @@ -1503,7 +1503,7 @@ static int __thp7312_flash_reg_read(struct thp7312_device *thp7312, msgs[0].addr = client->addr; msgs[0].flags = 0; - msgs[0].len = sizeof(thp7312_cmd_read_reg), + msgs[0].len = sizeof(thp7312_cmd_read_reg); msgs[0].buf = (u8 *)thp7312_cmd_read_reg; msgs[1].addr = client->addr; -- 2.25.1 . From: Kim Seer Paller To: , , CC: Jonathan Cameron , David Lechner , Lars-Peter Clausen , Liam Girdwood , Mark Brown , Dimitri Fedrau , Krzysztof Kozlowski , "Rob Herring" , Conor Dooley , "Michael Hennerich" , =?UTF-8?q?Nuno=20S=C3=A1?= , Kim Seer Paller Subject: [PATCH v5 0/6] Add driver for LTC2664 and LTC2672 Date: Tue, 2 Jul 2024 11:00:19 +0800 Message-ID: <20240702030025.57078-1-kimseer.paller@analog.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264797 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Generalize the ABI documentation for DAC. The ABI defined for toggle mode channels: LTC2664: * out_voltageY_toggle_en * out_voltageY_raw0 * out_voltageY_raw1 * out_voltageY_symbol LTC2672: * out_currentY_toggle_en * out_currentY_raw0 * out_currentY_raw1 * out_currentY_symbol Default channels won't have any of the above ABIs. A channel is toggle capable if the devicetree 'adi,toggle-mode' flag is set. changes in v5: ltc2664: * Removed return statement for error code in ltc2664_dac_code_read making it a void function. * Refactored voltage regulator error handling and logic setting for vref_mv. * Added Reviewed-by tag. Bindings: * Added dac.yaml and generalized DAC common properties. * Modified ltc2664 binding adding constraints for the adi,manual-span-operation-config and output-range-microvolt properties. changes in v4: ltc2664: * Added comments for each field in the ltc2664_chan struct. * Changed global_toggle data type to bool and updated vref and rfsadj variables to include units. * Added 0,0 entry in ltc2672_span_helper to removed the id field from the ltc2664_chip_info struct. * Used mul_u64_u32_div helper function from linux/math64.h to avoid integer overflow during scale calculation. * Refactored code to use a single template for channel instead of separate channel arrays. * Used the devm_regulator_get_enable_read_voltage API for simplifying voltage retrieval. ABI: sysfs-bus-iio: * Added commit message for the ABI changes. sysfs-bus-iio-dac: * Updated the description of toggle_en to clarify autonomous toggling. * Fixed inconsistent use of spacing and tabs. Bindings: * Dropped Reviewed-by tag. * Updated the description for both bindings to include both 12-bit and 16-bit versions. changes in v3: ltc2664: * Added span sanity check for no match. * Initialized the variable 'span' to fix build warning. * Added Reported-by and Closes by tag. ABI: * Modified descriptions to make it more generalize. * Removed MAINTAINERS file entry. Bindings: * Changed clr-gpios to reset-gpios. * Added output range and reset code description for 'adi,manual-span-operation-config' property in ltc2664 binding. * Removed the $ref for 'adi,output-range-microamp' due to dt-schema warning in ltc2672 binding. Added Reported-by and Closes by tag. * Modified io-channels description and added maxItems constraint. changes in v2: ltc2664: * Updated struct ltc2664_chip_info to include device-specific data for scale, offset, measurement type, internal vref, manual span support, and rfsadj support. * Added a read-only extended info attribute powerdown_mode to indicate the state that the DAC output enters when the device is powered down. * Refactored code for setting the span into separate function and directly returning the span. * Adjusted memory allocation for st->iio_channels to include null terminator. * Spaces have been added after { and before }. Each pair of values is now placed on a separate line. ABI: * Generalized the ABI documentation for DAC. * Added DAC 42kohm_to_gnd powerdown mode. Bindings: * Created separate bindings for ltc2664 and ltc2672. * Added v-pos-supply and v-neg-supply regulator properties. * Renamed vref-supply to ref-supply based on the datasheet. * Added io-channels property and specifying the pin for multiplexer output. * Added vdd0-vdd4 supply properties for ltc2672, although they are not currently supported in the driver. * Changed clr-gpios description based on the datasheet. * Used 4 spaces for example indentation. Kim Seer Paller (6): iio: ABI: Generalize ABI documentation for DAC iio: ABI: add DAC 42kohm_to_gnd powerdown mode dt-bindings: iio: dac: Generalize DAC common properties dt-bindings: iio: dac: Add adi,ltc2664.yaml dt-bindings: iio: dac: Add adi,ltc2672.yaml iio: dac: ltc2664: Add driver for LTC2664 and LTC2672 Documentation/ABI/testing/sysfs-bus-iio | 1 + Documentation/ABI/testing/sysfs-bus-iio-dac | 61 ++ .../ABI/testing/sysfs-bus-iio-dac-ltc2688 | 31 - .../bindings/iio/dac/adi,ltc2664.yaml | 176 +++++ .../bindings/iio/dac/adi,ltc2672.yaml | 160 ++++ .../devicetree/bindings/iio/dac/dac.yaml | 50 ++ MAINTAINERS | 10 + drivers/iio/dac/Kconfig | 11 + drivers/iio/dac/Makefile | 1 + drivers/iio/dac/ltc2664.c | 736 ++++++++++++++++++ 10 files changed, 1206 insertions(+), 31 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dac create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2664.yaml create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2672.yaml create mode 100644 Documentation/devicetree/bindings/iio/dac/dac.yaml create mode 100644 drivers/iio/dac/ltc2664.c base-commit: 3587914bf61df7924933530353d840378cdc4973 -- 2.34.1 . From: Haoqian He To: Christoph Hellwig , "James E.J. Bottomley" , linux-kernel@vger.kernel.org (open list), linux-scsi@vger.kernel.org (open list:SCSI SUBSYSTEM), "Martin K. Petersen" Cc: fengli@smartx.com Subject: [PATCH 0/3] scsi: disable discard when set target full provisioning Date: Mon, 1 Jul 2024 23:01:13 -0400 Message-ID: <20240702030118.2198570-1-haoqian.he@smartx.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264804 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-scsi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi all, this series has a few fixes for the scsi discard mode changes. The first disable the disacrd when set the target lun full provisioning, the reset have some cleanups. The series based on ("scsi: sd: Keep the discard mode stable"): https://lore.kernel.org/all/20240619071412.140100-1-fengli@smartx.com Haoqian He (3): scsi: sd: disable discard when set target full provisioning scsi: sd: remove scsi_disk field lbpvpd scsi: sd: remove some redundant initialization code drivers/scsi/sd.c | 34 ++++++++++++++++++---------------- drivers/scsi/sd.h | 1 - 2 files changed, 18 insertions(+), 17 deletions(-) -- 2.44.0 . From: Ping-Ke Shih To: Tim K CC: =?utf-8?B?TWFyY2luIMWabHVzYXJ6?= , "linux-wireless@vger.kernel.org" , =?utf-8?B?TWFyY2luIMWabHVzYXJ6?= , Larry Finger , Kalle Valo , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH] wifi: rtw88: schedule rx work after everything is set up Date: Tue, 2 Jul 2024 03:15:24 +0000 Message-ID: <2c4974e113474cea87ff276eff09c882@realtek.com> References: <13e848c1544245e6aef4b89c3f38daf0@realtek.com> <20240528110246.477321-1-marcin.slusarz@gmail.com> <801bd77995184b1fa35bf4a32ab3a036@realtek.com> Accept-Language: en-US, zh-TW Content-Language: zh-TW Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264809 org.kernel.vger.linux-wireless:85538 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail SGkgVGltLA0KDQpQaW5nLUtlIFNoaWggd3JvdGU6DQo+IFRpbSBLIDx0cGt1ZXN0ZXJAZ21haWwu Y29tPiB3cm90ZToNCj4gPg0KPiA+ID4gSSBnYXZlIHRoaXMgc3VnZ2VzdGlvbnMgdG9vIGVhcmx5 LCBzaW5jZSB3ZSBoYXZlIG5vdCBnb3R0ZW4gdGVzdCByZXN1bHQgZnJvbSBUaW0uDQo+ID4gPiBJ IHdpbGwgY2hhbmdlIHRoZW0gdG8gIkxpbms6IiBpZiBubyBBQ0sgZnJvbSBUaW0gd2hpbGUgbWVy Z2luZy4NCj4gPg0KPiA+IEhleSBhbGwsIHRoYW5rcyBmb3IgcmVhY2hpbmcgb3V0IQ0KPiA+DQo+ ID4gU2FkbHkgSSdtIG5vdCBhYmxlIHRvIHdvcmsgb24gdGhpcyBwcm9qZWN0IHJpZ2h0IG5vdywg YnV0IEkndmUNCj4gPiBmb3J3YXJkZWQgdGhpcyBlbWFpbCB0byBhIGZldyBjb2xsZWFndWVzIHRv IGJyaW5nIHRoZW0gaW4gdGhlIGxvb3AuDQo+ID4gRGlkIHlvdSBoYXZlIGEgdGltZWxpbmUgeW91 IHdlcmUgbG9va2luZyBhdCB0byBjbG9zZSB0aGlzIG9mZj8NCj4gDQo+IFRoYW5rcyBmb3IgeW91 ciByZXBseS4gSSB3b3VsZCB0YWtlIHRoaXMgcGF0Y2ggdG8gNi4xMSwgc28geW91IGhhdmUgYWJv dXQNCj4gNC01IHdlZWtzLiBJcyBpdCBlbm91Z2ggdG8geW91Pw0KDQpEbyB5b3UgaGF2ZSBhbnkg dXBkYXRlIG9uIHRoaXMgcGF0Y2g/IA0KDQpQaW5nLUtlDQoNCg== . From: Ma Ke To: vkoul@kernel.org, kishon@kernel.org, rogerq@kernel.org, sjakhade@cadence.com, sergio.paracuellos@gmail.com, robh@kernel.org, make24@iscas.ac.cn Cc: linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] phy: cadence-torrent: Check return value on register read Date: Tue, 2 Jul 2024 11:20:42 +0800 Message-Id: <20240702032042.3993031-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264810 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-phy Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail cdns_torrent_dp_set_power_state() does not consider that ret might be overwritten. Add return value check of regmap_read_poll_timeout() after register read in cdns_torrent_dp_set_power_state(). Fixes: 5b16a790f18d ("phy: cadence-torrent: Reorder few functions to remove function declarations") Signed-off-by: Ma Ke --- drivers/phy/cadence/phy-cadence-torrent.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/phy/cadence/phy-cadence-torrent.c b/drivers/phy/cadence/phy-cadence-torrent.c index 95924a09960c..6113f0022e6e 100644 --- a/drivers/phy/cadence/phy-cadence-torrent.c +++ b/drivers/phy/cadence/phy-cadence-torrent.c @@ -1156,6 +1156,9 @@ static int cdns_torrent_dp_set_power_state(struct cdns_torrent_phy *cdns_phy, ret = regmap_read_poll_timeout(regmap, PHY_PMA_XCVR_POWER_STATE_ACK, read_val, (read_val & mask) == value, 0, POLL_TIMEOUT_US); + if (ret) + return ret; + cdns_torrent_dp_write(regmap, PHY_PMA_XCVR_POWER_STATE_REQ, 0x00000000); ndelay(100); -- 2.25.1 . Return-Path: From: Yunhui Cui To: punit.agrawal@bytedance.com, sunilvl@ventanamicro.com, jesse@rivosinc.com, jrtc27@jrtc27.com, corbet@lwn.net, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, cleger@rivosinc.com, evan@rivosinc.com, conor.dooley@microchip.com, cuiyunhui@bytedance.com, costa.shul@redhat.com, andy.chiu@sifive.com, samitolvanen@google.com, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 0/1] Provide the frequency of time CSR via hwprobe Date: Tue, 2 Jul 2024 11:37:30 +0800 Message-Id: <20240702033731.71955-1-cuiyunhui@bytedance.com> MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79259 org.kernel.vger.linux-kernel:1264811 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-doc,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Some applications (e.g., DPDK) use the time counter for basic performance analysis as well as fine grained time-keeping. So we need export the time CSR frequency to userspace by hwporbe syscall. Changes: v1->v2: Modify "mtime" to "time CSR". v2->v3: Rebase "RISCV_HWPROBE_MAX_KEY 7" to "RISCV_HWPROBE_MAX_KEY 8" from Jesse. v3->v4: 1. Update the commit log from Punit. 2. Because RISCV_HWPROBE_MAX_KEY in https://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git/tree/arch/riscv/include/asm/hwprobe.h?h=for-next is 6, so keep RISCV_HWPROBE_MAX_KEY to 7 Palmer Dabbelt (1): RISC-V: Provide the frequency of time CSR via hwprobe Documentation/arch/riscv/hwprobe.rst | 2 ++ arch/riscv/include/asm/hwprobe.h | 2 +- arch/riscv/include/uapi/asm/hwprobe.h | 1 + arch/riscv/kernel/sys_hwprobe.c | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) -- 2.20.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Thorsten Blum To: geert@linux-m68k.org, gerg@uclinux.org, dhowells@redhat.com Cc: linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, Thorsten Blum Subject: [PATCH] m68k: cmpxchg: Fix return value for default case in __arch_xchg() Date: Tue, 2 Jul 2024 05:41:17 +0200 Message-ID: <20240702034116.140234-2-thorsten.blum@toblux.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264818 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-m68k Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The return value of __invalid_xchg_size() is assigned to tmp instead of the return variable x. Assign it to x instead. Fixes: 803f69144f0d ("Disintegrate asm/system.h for M68K") Signed-off-by: Thorsten Blum --- arch/m68k/include/asm/cmpxchg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h index d7f3de9c5d6f..4ba14f3535fc 100644 --- a/arch/m68k/include/asm/cmpxchg.h +++ b/arch/m68k/include/asm/cmpxchg.h @@ -32,7 +32,7 @@ static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, in x = tmp; break; default: - tmp = __invalid_xchg_size(x, ptr, size); + x = __invalid_xchg_size(x, ptr, size); break; } -- 2.45.2 . Date: Tue, 2 Jul 2024 14:15:55 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , "Rafael J. Wysocki" Cc: "Borislav Petkov (AMD)" , Linux Kernel Mailing List , Linux Next Mailing List , Mario Limonciello , Perry Yuan , "Rafael J. Wysocki" , Srinivas Pandruvada , Xiaojian Du Subject: linux-next: manual merge of the tip tree with the pm tree Message-ID: <20240702141555.3494c5a6@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/0U2=0zcqyTt+2jZ_5TTPgGt"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264827 org.kernel.vger.linux-next:62043 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/0U2=0zcqyTt+2jZ_5TTPgGt Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/include/asm/cpufeatures.h between commits: c7107750b2ff ("x86/cpufeatures: Add AMD FAST CPPC feature flag") 7ea81936b853 ("x86/cpufeatures: Add HWP highest perf change feature flag") from the pm tree and commit: 78ce84b9e0a5 ("x86/cpufeatures: Flip the /proc/cpuinfo appearance logic") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc arch/x86/include/asm/cpufeatures.h index 0d99515530d3,6007462e03d6..000000000000 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@@ -283,90 -283,89 +283,90 @@@ * * Reuse free bits when adding new feature flags! */ - #define X86_FEATURE_CQM_LLC (11*32+ 0) /* LLC QoS if 1 */ - #define X86_FEATURE_CQM_OCCUP_LLC (11*32+ 1) /* LLC occupancy monitoring = */ - #define X86_FEATURE_CQM_MBM_TOTAL (11*32+ 2) /* LLC Total MBM monitoring = */ - #define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* LLC Local MBM monitoring = */ - #define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* "" LFENCE in user ent= ry SWAPGS path */ - #define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel= entry SWAPGS path */ - #define X86_FEATURE_SPLIT_LOCK_DETECT (11*32+ 6) /* #AC for split lock */ - #define X86_FEATURE_PER_THREAD_MBA (11*32+ 7) /* "" Per-thread Memory Ban= dwidth Allocation */ - #define X86_FEATURE_SGX1 (11*32+ 8) /* "" Basic SGX */ - #define X86_FEATURE_SGX2 (11*32+ 9) /* "" SGX Enclave Dynamic Memory Man= agement (EDMM) */ - #define X86_FEATURE_ENTRY_IBPB (11*32+10) /* "" Issue an IBPB on kernel = entry */ - #define X86_FEATURE_RRSBA_CTRL (11*32+11) /* "" RET prediction control */ - #define X86_FEATURE_RETPOLINE (11*32+12) /* "" Generic Retpoline mitigat= ion for Spectre variant 2 */ - #define X86_FEATURE_RETPOLINE_LFENCE (11*32+13) /* "" Use LFENCE for Spec= tre variant 2 */ - #define X86_FEATURE_RETHUNK (11*32+14) /* "" Use REturn THUNK */ - #define X86_FEATURE_UNRET (11*32+15) /* "" AMD BTB untrain return */ - #define X86_FEATURE_USE_IBPB_FW (11*32+16) /* "" Use IBPB during runtime= firmware calls */ - #define X86_FEATURE_RSB_VMEXIT_LITE (11*32+17) /* "" Fill RSB on VM exit = when EIBRS is enabled */ - #define X86_FEATURE_SGX_EDECCSSA (11*32+18) /* "" SGX EDECCSSA user leaf = function */ - #define X86_FEATURE_CALL_DEPTH (11*32+19) /* "" Call depth tracking for = RSB stuffing */ - #define X86_FEATURE_MSR_TSX_CTRL (11*32+20) /* "" MSR IA32_TSX_CTRL (Inte= l) implemented */ - #define X86_FEATURE_SMBA (11*32+21) /* "" Slow Memory Bandwidth Allocati= on */ - #define X86_FEATURE_BMEC (11*32+22) /* "" Bandwidth Monitoring Event Con= figuration */ - #define X86_FEATURE_USER_SHSTK (11*32+23) /* Shadow stack support for us= er mode applications */ - #define X86_FEATURE_SRSO (11*32+24) /* "" AMD BTB untrain RETs */ - #define X86_FEATURE_SRSO_ALIAS (11*32+25) /* "" AMD BTB untrain RETs thr= ough aliasing */ - #define X86_FEATURE_IBPB_ON_VMEXIT (11*32+26) /* "" Issue an IBPB only on= VMEXIT */ - #define X86_FEATURE_APIC_MSRS_FENCE (11*32+27) /* "" IA32_TSC_DEADLINE an= d X2APIC MSRs need fencing */ - #define X86_FEATURE_ZEN2 (11*32+28) /* "" CPU based on Zen2 microarchite= cture */ - #define X86_FEATURE_ZEN3 (11*32+29) /* "" CPU based on Zen3 microarchite= cture */ - #define X86_FEATURE_ZEN4 (11*32+30) /* "" CPU based on Zen4 microarchite= cture */ - #define X86_FEATURE_ZEN1 (11*32+31) /* "" CPU based on Zen1 microarchite= cture */ + #define X86_FEATURE_CQM_LLC (11*32+ 0) /* "cqm_llc" LLC QoS if 1 */ + #define X86_FEATURE_CQM_OCCUP_LLC (11*32+ 1) /* "cqm_occup_llc" LLC occup= ancy monitoring */ + #define X86_FEATURE_CQM_MBM_TOTAL (11*32+ 2) /* "cqm_mbm_total" LLC Total= MBM monitoring */ + #define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* "cqm_mbm_local" LLC Local= MBM monitoring */ + #define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* LFENCE in user entry = SWAPGS path */ + #define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* LFENCE in kernel en= try SWAPGS path */ + #define X86_FEATURE_SPLIT_LOCK_DETECT (11*32+ 6) /* "split_lock_detect" #= AC for split lock */ + #define X86_FEATURE_PER_THREAD_MBA (11*32+ 7) /* Per-thread Memory Bandwi= dth Allocation */ + #define X86_FEATURE_SGX1 (11*32+ 8) /* Basic SGX */ + #define X86_FEATURE_SGX2 (11*32+ 9) /* SGX Enclave Dynamic Memory Manage= ment (EDMM) */ + #define X86_FEATURE_ENTRY_IBPB (11*32+10) /* Issue an IBPB on kernel ent= ry */ + #define X86_FEATURE_RRSBA_CTRL (11*32+11) /* RET prediction control */ + #define X86_FEATURE_RETPOLINE (11*32+12) /* Generic Retpoline mitigation= for Spectre variant 2 */ + #define X86_FEATURE_RETPOLINE_LFENCE (11*32+13) /* Use LFENCE for Spectre= variant 2 */ + #define X86_FEATURE_RETHUNK (11*32+14) /* Use REturn THUNK */ + #define X86_FEATURE_UNRET (11*32+15) /* AMD BTB untrain return */ + #define X86_FEATURE_USE_IBPB_FW (11*32+16) /* Use IBPB during runtime fi= rmware calls */ + #define X86_FEATURE_RSB_VMEXIT_LITE (11*32+17) /* Fill RSB on VM exit whe= n EIBRS is enabled */ + #define X86_FEATURE_SGX_EDECCSSA (11*32+18) /* SGX EDECCSSA user leaf fun= ction */ + #define X86_FEATURE_CALL_DEPTH (11*32+19) /* Call depth tracking for RSB= stuffing */ + #define X86_FEATURE_MSR_TSX_CTRL (11*32+20) /* MSR IA32_TSX_CTRL (Intel) = implemented */ + #define X86_FEATURE_SMBA (11*32+21) /* Slow Memory Bandwidth Allocation = */ + #define X86_FEATURE_BMEC (11*32+22) /* Bandwidth Monitoring Event Config= uration */ + #define X86_FEATURE_USER_SHSTK (11*32+23) /* "user_shstk" Shadow stack s= upport for user mode applications */ + #define X86_FEATURE_SRSO (11*32+24) /* AMD BTB untrain RETs */ + #define X86_FEATURE_SRSO_ALIAS (11*32+25) /* AMD BTB untrain RETs throug= h aliasing */ + #define X86_FEATURE_IBPB_ON_VMEXIT (11*32+26) /* Issue an IBPB only on VM= EXIT */ + #define X86_FEATURE_APIC_MSRS_FENCE (11*32+27) /* IA32_TSC_DEADLINE and X= 2APIC MSRs need fencing */ + #define X86_FEATURE_ZEN2 (11*32+28) /* CPU based on Zen2 microarchitectu= re */ + #define X86_FEATURE_ZEN3 (11*32+29) /* CPU based on Zen3 microarchitectu= re */ + #define X86_FEATURE_ZEN4 (11*32+30) /* CPU based on Zen4 microarchitectu= re */ + #define X86_FEATURE_ZEN1 (11*32+31) /* CPU based on Zen1 microarchitectu= re */ =20 /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ - #define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */ - #define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructio= ns */ - #define X86_FEATURE_CMPCCXADD (12*32+ 7) /* "" CMPccXADD instru= ctions */ - #define X86_FEATURE_ARCH_PERFMON_EXT (12*32+ 8) /* "" Intel Architectural= PerfMon Extension */ - #define X86_FEATURE_FZRM (12*32+10) /* "" Fast zero-length REP MOVSB */ - #define X86_FEATURE_FSRS (12*32+11) /* "" Fast short REP STOSB */ - #define X86_FEATURE_FSRC (12*32+12) /* "" Fast short REP {CMPSB,SCASB} */ - #define X86_FEATURE_FRED (12*32+17) /* Flexible Return and Event Deliver= y */ - #define X86_FEATURE_LKGS (12*32+18) /* "" Load "kernel" (userspace) GS */ - #define X86_FEATURE_WRMSRNS (12*32+19) /* "" Non-serializing WRMSR */ - #define X86_FEATURE_AMX_FP16 (12*32+21) /* "" AMX fp16 Support */ - #define X86_FEATURE_AVX_IFMA (12*32+23) /* "" Support for VPMA= DD52[H,L]UQ */ - #define X86_FEATURE_LAM (12*32+26) /* Linear Address Masking */ + #define X86_FEATURE_AVX_VNNI (12*32+ 4) /* "avx_vnni" AVX VNNI instructi= ons */ + #define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* "avx512_bf16" AVX512 BFLOA= T16 instructions */ + #define X86_FEATURE_CMPCCXADD (12*32+ 7) /* CMPccXADD instructi= ons */ + #define X86_FEATURE_ARCH_PERFMON_EXT (12*32+ 8) /* Intel Architectural Pe= rfMon Extension */ + #define X86_FEATURE_FZRM (12*32+10) /* Fast zero-length REP MOVSB */ + #define X86_FEATURE_FSRS (12*32+11) /* Fast short REP STOSB */ + #define X86_FEATURE_FSRC (12*32+12) /* Fast short REP {CMPSB,SCASB} */ + #define X86_FEATURE_FRED (12*32+17) /* "fred" Flexible Return and Event = Delivery */ + #define X86_FEATURE_LKGS (12*32+18) /* Load "kernel" (userspace) GS */ + #define X86_FEATURE_WRMSRNS (12*32+19) /* Non-serializing WRMSR */ + #define X86_FEATURE_AMX_FP16 (12*32+21) /* AMX fp16 Support */ + #define X86_FEATURE_AVX_IFMA (12*32+23) /* Support for VPMADD5= 2[H,L]UQ */ + #define X86_FEATURE_LAM (12*32+26) /* "lam" Linear Address Masking */ =20 /* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */ - #define X86_FEATURE_CLZERO (13*32+ 0) /* CLZERO instruction */ - #define X86_FEATURE_IRPERF (13*32+ 1) /* Instructions Retired Count */ - #define X86_FEATURE_XSAVEERPTR (13*32+ 2) /* Always save/restore FP erro= r pointers */ - #define X86_FEATURE_RDPRU (13*32+ 4) /* Read processor register at user = level */ - #define X86_FEATURE_WBNOINVD (13*32+ 9) /* WBNOINVD instruction */ - #define X86_FEATURE_AMD_IBPB (13*32+12) /* "" Indirect Branch Prediction= Barrier */ - #define X86_FEATURE_AMD_IBRS (13*32+14) /* "" Indirect Branch Restricted= Speculation */ - #define X86_FEATURE_AMD_STIBP (13*32+15) /* "" Single Thread Indirect Br= anch Predictors */ - #define X86_FEATURE_AMD_STIBP_ALWAYS_ON (13*32+17) /* "" Single Thread In= direct Branch Predictors always-on preferred */ - #define X86_FEATURE_AMD_PPIN (13*32+23) /* Protected Processor Inventory= Number */ - #define X86_FEATURE_AMD_SSBD (13*32+24) /* "" Speculative Store Bypass D= isable */ - #define X86_FEATURE_VIRT_SSBD (13*32+25) /* Virtualized Speculative Stor= e Bypass Disable */ - #define X86_FEATURE_AMD_SSB_NO (13*32+26) /* "" Speculative Store Bypass= is fixed in hardware. */ - #define X86_FEATURE_CPPC (13*32+27) /* Collaborative Processor Performan= ce Control */ - #define X86_FEATURE_AMD_PSFD (13*32+28) /* "" Predictive Store= Forwarding Disable */ - #define X86_FEATURE_BTC_NO (13*32+29) /* "" Not vulnerable to Branch Typ= e Confusion */ - #define X86_FEATURE_BRS (13*32+31) /* Branch Sampling available */ + #define X86_FEATURE_CLZERO (13*32+ 0) /* "clzero" CLZERO instruction */ + #define X86_FEATURE_IRPERF (13*32+ 1) /* "irperf" Instructions Retired C= ount */ + #define X86_FEATURE_XSAVEERPTR (13*32+ 2) /* "xsaveerptr" Always save/re= store FP error pointers */ + #define X86_FEATURE_RDPRU (13*32+ 4) /* "rdpru" Read processor register = at user level */ + #define X86_FEATURE_WBNOINVD (13*32+ 9) /* "wbnoinvd" WBNOINVD instructi= on */ + #define X86_FEATURE_AMD_IBPB (13*32+12) /* Indirect Branch Prediction Ba= rrier */ + #define X86_FEATURE_AMD_IBRS (13*32+14) /* Indirect Branch Restricted Sp= eculation */ + #define X86_FEATURE_AMD_STIBP (13*32+15) /* Single Thread Indirect Branc= h Predictors */ + #define X86_FEATURE_AMD_STIBP_ALWAYS_ON (13*32+17) /* Single Thread Indir= ect Branch Predictors always-on preferred */ + #define X86_FEATURE_AMD_PPIN (13*32+23) /* "amd_ppin" Protected Processo= r Inventory Number */ + #define X86_FEATURE_AMD_SSBD (13*32+24) /* Speculative Store Bypass Disa= ble */ + #define X86_FEATURE_VIRT_SSBD (13*32+25) /* "virt_ssbd" Virtualized Spec= ulative Store Bypass Disable */ + #define X86_FEATURE_AMD_SSB_NO (13*32+26) /* Speculative Store Bypass is= fixed in hardware. */ + #define X86_FEATURE_CPPC (13*32+27) /* "cppc" Collaborative Processor Pe= rformance Control */ + #define X86_FEATURE_AMD_PSFD (13*32+28) /* Predictive Store Fo= rwarding Disable */ + #define X86_FEATURE_BTC_NO (13*32+29) /* Not vulnerable to Branch Type C= onfusion */ + #define X86_FEATURE_BRS (13*32+31) /* "brs" Branch Sampling available */ =20 /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word = 14 */ - #define X86_FEATURE_DTHERM (14*32+ 0) /* Digital Thermal Sensor */ - #define X86_FEATURE_IDA (14*32+ 1) /* Intel Dynamic Acceleration */ - #define X86_FEATURE_ARAT (14*32+ 2) /* Always Running APIC Timer */ - #define X86_FEATURE_PLN (14*32+ 4) /* Intel Power Limit Notification */ - #define X86_FEATURE_PTS (14*32+ 6) /* Intel Package Thermal Status */ - #define X86_FEATURE_HWP (14*32+ 7) /* Intel Hardware P-states */ - #define X86_FEATURE_HWP_NOTIFY (14*32+ 8) /* HWP Notification */ - #define X86_FEATURE_HWP_ACT_WINDOW (14*32+ 9) /* HWP Activity Window */ - #define X86_FEATURE_HWP_EPP (14*32+10) /* HWP Energy Perf. Preference */ - #define X86_FEATURE_HWP_PKG_REQ (14*32+11) /* HWP Package Level Request = */ - #define X86_FEATURE_HWP_HIGHEST_PERF_CHANGE (14*32+15) /* "" HWP Highest = perf change */ - #define X86_FEATURE_HFI (14*32+19) /* Hardware Feedback Interface */ + #define X86_FEATURE_DTHERM (14*32+ 0) /* "dtherm" Digital Thermal Sensor= */ + #define X86_FEATURE_IDA (14*32+ 1) /* "ida" Intel Dynamic Acceleration = */ + #define X86_FEATURE_ARAT (14*32+ 2) /* "arat" Always Running APIC Timer = */ + #define X86_FEATURE_PLN (14*32+ 4) /* "pln" Intel Power Limit Notificat= ion */ + #define X86_FEATURE_PTS (14*32+ 6) /* "pts" Intel Package Thermal Statu= s */ + #define X86_FEATURE_HWP (14*32+ 7) /* "hwp" Intel Hardware P-states */ + #define X86_FEATURE_HWP_NOTIFY (14*32+ 8) /* "hwp_notify" HWP Notificati= on */ + #define X86_FEATURE_HWP_ACT_WINDOW (14*32+ 9) /* "hwp_act_window" HWP Act= ivity Window */ + #define X86_FEATURE_HWP_EPP (14*32+10) /* "hwp_epp" HWP Energy Perf. Pre= ference */ + #define X86_FEATURE_HWP_PKG_REQ (14*32+11) /* "hwp_pkg_req" HWP Package = Level Request */ ++#define X86_FEATURE_HWP_HIGHEST_PERF_CHANGE (14*32+15) /* HWP Highest per= f change */ + #define X86_FEATURE_HFI (14*32+19) /* "hfi" Hardware Feedback Interface= */ =20 /* AMD SVM Feature Identification, CPUID level 0x8000000a (EDX), word 15 = */ - #define X86_FEATURE_NPT (15*32+ 0) /* Nested Page Table support */ - #define X86_FEATURE_LBRV (15*32+ 1) /* LBR Virtualization support */ + #define X86_FEATURE_NPT (15*32+ 0) /* "npt" Nested Page Table support */ + #define X86_FEATURE_LBRV (15*32+ 1) /* "lbrv" LBR Virtualization support= */ #define X86_FEATURE_SVML (15*32+ 2) /* "svm_lock" SVM locking MSR */ #define X86_FEATURE_NRIPS (15*32+ 3) /* "nrip_save" SVM next_rip save */ #define X86_FEATURE_TSCRATEMSR (15*32+ 4) /* "tsc_scale" TSC scaling sup= port */ @@@ -466,12 -466,11 +467,12 @@@ * * Reuse free bits when adding new feature flags! */ - #define X86_FEATURE_AMD_LBR_PMC_FREEZE (21*32+ 0) /* AMD LBR and PMC Free= ze */ - #define X86_FEATURE_CLEAR_BHB_LOOP (21*32+ 1) /* "" Clear branch history = at syscall entry using SW loop */ - #define X86_FEATURE_BHI_CTRL (21*32+ 2) /* "" BHI_DIS_S HW control avail= able */ - #define X86_FEATURE_CLEAR_BHB_HW (21*32+ 3) /* "" BHI_DIS_S HW control en= abled */ - #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* "" Clear branc= h history at vmexit using SW loop */ - #define X86_FEATURE_FAST_CPPC (21*32 + 5) /* "" AMD Fast CPPC */ + #define X86_FEATURE_AMD_LBR_PMC_FREEZE (21*32+ 0) /* "amd_lbr_pmc_freeze"= AMD LBR and PMC Freeze */ + #define X86_FEATURE_CLEAR_BHB_LOOP (21*32+ 1) /* Clear branch history at = syscall entry using SW loop */ + #define X86_FEATURE_BHI_CTRL (21*32+ 2) /* BHI_DIS_S HW control availabl= e */ + #define X86_FEATURE_CLEAR_BHB_HW (21*32+ 3) /* BHI_DIS_S HW control enabl= ed */ + #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* Clear branch h= istory at vmexit using SW loop */ ++#define X86_FEATURE_FAST_CPPC (21*32 + 5) /* AMD Fast CPPC */ =20 /* * BUG word(s) --Sig_/0U2=0zcqyTt+2jZ_5TTPgGt Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaDfvsACgkQAVBC80lX 0Gx5SQf+LPzF8Ka4851H23x0zQ93J83TQppx6sUxnAKHu93l4xnzKTXhbvLCoHuN s203/7+GFdqL0LDEVrQm/UaYYIAiP7u1/yacPpUgXBrUELR4s257PhoI/KX6nRY9 YzkvcAJT00AF7ASBb+IGqxi3ROfmVXmvdxJiTdu7mQKerLQXJJ6kcCwAvmSaCJUU +PqExucNhKJDAoEEm5svbAngYTEUECWLpY5vNgOvApIOt1GPHnxlEKLV4lDyz+1c 5/Qiwd9ZBNiBUOfrJe66zV4b+k2XPyMAZhXsdzFyZgxPmzgYWtZzRJ807PHGExsV KiS6Y7/esrkwf7SjDiEpS3IRPKy89A== =z7x7 -----END PGP SIGNATURE----- --Sig_/0U2=0zcqyTt+2jZ_5TTPgGt-- . From: Changbin Du To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Nathan Chancellor CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Nick Desaulniers , Bill Wendling , Justin Stitt , , , , Hui Wang , Changbin Du Subject: [PATCH v5 0/8] perf: support specify vdso path in cmdline Date: Tue, 2 Jul 2024 12:18:29 +0800 Message-ID: <20240702041837.5306-1-changbin.du@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264830 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.llvm,org.kernel.vger.linux-perf-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The vdso dumped from process memory (in buildid-cache) lacks debugging info. To annotate vdso symbols with source lines we need a debugging version. For x86, we can find them from your local build as 'arch/x86/entry/vdso/vdso{32,64}.so.dbg'. Or they may resides in '/lib/modules//vdso/vdso{32,64}.so' on Ubuntu. But notice that the builid has to match. If user doesn't specify the path, perf will search them internally as long as vmlinux when recording samples. The searched debugging vdso will add to buildid cache. Below samples are captured on my local build kernel. perf succesfully find debugging version vdso and we can annotate with source without specifying vdso path. $ sudo perf record -a $ sudo perf report --objdump=llvm-objdump Samples: 17K of event 'cycles:P', 4000 Hz, Event count (approx.): 1760 __vdso_clock_gettime /work/linux-host/arch/x86/entry/vdso/vdso64.so.d Percent│ movq -48(%rbp),%rsi │ testq %rax,%rax │ ; return vread_hvclock(); │ movq %rax,%rdx │ ; if (unlikely(!vdso_cycles_ok(cycles))) │ ↑ js eb │ ↑ jmp 74 │ ; ts->tv_sec = vdso_ts->sec; 0.02 │147: leaq 2(%rbx),%rax │ shlq $4, %rax │ addq %r10,%rax │ ; while ((seq = READ_ONCE(vd->seq)) & 1) { 9.38 │152: movl (%r10),%ecx When doing cross platform analysis, we need to specify the vdso path if we are interested in its symbols. At most two vdso can be given. Also you can pack your buildid cache with perf-archive if the debugging vdso can be found on the sampled machine. $ sudo perf report --objdump=llvm-objdump \ --vdso arch/x86/entry/vdso/vdso64.so.dbg,arch/x86/entry/vdso/vdso32.so.dbg I also improved perf-buildid-cache command recognize vdso when adding files, then place it at correct place. v5: - Searching the vdso in record stage instead of report. So the debugging vdso will be in build-id cache. This is friendly for cross-machine analysis. - Improve perf-buildid-cache command recognize vdso when adding files v4: - split the refactoring from the actual change. v3: - update documentation. v2: - now search vdso automatically as long as vmlinux, as suggested by Adrian. - remove change 'prefer symsrc_filename for filename'. Changbin Du (8): perf: support specify vdso path in cmdline perf: disasm: refactor function dso__disassemble_filename perf: disasm: use build_id_path if fallback failed perf: build-id: name debugging vdso as "debug" perf: symbol: generalize vmlinux path searching perf: build-id: try to search debugging vdso and add to cache perf: disasm: prefer debugging files in build-id cache perf buildid-cache: recognize vdso when adding files tools/perf/Documentation/perf-annotate.txt | 3 + tools/perf/Documentation/perf-c2c.txt | 3 + tools/perf/Documentation/perf-inject.txt | 3 + tools/perf/Documentation/perf-report.txt | 3 + tools/perf/Documentation/perf-script.txt | 3 + tools/perf/Documentation/perf-top.txt | 3 + tools/perf/builtin-annotate.c | 2 + tools/perf/builtin-buildid-cache.c | 26 ++- tools/perf/builtin-c2c.c | 2 + tools/perf/builtin-inject.c | 2 + tools/perf/builtin-report.c | 2 + tools/perf/builtin-script.c | 2 + tools/perf/builtin-top.c | 2 + tools/perf/util/build-id.c | 57 +++++- tools/perf/util/disasm.c | 131 ++++++++----- tools/perf/util/machine.c | 4 +- tools/perf/util/symbol.c | 209 ++++++++++++++++----- tools/perf/util/symbol.h | 9 +- tools/perf/util/symbol_conf.h | 5 + 19 files changed, 359 insertions(+), 112 deletions(-) -- 2.34.1 . From: Zhangchun To: "akpm@linux-foundation.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" CC: "linux-kernel@vger.kernel.org" , Jiaoxupo , Bailin , Zhangzhansheng , "linux-mm@kvack.org" , wangyu , "shaohaojize@126.com" Subject: =?utf-8?B?562U5aSNOiAgW1BBVENIXSBtbTogZml4IGttYXBfaGlnaCBkZWFkbG9jayBW?= =?utf-8?Q?2?= Date: Tue, 2 Jul 2024 04:25:17 +0000 Message-ID: <7e855a8ff82743979be9bb15363f98dc@h3c.com> Accept-Language: en-US Content-Language: zh-CN x-sender-location: DAG2 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-DNSRBL: X-SPAM-SOURCE-CHECK: pass Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264840 org.kvack.linux-mm:202100 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail RnJvbTogInpoYW5nLmNodW4iIDx6aGFuZy5jaHVuYUBoM2MuY29tPg0KDQpJIHdvcmsgd2l0aCB6 aGFuZ3poYW5zaGVuZyhmcm9tIGgzYykgZmluZCB0aGF0IHNvbWUgc2l0dWF0aW9uDQptYXkgY2Fz dWUgZGVhZGxvY2sgd2hlbiB3ZSB1c2Uga21hcF9oaWdoIGFuZCBrbWFwX1hYWCBvciBrdW1hcF94 eHgNCmJldHdlZW4gIGRpZmZlcnQgY29yZXMgYXQgdGhlIHNhbWUgdGltZSwgIGttYXBfaGlnaC0+ bWFwX25ld192aXJ0dWFsLT4NCmZsdXNoX2FsbF96ZXJvX3BrbWFwcy0+Zmx1c2hfdGxiX2tlcm5l bF9yYW5nZS0+b25fZWFjaF9jcHUuIE9uIHRoaXMNCmNvbmRpdGlvbiwga21hcF9oaWdoIGhvbGQg dGhlIGttYXBfbG9ja++8jHdhaXQgdGhlIG90aGVyIGNvcmVzIHJlc3BvbmQNCnRvIGlwaS4gQnV0 IHRoZSBvdGhlcnMgbWF5IGRpc2FibGUgaXJxIGFuZCB3YWl0IGttYXBfbG9jaywNCnRoaXMgaXMg c29tZSBkZWFkbG9jayBjb25kaXRpb24uIEkgdGhpbmsgaXQncyBuZWNlc3NhcnkgdG8gZ2l2ZQ0K a21hcF9sb2NrIGJlZm9yZSBjYWxsIGZsdXNoX3RsYl9rZXJuZWxfcmFuZ2UuDQpMaWtlIHRoaXM6 DQpzcGluX3VubG9jaygma21hcF9sb2NrKTsNCmZsdXNoX3RsYl9rZXJuZWxfcmFuZ2UoeHh4KTsN CnNwaW5fbG9jaygma21hcF9sb2NrKTsNCg0KQ1BVIDA6ICAgICAgICAgICAgICAgIGNwdSAxOg0K ICAgICAgICAgICAgICAgICAgICAgICAga21hcF94eHgoKSB7DQp4eHggICAgICAgICAgICAgICAg ICAgICBpcnFfZGlzYWJsZSgpOw0Ka21hcF9oaWdoKCk7ICAgICAgICAgICAgc3Bpbl9sb2NrKCZr bWFwX2xvY2spDQp4eHggICAgICAgICAgICAgICAgICAgICB5eXl5eXl5DQogICAgICAgICAgICAg ICAgICAgICAgICBzcGluX3VubG9jaygma21hcF9sb2NrKQ0KICAgICAgICAgICAgICAgICAgICAg ICAgaXJxX2VuYWJsZSgpOw0KICAgICAgICAgICAgICAgICAgICAgICAgfQ0Ka21hcF9oaWdoIGRl dGFpbDoNCmttYXBfaGlnaCgpIHsNCiAgICAgICAgenp6DQogICAgICAgIHNwaW5fbG9jaygma21h cF9sb2NrKQ0KICAgICAgICBtYXBfbmV3X3ZpcnR1YWwtPg0KICAgICAgICAgICAgICAgIGZsdXNo X2FsbF96ZXJvX3BrbWFwcy0+DQogICAgICAgICAgICAgICAgICAgICAgICBmbHVzaF90bGJfa2Vy bmVsX3JhbmdlLT4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb25fZWFjaF9jcHUN CiAgICAgICAgLyoNCiAgICAgICAgaWYgY3B1IDEgaXJxX2Rpc2FibGVkLCB0aGUgY3B1IDENCiAg ICAgICAgY2Fubm90IGFjaywgdGhlbiBjcHUgMCBhbmQgY3B1IDEgbWF5IGhhbmd1cC4NCiAgICAg ICAgKi8NCiAgICAgICAgc3Bpbl91bmxvY2soJmttYXBfbG9jaykNCiAgICAgICAgenp6DQp9DQpT aWduZWQtb2ZmLWJ5OiB6aGFuZ2NodW4gPHpoYW5nLmNodW5hQGgzYy5jb20+DQoNClJldmlld2Vk LWJ5OiB6aGFuZ3poZW5nbWluZyA8emhhbmcuemhlbmdtaW5nQGgzYy5jb20+DQotLS0NCiBtbS9o aWdobWVtLmMgfCA1ICsrKystDQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMSBk ZWxldGlvbigtKQ0KDQpkaWZmIC0tZ2l0IGEvbW0vaGlnaG1lbS5jIGIvbW0vaGlnaG1lbS5jDQpp bmRleCBiZDQ4YmE0Li44NDFiMzcwIDEwMDY0NA0KLS0tIGEvbW0vaGlnaG1lbS5jDQorKysgYi9t bS9oaWdobWVtLmMNCkBAIC0yMjAsOCArMjIwLDExIEBAIHN0YXRpYyB2b2lkIGZsdXNoX2FsbF96 ZXJvX3BrbWFwcyh2b2lkKQ0KICAgICAgICAgICAgICAgIHNldF9wYWdlX2FkZHJlc3MocGFnZSwg TlVMTCk7DQogICAgICAgICAgICAgICAgbmVlZF9mbHVzaCA9IDE7DQogICAgICAgIH0NCi0gICAg ICAgaWYgKG5lZWRfZmx1c2gpDQorICAgICAgIGlmIChuZWVkX2ZsdXNoKSB7DQorICAgICAgICAg ICAgICAgc3Bpbl91bmxvY2soJmttYXBfbG9jayk7DQogICAgICAgICAgICAgICAgZmx1c2hfdGxi X2tlcm5lbF9yYW5nZShQS01BUF9BRERSKDApLCBQS01BUF9BRERSKExBU1RfUEtNQVApKTsNCisg ICAgICAgICAgICAgICBzcGluX2xvY2soJmttYXBfbG9jayk7DQorICAgICAgIH0NCiB9DQoNCiB2 b2lkIF9fa21hcF9mbHVzaF91bnVzZWQodm9pZCkNCi0tDQoyLjM0LjENCg0KLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQ0K5pys6YKu5Lu25Y+K5YW26ZmE5Lu25ZCr5pyJ5paw5Y2O5LiJ6ZuG5Zui55qE5L+d 5a+G5L+h5oGv77yM5LuF6ZmQ5LqO5Y+R6YCB57uZ5LiK6Z2i5Zyw5Z2A5Lit5YiX5Ye6DQrnmoTk uKrkurrmiJbnvqTnu4TjgILnpoHmraLku7vkvZXlhbbku5bkurrku6Xku7vkvZXlvaLlvI/kvb/n lKjvvIjljIXmi6zkvYbkuI3pmZDkuo7lhajpg6jmiJbpg6jliIblnLDms4TpnLLjgIHlpI3liLbj gIENCuaIluaVo+WPke+8ieacrOmCruS7tuS4reeahOS/oeaBr+OAguWmguaenOaCqOmUmeaUtuS6 huacrOmCruS7tu+8jOivt+aCqOeri+WNs+eUteivneaIlumCruS7tumAmuefpeWPkeS7tuS6uuW5 tuWIoOmZpOacrA0K6YKu5Lu277yBDQpUaGlzIGUtbWFpbCBhbmQgaXRzIGF0dGFjaG1lbnRzIGNv bnRhaW4gY29uZmlkZW50aWFsIGluZm9ybWF0aW9uIGZyb20gTmV3IEgzQywgd2hpY2ggaXMNCmlu dGVuZGVkIG9ubHkgZm9yIHRoZSBwZXJzb24gb3IgZW50aXR5IHdob3NlIGFkZHJlc3MgaXMgbGlz dGVkIGFib3ZlLiBBbnkgdXNlIG9mIHRoZQ0KaW5mb3JtYXRpb24gY29udGFpbmVkIGhlcmVpbiBp biBhbnkgd2F5IChpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0bywgdG90YWwgb3IgcGFydGlh bA0KZGlzY2xvc3VyZSwgcmVwcm9kdWN0aW9uLCBvciBkaXNzZW1pbmF0aW9uKSBieSBwZXJzb25z IG90aGVyIHRoYW4gdGhlIGludGVuZGVkDQpyZWNpcGllbnQocykgaXMgcHJvaGliaXRlZC4gSWYg eW91IHJlY2VpdmUgdGhpcyBlLW1haWwgaW4gZXJyb3IsIHBsZWFzZSBub3RpZnkgdGhlIHNlbmRl cg0KYnkgcGhvbmUgb3IgZW1haWwgaW1tZWRpYXRlbHkgYW5kIGRlbGV0ZSBpdCENCg== . From: Zhangchun To: "akpm@linux-foundation.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" CC: "linux-kernel@vger.kernel.org" , Jiaoxupo , Bailin , Zhangzhansheng , "linux-mm@kvack.org" , wangyu , "shaohaojize@126.com" , Zhangzhengming Subject: [PATCH] mm: fix kmap_high deadlock V2 Date: Tue, 2 Jul 2024 04:26:59 +0000 Message-ID: <7caa255fa5fe4e8e9c6a05084a1faf72@h3c.com> Accept-Language: en-US Content-Language: zh-CN x-sender-location: DAG2 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-DNSRBL: X-SPAM-SOURCE-CHECK: pass Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264842 org.kvack.linux-mm:202101 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail DQpGcm9tOiAiemhhbmcuY2h1biIgPHpoYW5nLmNodW5hQGgzYy5jb20+DQoNCkkgd29yayB3aXRo IHpoYW5nemhhbnNoZW5nKGZyb20gaDNjKSBmaW5kIHRoYXQgc29tZSBzaXR1YXRpb24gbWF5IGNh c3VlIGRlYWRsb2NrIHdoZW4gd2UgdXNlIGttYXBfaGlnaCBhbmQga21hcF9YWFggb3Iga3VtYXBf eHh4IGJldHdlZW4gIGRpZmZlcnQgY29yZXMgYXQgdGhlIHNhbWUgdGltZSwgIGttYXBfaGlnaC0+ bWFwX25ld192aXJ0dWFsLT4gZmx1c2hfYWxsX3plcm9fcGttYXBzLT5mbHVzaF90bGJfa2VybmVs X3JhbmdlLT5vbl9lYWNoX2NwdS4gT24gdGhpcyBjb25kaXRpb24sIGttYXBfaGlnaCBob2xkIHRo ZSBrbWFwX2xvY2vvvIx3YWl0IHRoZSBvdGhlciBjb3JlcyByZXNwb25kIHRvIGlwaS4gQnV0IHRo ZSBvdGhlcnMgbWF5IGRpc2FibGUgaXJxIGFuZCB3YWl0IGttYXBfbG9jaywgdGhpcyBpcyBzb21l IGRlYWRsb2NrIGNvbmRpdGlvbi4gSSB0aGluayBpdCdzIG5lY2Vzc2FyeSB0byBnaXZlIGttYXBf bG9jayBiZWZvcmUgY2FsbCBmbHVzaF90bGJfa2VybmVsX3JhbmdlLg0KTGlrZSB0aGlzOg0Kc3Bp bl91bmxvY2soJmttYXBfbG9jayk7DQpmbHVzaF90bGJfa2VybmVsX3JhbmdlKHh4eCk7DQpzcGlu X2xvY2soJmttYXBfbG9jayk7DQoNCkNQVSAwOiAgICAgICAgICAgICAgICBjcHUgMToNCiAgICAg ICAgICAgICAgICAgICAgICAgIGttYXBfeHh4KCkgew0KeHh4ICAgICAgICAgICAgICAgICAgICAg aXJxX2Rpc2FibGUoKTsNCmttYXBfaGlnaCgpOyAgICAgICAgICAgIHNwaW5fbG9jaygma21hcF9s b2NrKQ0KeHh4ICAgICAgICAgICAgICAgICAgICAgeXl5eXl5eQ0KICAgICAgICAgICAgICAgICAg ICAgICAgc3Bpbl91bmxvY2soJmttYXBfbG9jaykNCiAgICAgICAgICAgICAgICAgICAgICAgIGly cV9lbmFibGUoKTsNCiAgICAgICAgICAgICAgICAgICAgICAgIH0NCmttYXBfaGlnaCBkZXRhaWw6 DQprbWFwX2hpZ2goKSB7DQogICAgICAgIHp6eg0KICAgICAgICBzcGluX2xvY2soJmttYXBfbG9j aykNCiAgICAgICAgbWFwX25ld192aXJ0dWFsLT4NCiAgICAgICAgICAgICAgICBmbHVzaF9hbGxf emVyb19wa21hcHMtPg0KICAgICAgICAgICAgICAgICAgICAgICAgZmx1c2hfdGxiX2tlcm5lbF9y YW5nZS0+DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9uX2VhY2hfY3B1DQogICAg ICAgIC8qDQogICAgICAgIGlmIGNwdSAxIGlycV9kaXNhYmxlZCwgdGhlIGNwdSAxDQogICAgICAg IGNhbm5vdCBhY2ssIHRoZW4gY3B1IDAgYW5kIGNwdSAxIG1heSBoYW5ndXAuDQogICAgICAgICov DQogICAgICAgIHNwaW5fdW5sb2NrKCZrbWFwX2xvY2spDQogICAgICAgIHp6eg0KfQ0KU2lnbmVk LW9mZi1ieTogemhhbmdjaHVuIDx6aGFuZy5jaHVuYUBoM2MuY29tPg0KDQpSZXZpZXdlZC1ieTog emhhbmd6aGVuZ21pbmcgPHpoYW5nLnpoZW5nbWluZ0BoM2MuY29tPg0KLS0tDQogbW0vaGlnaG1l bS5jIHwgNSArKysrLQ0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDEgZGVsZXRp b24oLSkNCg0KZGlmZiAtLWdpdCBhL21tL2hpZ2htZW0uYyBiL21tL2hpZ2htZW0uYyBpbmRleCBi ZDQ4YmE0Li44NDFiMzcwIDEwMDY0NA0KLS0tIGEvbW0vaGlnaG1lbS5jDQorKysgYi9tbS9oaWdo bWVtLmMNCkBAIC0yMjAsOCArMjIwLDExIEBAIHN0YXRpYyB2b2lkIGZsdXNoX2FsbF96ZXJvX3Br bWFwcyh2b2lkKQ0KICAgICAgICAgICAgICAgIHNldF9wYWdlX2FkZHJlc3MocGFnZSwgTlVMTCk7 DQogICAgICAgICAgICAgICAgbmVlZF9mbHVzaCA9IDE7DQogICAgICAgIH0NCi0gICAgICAgaWYg KG5lZWRfZmx1c2gpDQorICAgICAgIGlmIChuZWVkX2ZsdXNoKSB7DQorICAgICAgICAgICAgICAg c3Bpbl91bmxvY2soJmttYXBfbG9jayk7DQogICAgICAgICAgICAgICAgZmx1c2hfdGxiX2tlcm5l bF9yYW5nZShQS01BUF9BRERSKDApLCBQS01BUF9BRERSKExBU1RfUEtNQVApKTsNCisgICAgICAg ICAgICAgICBzcGluX2xvY2soJmttYXBfbG9jayk7DQorICAgICAgIH0NCiB9DQoNCiB2b2lkIF9f a21hcF9mbHVzaF91bnVzZWQodm9pZCkNCi0tDQoyLjM0LjENCg0KLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQ0K5pys6YKu5Lu25Y+K5YW26ZmE5Lu25ZCr5pyJ5paw5Y2O5LiJ6ZuG5Zui55qE5L+d5a+G5L+h 5oGv77yM5LuF6ZmQ5LqO5Y+R6YCB57uZ5LiK6Z2i5Zyw5Z2A5Lit5YiX5Ye6DQrnmoTkuKrkurrm iJbnvqTnu4TjgILnpoHmraLku7vkvZXlhbbku5bkurrku6Xku7vkvZXlvaLlvI/kvb/nlKjvvIjl jIXmi6zkvYbkuI3pmZDkuo7lhajpg6jmiJbpg6jliIblnLDms4TpnLLjgIHlpI3liLbjgIENCuaI luaVo+WPke+8ieacrOmCruS7tuS4reeahOS/oeaBr+OAguWmguaenOaCqOmUmeaUtuS6huacrOmC ruS7tu+8jOivt+aCqOeri+WNs+eUteivneaIlumCruS7tumAmuefpeWPkeS7tuS6uuW5tuWIoOmZ pOacrA0K6YKu5Lu277yBDQpUaGlzIGUtbWFpbCBhbmQgaXRzIGF0dGFjaG1lbnRzIGNvbnRhaW4g Y29uZmlkZW50aWFsIGluZm9ybWF0aW9uIGZyb20gTmV3IEgzQywgd2hpY2ggaXMNCmludGVuZGVk IG9ubHkgZm9yIHRoZSBwZXJzb24gb3IgZW50aXR5IHdob3NlIGFkZHJlc3MgaXMgbGlzdGVkIGFi b3ZlLiBBbnkgdXNlIG9mIHRoZQ0KaW5mb3JtYXRpb24gY29udGFpbmVkIGhlcmVpbiBpbiBhbnkg d2F5IChpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0bywgdG90YWwgb3IgcGFydGlhbA0KZGlz Y2xvc3VyZSwgcmVwcm9kdWN0aW9uLCBvciBkaXNzZW1pbmF0aW9uKSBieSBwZXJzb25zIG90aGVy IHRoYW4gdGhlIGludGVuZGVkDQpyZWNpcGllbnQocykgaXMgcHJvaGliaXRlZC4gSWYgeW91IHJl Y2VpdmUgdGhpcyBlLW1haWwgaW4gZXJyb3IsIHBsZWFzZSBub3RpZnkgdGhlIHNlbmRlcg0KYnkg cGhvbmUgb3IgZW1haWwgaW1tZWRpYXRlbHkgYW5kIGRlbGV0ZSBpdCENCg== . Date: Tue, 2 Jul 2024 14:58:19 +1000 From: Stephen Rothwell To: Lee Jones , Benson Leung , Guenter Roeck , Dmitry Torokhov Cc: Linux Kernel Mailing List , Linux Next Mailing List , Thomas =?UTF-8?B?V2Vpw59zY2h1?= =?UTF-8?B?aA==?= , Tzung-Bi Shih Subject: linux-next: manual merge of the leds-lj tree with the chrome-platform tree Message-ID: <20240702145819.3bd4e113@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/11QYbJkL6x_QzL4iq/kQb4w"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264854 org.kernel.vger.linux-next:62045 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/11QYbJkL6x_QzL4iq/kQb4w Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the leds-lj tree got a conflict in: MAINTAINERS between commits: bc3e45258096 ("hwmon: add ChromeOS EC driver") c6ed48ef5259 ("power: supply: add ChromeOS EC based charge control driver= ") from the chrome-platform tree and commit: 8d6ce6f3ec9d ("leds: Add ChromeOS EC driver") from the leds-lj tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc MAINTAINERS index c89c84111696,a7deb8fa20ca..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -5210,19 -5135,11 +5210,24 @@@ S: Maintaine F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml F: sound/soc/codecs/cros_ec_codec.* =20 +CHROMEOS EC CHARGE CONTROL +M: Thomas Wei=C3=9Fschuh +S: Maintained +F: drivers/power/supply/cros_charge-control.c + +CHROMEOS EC HARDWARE MONITORING +M: Thomas Wei=C3=9Fschuh +L: chrome-platform@lists.linux.dev +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/hwmon/cros_ec_hwmon.rst +F: drivers/hwmon/cros_ec_hwmon.c + + CHROMEOS EC LED DRIVER + M: Thomas Wei=C3=9Fschuh + S: Maintained + F: drivers/leds/leds-cros_ec.c +=20 CHROMEOS EC SUBDRIVERS M: Benson Leung R: Guenter Roeck --Sig_/11QYbJkL6x_QzL4iq/kQb4w Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaDiOsACgkQAVBC80lX 0Gx1qAf+LmxInoYE6m3SPzbudcHjQ9fuwnlOPG4+7+IQ8jstwOCU/ilkFsHCThYE JS1/RdvQOmLweOI6asc62xfNaEDfVr0u6l6QcvgCLg1yOMiLgxl6V2WLon3NN5VU XtgvcpiGLPOJSugxCKzHW+Wt/ZWR0VNh8HmngQHpVFckxSNfXTNn4X2K0OV3TsyX 0RJJTHHd7l1e546b4CriGDYfPLdwZXNkbCl4vlOnyMZ8fzNSp8d/1H/qTFIiPXaS GdibRGeVw0zwR1DADL70zFWroKUu8DI4VWpjsxrb0s1nDef+MvBvV1XwO7QShbp5 XZvUr6Cd00vAWzf+KJtFOBIZSAO4YA== =RalT -----END PGP SIGNATURE----- --Sig_/11QYbJkL6x_QzL4iq/kQb4w-- . Date: Tue, 2 Jul 2024 13:03:07 +0800 From: kernel test robot To: Arnd Bergmann Cc: oe-kbuild-all@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Gleixner Subject: arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared; did you mean 'CONFIG_LOG_BUF_SHIFT'? Message-ID: <202407021254.3swXeUSl-lkp@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="bUqKCQyvj0fy7ycf" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264857 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.oe-kbuild-all Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --bUqKCQyvj0fy7ycf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Arnd, FYI, the error/warning still remains. tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master head: 73e931504f8e0d42978bfcda37b323dbbd1afc08 commit: 5394f1e9b687bcf26595cabf83483e568676128d arch: define CONFIG_PAGE_SIZE_*KB on all architectures date: 4 months ago config: m68k-alldefconfig compiler: m68k-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-kbuild-all/202407021254.3swXeUSl-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from arch/m68k/include/asm/thread_info.h:6, from include/linux/thread_info.h:60, from include/asm-generic/preempt.h:5, from ./arch/m68k/include/generated/asm/preempt.h:1, from include/linux/preempt.h:79, from arch/m68k/include/asm/processor.h:11, from include/linux/sched.h:13, from arch/m68k/kernel/asm-offsets.c:15: arch/m68k/include/asm/page_mm.h: In function 'virt_to_pfn': >> arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared (first use in this function); did you mean 'CONFIG_LOG_BUF_SHIFT'? 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page_mm.h:125:31: note: in expansion of macro 'PAGE_SHIFT' 125 | return __pa(kaddr) >> PAGE_SHIFT; | ^~~~~~~~~~ arch/m68k/include/asm/page.h:10:25: note: each undeclared identifier is reported only once for each function it appears in 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page_mm.h:125:31: note: in expansion of macro 'PAGE_SHIFT' 125 | return __pa(kaddr) >> PAGE_SHIFT; | ^~~~~~~~~~ arch/m68k/include/asm/page_mm.h: In function 'pfn_to_virt': >> arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared (first use in this function); did you mean 'CONFIG_LOG_BUF_SHIFT'? 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page_mm.h:130:28: note: in expansion of macro 'PAGE_SHIFT' 130 | return __va(pfn << PAGE_SHIFT); | ^~~~~~~~~~ include/asm-generic/getorder.h: In function 'get_order': >> arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared (first use in this function); did you mean 'CONFIG_LOG_BUF_SHIFT'? 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ include/asm-generic/getorder.h:33:48: note: in expansion of macro 'PAGE_SHIFT' 33 | return BITS_PER_LONG - PAGE_SHIFT; | ^~~~~~~~~~ arch/m68k/include/asm/thread_info.h: At top level: arch/m68k/include/asm/page.h:10:25: warning: "CONFIG_PAGE_SHIFT" is not defined, evaluates to 0 [-Wundef] 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/thread_info.h:13:5: note: in expansion of macro 'PAGE_SHIFT' 13 | #if PAGE_SHIFT < 13 | ^~~~~~~~~~ arch/m68k/include/asm/page.h:10:25: warning: "CONFIG_PAGE_SHIFT" is not defined, evaluates to 0 [-Wundef] 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page.h:11:40: note: in expansion of macro 'PAGE_SHIFT' 11 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ^~~~~~~~~~ include/linux/mm_types_task.h:40:30: note: in expansion of macro 'PAGE_SIZE' 40 | #if (BITS_PER_LONG > 32) || (PAGE_SIZE >= 65536) | ^~~~~~~~~ arch/m68k/include/asm/page.h:10:25: warning: "CONFIG_PAGE_SHIFT" is not defined, evaluates to 0 [-Wundef] 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page.h:11:40: note: in expansion of macro 'PAGE_SHIFT' 11 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ^~~~~~~~~~ include/linux/mm_types.h:502:6: note: in expansion of macro 'PAGE_SIZE' 502 | #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) | ^~~~~~~~~ In file included from include/vdso/const.h:5, from include/linux/const.h:4, from include/linux/bits.h:5, from include/linux/ratelimit_types.h:5, from include/linux/printk.h:9, from include/asm-generic/bug.h:22, from arch/m68k/include/asm/bug.h:32, from include/linux/bug.h:5, from include/linux/thread_info.h:13: arch/m68k/include/asm/page.h:10:25: warning: "CONFIG_PAGE_SHIFT" is not defined, evaluates to 0 [-Wundef] 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ include/uapi/linux/const.h:32:50: note: in definition of macro '__ALIGN_KERNEL_MASK' 32 | #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) | ^~~~ include/linux/mm_types.h:479:41: note: in expansion of macro '__ALIGN_MASK' 479 | #define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) | ^~~~~~~~~~~~ arch/m68k/include/asm/page.h:11:40: note: in expansion of macro 'PAGE_SHIFT' 11 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ^~~~~~~~~~ arch/m68k/include/asm/page.h:12:28: note: in expansion of macro 'PAGE_SIZE' 12 | #define PAGE_MASK (~(PAGE_SIZE-1)) | ^~~~~~~~~ include/linux/mm_types.h:479:62: note: in expansion of macro 'PAGE_MASK' 479 | #define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) | ^~~~~~~~~ include/linux/mm_types.h:502:18: note: in expansion of macro 'PAGE_FRAG_CACHE_MAX_SIZE' 502 | #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page.h:10:25: warning: "CONFIG_PAGE_SHIFT" is not defined, evaluates to 0 [-Wundef] 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ include/uapi/linux/const.h:32:61: note: in definition of macro '__ALIGN_KERNEL_MASK' 32 | #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) | ^~~~ include/linux/mm_types.h:479:41: note: in expansion of macro '__ALIGN_MASK' 479 | #define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) | ^~~~~~~~~~~~ arch/m68k/include/asm/page.h:11:40: note: in expansion of macro 'PAGE_SHIFT' 11 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ^~~~~~~~~~ arch/m68k/include/asm/page.h:12:28: note: in expansion of macro 'PAGE_SIZE' 12 | #define PAGE_MASK (~(PAGE_SIZE-1)) | ^~~~~~~~~ include/linux/mm_types.h:479:62: note: in expansion of macro 'PAGE_MASK' 479 | #define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) | ^~~~~~~~~ include/linux/mm_types.h:502:18: note: in expansion of macro 'PAGE_FRAG_CACHE_MAX_SIZE' 502 | #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) | ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/vmalloc.h: In function 'arch_vmap_pte_range_map_size': >> arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared (first use in this function); did you mean 'CONFIG_LOG_BUF_SHIFT'? 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page.h:11:40: note: in expansion of macro 'PAGE_SHIFT' 11 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ^~~~~~~~~~ include/linux/vmalloc.h:109:16: note: in expansion of macro 'PAGE_SIZE' 109 | return PAGE_SIZE; | ^~~~~~~~~ include/linux/vmalloc.h: In function 'arch_vmap_pte_supported_shift': >> arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared (first use in this function); did you mean 'CONFIG_LOG_BUF_SHIFT'? 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ include/linux/vmalloc.h:116:16: note: in expansion of macro 'PAGE_SHIFT' 116 | return PAGE_SHIFT; | ^~~~~~~~~~ include/linux/vmalloc.h: In function 'get_vm_area_size': >> arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared (first use in this function); did you mean 'CONFIG_LOG_BUF_SHIFT'? 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ arch/m68k/include/asm/page.h:11:40: note: in expansion of macro 'PAGE_SHIFT' 11 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ^~~~~~~~~~ include/linux/vmalloc.h:200:37: note: in expansion of macro 'PAGE_SIZE' 200 | return area->size - PAGE_SIZE; | ^~~~~~~~~ include/linux/slab.h: At top level: >> arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared here (not in a function); did you mean 'CONFIG_LOG_BUF_SHIFT'? 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ include/linux/slab.h:309:34: note: in expansion of macro 'PAGE_SHIFT' 309 | #define KMALLOC_SHIFT_HIGH (PAGE_SHIFT + 1) | ^~~~~~~~~~ include/linux/slab.h:379:34: note: in expansion of macro 'KMALLOC_SHIFT_HIGH' 379 | kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1]; | ^~~~~~~~~~~~~~~~~~ In file included from include/linux/init.h:5, from include/linux/printk.h:6: >> arch/m68k/include/asm/page.h:10:25: error: expression in static assertion is not an integer 10 | #define PAGE_SHIFT CONFIG_PAGE_SHIFT | ^~~~~~~~~~~~~~~~~ include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert' 78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) | ^~~~ include/linux/slab.h:475:1: note: in expansion of macro 'static_assert' 475 | static_assert(PAGE_SHIFT <= 20); | ^~~~~~~~~~~~~ include/linux/slab.h:475:15: note: in expansion of macro 'PAGE_SHIFT' 475 | static_assert(PAGE_SHIFT <= 20); | ^~~~~~~~~~ In file included from include/linux/irq.h:21, from include/asm-generic/hardirq.h:17, from ./arch/m68k/include/generated/asm/hardirq.h:1, from include/linux/hardirq.h:11, from include/linux/interrupt.h:11, from include/linux/kernel_stat.h:9, from arch/m68k/kernel/asm-offsets.c:16: include/linux/slab.h:522:47: warning: 'assume_aligned' attribute argument is not an integer constant [-Wattributes] 522 | __alloc_size(1); | ^~~~~~~~~~~~ include/linux/slab.h:525:62: warning: 'assume_aligned' attribute argument is not an integer constant [-Wattributes] 525 | __alloc_size(1); | ^~~~~~~~~~~~ include/linux/slab.h: In function 'kmalloc': include/linux/slab.h:584:30: warning: variable 'index' set but not used [-Wunused-but-set-variable] 584 | unsigned int index; | ^~~~~ include/linux/slab.h: In function 'kmalloc_node': include/linux/slab.h:600:30: warning: variable 'index' set but not used [-Wunused-but-set-variable] 600 | unsigned int index; | ^~~~~ make[3]: *** [scripts/Makefile.build:116: arch/m68k/kernel/asm-offsets.s] Error 1 make[3]: Target 'prepare' not remade because of errors. make[2]: *** [Makefile:1199: prepare0] Error 2 make[2]: Target 'prepare' not remade because of errors. make[1]: *** [Makefile:240: __sub-make] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [Makefile:240: __sub-make] Error 2 make: Target 'prepare' not remade because of errors. vim +10 arch/m68k/include/asm/page.h 8 9 /* PAGE_SHIFT determines the page size */ > 10 #define PAGE_SHIFT CONFIG_PAGE_SHIFT 11 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 12 #define PAGE_MASK (~(PAGE_SIZE-1)) 13 #define PAGE_OFFSET (PAGE_OFFSET_RAW) 14 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki --bUqKCQyvj0fy7ycf Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=reproduce reproduce (this is a W=1 build): git clone https://github.com/intel/lkp-tests.git ~/lkp-tests # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5394f1e9b687bcf26595cabf83483e568676128d git remote add linus https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git git fetch --no-tags linus master git checkout 5394f1e9b687bcf26595cabf83483e568676128d # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-13.2.0 ~/lkp-tests/kbuild/make.cross W=1 O=build_dir ARCH=m68k olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-13.2.0 ~/lkp-tests/kbuild/make.cross W=1 O=build_dir ARCH=m68k prepare --bUqKCQyvj0fy7ycf Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=config # # Automatically generated file; DO NOT EDIT. # Linux/m68k 6.8.0-rc5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="m68k-linux-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=127 CONFIG_IRQ_WORK=y # # General setup # CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" # CONFIG_SYSVIPC is not set # CONFIG_WATCH_QUEUE is not set CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_USELIB=y # # IRQ subsystem # CONFIG_GENERIC_IRQ_SHOW=y # end of IRQ subsystem CONFIG_GENERIC_CLOCKEVENTS=y # # Timers subsystem # CONFIG_HZ_PERIODIC=y # CONFIG_NO_HZ_IDLE is not set # CONFIG_NO_HZ is not set # CONFIG_HIGH_RES_TIMERS is not set # end of Timers subsystem # # BPF subsystem # # CONFIG_BPF_SYSCALL is not set # end of BPF subsystem CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PREEMPT_NONE=y # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_PSI is not set # end of CPU/Task time and stats accounting # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_TINY_SRCU=y # end of RCU Subsystem # CONFIG_IKCONFIG is not set # CONFIG_IKHEADERS is not set CONFIG_LOG_BUF_SHIFT=17 # # Scheduler features # # end of Scheduler features CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_GCC_NO_STRINGOP_OVERFLOW=y CONFIG_CC_NO_STRINGOP_OVERFLOW=y # CONFIG_CGROUPS is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y # CONFIG_USER_NS is not set CONFIG_PID_NS=y # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_RELAY is not set # CONFIG_BLK_DEV_INITRD is not set # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_HAVE_UID16=y # CONFIG_EXPERT is not set CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y CONFIG_FHANDLE=y CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_FUTEX_PI=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_BASE_RELATIVE=y # # Kernel Performance Events And Counters # # end of Kernel Performance Events And Counters # CONFIG_PROFILING is not set # # Kexec and crash features # # CONFIG_KEXEC is not set # end of Kexec and crash features # end of General setup CONFIG_M68K=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_TIME_LOW_RES=y CONFIG_NO_IOPORT_MAP=y CONFIG_HZ=100 CONFIG_PGTABLE_LEVELS=3 CONFIG_MMU=y CONFIG_ARCH_SUPPORTS_KEXEC=y # # Platform setup # # # Processor Type # CONFIG_M68KCLASSIC=y # CONFIG_COLDFIRE is not set # CONFIG_M68020 is not set # CONFIG_M68030 is not set # CONFIG_M68040 is not set # CONFIG_M68060 is not set # # Processor Specific Options # # CONFIG_ADVANCED is not set CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_M68K_NONCOHERENT_DMA=y # # Machine Types # # CONFIG_AMIGA is not set # CONFIG_ATARI is not set # CONFIG_MAC is not set # CONFIG_APOLLO is not set # CONFIG_VME is not set # CONFIG_HP300 is not set # CONFIG_SUN3X is not set # CONFIG_Q40 is not set # CONFIG_SUN3 is not set # CONFIG_VIRT is not set # # Bus Support # # end of Platform setup # # Kernel Features # # end of Kernel Features # # Platform devices # # CONFIG_PROC_HARDWARE is not set # end of Platform devices # # Character devices # # end of Character devices # # General architecture-dependent options # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_MMU_GATHER_NO_RANGE=y CONFIG_MMU_GATHER_MERGE_VMAS=y CONFIG_MMU_LAZY_TLB_REFCOUNT=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y CONFIG_LTO_NONE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_NO_PREEMPT=y CONFIG_HAVE_ARCH_PFN_VALID=y # # GCOV-based kernel profiling # # end of GCOV-based kernel profiling CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 # CONFIG_MODULES is not set CONFIG_BLOCK=y CONFIG_BLOCK_LEGACY_AUTOLOAD=y # CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set CONFIG_BLK_DEV_WRITE_MOUNTED=y # CONFIG_BLK_DEV_ZONED is not set # CONFIG_BLK_WBT is not set # CONFIG_BLK_INLINE_ENCRYPTION is not set # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y CONFIG_EFI_PARTITION=y # end of Partition Types # # IO Schedulers # CONFIG_MQ_IOSCHED_DEADLINE=y CONFIG_MQ_IOSCHED_KYBER=y # CONFIG_IOSCHED_BFQ is not set # end of IO Schedulers CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # # Executable file formats # CONFIG_BINFMT_ELF=y CONFIG_ELFCORE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y CONFIG_ARCH_HAS_BINFMT_FLAT=y # CONFIG_BINFMT_FLAT is not set CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y # CONFIG_BINFMT_MISC is not set CONFIG_COREDUMP=y # end of Executable file formats # # Memory Management options # CONFIG_SWAP=y # CONFIG_ZSWAP is not set # # Slab allocator options # CONFIG_SLUB=y CONFIG_SLAB_MERGE_DEFAULT=y # CONFIG_SLAB_FREELIST_RANDOM is not set # CONFIG_SLAB_FREELIST_HARDENED is not set # CONFIG_SLUB_STATS is not set # CONFIG_RANDOM_KMALLOC_CACHES is not set # end of Slab allocator options # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set CONFIG_COMPAT_BRK=y CONFIG_FLATMEM=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 # CONFIG_PAGE_REPORTING is not set CONFIG_MIGRATION=y CONFIG_PCP_BATCH_SCALE_MAX=5 # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_NEED_PER_CPU_KM=y # CONFIG_CMA is not set # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y CONFIG_ZONE_DMA=y CONFIG_VM_EVENT_COUNTERS=y # CONFIG_PERCPU_STATS is not set # # GUP_TEST needs to have DEBUG_FS enabled # # CONFIG_DMAPOOL_TEST is not set # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set # CONFIG_LRU_GEN is not set # # Data Access Monitoring # # CONFIG_DAMON is not set # end of Data Access Monitoring # end of Memory Management options # CONFIG_NET is not set # # Device Drivers # # CONFIG_PCCARD is not set # # Generic Driver Options # # CONFIG_UEVENT_HELPER is not set # CONFIG_DEVTMPFS is not set CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # # Firmware loader # CONFIG_FW_LOADER=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_COMPRESS is not set # CONFIG_FW_UPLOAD is not set # end of Firmware loader CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_GENERIC_CPU_DEVICES=y # CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set # end of Generic Driver Options # # Bus devices # # CONFIG_MHI_BUS is not set # CONFIG_MHI_BUS_EP is not set # end of Bus devices # # Cache Drivers # # end of Cache Drivers # # Firmware Drivers # # # ARM System Control and Management Interface Protocol # # end of ARM System Control and Management Interface Protocol # CONFIG_GOOGLE_FIRMWARE is not set # # Qualcomm firmware drivers # # end of Qualcomm firmware drivers # # Tegra firmware driver # # end of Tegra firmware driver # end of Firmware Drivers # CONFIG_GNSS is not set # CONFIG_MTD is not set # CONFIG_OF is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_LOOP is not set # # DRBD disabled because PROC_FS or INET not selected # # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_UBLK is not set # # NVME Support # # CONFIG_NVME_FC is not set # end of NVME Support # # Misc devices # # CONFIG_DUMMY_IRQ is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_SRAM is not set # CONFIG_XILINX_SDFEC is not set # CONFIG_C2PORT is not set # # EEPROM support # # CONFIG_EEPROM_93CX6 is not set # end of EEPROM support # # Texas Instruments shared transport line discipline # # end of Texas Instruments shared transport line discipline # # Altera FPGA firmware download module (requires I2C) # # CONFIG_ECHO is not set # CONFIG_PVPANIC is not set # end of Misc devices # # SCSI device support # CONFIG_SCSI_MOD=y # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set # end of SCSI device support # CONFIG_ATA is not set # CONFIG_MD is not set # CONFIG_TARGET_CORE is not set # # Input device support # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y # CONFIG_INPUT_SPARSEKMAP is not set # CONFIG_INPUT_MATRIXKMAP is not set CONFIG_INPUT_VIVALDIFMAP=y # # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_BYD=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_PS2_FOCALTECH=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_APPLETOUCH is not set # CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set # CONFIG_RMI4_CORE is not set # # Hardware I/O ports # CONFIG_SERIO=y CONFIG_SERIO_SERPORT=y CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set # CONFIG_SERIO_ALTERA_PS2 is not set # CONFIG_SERIO_PS2MULT is not set # CONFIG_SERIO_ARC_PS2 is not set # CONFIG_USERIO is not set # CONFIG_GAMEPORT is not set # end of Hardware I/O ports # end of Input device support # # Character devices # CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LEGACY_TIOCSTI=y CONFIG_LDISC_AUTOLOAD=y # # Serial drivers # # CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support # # CONFIG_SERIAL_UARTLITE is not set # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_FSL_LPUART is not set # CONFIG_SERIAL_FSL_LINFLEXUART is not set # end of Serial drivers # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NULL_TTY is not set # CONFIG_SERIAL_DEV_BUS is not set # CONFIG_VIRTIO_CONSOLE is not set # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_XIPHERA is not set CONFIG_DEVMEM=y # CONFIG_TCG_TPM is not set # end of Character devices # # I2C support # # CONFIG_I2C is not set # end of I2C support # CONFIG_I3C is not set # CONFIG_SPI is not set # CONFIG_SPMI is not set # CONFIG_HSI is not set # CONFIG_PPS is not set # # PTP clock support # CONFIG_PTP_1588_CLOCK_OPTIONAL=y # # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # # end of PTP clock support # CONFIG_PINCTRL is not set # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set # CONFIG_POWER_RESET is not set # CONFIG_POWER_SUPPLY is not set CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set # # Native drivers # # CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set # CONFIG_SENSORS_F71805F is not set # CONFIG_SENSORS_F71882FG is not set # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_MAX197 is not set # CONFIG_SENSORS_MR75203 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NCT6683 is not set # CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_VT1211 is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y # CONFIG_SSB is not set CONFIG_BCMA_POSSIBLE=y # CONFIG_BCMA is not set # # Multifunction device drivers # # CONFIG_MFD_MADERA is not set # CONFIG_MFD_KEMPLD is not set # CONFIG_MFD_MT6397 is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TQMX86 is not set # end of Multifunction device drivers # CONFIG_REGULATOR is not set # CONFIG_RC_CORE is not set # # CEC support # # CONFIG_MEDIA_CEC_SUPPORT is not set # end of CEC support # CONFIG_MEDIA_SUPPORT is not set # # Graphics support # # CONFIG_AUXDISPLAY is not set # CONFIG_DRM is not set # # Frame buffer Devices # # CONFIG_FB is not set # end of Frame buffer Devices # # Backlight & LCD device support # # CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_CLASS_DEVICE is not set # end of Backlight & LCD device support # # Console display driver support # CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 # end of Console display driver support # end of Graphics support # CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_BATTERY_STRENGTH is not set # CONFIG_HIDRAW is not set # CONFIG_UHID is not set CONFIG_HID_GENERIC=y # # Special HID drivers # CONFIG_HID_A4TECH=y # CONFIG_HID_ACRUX is not set # CONFIG_HID_AUREAL is not set CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y # CONFIG_HID_COUGAR is not set # CONFIG_HID_MACALLY is not set # CONFIG_HID_CMEDIA is not set CONFIG_HID_CYPRESS=y # CONFIG_HID_DRAGONRISE is not set # CONFIG_HID_EMS_FF is not set # CONFIG_HID_ELECOM is not set # CONFIG_HID_EVISION is not set CONFIG_HID_EZKEY=y # CONFIG_HID_GEMBIRD is not set # CONFIG_HID_GFRM is not set # CONFIG_HID_GLORIOUS is not set # CONFIG_HID_GOOGLE_STADIA_FF is not set # CONFIG_HID_VIVALDI is not set # CONFIG_HID_KEYTOUCH is not set # CONFIG_HID_KYE is not set # CONFIG_HID_WALTOP is not set # CONFIG_HID_VIEWSONIC is not set # CONFIG_HID_VRC2 is not set # CONFIG_HID_XIAOMI is not set # CONFIG_HID_GYRATION is not set # CONFIG_HID_ICADE is not set CONFIG_HID_ITE=y # CONFIG_HID_JABRA is not set # CONFIG_HID_TWINHAN is not set CONFIG_HID_KENSINGTON=y # CONFIG_HID_LCPOWER is not set # CONFIG_HID_LENOVO is not set # CONFIG_HID_MAGICMOUSE is not set # CONFIG_HID_MALTRON is not set # CONFIG_HID_MAYFLASH is not set CONFIG_HID_REDRAGON=y CONFIG_HID_MICROSOFT=y CONFIG_HID_MONTEREY=y # CONFIG_HID_MULTITOUCH is not set # CONFIG_HID_NTI is not set # CONFIG_HID_ORTEK is not set # CONFIG_HID_PANTHERLORD is not set # CONFIG_HID_PETALYNX is not set # CONFIG_HID_PICOLCD is not set # CONFIG_HID_PLANTRONICS is not set # CONFIG_HID_PXRC is not set # CONFIG_HID_RAZER is not set # CONFIG_HID_PRIMAX is not set # CONFIG_HID_SAITEK is not set # CONFIG_HID_SEMITEK is not set # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEAM is not set # CONFIG_HID_SUNPLUS is not set # CONFIG_HID_RMI is not set # CONFIG_HID_GREENASIA is not set # CONFIG_HID_SMARTJOYPLUS is not set # CONFIG_HID_TIVO is not set # CONFIG_HID_TOPSEED is not set # CONFIG_HID_TOPRE is not set # CONFIG_HID_UDRAW_PS3 is not set # CONFIG_HID_XINMO is not set # CONFIG_HID_ZEROPLUS is not set # CONFIG_HID_ZYDACRON is not set # CONFIG_HID_SENSOR_HUB is not set # CONFIG_HID_ALPS is not set # end of Special HID drivers # # HID-BPF support # # end of HID-BPF support CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y # CONFIG_USB_ULPI_BUS is not set CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB is not set # # USB dual-mode controller drivers # # # USB port drivers # # # USB Physical Layer drivers # # CONFIG_NOP_USB_XCEIV is not set # end of USB Physical Layer drivers # CONFIG_USB_GADGET is not set # CONFIG_TYPEC is not set # CONFIG_USB_ROLE_SWITCH is not set # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # # DMABUF options # # CONFIG_SYNC_FILE is not set # CONFIG_DMABUF_HEAPS is not set # end of DMABUF options # CONFIG_UIO is not set # CONFIG_VFIO is not set # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO is not set CONFIG_VHOST_MENU=y # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set # # Microsoft Hyper-V guest support # # end of Microsoft Hyper-V guest support # CONFIG_GREYBUS is not set # CONFIG_COMEDI is not set # CONFIG_STAGING is not set # CONFIG_GOLDFISH is not set # CONFIG_COMMON_CLK is not set # CONFIG_HWSPINLOCK is not set # # Clock Source drivers # # end of Clock Source drivers # CONFIG_MAILBOX is not set CONFIG_IOMMU_SUPPORT=y # # Generic IOMMU Pagetable Support # # end of Generic IOMMU Pagetable Support # CONFIG_IOMMUFD is not set # # Remoteproc drivers # # CONFIG_REMOTEPROC is not set # end of Remoteproc drivers # # Rpmsg drivers # # CONFIG_RPMSG_VIRTIO is not set # end of Rpmsg drivers # # SOC (System On Chip) specific Drivers # # # Amlogic SoC drivers # # end of Amlogic SoC drivers # # Broadcom SoC drivers # # end of Broadcom SoC drivers # # NXP/Freescale QorIQ SoC drivers # # end of NXP/Freescale QorIQ SoC drivers # # fujitsu SoC drivers # # end of fujitsu SoC drivers # # i.MX SoC drivers # # end of i.MX SoC drivers # # Enable LiteX SoC Builder specific drivers # # end of Enable LiteX SoC Builder specific drivers # CONFIG_WPCM450_SOC is not set # # Qualcomm SoC drivers # # end of Qualcomm SoC drivers # CONFIG_SOC_TI is not set # # Xilinx SoC drivers # # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers # # PM Domains # # # Amlogic PM Domains # # end of Amlogic PM Domains # # Broadcom PM Domains # # end of Broadcom PM Domains # # i.MX PM Domains # # end of i.MX PM Domains # # Qualcomm PM Domains # # end of Qualcomm PM Domains # end of PM Domains # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set # CONFIG_IIO is not set # CONFIG_PWM is not set # # IRQ chip support # # end of IRQ chip support # CONFIG_IPACK_BUS is not set # CONFIG_RESET_CONTROLLER is not set # # PHY Subsystem # # CONFIG_GENERIC_PHY is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # # PHY drivers for Broadcom platforms # # CONFIG_BCM_KONA_USB2_PHY is not set # end of PHY drivers for Broadcom platforms # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # end of PHY Subsystem # CONFIG_POWERCAP is not set # CONFIG_MCB is not set # CONFIG_RAS is not set # # Android # # CONFIG_ANDROID_BINDER_IPC is not set # end of Android # CONFIG_DAX is not set # CONFIG_NVMEM is not set # # HW tracing support # # CONFIG_STM is not set # CONFIG_INTEL_TH is not set # end of HW tracing support # CONFIG_FPGA is not set # CONFIG_SIOX is not set # CONFIG_SLIMBUS is not set # CONFIG_INTERCONNECT is not set # CONFIG_COUNTER is not set # CONFIG_PECI is not set # CONFIG_HTE is not set # end of Device Drivers # # File systems # # CONFIG_VALIDATE_FS_PARSER is not set CONFIG_FS_IOMAP=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_F2FS_FS is not set # CONFIG_BCACHEFS_FS is not set CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set CONFIG_FILE_LOCKING=y # CONFIG_FS_ENCRYPTION is not set # CONFIG_FS_VERITY is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_FANOTIFY is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_FUSE_FS is not set # CONFIG_OVERLAY_FS is not set # # Caches # # end of Caches # # CD-ROM/DVD Filesystems # # CONFIG_ISO9660_FS is not set # CONFIG_UDF_FS is not set # end of CD-ROM/DVD Filesystems # # DOS/FAT/EXFAT/NT Filesystems # # CONFIG_MSDOS_FS is not set # CONFIG_VFAT_FS is not set # CONFIG_EXFAT_FS is not set # CONFIG_NTFS_FS is not set # CONFIG_NTFS3_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems # # Pseudo filesystems # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROC_CHILDREN is not set CONFIG_KERNFS=y CONFIG_SYSFS=y # CONFIG_TMPFS is not set # CONFIG_CONFIGFS_FS is not set # end of Pseudo filesystems CONFIG_MISC_FILESYSTEMS=y # CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set # CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_EROFS_FS is not set # CONFIG_NLS is not set # CONFIG_UNICODE is not set CONFIG_IO_WQ=y # end of File systems # # Security options # # CONFIG_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set # CONFIG_HARDENED_USERCOPY is not set # CONFIG_STATIC_USERMODEHELPER is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf" # # Kernel hardening options # # # Memory initialization # CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y # CONFIG_INIT_STACK_NONE is not set # CONFIG_INIT_STACK_ALL_PATTERN is not set CONFIG_INIT_STACK_ALL_ZERO=y # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization # # Hardening of kernel data structures # # CONFIG_LIST_HARDENED is not set # CONFIG_BUG_ON_DATA_CORRUPTION is not set # end of Hardening of kernel data structures CONFIG_RANDSTRUCT_NONE=y # end of Kernel hardening options # end of Security options # CONFIG_CRYPTO is not set # # Library routines # # CONFIG_PACKING is not set CONFIG_BITREVERSE=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y # CONFIG_CORDIC is not set # CONFIG_PRIME_NUMBERS is not set CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y # # Crypto library routines # CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y # CONFIG_CRYPTO_LIB_CHACHA is not set # CONFIG_CRYPTO_LIB_CURVE25519 is not set CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 # CONFIG_CRYPTO_LIB_POLY1305 is not set # end of Crypto library routines # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set # CONFIG_CRC_T10DIF is not set # CONFIG_CRC64_ROCKSOFT is not set # CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set # CONFIG_CRC64 is not set # CONFIG_CRC4 is not set # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set # CONFIG_CRC8 is not set # CONFIG_RANDOM32_SELFTEST is not set # CONFIG_XZ_DEC is not set CONFIG_GENERIC_ALLOCATOR=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_DIRECT_REMAP=y # CONFIG_DMA_API_DEBUG is not set CONFIG_GENERIC_ATOMIC64=y # CONFIG_IRQ_POLL is not set CONFIG_SBITMAP=y # CONFIG_LWQ_TEST is not set # end of Library routines CONFIG_GENERIC_LIB_ASHLDI3=y CONFIG_GENERIC_LIB_ASHRDI3=y CONFIG_GENERIC_LIB_LSHRDI3=y # # Kernel hacking # # # printk and dmesg options # # CONFIG_PRINTK_TIME is not set # CONFIG_PRINTK_CALLER is not set # CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONSOLE_LOGLEVEL_QUIET=4 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DYNAMIC_DEBUG_CORE is not set CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options # CONFIG_DEBUG_KERNEL is not set # # Compile-time checks and compiler options # CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_FRAME_WARN=1024 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_HEADERS_INSTALL is not set CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # end of Compile-time checks and compiler options # # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_FS is not set # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments # # Networking Debugging # # end of Networking Debugging # # Memory Debugging # # CONFIG_PAGE_EXTENSION is not set CONFIG_SLUB_DEBUG=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_PAGE_POISONING is not set CONFIG_DEBUG_MEMORY_INIT=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # end of Memory Debugging # # Debug Oops, Lockups and Hangs # # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 # end of Debug Oops, Lockups and Hangs # # Scheduler Debugging # # end of Scheduler Debugging # CONFIG_DEBUG_TIMEKEEPING is not set # # Lock Debugging (spinlocks, mutexes, etc...) # # CONFIG_WW_MUTEX_SELFTEST is not set # end of Lock Debugging (spinlocks, mutexes, etc...) # CONFIG_DEBUG_IRQFLAGS is not set # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_HAVE_DEBUG_BUGVERBOSE=y # # Debug kernel data structures # # end of Debug kernel data structures # # RCU Debugging # # end of RCU Debugging # CONFIG_SAMPLES is not set # # m68k Debugging # # CONFIG_BOOTPARAM is not set # CONFIG_EARLY_PRINTK is not set # end of m68k Debugging # # Kernel Testing and Coverage # # CONFIG_KUNIT is not set CONFIG_CC_HAS_SANCOV_TRACE_PC=y CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_STRING_SELFTEST is not set # CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_SCANF is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_UUID is not set # CONFIG_TEST_XARRAY is not set # CONFIG_TEST_MAPLE_TREE is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_IDA is not set # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_MEMINIT is not set # CONFIG_TEST_FREE_PAGES is not set # end of Kernel Testing and Coverage # # Rust hacking # # end of Rust hacking # end of Kernel hacking --bUqKCQyvj0fy7ycf-- . X-NS-SCAN: PASS Date: Tue, 2 Jul 2024 02:44:31 -0300 From: =?utf-8?Q?=C3=81gatha?= Isabelle Chris Moreira Guedes To: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, Greg Kroah-Hartman , Luis Chamberlain Cc: =?utf-8?Q?=C3=81gatha?= Isabelle Chris Moreira Guedes , Jookia Subject: [PATCH] staging: Fix missing warning/taint on builtin code Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="g43t564sfxvjtdzc" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264866 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-staging,org.kernel.vger.linux-modules Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --g43t564sfxvjtdzc Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Fix the absence of warning message and kernel tainting when initializing drivers from the `drivers/staging` subtree from initcalls (when configured as built-in). When such a driver is built as module and the module is loaded, the `load_module()` function taints the kernel to signal code of unknown quality is loaded, and produces a warning like this: [ 8.076352] rts5208: module is from the staging directory, the quality is unknown, you have been warned. The same behaviour is absent, however, when a staging driver is compiled as built-in on the kernel image, since loading it happens through initcalls and not through load_module(). This might prevent relevant information of being available on a bug report (i.e. on a panic log) among other possible problems. Signed-off-by: =C1gatha Isabelle Chris Moreira Guedes --- ACKNOWLEDGEMENTS Thanks for Jookia, heat and ukleinek for the important comments & suggestions on this patch prior to submission. drivers/staging/Makefile | 2 ++ include/linux/init.h | 6 ++++++ include/linux/module.h | 33 +++++++++++++++++++++++++++++++++ init/main.c | 20 ++++++++++++++++++++ kernel/module/main.c | 4 +--- 5 files changed, 62 insertions(+), 3 deletions(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 5390879b5d1b..7cea13436426 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for staging directory =20 +subdir-ccflags-y +=3D -DSTAGING_CODE + obj-y +=3D media/ obj-$(CONFIG_FB_OLPC_DCON) +=3D olpc_dcon/ obj-$(CONFIG_RTL8192E) +=3D rtl8192e/ diff --git a/include/linux/init.h b/include/linux/init.h index 58cef4c2e59a..68c37600958f 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -397,4 +397,10 @@ void __init parse_early_options(char *cmdline); #define __exit_p(x) NULL #endif =20 +#ifdef CONFIG_STAGING +#ifndef __ASSEMBLY__ +extern void staging_taint(const char *code_id, bool module); +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_STAGING */ + #endif /* _LINUX_INIT_H */ diff --git a/include/linux/module.h b/include/linux/module.h index 330ffb59efe5..ffe58f5d143b 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -76,6 +76,39 @@ extern struct module_attribute module_uevent; extern int init_module(void); extern void cleanup_module(void); =20 +#ifdef CONFIG_STAGING + +#define __lower_define_initcall(fn, id) ___define_initcall(fn, id, .initca= ll##id) + +/** + * __staging_define_initcall(fn,id) - staging initialization entry point + * @fn: the function to run at kernel boot time + * @id: the initcall level + * + * __staging_define_initcall() will ensure the drive's init function is al= ways + * called during initcalls for staging code by producing a wrapper functio= n. + * It applies if a module from the drivers/staging subtree is builtin to t= he + * kernel. It reproduces the behavior in load_module() by tainting the ker= nel + * and logging a warning about the code quality. + */ + +#define __staging_define_initcall(fn, id) \ + static int __init __staging_wrapped_##fn(void) \ + { \ + staging_taint(__FILE__, false); \ + return fn(); \ + } \ +__lower_define_initcall(__staging_wrapped_##fn, id) + +#ifdef STAGING_CODE + +#undef __define_initcall +#define __define_initcall(fn, id) __staging_define_initcall(fn, id) + +#endif /* STAGING_CODE */ + +#endif /* CONFIG_STAGING */ + #ifndef MODULE /** * module_init() - driver initialization entry point diff --git a/init/main.c b/init/main.c index 206acdde51f5..fca889f3bcc0 100644 --- a/init/main.c +++ b/init/main.c @@ -1602,3 +1602,23 @@ static noinline void __init kernel_init_freeable(voi= d) =20 integrity_load_keys(); } + +#ifdef CONFIG_STAGING +/** + * staging_init_taint() - We need to taint the kernel whenever staging code + * is initialized (from built-in drivers) or loaded (as modules) and issue + * a warning the first time it happens. + */ +void staging_taint(const char *code_id, bool module) +{ + char *code_type =3D module ? "module" : "builtin driver at"; + + pr_warn("%s %s: The kernel contains code from staging directory" + "the quality is unknown, you have been warned.\n", + code_type, code_id); + + add_taint(TAINT_CRAP, LOCKDEP_STILL_OK); +} +EXPORT_SYMBOL(staging_taint); + +#endif /* CONFIG_STAGING */ diff --git a/kernel/module/main.c b/kernel/module/main.c index d18a94b973e1..d7d33336ab43 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2039,9 +2039,7 @@ static void module_augment_kernel_taints(struct modul= e *mod, struct load_info *i check_modinfo_retpoline(mod, info); =20 if (get_modinfo(info, "staging")) { - add_taint_module(mod, TAINT_CRAP, LOCKDEP_STILL_OK); - pr_warn("%s: module is from the staging directory, the quality " - "is unknown, you have been warned.\n", mod->name); + staging_taint(mod->name, true); } =20 if (is_livepatch_module(mod)) { --=20 2.45.2 --g43t564sfxvjtdzc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQQMdxNgKl/8Z+5yuVT3jE4VBgsOTAUCZoOTugAKCRD3jE4VBgsO TPWCAPwOyNBuM1QEcscgmuuJFibaalLbh+ZZc4yb3TVJkqpGNQEAvqpNDfRaKcZJ +PyayOxrPy9KDV4NYowEE0s3RC/32Ac= =ReiF -----END PGP SIGNATURE----- --g43t564sfxvjtdzc-- . From: Dang Huynh Date: Tue, 02 Jul 2024 13:01:19 +0700 Subject: [PATCH v3] arm64: dts: qcom: qrb4210-rb2: Correct max current draw for VBUS X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240702-qrd4210rb2-vbus-volt-v3-1-fbd24661eec4@riseup.net> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Baryshkov Cc: Luca Weiss , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Dang Huynh Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264870 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail According to downstream sources, maximum current for PMI632 VBUS is 1A. Taken from msm-4.19 (631561973a034e46ccacd0e53ef65d13a40d87a4) Line 685-687 in drivers/power/supply/qcom/qpnp-smb5.c Fixes: a06a2f12f9e2 ("arm64: dts: qcom: qrb4210-rb2: enable USB-C port handling") Reviewed-by: Luca Weiss Signed-off-by: Dang Huynh --- In previous patch series, there's a suggestion to correct maximum current for PMI632 VBUS. Unfortunately it didn't make it and probably forgotten. Link to the suggestion mentioned: https://lore.kernel.org/linux-arm-msm/CYMDEAJZ0TJK.K31XZB3E9QOG@fairphone.com/ Signed-off-by: Dang Huynh ---- Changes in v3: - Fixed wrong usage of electrical units. - Link to v2: https://lore.kernel.org/r/20240701-qrd4210rb2-vbus-volt-v2-1-b7bcd2a78c8b@riseup.net Changes in v2: - Fixed typo (voltage -> ampere) - Link to v1: https://lore.kernel.org/r/20240701-qrd4210rb2-vbus-volt-v1-1-5c06f8358436@riseup.net --- arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts index 1c7de7f2db79..1888d99d398b 100644 --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts @@ -305,7 +305,7 @@ pmi632_ss_in: endpoint { &pmi632_vbus { regulator-min-microamp = <500000>; - regulator-max-microamp = <3000000>; + regulator-max-microamp = <1000000>; status = "okay"; }; --- base-commit: 642a16ca7994a50d7de85715996a8ce171a5bdfb change-id: 20240701-qrd4210rb2-vbus-volt-822764c7cfca Best regards, -- Dang Huynh . From: Alistair Francis To: bhelgaas@google.com, linux-pci@vger.kernel.org, Jonathan.Cameron@huawei.com, lukas@wunner.de Cc: alex.williamson@redhat.com, christian.koenig@amd.com, kch@nvidia.com, gregkh@linuxfoundation.org, logang@deltatee.com, linux-kernel@vger.kernel.org, alistair23@gmail.com, chaitanyak@nvidia.com, rdunlap@infradead.org, Alistair Francis Subject: [PATCH v13 1/4] PCI/DOE: Rename DOE protocol to feature Date: Tue, 2 Jul 2024 16:04:15 +1000 Message-ID: <20240702060418.387500-1-alistair.francis@wdc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264873 org.kernel.vger.linux-pci:144771 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail DOE r1.1 replaced all occurrences of "protocol" with the term "feature" or "Data Object Type". PCIe r6.1 (which was published July 24) incorporated that change. Rename the existing terms protocol with feature. Signed-off-by: Alistair Francis Reviewed-by: Jonathan Cameron Reviewed-by: Lukas Wunner --- v13: - No changes v12: - No changes v11: - No changes v10: - Split original patch into two v9: - Rename two more DOE macros v8: - Rename prot to feat as well v7: - Initial patch drivers/pci/doe.c | 88 +++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c index 652d63df9d22..f776f5304a3e 100644 --- a/drivers/pci/doe.c +++ b/drivers/pci/doe.c @@ -22,7 +22,7 @@ #include "pci.h" -#define PCI_DOE_PROTOCOL_DISCOVERY 0 +#define PCI_DOE_FEATURE_DISCOVERY 0 /* Timeout of 1 second from 6.30.2 Operation, PCI Spec r6.0 */ #define PCI_DOE_TIMEOUT HZ @@ -43,7 +43,7 @@ * * @pdev: PCI device this mailbox belongs to * @cap_offset: Capability offset - * @prots: Array of protocols supported (encoded as long values) + * @feats: Array of features supported (encoded as long values) * @wq: Wait queue for work item * @work_queue: Queue of pci_doe_work items * @flags: Bit array of PCI_DOE_FLAG_* flags @@ -51,14 +51,14 @@ struct pci_doe_mb { struct pci_dev *pdev; u16 cap_offset; - struct xarray prots; + struct xarray feats; wait_queue_head_t wq; struct workqueue_struct *work_queue; unsigned long flags; }; -struct pci_doe_protocol { +struct pci_doe_feature { u16 vid; u8 type; }; @@ -66,7 +66,7 @@ struct pci_doe_protocol { /** * struct pci_doe_task - represents a single query/response * - * @prot: DOE Protocol + * @feat: DOE Feature * @request_pl: The request payload * @request_pl_sz: Size of the request payload (bytes) * @response_pl: The response payload @@ -78,7 +78,7 @@ struct pci_doe_protocol { * @doe_mb: Used internally by the mailbox */ struct pci_doe_task { - struct pci_doe_protocol prot; + struct pci_doe_feature feat; const __le32 *request_pl; size_t request_pl_sz; __le32 *response_pl; @@ -171,8 +171,8 @@ static int pci_doe_send_req(struct pci_doe_mb *doe_mb, length = 0; /* Write DOE Header */ - val = FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_VID, task->prot.vid) | - FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, task->prot.type); + val = FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_VID, task->feat.vid) | + FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, task->feat.type); pci_write_config_dword(pdev, offset + PCI_DOE_WRITE, val); pci_write_config_dword(pdev, offset + PCI_DOE_WRITE, FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH, @@ -217,12 +217,12 @@ static int pci_doe_recv_resp(struct pci_doe_mb *doe_mb, struct pci_doe_task *tas int i = 0; u32 val; - /* Read the first dword to get the protocol */ + /* Read the first dword to get the feature */ pci_read_config_dword(pdev, offset + PCI_DOE_READ, &val); - if ((FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_VID, val) != task->prot.vid) || - (FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val) != task->prot.type)) { - dev_err_ratelimited(&pdev->dev, "[%x] expected [VID, Protocol] = [%04x, %02x], got [%04x, %02x]\n", - doe_mb->cap_offset, task->prot.vid, task->prot.type, + if ((FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_VID, val) != task->feat.vid) || + (FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val) != task->feat.type)) { + dev_err_ratelimited(&pdev->dev, "[%x] expected [VID, Feature] = [%04x, %02x], got [%04x, %02x]\n", + doe_mb->cap_offset, task->feat.vid, task->feat.type, FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_VID, val), FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val)); return -EIO; @@ -384,7 +384,7 @@ static void pci_doe_task_complete(struct pci_doe_task *task) } static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u16 *vid, - u8 *protocol) + u8 *feature) { u32 request_pl = FIELD_PREP(PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX, *index) | @@ -395,7 +395,7 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 u32 response_pl; int rc; - rc = pci_doe(doe_mb, PCI_VENDOR_ID_PCI_SIG, PCI_DOE_PROTOCOL_DISCOVERY, + rc = pci_doe(doe_mb, PCI_VENDOR_ID_PCI_SIG, PCI_DOE_FEATURE_DISCOVERY, &request_pl_le, sizeof(request_pl_le), &response_pl_le, sizeof(response_pl_le)); if (rc < 0) @@ -406,7 +406,7 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 response_pl = le32_to_cpu(response_pl_le); *vid = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID, response_pl); - *protocol = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL, + *feature = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL, response_pl); *index = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX, response_pl); @@ -414,12 +414,12 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 return 0; } -static void *pci_doe_xa_prot_entry(u16 vid, u8 prot) +static void *pci_doe_xa_feat_entry(u16 vid, u8 prot) { return xa_mk_value((vid << 8) | prot); } -static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) +static int pci_doe_cache_features(struct pci_doe_mb *doe_mb) { u8 index = 0; u8 xa_idx = 0; @@ -438,11 +438,11 @@ static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) return rc; pci_dbg(doe_mb->pdev, - "[%x] Found protocol %d vid: %x prot: %x\n", + "[%x] Found feature %d vid: %x prot: %x\n", doe_mb->cap_offset, xa_idx, vid, prot); - rc = xa_insert(&doe_mb->prots, xa_idx++, - pci_doe_xa_prot_entry(vid, prot), GFP_KERNEL); + rc = xa_insert(&doe_mb->feats, xa_idx++, + pci_doe_xa_feat_entry(vid, prot), GFP_KERNEL); if (rc) return rc; } while (index); @@ -466,7 +466,7 @@ static void pci_doe_cancel_tasks(struct pci_doe_mb *doe_mb) * @pdev: PCI device to create the DOE mailbox for * @cap_offset: Offset of the DOE mailbox * - * Create a single mailbox object to manage the mailbox protocol at the + * Create a single mailbox object to manage the mailbox feature at the * cap_offset specified. * * RETURNS: created mailbox object on success @@ -485,7 +485,7 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, doe_mb->pdev = pdev; doe_mb->cap_offset = cap_offset; init_waitqueue_head(&doe_mb->wq); - xa_init(&doe_mb->prots); + xa_init(&doe_mb->feats); doe_mb->work_queue = alloc_ordered_workqueue("%s %s DOE [%x]", 0, dev_bus_name(&pdev->dev), @@ -508,11 +508,11 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, /* * The state machine and the mailbox should be in sync now; - * Use the mailbox to query protocols. + * Use the mailbox to query features. */ - rc = pci_doe_cache_protocols(doe_mb); + rc = pci_doe_cache_features(doe_mb); if (rc) { - pci_err(pdev, "[%x] failed to cache protocols : %d\n", + pci_err(pdev, "[%x] failed to cache features : %d\n", doe_mb->cap_offset, rc); goto err_cancel; } @@ -521,7 +521,7 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, err_cancel: pci_doe_cancel_tasks(doe_mb); - xa_destroy(&doe_mb->prots); + xa_destroy(&doe_mb->feats); err_destroy_wq: destroy_workqueue(doe_mb->work_queue); err_free: @@ -539,31 +539,31 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, static void pci_doe_destroy_mb(struct pci_doe_mb *doe_mb) { pci_doe_cancel_tasks(doe_mb); - xa_destroy(&doe_mb->prots); + xa_destroy(&doe_mb->feats); destroy_workqueue(doe_mb->work_queue); kfree(doe_mb); } /** - * pci_doe_supports_prot() - Return if the DOE instance supports the given - * protocol + * pci_doe_supports_feat() - Return if the DOE instance supports the given + * feature * @doe_mb: DOE mailbox capability to query - * @vid: Protocol Vendor ID - * @type: Protocol type + * @vid: Feature Vendor ID + * @type: Feature type * - * RETURNS: True if the DOE mailbox supports the protocol specified + * RETURNS: True if the DOE mailbox supports the feature specified */ -static bool pci_doe_supports_prot(struct pci_doe_mb *doe_mb, u16 vid, u8 type) +static bool pci_doe_supports_feat(struct pci_doe_mb *doe_mb, u16 vid, u8 type) { unsigned long index; void *entry; - /* The discovery protocol must always be supported */ - if (vid == PCI_VENDOR_ID_PCI_SIG && type == PCI_DOE_PROTOCOL_DISCOVERY) + /* The discovery feature must always be supported */ + if (vid == PCI_VENDOR_ID_PCI_SIG && type == PCI_DOE_FEATURE_DISCOVERY) return true; - xa_for_each(&doe_mb->prots, index, entry) - if (entry == pci_doe_xa_prot_entry(vid, type)) + xa_for_each(&doe_mb->feats, index, entry) + if (entry == pci_doe_xa_feat_entry(vid, type)) return true; return false; @@ -591,7 +591,7 @@ static bool pci_doe_supports_prot(struct pci_doe_mb *doe_mb, u16 vid, u8 type) static int pci_doe_submit_task(struct pci_doe_mb *doe_mb, struct pci_doe_task *task) { - if (!pci_doe_supports_prot(doe_mb, task->prot.vid, task->prot.type)) + if (!pci_doe_supports_feat(doe_mb, task->feat.vid, task->feat.type)) return -EINVAL; if (test_bit(PCI_DOE_FLAG_DEAD, &doe_mb->flags)) @@ -637,8 +637,8 @@ int pci_doe(struct pci_doe_mb *doe_mb, u16 vendor, u8 type, { DECLARE_COMPLETION_ONSTACK(c); struct pci_doe_task task = { - .prot.vid = vendor, - .prot.type = type, + .feat.vid = vendor, + .feat.type = type, .request_pl = request, .request_pl_sz = request_sz, .response_pl = response, @@ -663,9 +663,9 @@ EXPORT_SYMBOL_GPL(pci_doe); * * @pdev: PCI device * @vendor: Vendor ID - * @type: Data Object Type + * @prot: Data Object Type * - * Find first DOE mailbox of a PCI device which supports the given protocol. + * Find first DOE mailbox of a PCI device which supports the given feature. * * RETURNS: Pointer to the DOE mailbox or NULL if none was found. */ @@ -676,7 +676,7 @@ struct pci_doe_mb *pci_find_doe_mailbox(struct pci_dev *pdev, u16 vendor, unsigned long index; xa_for_each(&pdev->doe_mbs, index, doe_mb) - if (pci_doe_supports_prot(doe_mb, vendor, type)) + if (pci_doe_supports_feat(doe_mb, vendor, type)) return doe_mb; return NULL; -- 2.45.2 . From: Krzysztof Kozlowski To: Michael Turquette , Stephen Boyd Cc: Krzysztof Kozlowski , Chanwoo Choi , linux-clk@vger.kernel.org, Sylwester Nawrocki , Alim Akhtar , Peter Griffin , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [GIT PULL] clk: samsung: drivers for v6.11 Date: Tue, 2 Jul 2024 08:31:19 +0200 Message-ID: <20240702063120.5821-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264887 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-clk,org.kernel.vger.linux-samsung-soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The following changes since commit 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0: Linux 6.10-rc1 (2024-05-26 15:20:12 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-clk-6.11 for you to fetch changes up to e61f400d6cf3d598ac3ff88a47b34823f9e1f2d5: clk: samsung: gs101: mark gout_hsi2_ufs_embd_i_clk_unipro as critical (2024-07-01 10:15:30 +0200) ---------------------------------------------------------------- Samsung SoC clock drivers changes for 6.11 1. exynos-clkout: Remove usage of of_device_id table as .of_match_table, because the driver is instantiated as MFD cell, not as standalone platform driver. Populated .of_match_table confused people few times to convert the code to device_get_match_data(), which broke the driver. 2. Mark one of UFS clocks as critical, because having it off stops the system from shutdown. 3. Cleanup: Use kmemdup_array() when applicable. ---------------------------------------------------------------- Andy Shevchenko (1): clk: samsung: Switch to use kmemdup_array() Marek Szyprowski (1): clk: samsung: exynos-clkout: Remove misleading of_match_table/MODULE_DEVICE_TABLE Peter Griffin (1): clk: samsung: gs101: mark gout_hsi2_ufs_embd_i_clk_unipro as critical drivers/clk/samsung/clk-cpu.c | 4 ++-- drivers/clk/samsung/clk-exynos-clkout.c | 7 ++++--- drivers/clk/samsung/clk-gs101.c | 2 +- drivers/clk/samsung/clk-pll.c | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) . From: Lu Baolu To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Robin Murphy , Jean-Philippe Brucker , Nicolin Chen , Yi Liu , Jacob Pan , Joel Granados Cc: iommu@lists.linux.dev, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v8 00/10] IOMMUFD: Deliver IO page faults to user space Date: Tue, 2 Jul 2024 14:34:34 +0800 Message-Id: <20240702063444.105814-1-baolu.lu@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264890 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu,dev.linux.lists.virtualization Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series implements the functionality of delivering IO page faults to user space through the IOMMUFD framework. One feasible use case is the nested translation. Nested translation is a hardware feature that supports two-stage translation tables for IOMMU. The second-stage translation table is managed by the host VMM, while the first-stage translation table is owned by user space. This allows user space to control the IOMMU mappings for its devices. When an IO page fault occurs on the first-stage translation table, the IOMMU hardware can deliver the page fault to user space through the IOMMUFD framework. User space can then handle the page fault and respond to the device top-down through the IOMMUFD. This allows user space to implement its own IO page fault handling policies. User space application that is capable of handling IO page faults should allocate a fault object, and bind the fault object to any domain that it is willing to handle the fault generatd for them. On a successful return of fault object allocation, the user can retrieve and respond to page faults by reading or writing to the file descriptor (FD) returned. The iommu selftest framework has been updated to test the IO page fault delivery and response functionality. The series and related patches are available on GitHub: https://github.com/LuBaolu/intel-iommu/commits/iommufd-io-pgfault-delivery-v8 Change log: v8: - Update an out-of-date commit message. - Fix an error unwind issue by storing to a reserved entry. - Add a fail_nth selftest case to test iommufd_ucmd_respond() failure path. - Fix a refcounting issue in hwpt allocation with fault object. - Miscellaneous cleanup. v7: https://lore.kernel.org/linux-iommu/20240616061155.169343-1-baolu.lu@linux.intel.com/ - Move the setting of handle.domain into the helpers. - Return value of copy_to_user() should be converted to -EFAULT. - Add more checks on a fetched dma handle in the sva bind path. - Add a constant flag in iommu_ops to replace IOMMU_CAP_USER_IOASID_TABLE. - Simplify iommu_hwpt_pgfault and iommu_hwpt_page_response by removing some unnecessary fields. - Address the wrong order between dec users and ctx_put in fault FD release path. - Miscellaneous cleanup. v6: https://lore.kernel.org/linux-iommu/20240527040517.38561-1-baolu.lu@linux.intel.com/ - Refine the attach handle code by shifting the handle allocation to the caller. The caller will then provide the allocated handle to the domain attachment interfaces. - Add reference counter in iommufd_fault_iopf_enable/disable() helpers. - Fix the return values of fault FD's read/write fops. - Add IOMMU_CAP_USER_IOASID_TABLE capability and check it before roll back getting attach_handle to RID. - Move the iopf respond queue from iommufd device to iommufd fault. - Disallow PRI enablement on SR-IOV VF devices. - Miscellaneous cleanup. v5: https://lore.kernel.org/linux-iommu/20240430145710.68112-1-baolu.lu@linux.intel.com/ - Removed attach handle reference count from the core. Drivers will now synchronize their use of handles and domain attach/detach. - Automatically responds to all outstanding faults in hwpt detach or replace paths. - Supports getting a domain-type specific attach handle. - Reorganized the series by changing the patch order. - Miscellaneous cleanup. v4: https://lore.kernel.org/linux-iommu/20240403011519.78512-1-baolu.lu@linux.intel.com/ - Add the iommu domain attachment handle to replace the iopf-specific domain attachment interfaces introduced in the previous v3. - Replace the iommu_sva with iommu domain attachment handle. - Refine some fields in the fault and response message encoding according to feedback collected during v3 review period. - Refine and fix some problems in the fault FD implementation. - Miscellaneous cleanup. v3: https://lore.kernel.org/linux-iommu/20240122073903.24406-1-baolu.lu@linux.intel.com/ - Add iopf domain attach/detach/replace interfaces to manage the reference counters of hwpt and device, ensuring that both can only be destroyed after all outstanding IOPFs have been responded to. - Relocate the fault handling file descriptor from hwpt to a fault object to enable a single fault handling object to be utilized across multiple domains. - Miscellaneous cleanup and performance improvements. v2: https://lore.kernel.org/linux-iommu/20231026024930.382898-1-baolu.lu@linux.intel.com/ - Move all iommu refactoring patches into a sparated series and discuss it in a different thread. The latest patch series [v6] is available at https://lore.kernel.org/linux-iommu/20230928042734.16134-1-baolu.lu@linux.intel.com/ - We discussed the timeout of the pending page fault messages. We agreed that we shouldn't apply any timeout policy for the page fault handling in user space. https://lore.kernel.org/linux-iommu/20230616113232.GA84678@myrica/ - Jason suggested that we adopt a simple file descriptor interface for reading and responding to I/O page requests, so that user space applications can improve performance using io_uring. https://lore.kernel.org/linux-iommu/ZJWjD1ajeem6pK3I@ziepe.ca/ v1: https://lore.kernel.org/linux-iommu/20230530053724.232765-1-baolu.lu@linux.intel.com/ Lu Baolu (10): iommu: Introduce domain attachment handle iommu: Remove sva handle list iommu: Add attach handle to struct iopf_group iommu: Extend domain attach group with handle support iommufd: Add fault and response message definitions iommufd: Add iommufd fault object iommufd: Fault-capable hwpt attach/detach/replace iommufd: Associate fault object with iommufd_hw_pgtable iommufd/selftest: Add IOPF support for mock device iommufd/selftest: Add coverage for IOPF test include/linux/iommu.h | 41 +- drivers/iommu/iommu-priv.h | 11 + drivers/iommu/iommufd/iommufd_private.h | 80 ++++ drivers/iommu/iommufd/iommufd_test.h | 8 + include/uapi/linux/iommufd.h | 109 +++++ tools/testing/selftests/iommu/iommufd_utils.h | 86 +++- drivers/dma/idxd/init.c | 2 +- drivers/iommu/io-pgfault.c | 63 +-- drivers/iommu/iommu-sva.c | 42 +- drivers/iommu/iommu.c | 185 ++++++-- drivers/iommu/iommufd/device.c | 7 +- drivers/iommu/iommufd/fault.c | 433 ++++++++++++++++++ drivers/iommu/iommufd/hw_pagetable.c | 38 +- drivers/iommu/iommufd/main.c | 6 + drivers/iommu/iommufd/selftest.c | 64 +++ tools/testing/selftests/iommu/iommufd.c | 22 + .../selftests/iommu/iommufd_fail_nth.c | 2 +- drivers/iommu/iommufd/Makefile | 1 + 18 files changed, 1083 insertions(+), 117 deletions(-) create mode 100644 drivers/iommu/iommufd/fault.c -- 2.34.1 . From: Dapeng Mi To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Adrian Hunter , Alexander Shishkin , Kan Liang Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Yanfei Xu , Dapeng Mi , Dapeng Mi Subject: [PATCH 0/4] Bug fixes on topdown metrics group leader selection Date: Wed, 3 Jul 2024 06:40:33 +0800 Message-Id: <20240702224037.343958-1-dapeng1.mi@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264904 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-perf-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail when counting/sampling topdown slots and metrics events, the following issues are found. a. incorrect sampling leader selection if group only contains topdown slots event without topdown metrics event, such as perf record -e '{slots,branches}:S' -c 10000 -vv sleep 1 In this case, the slots event should be sampled as leader but the branches event is sampled in fact like the verbose output shows. perf_event_attr: type 4 (cpu) size 168 config 0x400 (slots) sample_type IP|TID|TIME|READ|CPU|IDENTIFIER read_format ID|GROUP|LOST disabled 1 sample_id_all 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5 ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 168 config 0x4 (PERF_COUNT_HW_BRANCH_INSTRUCTIONS) { sample_period, sample_freq } 10000 sample_type IP|TID|TIME|READ|CPU|IDENTIFIER read_format ID|GROUP|LOST sample_id_all 1 exclude_guest 1 b. Fail to run the perf command perf record -e "{slots,instructions,topdown-retiring}:S" -vv -C0 sleep 1 ------------------------------------------------------------ perf_event_attr: type 4 (cpu) size 168 config 0x400 (slots) sample_type IP|TID|TIME|READ|CPU|PERIOD|IDENTIFIER read_format ID|GROUP|LOST disabled 1 sample_id_all 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5 ------------------------------------------------------------ perf_event_attr: type 4 (cpu) size 168 config 0x8000 (topdown-retiring) { sample_period, sample_freq } 4000 sample_type IP|TID|TIME|READ|CPU|PERIOD|IDENTIFIER read_format ID|GROUP|LOST freq 1 sample_id_all 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid -1 cpu 0 group_fd 5 flags 0x8 sys_perf_event_open failed, error -22 Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (topdown-retiring). Perf tool tries to regroup the events and move topdown-retiring event closely after slots event and leads to topdown-retiring event is select to sample. This is incorrect. c. unnecessary events regroup for the group which only has slots event but without topdown metrics events, such as perf stat -e "{instructions,slots}" -C 0 sleep 1 WARNING: events were regrouped to match PMUs Performance counter stats for 'CPU(s) 0': 27,581,148 slots 8,390,827 instructions 1.045546595 seconds time elapsed Obviously, this events regroup is unnecessary. The patches 1-3 separately fixes the above 3 issues in order and the patch 4/4 adds a new perf test to verify the leader sampling. Dapeng Mi (4): perf topdown: Correct leader selection with sample_read enabled perf parse-events: Don't move topdown metrics events when sorting events perf parse-events: Don't move slots event when no topdwon metrics event perf tests: Add leader sampling test in record tests tools/perf/arch/x86/util/evlist.c | 11 ++++------ tools/perf/arch/x86/util/topdown.c | 16 ++++++++++++-- tools/perf/tests/shell/record.sh | 28 ++++++++++++++++++++++++ tools/perf/util/evlist.h | 7 +++++- tools/perf/util/parse-events.c | 35 ++++++++++++++++++------------ 5 files changed, 73 insertions(+), 24 deletions(-) base-commit: 73e931504f8e0d42978bfcda37b323dbbd1afc08 -- 2.40.1 . Date: Tue, 2 Jul 2024 16:40:41 +1000 From: Stephen Rothwell To: Theodore Ts'o , "Jason A. Donenfeld" , Andrew Morton Cc: Barry Song , Barry Song , Hugh Dickins , Lance Yang , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the random tree with the mm-stable tree Message-ID: <20240702164041.60a19dfb@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_//UoFVVvrpE_FsoEM7YRuMGE"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264911 org.kernel.vger.linux-next:62048 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_//UoFVVvrpE_FsoEM7YRuMGE Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the random tree got a conflict in: mm/rmap.c between commits: a2a1b9f670f3 ("mm/rmap: remove duplicated exit code in pagewalk loop") 92493c3b92b1 ("mm: extend rmap flags arguments for folio_add_new_anon_rma= p") db4fb1039a19 ("mm: use folio_add_new_anon_rmap() if folio_test_anon(folio= )=3D=3Dfalse") from the mm-stable tree and commit: e788371a45ac ("mm: add VM_DROPPABLE for designating always lazily freeabl= e mappings") from the random tree. I fixed it up (I think - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc mm/rmap.c index 8616308610b9,d873a3f06506..000000000000 --- a/mm/rmap.c +++ b/mm/rmap.c @@@ -1394,27 -1384,22 +1394,27 @@@ void folio_add_anon_rmap_pmd(struct fol * * Like folio_add_anon_rmap_*() but must only be called on *new* folios. * This means the inc-and-test can be bypassed. - * The folio does not have to be locked. + * The folio doesn't necessarily need to be locked while it's exclusive + * unless two threads map it concurrently. However, the folio must be + * locked if it's shared. * - * If the folio is pmd-mappable, it is accounted as a THP. As the folio - * is new, it's assumed to be mapped exclusively by a single process. + * If the folio is pmd-mappable, it is accounted as a THP. */ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *= vma, - unsigned long address) + unsigned long address, rmap_t flags) { - int nr =3D folio_nr_pages(folio); + const int nr =3D folio_nr_pages(folio); + const bool exclusive =3D flags & RMAP_EXCLUSIVE; + int nr_pmdmapped =3D 0; =20 VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); + VM_WARN_ON_FOLIO(!exclusive && !folio_test_locked(folio), folio); VM_BUG_ON_VMA(address < vma->vm_start || address + (nr << PAGE_SHIFT) > vma->vm_end, vma); - if (!(vma->vm_flags & VM_DROPPABLE)) + - if (!folio_test_swapbacked(folio)) ++ if (!folio_test_swapbacked(folio) && !(vma->vm_flags & VM_DROPPABLE)) __folio_set_swapbacked(folio); - __folio_set_anon(folio, vma, address, true); + __folio_set_anon(folio, vma, address, exclusive); =20 if (likely(!folio_test_large(folio))) { /* increment count (starts at -1) */ @@@ -1858,8 -1852,11 +1858,9 @@@ static bool try_to_unmap_one(struct fol * discarded. Remap the page to page table. */ set_pte_at(mm, address, pvmw.pte, pteval); - folio_set_swapbacked(folio); + if (!(vma->vm_flags & VM_DROPPABLE)) + folio_set_swapbacked(folio); - ret =3D false; - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_abort; } =20 if (swap_duplicate(entry) < 0) { --Sig_//UoFVVvrpE_FsoEM7YRuMGE Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaDoOkACgkQAVBC80lX 0GzqeQf/fQAJLD8KQCy6uHlD5DlDCvt/BypC3dJWnm1+Q4mCEBjJKuJb7D379ZQf fq5OmRzUyCVAER9XGNJ91WOKVNceiTuhA3ia5mRkCPXbqtgAUaRHi+zHqfJPQjU2 R/3SghgGvSKzNSJOkNrpZmQZ3l6ETjfoHIbdwdyryfuEmkgKa19nZ0TyMmIDD8Pb +vWZrPB8YOhfvdzzhR7ReVxZV+g8JlUlot+m/zdD6Uxa/wQKIn5byZ75GRN7ZcPT hDjAUAcrE59qmDyyOf4xgCOWdI2+LvMmwU3NOS4XRc8S81L3ARQvneqkFUO5vBhB 36mJfB+cPcelKfnxJn9x0ToKt8SWpQ== =gOkZ -----END PGP SIGNATURE----- --Sig_//UoFVVvrpE_FsoEM7YRuMGE-- . From: Eric Biggers To: dm-devel@lists.linux.dev, Alasdair Kergon , Mike Snitzer , Mikulas Patocka Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , Sami Tolvanen , Bart Van Assche Subject: [PATCH 0/7] dm-verity cleanups and optimizations Date: Mon, 1 Jul 2024 23:48:28 -0700 Message-ID: <20240702064835.120541-1-ebiggers@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264916 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.dm-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series contains some cleanups and optimizations for dm-verity that I've split out from my multibuffer hashing series https://lore.kernel.org/linux-crypto/20240621165922.77672-1-ebiggers@kernel.org/. This series does not depend on any crypto API changes, so it can be applied right away. Eric Biggers (7): dm-verity: move hash algorithm setup into its own function dm-verity: move data hash mismatch handling into its own function dm-verity: make real_digest and want_digest fixed-length dm-verity: provide dma_alignment limit in io_hints dm-verity: always "map" the data blocks dm-verity: make verity_hash() take dm_verity_io instead of ahash_request dm-verity: hash blocks with shash import+finup when possible drivers/md/dm-verity-fec.c | 32 +-- drivers/md/dm-verity-fec.h | 6 +- drivers/md/dm-verity-target.c | 461 ++++++++++++++++------------------ drivers/md/dm-verity.h | 39 ++- 4 files changed, 242 insertions(+), 296 deletions(-) base-commit: 22a40d14b572deb80c0648557f4bd502d7e83826 -- 2.45.2 . From: Krzysztof Kozlowski To: Olof Johansson , Arnd Bergmann , arm@kernel.org, soc@kernel.org Cc: Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [GIT PULL 1/2] arm64: dts: various cleanup for v6.11 Date: Tue, 2 Jul 2024 08:53:57 +0200 Message-ID: <20240702065359.7378-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264926 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.lore.soc,org.kernel.vger.linux-samsung-soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The following changes since commit 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0: Linux 6.10-rc1 (2024-05-26 15:20:12 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git tags/dt64-cleanup-6.11 for you to fetch changes up to c0304446611536a771462f27d98db6775d222b38: arm64: dts: apm: Add dedicated syscon poweroff compatibles (2024-07-01 10:33:07 +0200) ---------------------------------------------------------------- Minor improvements in ARM64 DTS for v6.11 Few cleanups and improvements which were missed by their maintainers: 1. Spreadtrum: correct PMU nodes - split per clusters. 2. HiSilicon: add dedicated compatible to syscon node ("syscon" alone is not allowed). 3. APM: add dedicated compatible to syscon node (binding applied to MFD tree). ---------------------------------------------------------------- Krzysztof Kozlowski (3): dt-bindings: soc: hisilicon: document hi3660-usb3-otg-bc arm64: dts: hisilicon: hi3660: add dedicated hi3660-usb3-otg-bc compatible arm64: dts: apm: Add dedicated syscon poweroff compatibles Rob Herring (1): arm64: dts: sprd: Split PMU nodes for heterogeneous CPUs .../hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml | 46 ++++++++++++++++++++++ arch/arm64/boot/dts/apm/apm-merlin.dts | 2 +- arch/arm64/boot/dts/apm/apm-mustang.dts | 2 +- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 +- arch/arm64/boot/dts/sprd/ums512.dtsi | 14 +++++-- arch/arm64/boot/dts/sprd/ums9620.dtsi | 14 +++++-- 6 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml . From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH 0/2] ARM: 9322/1: Switch over to GENERIC_CPU_DEVICES Date: Tue, 2 Jul 2024 14:59:04 +0800 Message-ID: <20240702065906.929987-1-ruanjinjie@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264928 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Currently, almost all architectures have switched to GENERIC_CPU_DEVICES, except for arm32. Also switch over to GENERIC_CPU_DEVICES, which can also make the code more concise. Jinjie Ruan (2): ARM: 9322/1: Switch over to GENERIC_CPU_DEVICES using arch_register_cpu() ARM: 9322/1: Convert to arch_cpu_is_hotpluggable() arch/arm/Kconfig | 1 + arch/arm/include/asm/cpu.h | 1 - arch/arm/kernel/setup.c | 14 ++------------ 3 files changed, 3 insertions(+), 13 deletions(-) -- 2.34.1 . From: zhangchun To: CC: , , , , , , zhangchun Subject: [PATCH] mm: fix kmap_high deadlock V2 Date: Tue, 2 Jul 2024 14:56:09 +0800 Message-ID: <1719903369-35385-1-git-send-email-zhang.chuna@h3c.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DNSRBL: X-SPAM-SOURCE-CHECK: pass Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264932 org.kvack.linux-mm:202110 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail I work with zhangzhansheng(from h3c) find that some situation may casue deadlock when we use kmap_high and kmap_XXX or kumap_xxx between differt cores at the same time, kmap_high->map_new_virtual-> flush_all_zero_pkmaps->flush_tlb_kernel_range->on_each_cpu. On this condition, kmap_high hold the kmap_lock，wait the other cores respond to ipi. But the others may disable irq and wait kmap_lock, this is some deadlock condition. I think it's necessary to give kmap_lock before call flush_tlb_kernel_range. Like this: spin_unlock(&kmap_lock); flush_tlb_kernel_range(xxx); spin_lock(&kmap_lock); CPU 0: cpu 1: kmap_xxx() { xxx irq_disable(); kmap_high(); spin_lock(&kmap_lock) xxx yyyyyyy spin_unlock(&kmap_lock) irq_enable(); } kmap_high detail: kmap_high() { zzz spin_lock(&kmap_lock) map_new_virtual-> flush_all_zero_pkmaps-> flush_tlb_kernel_range-> on_each_cpu /* if cpu 1 irq_disabled, the cpu 1 cannot ack, then cpu 0 and cpu 1 may hangup. */ spin_unlock(&kmap_lock) zzz } Signed-off-by: zhangchun Reviewed-by: zhangzhengming --- mm/highmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/highmem.c b/mm/highmem.c index bd48ba4..841b370 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -220,8 +220,11 @@ static void flush_all_zero_pkmaps(void) set_page_address(page, NULL); need_flush = 1; } - if (need_flush) + if (need_flush) { + spin_unlock(&kmap_lock); flush_tlb_kernel_range(PKMAP_ADDR(0), PKMAP_ADDR(LAST_PKMAP)); + spin_lock(&kmap_lock); + } } void __kmap_flush_unused(void) -- 1.8.3.1 . Date: Tue, 2 Jul 2024 16:56:01 +1000 From: Stephen Rothwell To: Theodore Ts'o , "Jason A. Donenfeld" , Christian Brauner , Steven Rostedt , Masami Hiramatsu Cc: Christian =?UTF-8?B?R8O2dHRzY2hl?= , Jiri Olsa , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the random tree with the vfs-brauner, ftrace trees Message-ID: <20240702165601.08bb4545@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qBBRs7gO0BKNkyBbCA91t_D"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264933 org.kernel.vger.linux-next:62049 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/qBBRs7gO0BKNkyBbCA91t_D Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the random tree got conflicts in: arch/alpha/kernel/syscalls/syscall.tbl arch/arm/tools/syscall.tbl arch/arm64/include/asm/unistd.h arch/arm64/include/asm/unistd32.h arch/m68k/kernel/syscalls/syscall.tbl arch/microblaze/kernel/syscalls/syscall.tbl arch/mips/kernel/syscalls/syscall_n32.tbl arch/mips/kernel/syscalls/syscall_n64.tbl arch/mips/kernel/syscalls/syscall_o32.tbl arch/parisc/kernel/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl arch/s390/kernel/syscalls/syscall.tbl arch/sh/kernel/syscalls/syscall.tbl arch/sparc/kernel/syscalls/syscall.tbl arch/x86/entry/syscalls/syscall_32.tbl arch/x86/entry/syscalls/syscall_64.tbl arch/xtensa/kernel/syscalls/syscall.tbl include/uapi/asm-generic/unistd.h between commits: e6873349f700 ("fs/xattr: add *at family syscalls") 190fec72df4a ("uprobe: Wire up uretprobe system call") from the vfs-brauner, ftrace trees and commit: 4549ad25b76f ("arch: allocate vgetrandom_alloc() syscall number") from the random tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc arch/alpha/kernel/syscalls/syscall.tbl index c59d53d6d3f3,8c38193bf86a..000000000000 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@@ -502,7 -502,4 +502,8 @@@ 570 common lsm_set_self_attr sys_lsm_set_self_attr 571 common lsm_list_modules sys_lsm_list_modules 572 common mseal sys_mseal -573 common vgetrandom_alloc sys_vgetrandom_alloc +573 common setxattrat sys_setxattrat +574 common getxattrat sys_getxattrat +575 common listxattrat sys_listxattrat +576 common removexattrat sys_removexattrat ++578 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/arm/tools/syscall.tbl index 49eeb2ad8dbd,118e41178905..000000000000 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@@ -477,7 -476,4 +477,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/arm64/include/asm/unistd.h index ad8afcad8516,6067f617273f..000000000000 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@@ -39,7 -39,7 +39,7 @@@ #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) =20 - #define __NR_compat_syscalls 467 -#define __NR_compat_syscalls 464 ++#define __NR_compat_syscalls 469 #endif =20 #define __ARCH_WANT_SYS_CLONE diff --cc arch/arm64/include/asm/unistd32.h index cff1ca302791,f7a45c1788b3..000000000000 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@@ -931,14 -931,8 +931,16 @@@ __SYSCALL(__NR_lsm_set_self_attr, sys_l __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules) #define __NR_mseal 462 __SYSCALL(__NR_mseal, sys_mseal) -#define __NR_vgetrandom_alloc 463 +#define __NR_setxattrat 463 +__SYSCALL(__NR_setxattrat, sys_setxattrat) +#define __NR_getxattrat 464 +__SYSCALL(__NR_getxattrat, sys_getxattrat) +#define __NR_listxattrat 465 +__SYSCALL(__NR_listxattrat, sys_listxattrat) +#define __NR_removexattrat 466 +__SYSCALL(__NR_removexattrat, sys_removexattrat) ++#define __NR_vgetrandom_alloc 468 + __SYSCALL(__NR_vgetrandom_alloc, sys_vgetrandom_alloc) =20 /* * Please add new compat syscalls above this comment and update diff --cc arch/m68k/kernel/syscalls/syscall.tbl index f5ed71f1910d,bd919d1a8231..000000000000 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl @@@ -462,7 -462,4 +462,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/microblaze/kernel/syscalls/syscall.tbl index 680f568b77f2,d3d3c017a5bb..000000000000 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl @@@ -468,7 -468,4 +468,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl index 0b9b7e25b69a,502cedc0f84d..000000000000 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl @@@ -401,7 -401,4 +401,8 @@@ 460 n32 lsm_set_self_attr sys_lsm_set_self_attr 461 n32 lsm_list_modules sys_lsm_list_modules 462 n32 mseal sys_mseal -463 n32 vgetrandom_alloc sys_vgetrandom_alloc +463 n32 setxattrat sys_setxattrat +464 n32 getxattrat sys_getxattrat +465 n32 listxattrat sys_listxattrat +466 n32 removexattrat sys_removexattrat ++468 n32 vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl index c844cd5cda62,33710f855c46..000000000000 --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl @@@ -377,7 -377,4 +377,8 @@@ 460 n64 lsm_set_self_attr sys_lsm_set_self_attr 461 n64 lsm_list_modules sys_lsm_list_modules 462 n64 mseal sys_mseal -463 n64 vgetrandom_alloc sys_vgetrandom_alloc +463 n64 setxattrat sys_setxattrat +464 n64 getxattrat sys_getxattrat +465 n64 listxattrat sys_listxattrat +466 n64 removexattrat sys_removexattrat ++468 n64 vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl index 349b8aad1159,f342d3f26396..000000000000 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@@ -450,7 -450,4 +450,8 @@@ 460 o32 lsm_set_self_attr sys_lsm_set_self_attr 461 o32 lsm_list_modules sys_lsm_list_modules 462 o32 mseal sys_mseal -463 o32 vgetrandom_alloc sys_vgetrandom_alloc +463 o32 setxattrat sys_setxattrat +464 o32 getxattrat sys_getxattrat +465 o32 listxattrat sys_listxattrat +466 o32 removexattrat sys_removexattrat ++468 o32 vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/parisc/kernel/syscalls/syscall.tbl index d9fc94c86965,cddae8bc6fd5..000000000000 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl @@@ -461,7 -461,4 +461,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/powerpc/kernel/syscalls/syscall.tbl index d8b4ab78bef0,5c01ec49f510..000000000000 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@@ -553,7 -553,4 +553,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/s390/kernel/syscalls/syscall.tbl index e9115b4d8b63,f5abf7e496ee..000000000000 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@@ -465,7 -465,4 +465,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/sh/kernel/syscalls/syscall.tbl index c8cad33bf250,b911231478ee..000000000000 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl @@@ -466,7 -466,4 +466,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/sparc/kernel/syscalls/syscall.tbl index 727f99d333b3,7578d0dee5b1..000000000000 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@@ -508,7 -508,4 +508,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/x86/entry/syscalls/syscall_32.tbl index 4d0fb2fba7e2,c4fc7c4f65c3..000000000000 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@@ -468,7 -467,4 +468,8 @@@ 460 i386 lsm_set_self_attr sys_lsm_set_self_attr 461 i386 lsm_list_modules sys_lsm_list_modules 462 i386 mseal sys_mseal -463 i386 vgetrandom_alloc sys_vgetrandom_alloc +463 i386 setxattrat sys_setxattrat +464 i386 getxattrat sys_getxattrat +465 i386 listxattrat sys_listxattrat +466 i386 removexattrat sys_removexattrat ++468 i386 vgetrandom_alloc sys_vgetrandom_alloc diff --cc arch/x86/entry/syscalls/syscall_64.tbl index b1d45a7399a5,441443ba2ae6..000000000000 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@@ -385,11 -384,7 +385,12 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat +467 64 uretprobe sys_uretprobe ++468 common vgetrandom_alloc sys_vgetrandom_alloc =20 # # Due to a historical design error, certain syscalls are numbered differe= ntly diff --cc arch/xtensa/kernel/syscalls/syscall.tbl index 37effc1b134e,b9f64edd0b18..000000000000 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl @@@ -433,7 -433,4 +433,8 @@@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal -463 common vgetrandom_alloc sys_vgetrandom_alloc +463 common setxattrat sys_setxattrat +464 common getxattrat sys_getxattrat +465 common listxattrat sys_listxattrat +466 common removexattrat sys_removexattrat ++468 common vgetrandom_alloc sys_vgetrandom_alloc diff --cc include/uapi/asm-generic/unistd.h index a48dcc83d289,57371c90dc13..000000000000 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@@ -845,20 -845,11 +845,23 @@@ __SYSCALL(__NR_lsm_list_modules, sys_ls #define __NR_mseal 462 __SYSCALL(__NR_mseal, sys_mseal) =20 -#define __NR_vgetrandom_alloc 463 +#define __NR_setxattrat 463 +__SYSCALL(__NR_setxattrat, sys_setxattrat) +#define __NR_getxattrat 464 +__SYSCALL(__NR_getxattrat, sys_getxattrat) +#define __NR_listxattrat 465 +__SYSCALL(__NR_listxattrat, sys_listxattrat) +#define __NR_removexattrat 466 +__SYSCALL(__NR_removexattrat, sys_removexattrat) + +#define __NR_uretprobe 467 +__SYSCALL(__NR_uretprobe, sys_uretprobe) + ++#define __NR_vgetrandom_alloc 468 + __SYSCALL(__NR_vgetrandom_alloc, sys_vgetrandom_alloc) +=20 #undef __NR_syscalls - #define __NR_syscalls 468 -#define __NR_syscalls 464 ++#define __NR_syscalls 469 =20 /* * 32 bit systems traditionally used different --Sig_/qBBRs7gO0BKNkyBbCA91t_D Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaDpIEACgkQAVBC80lX 0GyaRggAgHzIJMz1wlGmtK/9vO6yTbjch1hBTR9cRhJy4wASdayDb8ZbuCw40rWJ UCB70b9Xv1hcGYlU02famfGHcG2VZJgdF/3Ui8trC62KM796z+KXTZ1QERkLgQqT XY70enrcC6UH1SnVBS+y+tRw6eqrNuZuZcZlJVfE9nSBuZqa5x3zL286/fhxLUzm 9qhljexB0SPPZ3A0gWEk75NrYyt/+qh0z1uX3lYEUzBOOEjZ6zZuGP7/Ai1SBF9E 9Jl7S7pGg7VW0gHsWdcDAFogxtIixcdFG+OeUBC1r4ok89TVQWQtQHomK2V1kiaQ djvSrPqG+SpAlnbyi/9BwKtc5hhHKg== =UUUu -----END PGP SIGNATURE----- --Sig_/qBBRs7gO0BKNkyBbCA91t_D-- . From: Muhammad Usama Anjum To: Jarkko Sakkinen , Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] selftests: tpm2: conform test to TAP output Date: Tue, 2 Jul 2024 11:55:53 +0500 Message-Id: <20240702065559.772855-1-usama.anjum@collabora.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264934 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The python unittest is being used for executing tests. TAP output cannot be added in the unittest framework. The python unittest is being run from a script. Add the output TAP logs to the script. Add "#" prefix to the python unittest output which will mark all output as informational TAP messages. Check exit status of the python unittest to decide if test passed or failed. Not sure why but python unittest outputs logs in stderr. So redirect the logs to stdout and then add prefix. Specify the bash explicitly instead of sh to run these tests as all of the kselftests are shifting towards using bash explicitly. Some interpreters have different syntax and cause issues. Cc: Jarkko Sakkinen Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - CC more people which were missing earlier --- tools/testing/selftests/tpm2/test_async.sh | 24 ++++++++++++++++------ tools/testing/selftests/tpm2/test_smoke.sh | 19 ++++++++++++++--- tools/testing/selftests/tpm2/test_space.sh | 19 ++++++++++++++--- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/tpm2/test_async.sh b/tools/testing/selftests/tpm2/test_async.sh index 43bf5bd772fd4..0e6e5d9d649fb 100755 --- a/tools/testing/selftests/tpm2/test_async.sh +++ b/tools/testing/selftests/tpm2/test_async.sh @@ -1,10 +1,22 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 +DIR="$(dirname $(readlink -f "$0"))" +source "${DIR}"/../kselftest/ktap_helpers.sh -[ -e /dev/tpm0 ] || exit $ksft_skip -[ -e /dev/tpmrm0 ] || exit $ksft_skip +ktap_print_header -python3 -m unittest -v tpm2_tests.AsyncTest +[ -e /dev/tpm0 ] || ktap_finished +[ -e /dev/tpmrm0 ] || ktap_finished + +ktap_set_plan 1 + +python3 -m unittest -v tpm2_tests.AsyncTest 2>&1 | sed "s/^/# /" + +if [ ${PIPESTATUS[0]} -eq $ksft_pass ]; then + ktap_test_pass "tpm2_tests.AsyncTest" +else + ktap_test_fail "tpm2_tests.AsyncTest" +fi + +ktap_finished diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh index 58af963e5b55a..2219a180de91d 100755 --- a/tools/testing/selftests/tpm2/test_smoke.sh +++ b/tools/testing/selftests/tpm2/test_smoke.sh @@ -1,9 +1,22 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) # Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 +DIR="$(dirname $(readlink -f "$0"))" +source "${DIR}"/../kselftest/ktap_helpers.sh + +ktap_print_header [ -e /dev/tpm0 ] || exit $ksft_skip -python3 -m unittest -v tpm2_tests.SmokeTest +ktap_set_plan 1 + +python3 -m unittest -v tpm2_tests.SmokeTest 2>&1 | sed "s/^/# /" + +if [ ${PIPESTATUS[0]} -eq $ksft_pass ]; then + ktap_test_pass "tpm2_tests.AsyncTest" +else + ktap_test_fail "tpm2_tests.AsyncTest" +fi + +ktap_finished diff --git a/tools/testing/selftests/tpm2/test_space.sh b/tools/testing/selftests/tpm2/test_space.sh index 04c47b13fe8ac..6a55d13d74983 100755 --- a/tools/testing/selftests/tpm2/test_space.sh +++ b/tools/testing/selftests/tpm2/test_space.sh @@ -1,9 +1,22 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) # Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 +DIR="$(dirname $(readlink -f "$0"))" +source "${DIR}"/../kselftest/ktap_helpers.sh + +ktap_print_header [ -e /dev/tpmrm0 ] || exit $ksft_skip -python3 -m unittest -v tpm2_tests.SpaceTest +ktap_set_plan 1 + +python3 -m unittest -v tpm2_tests.SpaceTest 2>&1 | sed "s/^/# /" + +if [ ${PIPESTATUS[0]} -eq $ksft_pass ]; then + ktap_test_pass "tpm2_tests.AsyncTest" +else + ktap_test_fail "tpm2_tests.AsyncTest" +fi + +ktap_finished -- 2.39.2 . From: Krzysztof Kozlowski To: Olof Johansson , Arnd Bergmann , arm@kernel.org, soc@kernel.org Cc: Krzysztof Kozlowski , linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [GIT PULL] memory: drivers for v6.11 Date: Tue, 2 Jul 2024 09:02:12 +0200 Message-ID: <20240702070212.8291-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264941 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.lore.soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, If by any chance you can also pick up: https://lore.kernel.org/all/20240530-fsl-ifc-config-v3-2-1fd2c3d233dd@geanix.com/ https://lore.kernel.org/all/20240530-fsl-ifc-config-v3-3-1fd2c3d233dd@geanix.com/ ? I was planning to take them with this pull, but eventually forgot... Best regards, Krzysztof The following changes since commit 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0: Linux 6.10-rc1 (2024-05-26 15:20:12 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git tags/memory-controller-drv-6.11 for you to fetch changes up to 815cc7715ab183701de42b570a28b4e3d877ef6c: dt-bindings: memory: fsl: replace maintainer (2024-06-17 08:07:35 +0200) ---------------------------------------------------------------- Memory controller drivers for v6.11 Make the Freescale IFC driver selectable because it is used now by two drivers: Freescale NAND and generic NOR flash. The patches adjusting defconfig are waiting on the mailing lists to be picked up. ---------------------------------------------------------------- Esben Haabendal (1): memory: fsl_ifc: Make FSL_IFC config visible and selectable Michael Walle (1): dt-bindings: memory: fsl: replace maintainer Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml | 2 +- drivers/memory/Kconfig | 2 +- drivers/mtd/nand/raw/Kconfig | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) . Date: Tue, 2 Jul 2024 00:40:55 -0700 (PDT) From: Hugh Dickins To: Andrew Morton cc: Baolin Wang , Nhat Pham , Yang Shi , Zi Yan , Barry Song , Kefeng Wang , David Hildenbrand , Matthew Wilcox , Hugh Dickins , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH hotfix] mm: fix crashes from deferred split racing folio migration Message-ID: <29c83d1a-11ca-b6c9-f92e-6ccb322af510@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264965 org.kvack.linux-mm:202120 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Even on 6.10-rc6, I've been seeing elusive "Bad page state"s (often on flags when freeing, yet the flags shown are not bad: PG_locked had been set and cleared??), and VM_BUG_ON_PAGE(page_ref_count(page) == 0)s from deferred_split_scan()'s folio_put(), and a variety of other BUG and WARN symptoms implying double free by deferred split and large folio migration. 6.7 commit 9bcef5973e31 ("mm: memcg: fix split queue list crash when large folio migration") was right to fix the memcg-dependent locking broken in 85ce2c517ade ("memcontrol: only transfer the memcg data for migration"), but missed a subtlety of deferred_split_scan(): it moves folios to its own local list to work on them without split_queue_lock, during which time folio->_deferred_list is not empty, but even the "right" lock does nothing to secure the folio and the list it is on. Fortunately, deferred_split_scan() is careful to use folio_try_get(): so folio_migrate_mapping() can avoid the race by folio_undo_large_rmappable() while the old folio's reference count is temporarily frozen to 0 - adding such a freeze in the !mapping case too (originally, folio lock and unmapping and no swap cache left an anon folio unreachable, so no freezing was needed there: but the deferred split queue offers a way to reach it). Fixes: 9bcef5973e31 ("mm: memcg: fix split queue list crash when large folio migration") Signed-off-by: Hugh Dickins Cc: stable@vger.kernel.org --- This patch against 6.10-rc6: Kefeng has commits in the mm-tree which which will need adjustment to go over this, but we can both check the result. I have wondered whether just reverting 85ce2c517ade and its subsequent fixups would be better: but that would be a bigger job, and probably not the right choice. mm/memcontrol.c | 11 ----------- mm/migrate.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 71fe2a95b8bd..8f2f1bb18c9c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7823,17 +7823,6 @@ void mem_cgroup_migrate(struct folio *old, struct folio *new) /* Transfer the charge and the css ref */ commit_charge(new, memcg); - /* - * If the old folio is a large folio and is in the split queue, it needs - * to be removed from the split queue now, in case getting an incorrect - * split queue in destroy_large_folio() after the memcg of the old folio - * is cleared. - * - * In addition, the old folio is about to be freed after migration, so - * removing from the split queue a bit earlier seems reasonable. - */ - if (folio_test_large(old) && folio_test_large_rmappable(old)) - folio_undo_large_rmappable(old); old->memcg_data = 0; } diff --git a/mm/migrate.c b/mm/migrate.c index 20cb9f5f7446..a8c6f466e33a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -415,6 +415,15 @@ int folio_migrate_mapping(struct address_space *mapping, if (folio_ref_count(folio) != expected_count) return -EAGAIN; + /* Take off deferred split queue while frozen and memcg set */ + if (folio_test_large(folio) && + folio_test_large_rmappable(folio)) { + if (!folio_ref_freeze(folio, expected_count)) + return -EAGAIN; + folio_undo_large_rmappable(folio); + folio_ref_unfreeze(folio, expected_count); + } + /* No turning back from here */ newfolio->index = folio->index; newfolio->mapping = folio->mapping; @@ -433,6 +442,10 @@ int folio_migrate_mapping(struct address_space *mapping, return -EAGAIN; } + /* Take off deferred split queue while frozen and memcg set */ + if (folio_test_large(folio) && folio_test_large_rmappable(folio)) + folio_undo_large_rmappable(folio); + /* * Now we know that no one else is looking at the folio: * no turning back from here. -- 2.35.3 . Date: Tue, 2 Jul 2024 17:49:38 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM Cc: Marek =?UTF-8?B?QmVow7pu?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build warning after merge of the arm-soc tree Message-ID: <20240702174938.04c12aab@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/8dRmiJtKFHT6wPSib/zPlpQ"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264974 org.kernel.vger.linux-next:62051 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/8dRmiJtKFHT6wPSib/zPlpQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the arm-soc tree, today's linux-next build (htmldocs) produced this warning: Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu:26: ERROR:= Unexpected indentation. Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu:26: WARNIN= G: Block quote ends without a blank line; unexpected unindent. Introduced by commit dfa556e45ae9 ("platform: cznic: turris-omnia-mcu: Add support for MCU con= nected GPIOs") --=20 Cheers, Stephen Rothwell --Sig_/8dRmiJtKFHT6wPSib/zPlpQ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaDsRIACgkQAVBC80lX 0GxnnQf/RhrN2fssfrxWEHOyovqD0Lwt+aRTCRiCOFbtPlan8mdOYktsfNqmVAZ8 JVj5MAK1hql3j0Cuq6BIxyx/hI7oBByxqrz7ktNIYhKn4Vpaeuv8WKJiGdd8JQH1 E10JGWOZSSwUrkWiPI0IJN49IHIuj5Uqr3GSiHP+EJg+b9+DjGixF/HpczMkQoNi O9dJFtHeaW75XNj8ZsiBt5af/do+4l5rGiKCZRXsE/nJDfT7mfQUxbXXZNrMoP2F S2Y5ErnAoGmvDVnvMaPW/auRO/FdpAVGzi9ELmUJXyE82CB9hP2ng96N+WSJ2yee gCIRZSrPt9dw2v19zVigJrJafJQDrg== =9BIA -----END PGP SIGNATURE----- --Sig_/8dRmiJtKFHT6wPSib/zPlpQ-- . From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH RESEND 0/2] ARM: Switch over to GENERIC_CPU_DEVICES Date: Tue, 2 Jul 2024 15:57:40 +0800 Message-ID: <20240702075742.945768-1-ruanjinjie@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264976 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Currently, almost all architectures have switched to GENERIC_CPU_DEVICES, except for arm32. Also switch over to GENERIC_CPU_DEVICES, which can also make the code more concise. Jinjie Ruan (2): ARM: Switch over to GENERIC_CPU_DEVICES using arch_register_cpu() ARM: Convert to arch_cpu_is_hotpluggable() arch/arm/Kconfig | 1 + arch/arm/include/asm/cpu.h | 1 - arch/arm/kernel/setup.c | 14 ++------------ 3 files changed, 3 insertions(+), 13 deletions(-) -- 2.34.1 . Date: Tue, 2 Jul 2024 17:54:16 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jul 2 Message-ID: <20240702175416.5d4ebf41@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HvzxS7E6YlmDgT8NKcItn1m"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264979 org.kernel.vger.linux-next:62052 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/HvzxS7E6YlmDgT8NKcItn1m Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20240701: The mm-hotfixes tree still had its build failure for which I reverted a com= mit. The ipsec tree lost its build failure. The mm tree still had its build failure for which I applied a supplied patc= h. The qcom tree lost its build failure. The pci tree still had its build failure so I used the version from next-20240628. The hid tree lost its build failure. The bpf-next tree gained a conflict against the risc-v tree. The bluetooth tree gained a conflict against the net tree. The drm tree still had its build failures so I used the version from next-20240627 and reverted a commit. The tip tree gained a conflict against the pm tree. The leds-lj tree gained a conflict against the chrome-platform tree. The rpmsg tree lost its build failure. The random tree gained conflicts against the mm-stable, vfs-brauner and ftrace trees. Non-merge commits (relative to Linus' tree): 9054 9678 files changed, 740226 insertions(+), 172595 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 378 trees (counting Linus' and 106 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (73e931504f8e Merge tag 'cxl-fixes-6.10-rc7' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (5f408bfe0d13 mm: gup: stop abusin= g try_grab_folio) Applying: Revert "mm: gup: stop abusing try_grab_folio" Merging vfs-brauner-fixes/vfs.fixes (9d66154f73b7 netfs: Fix netfs_page_mkw= rite() to flush conflicting data, not wait) Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1) Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1) Merging btrfs-fixes/next-fixes (6ccd00e27729 Merge branch 'misc-6.10' into = next-fixes) Merging vfs-fixes/fixes (bba1f6758a9e lirc: rc_dev_get_from_fd(): fix file = leak) Merging erofs-fixes/fixes (9b32b063be10 erofs: ensure m_llen is reset to 0 = if metadata is invalid) Merging nfsd-fixes/nfsd-fixes (ac03629b1612 Revert "nfsd: fix oops when rea= ding pool_stats before server is started") Merging v9fs-fixes/fixes/next (1613e604df0c Linux 6.10-rc1) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_v= erify_area()) Merging fs-current (82c419de3fb4 Merge branch 'fixes' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/xiang/erofs.git) Merging kbuild-current/fixes (a11aaf6d0bb4 kbuild: scripts/gdb: bring the "= abspath" back) Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6) Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the fo= lio is reserved for no-mapping addresses) Merging arm64-fixes/for-next/fixes (ecc54006f158 arm64: Clear the initial I= D map correctly before remapping) Merging arm-soc-fixes/arm/fixes (07917ee08723 Merge tag 'v6.10-rockchip-dts= fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockch= ip into arm/fixes) Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) Merging drivers-memory-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging sophgo-fixes/fixes (90f6cc7f8e07 riscv: dts: sophgo: disable write-= protection for milkv duo) Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defcon= figs for v6.9-rc1) Merging powerpc-fixes/fixes (21a741eb75f8 powerpc/pseries: Fix scv instruct= ion crash with kexec) Merging s390-fixes/fixes (cea5589e958f s390/boot: Do not adjust GOT entries= for undef weak sym) Merging net/main (42391445a863 Merge tag 'for-net-2024-06-28' of git://git.= kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth into main) Merging bpf/master (42391445a863 Merge tag 'for-net-2024-06-28' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth into main) Merging ipsec/master (2d5317753e5f xfrm: Export symbol xfrm_dev_state_delet= e.) Merging netfilter/main (7931d32955e0 netfilter: nf_tables: fully validate N= FT_DATA_VALUE on store to data registers) Merging ipvs/main (7931d32955e0 netfilter: nf_tables: fully validate NFT_DA= TA_VALUE on store to data registers) Merging wireless/for-next (816c6bec09ed wifi: mac80211: fix BSS_CHANGED_UNS= OL_BCAST_PROBE_RESP) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats upd= ates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (f2661062f16b Linux 6.10-rc5) Merging sound-current/for-linus (4b3e38107383 Merge tag 'asoc-fix-v6.10-rc5= ' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for= -linus) Merging sound-asoc-fixes/for-linus (2163aff6bebb firmware: cs_dsp: Prevent = buffer overrun when processing V2 alg headers) Merging regmap-fixes/for-linus (76f19626bd35 regmap: add missing MODULE_DES= CRIPTION() macros) Merging regulator-fixes/for-linus (f2661062f16b Linux 6.10-rc5) Merging spi-fixes/for-linus (1762dc01fc78 spi: davinci: Unset POWERDOWN bit= when releasing resources) Merging pci-current/for-linus (419d57d429f6 CREDITS: Add Synopsys DesignWar= e eDMA driver for Gustavo Pimentel) Merging driver-core.current/driver-core-linus (6ba59ff42279 Linux 6.10-rc4) Merging tty.current/tty-linus (22a40d14b572 Linux 6.10-rc6) Merging usb.current/usb-linus (22a40d14b572 Linux 6.10-rc6) Merging usb-serial-fixes/usb-linus (4298e400dbdb USB: serial: option: add T= elit generic core-dump composition) Merging phy/fixes (f2661062f16b Linux 6.10-rc5) Merging staging.current/staging-linus (22a40d14b572 Linux 6.10-rc6) Merging iio-fixes/fixes-togreg (74cb21576ea5 iio: trigger: Fix condition fo= r own trigger) Merging counter-current/counter-current (22a40d14b572 Linux 6.10-rc6) Merging char-misc.current/char-misc-linus (22a40d14b572 Linux 6.10-rc6) Merging soundwire-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging thunderbolt-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging input-current/for-linus (7c7b1be19b22 Input: ads7846 - use spi_devi= ce_id table) Merging crypto-current/master (a5d8922ab2ae crypto: qat - fix linking error= s when PCI_IOV is disabled) Merging vfio-fixes/for-linus (d71a989cf5d9 vfio/pci: Insert full vma on mma= p'd MMIO fault) Merging kselftest-fixes/fixes (48236960c06d selftests/resctrl: Fix non-cont= iguous CBM for AMD) Merging dmaengine-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NV= DDR timings are rejected) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix miss= ing IRQ status registers range) Merging v4l-dvb-fixes/fixes (fd404435d44b media: ivsc: Depend on IPU_BRIDGE= or not IPU_BRIDGE) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add= missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (0d5679a0aae2 mips: fix compat_sys_lseek sysc= all) Merging at91-fixes/at91-fixes (1613e604df0c Linux 6.10-rc1) Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang f= or am3 usb) Merging kvm-fixes/master (dee67a94d4c6 Merge tag 'kvm-x86-fixes-6.10-rcN' o= f https://github.com/kvm-x86/linux into HEAD) Merging kvms390-fixes/master (4c6abb7f7b34 KVM: s390: fix LPSWEY handling) Merging hwmon-fixes/hwmon (6ba59ff42279 Linux 6.10-rc4) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrec= t calculation of idt size) Merging cxl-fixes/fixes (a0f39d51dbf7 cxl: documentation: add missing files= to cxl driver-api) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restr= icted pool list_head when SWIOTLB_DYNAMIC=3Dy) Merging drivers-x86-fixes/fixes (7add1ee34692 platform/x86: add missing MOD= ULE_DESCRIPTION() macros) Merging samsung-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-samsung-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging devicetree-fixes/dt/linus (e7985f43609c of: property: Fix fw_devlin= k handling of interrupt-map) Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging scsi-fixes/fixes (ab2068a6fb84 scsi: libsas: Fix exp-attached devic= e scan after probe failure scanned in again after probe failed) Merging drm-fixes/drm-fixes (22a40d14b572 Linux 6.10-rc6) Merging drm-intel-fixes/for-linux-next-fixes (f72383371e8c drm/i915/display= : For MTL+ platforms skip mg dp programming) Merging mmc-fixes/fixes (ab069ce12596 mmc: sdhci: Do not lock spinlock arou= nd mmc_gpio_get_ro()) Merging rtc-fixes/rtc-fixes (1613e604df0c Linux 6.10-rc1) Merging gnss-fixes/gnss-linus (6ba59ff42279 Linux 6.10-rc4) Merging hyperv-fixes/hyperv-fixes (3b85a2eacd3d Documentation: hyperv: Add = overview of Confidential Computing VM support) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (cc2c169e34b4 Merge patch "riscv: stacktrace: co= nvert arch_stack_walk() to noinstr") Merging riscv-dt-fixes/riscv-dt-fixes (e21de658f8e8 MAINTAINERS: thead: upd= ate Maintainer) Merging riscv-soc-fixes/riscv-soc-fixes (1613e604df0c Linux 6.10-rc1) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (a3e18a540541 Merge tag 'xfs-6.10-fixes-3' of git:/= /git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging gpio-brgl-fixes/gpio/for-current (22a40d14b572 Linux 6.10-rc6) Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging kunit-fixes/kunit-fixes (1613e604df0c Linux 6.10-rc1) Merging memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() = helper to check for invalid node ID) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add= missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (83a7eefedc9b Linux 6.10-rc3) Merging efi-fixes/urgent (46e27b9961d8 efi/arm64: Fix kmemleak false positi= ve in arm64_efi_rt_init()) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bo= unds UBSAN warning) Merging battery-fixes/fixes (d3911f1639e6 power: supply: rt5033: Bring back= i2c_set_clientdata) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7) Merging rust-fixes/rust-fixes (a126eca84435 rust: avoid unused import warni= ng in `rusttest`) Merging w1-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pmdomain-fixes/fixes (c3f38fa61af7 Linux 6.10-rc2) Merging i2c-host-fixes/i2c/i2c-host-fixes (22a40d14b572 Linux 6.10-rc6) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (2607133196c3 clk: sifive: Do not register clkd= evs for PRCI clocks) Merging pwrseq-fixes/pwrseq/for-current (83a7eefedc9b Linux 6.10-rc3) Merging drm-misc-fixes/for-linux-next-fixes (704c1bef3aa4 drm: panel-orient= ation-quirks: Add labels for both Valve Steam Deck revisions) Merging mm-stable/mm-stable (37a658069afb selftests/damon/damon_nr_regions:= test online-tuned max_nr_regions) Merging mm-nonmm-stable/mm-nonmm-stable (2a49c8b6b6d0 selftests/fpu: add mi= ssing MODULE_DESCRIPTION() macro) Merging mm/mm-everything (2c411ab262e6 foo) Applying: Revert "mm-gup-introduce-memfd_pin_folios-for-pinning-memfd-folio= s-fix" Applying: fs/procfs: fix integer to pointer cast warning in do_procmap_quer= y() Merging kbuild/for-next (d9ddc122becc kconfig: remove E_LIST expression typ= e) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v= 6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (7afbf90ea2e2 perf pmu: Don't de-duplicate cor= e PMUs) CONFLICT (content): Merge conflict in tools/perf/builtin-record.c Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attr= ibutes: counted_by: fixup clang URL) Merging dma-mapping/for-next (82d71b53d7e7 Documentation/core-api: correct = reference to SWIOTLB_DYNAMIC) Merging asm-generic/master (01b6ed5fcd5a syscalls: fix sys_fanotify_mark pr= ototype) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (b5e352609497 Merge branches 'clkdev', 'fixes' and 'mi= sc' into for-next) Merging arm64/for-next/core (2de29d1f8172 Merge branch 'for-next/vcpu-hotpl= ug' into for-next/core) Merging arm-perf/for-next/perf (d0d7c66c537d perf: imx_perf: add support fo= r i.MX95 platform) Merging arm-soc/for-next (bf35f851523a soc: document merges) Merging amlogic/for-next (338c92a5d195 Merge branch 'v6.11/arm64-dt' into f= or-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (73feb9cd46f1 ARM: dts: aspeed: System1: Updates to= BMC board) Merging at91/at91-next (1cdb1c9626a4 Merge branch 'at91-defconfig' into at9= 1-next) Merging broadcom/next (4caff16b6e00 Merge branch 'devicetree-arm64/next' in= to next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (815cc7715ab1 dt-bindings: memory: fsl: rep= lace maintainer) Merging imx-mxs/for-next (18fa4217da69 Merge branch 'imx/defconfig' into fo= r-next) Merging mediatek/for-next (1613e604df0c Linux 6.10-rc1) Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10= ' into for-next) Merging qcom/for-next (8f7e6bbf23c7 Merge branches 'arm32-for-6.11', 'arm64= -defconfig-fixes-for-6.10', 'arm64-defconfig-for-6.11', 'arm64-fixes-for-6.= 10', 'arm64-for-6.11', 'clk-fixes-for-6.10', 'clk-for-6.11', 'drivers-fixes= -for-6.10' and 'drivers-for-6.11' into for-next) Merging renesas/next (5c91aa40e630 Merge branches 'renesas-arm-defconfig-fo= r-v6.11' and 'renesas-dts-for-v6.11' into renesas-next) Merging reset/reset/next (eb5d88b15388 reset: RESET_IMX8MP_AUDIOMIX should = depend on ARCH_MXC) Merging rockchip/for-next (84a3d3b435e7 Merge branch 'v6.11-clk/next' into = for-next) Merging samsung-krzk/for-next (b305fd6840d1 Merge branch 'next/dt64' into f= or-next) Merging scmi/for-linux-next (eaaeef9e62f9 Merge tags 'scmi-updates-6.11', '= ffa-updates-6.11', 'vexpress-updates-6.11' and 'juno-updates-6.11' of ssh:/= /gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-l= inux-next) Merging sophgo/for-next (1613e604df0c Linux 6.10-rc1) Merging stm32/stm32-next (45fad67e8307 arm64: dts: st: enable Ethernet2 on = stm32mp257f-ev1 board) Merging sunxi/sunxi/for-next (0682fbf17dd9 Merge branches 'sunxi/clk-fixes-= for-6.10', 'sunxi/drivers-for-6.11' and 'sunxi/dt-for-6.11' into sunxi/for-= next) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v= 6.11' into next) Merging tegra/for-next (5211d93c551f Merge branch for-6.11/arm64/defconfig = into for-next) Merging ti/ti-next (0457310f1e9d Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (613af8986db8 Merge remote-tracking branch 'git/zyn= qmp/dt' into for-next) Merging clk/clk-next (28975d688935 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL i= nstead of 0) Merging clk-renesas/renesas-clk (c7e58843d1e4 clk: renesas: r9a08g045: Add = clock, reset and power domain support for I2C) Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.= kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging loongarch/loongarch-next (8051b80fbeef LoongArch: Automatically dis= able KASLR for hibernation) Merging m68k/for-next (75d3891ca19e m68k: defconfig: Update defconfigs for = v6.10-rc1) Merging m68knommu/for-next (22a40d14b572 Linux 6.10-rc6) Merging microblaze/next (1613e604df0c Linux 6.10-rc1) Merging mips/mips-next (04f38d1a4db0 mips: bmips: enable RAC on BMIPS4350) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_= regs) Merging parisc-hd/for-next (5f55e098b8d0 parisc: Add 64-bit gettimeofday() = and clock_gettime() vDSO functions) Merging powerpc/next (17c743b9da9e selftests/sigaltstack: Fix ppc64 GCC bui= ld) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a wr= ite-only variable) Merging risc-v/for-next (60a6707f582e Merge patch series "riscv: Memory Hot= (Un)Plug support") CONFLICT (content): Merge conflict in arch/riscv/kernel/patch.c Merging riscv-dt/riscv-dt-for-next (2904244a8c46 riscv: dts: starfive: add = PCIe dts configuration for JH7110) Merging riscv-soc/riscv-soc-for-next (16b8597f1774 Merge branch 'riscv-cach= e-for-next' into riscv-soc-for-next) Merging s390/for-next (d43381018369 Merge branch 'features' into for-next) Merging sh/for-next (1613e604df0c Linux 6.10-rc1) Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask va= r) Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove c= allback returning void) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush= _dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging bcachefs/for-next (d6d793ae5589 bcachefs: Simplify btree key cache = fill path) CONFLICT (content): Merge conflict in fs/bcachefs/super.c [fs-next 62bda85e3402] Merge branch 'for-next' of https://evilpiepirate.org= /git/bcachefs.git Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git:/= /git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent = dentry in fscrypt_file_open) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), includi= ng server address) Merging btrfs/for-next (80d54c4200e1 Merge branch 'for-next-next-v6.10-2024= 0624' into for-next-20240624) CONFLICT (content): Merge conflict in fs/btrfs/qgroup.c CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c [fs-next 1c3d323ed216] Merge branch 'for-next' of git://git.kernel.org/pub/= scm/linux/kernel/git/kdave/linux.git Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to ge= t CephFS metadata) Merging cifs/for-next (22a40d14b572 Linux 6.10-rc6) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation per= formance) Merging dlm/next (89b01913dc73 dlm: add rcu_barrier before destroy kmem cac= he) Merging erofs/dev (f2661062f16b Linux 6.10-rc5) Merging exfat/dev (0daa52fbc7ac exfat: fix potential deadlock on __exfat_ge= t_dentry_set) Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) Merging ext4/dev (8262fe9a902c ext4: make ext4_da_map_blocks() buffer_head = unaware) Merging f2fs/dev (8cb1f4080dd9 f2fs: assign CURSEG_ALL_DATA_ATGC if blkaddr= is valid) Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init(= ) to avoid kmemleak warning) Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) Merging gfs2/for-next (5a1906a476bc gfs2: Revert "check for no eligible quo= ta changes") Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist) Merging ksmbd/ksmbd-for-next (6ba59ff42279 Linux 6.10-rc4) Merging nfs/linux-next (22a40d14b572 Linux 6.10-rc6) Merging nfs-anna/linux-next (e53a863bab58 nfs/blocklayout: SCSI layout trac= e points for reservation key reg/unreg) Merging nfsd/nfsd-next (b3984e398f08 MAINTAINERS: Add a bugzilla link for N= FSD) Merging ntfs3/master (bde63e8eae5d fs/ntfs3: Fix formatting, change comment= s, renaming) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid ac= cess) Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lo= wer only root) Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address acces= s in jffs2_free_inode) Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) Merging v9fs-ericvh/ericvh/for-next (1613e604df0c Linux 6.10-rc1) Merging xfs/for-next (673cd885bbbf xfs: honor init_xattrs in xfs_init_new_i= node for !ATTR fs) Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large foli= os) Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_w= rite_iter()) Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counte= rs for online fsck) Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-= mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6= -mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging vfs-brauner/vfs.all (6cbc40abcac6 Merge branch 'vfs.iomap' into vfs= .all) CONFLICT (content): Merge conflict in fs/btrfs/inode.c [fs-next d6e1d7c0bd1d] Merge branch 'vfs.all' of git://git.kernel.org/pub/s= cm/linux/kernel/git/vfs/vfs.git Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (d6e1d7c0bd1d Merge branch 'vfs.all' of git://git.kernel.or= g/pub/scm/linux/kernel/git/vfs/vfs.git) CONFLICT (content): Merge conflict in fs/nfs/internal.h Merging printk/for-next (07c2ab22a8da Merge branch 'for-6.11' into for-next) Merging pci/next (4548d07493dc Merge remote-tracking branch 'origin/control= ler/tegra194' into next) CONFLICT (content): Merge conflict in drivers/pci/pci.c $ git reset --hard HEAD^ Merging next-20240628 version of pci CONFLICT (content): Merge conflict in drivers/pci/pci.c [master 291f83a621c7] next-20240628/pci Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing = MODULE_DESCRIPTION() macro) Merging hid/for-next (07fbb3e88d22 Merge branch 'for-6.11/bpf' into for-nex= t) Merging i2c/i2c/for-next (6367df381ba9 Merge branch 'i2c/for-current' into = i2c/for-next) Merging i2c-host/i2c/i2c-host (04d6adabcdd5 dt-bindings: i2c: nxp,lpc1788-i= 2c: convert to dt schema) Merging i3c/i3c/next (67678602c4fc i3c: mipi-i3c-hci: Round IBI data chunk = size to HW supported value) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for = number of populated and total memory slots) Merging hwmon-staging/hwmon-next (39b24cced70f hwmon: (adt7475) Fix default= duty on fan is disabled) Merging jc_docs/docs-next (93dd11d0dd74 Merge branch 'docs-mw' into docs-ne= xt) Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMO= N_CLK) Merging v4l-dvb-next/master (156922faabce media: atomisp: Switch to new Int= el CPU model defines) Merging pm/linux-next (fc0897199e16 Merge branch 'pm-cpufreq-fixes' into li= nux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (ce84b7beeb52 cpufreq: sti: add = missing MODULE_DEVICE_TABLE entry for stih418) Merging cpupower/cpupower (cdaed24abf83 cpupower: Disable direct build of t= he 'bench' subproject) Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use de= vm_clk_get_enabled() helpers) Merging pmdomain/next (cc647e931a24 pmdomain: amlogic: add missing MODULE_D= ESCRIPTION() macros) Merging opp/opp/linux-next (e3943f00afdb OPP: Introduce an OF helper functi= on to inform if required-opps is used) Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: conv= ert hisilicon-thermal.txt to dt-schema) Merging rdma/for-next (589b844f1bf0 RDMA/mlx5: Send UAR page index as ioctl= attribute) Merging net-next/main (74d6529b78f7 net: ethtool: Fix the panic caused by d= ev being null when dumping coalesce) CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h Merging bpf-next/for-next (03922e97bc30 selftests/bpf: Delete extra blank l= ines in test_sockmap) CONFLICT (content): Merge conflict in arch/riscv/net/bpf_jit_comp64.c Applying: HID: bpf: Fix up build Merging ipsec-next/master (f531d13bdfe3 xfrm: support sending NAT keepalive= s in ESP in UDP states) Merging mlx5-next/mlx5-next (b339e0a39dc3 RDMA/mlx5: Add Qcounters req_tran= sport_retries_exceeded/req_rnr_retries_exceeded) Merging netfilter-next/main (f4ebd03496f6 netfilter: xt_recent: Lift restri= ctions on max hitcount value) Merging ipvs-next/main (f4ebd03496f6 netfilter: xt_recent: Lift restriction= s on max hitcount value) Merging bluetooth/master (31cdab2ae178 dt-bindings: net: bluetooth: convert= MT7622 Bluetooth to the json-schema) 1754e2144739 ("Bluetooth: hci_core: cancel all works upon hci_unregister_= dev()") 1fc73da90b52 ("bluetooth/hci: disallow setting handle bigger than HCI_CON= N_HANDLE_MAX") 39a92a55be13 ("bluetooth/l2cap: sync sock recv cb and release") 48bdb4085485 ("Bluetooth: hci_event: Fix setting of unicast qos interval") 4b5e8d5635bd ("Bluetooth: Add quirk to ignore reserved PHY bits in LE Ext= ended Adv Report") 7274f7479942 ("Bluetooth: hci_bcm4377: Fix msgid release") 7bc60457138b ("Bluetooth: btintel_pcie: Fix REVERSE_INULL issue reported = by coverity") 94a60402b1c1 ("Bluetooth: Ignore too large handle values in BIG") bafd12aba679 ("Bluetooth: btnxpuart: Enable Power Save feature on startup= ") c54bcd8a2f9c ("Bluetooth: ISO: Check socket flag instead of hcon") f305a9bafe14 ("Bluetooth: qca: Fix BT enable failure again for QCA6390 af= ter warm reboot") CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c Merging wireless-next/for-next (8c62617295d3 wifi: mac80211: remove DEAUTH_= NEED_MGD_TX_PREP) Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git:= //git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mtd/mtd/next (2538af030d6f mtd: cmdlinepart: Replace `dbg()` macro = with `pr_debug()`) Merging nand/nand/next (7326d3fb1ee3 mtd: rawnand: lpx32xx: Request DMA cha= nnels using DT entries) Merging spi-nor/spi-nor/next (d35df77707bf mtd: spi-nor: winbond: fix w25q1= 28 regression) Merging crypto/master (95c0f5c3b8bb hwrng: core - Fix wrong quality calcula= tion at hw rng registration) Merging drm/drm-next (fb625bf6187d Merge tag 'drm-habanalabs-next-2024-06-2= 3' of https://github.com/HabanaAI/drivers.accel.habanalabs.kernel into drm-= next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ato= mfirmware.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/d= cn35/dcn35_init.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_= types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c Applying: Revert "drm/omap: Allow build with COMPILE_TEST=3Dy" $ git reset --hard HEAD^ Merging next-20240627 version of drm CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ato= mfirmware.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/d= cn35/dcn35_init.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_= types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c [master 2ee4c810e72d] next-20240627/drm Applying: Revert "drm/omap: Allow build with COMPILE_TEST=3Dy" [master af5526287bec] next-20240627/drm Merging drm-exynos/for-linux-next (9347028bfcfc drm/exynos/vidi: convert to= struct drm_edid) Merging drm-misc/for-linux-next (e31538489908 drm/tests: Add tests for the = new Monochrome value of tv_mode) Merging amdgpu/drm-next (f340f2bad1c7 drm/amdgpu: rewrite convert_tiling_fl= ags_to_modifier_gfx12) Merging drm-intel/for-linux-next (9fc97277eb2d drm/i915: Skip programming F= IA link enable bits for MTL+) aaf9dc86bd80 ("drm/i915/display: For MTL+ platforms skip mg dp programmin= g") Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit = integer overflow) Merging drm-msm/msm-next (2c4c53f316f6 drm/msm/adreno: Introduce gmu_chipid= for a740 & a750) Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-m= anaged allocation for mdp4_plane) Merging drm-xe/drm-xe-next (2d46ecc958c9 drm/xe/oa: Destroy the stream_lock= mutex) Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block schedul= er when GPU is still active) Merging fbdev/for-next (7ee6cfe6d9cf fbdev: omap2: Return clk_prepare_enabl= e to transfer the error) Merging regmap/for-next (438685f6714a Merge remote-tracking branch 'regmap/= for-6.11' into regmap-next) Merging sound/for-next (5b707581c072 selftests/alsa:Fix printf format strin= g in pcm-test.c) Merging ieee1394/for-next (502099acb8cb firewire: core: Fix spelling mistak= es in tracepoint messages) Merging sound-asoc/for-next (9fa5527b19b2 Merge remote-tracking branch 'aso= c/for-6.11' into asoc-next) Merging modules/modules-next (61842868de13 module: create weak dependecies) Merging input/next (7c459517252e Input: ili210x - use guard notation when d= isabling and reenabling IRQ) CONFLICT (content): Merge conflict in include/linux/interrupt.h Merging block/for-next (f759ab27f0c1 Merge branch 'for-6.11/io_uring' into = for-next) CONFLICT (content): Merge conflict in fs/stat.c CONFLICT (content): Merge conflict in include/linux/fs.h Merging device-mapper/for-next (aaa53168cbcc dm: optimize flushes) Merging libata/for-next (f5a0205ad031 Merge remote-tracking branch 'libata/= for-6.11' into HEAD) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIP= TION() macros) Merging mmc/next (f7e7e00f7b86 MAINTAINERS: drop entry for VIA SD/MMC contr= oller) Merging mfd/for-mfd-next (33c0e553c8c3 dt-bindings: mfd: syscon: Add APM po= weroff mailbox) Merging backlight/for-backlight-next (b337cc3ce475 backlight: lm3509_bl: Fi= x early returns in for_each_child_of_node()) Merging battery/for-next (b498ddb6f283 power: reset: piix4: add missing MOD= ULE_DESCRIPTION() macro) Merging regulator/for-next (db576ed76232 Add USB VBUS regulator for RZ/G2L) Merging security/next (9ca51b3176e0 Automated merge of 'dev' into 'next') Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL po= inter dereference) Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignme= nt during securityfs dentry remove) Merging selinux/next (1613e604df0c Linux 6.10-rc1) Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket= label) Merging tomoyo/master (b96342141183 rtnetlink: print rtnl_mutex holder/wait= er for debug purpose) Merging tpmdd/next (cf5ae3c7d48e tpm_tis_spi: add missing attpm20p SPI devi= ce ID entry) Merging watchdog/master (22a40d14b572 Linux 6.10-rc6) Merging iommu/next (cfb822815752 Merge branches 'fixes', 'allwinner/sun50i'= , 'qualcomm/msm', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) Merging audit/next (1613e604df0c Linux 6.10-rc1) Merging devicetree/for-next (bbf9b1ffa198 dt-bindings: interrupt-controller= : convert fsl,ls-scfg-msi to yaml) Merging dt-krzk/for-next (828f810f69f3 Merge branch 'next/dt64' into for-ne= xt) Merging mailbox/for-next (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Doc= ument the SDX75 IPCC) Merging spi/for-next (5b6cad81d0c1 Merge remote-tracking branch 'spi/for-6.= 11' into spi-next) Merging tip/master (ec6574a634db Merge branch into tip/master: 'x86/vmware') CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h CONFLICT (content): Merge conflict in include/linux/cacheinfo.h Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/a= rm_arch_timer: Mark hisi_161010101_oem_info const) Merging edac/edac-for-next (9a1c5fe0f0a8 Merge ras/edac-misc into for-next) Merging ftrace/for-next (5dfebf3c26dc Merge ring-buffer/for-next) CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h Merging rcu/next (a9e1661087f1 Merge branches 'doc.2024.06.06a', 'fixes.202= 4.06.18a', 'mb.2024.06.28a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a', '= rcutorture.2024.06.06a' and 'srcu.2024.06.18a' into HEAD) Merging paulmck/non-rcu/next (f5d5a3bc7a69 tools/memory-model: simple.txt: = Fix stale reference to recipes-pairs.txt) Merging kvm/next (02b0d3b9d4dd Merge branch 'kvm-6.10-fixes' into HEAD) CONFLICT (content): Merge conflict in arch/x86/include/asm/sev-common.h Merging kvm-arm/next (62933f02c855 Merge branch kvm-arm64/docs into kvmarm/= next) Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2) Merging kvm-ppc/topic/ppc-kvm (0b65365f3fa9 KVM: PPC: Book3S HV nestedv2: K= eep nested guest HASHPKEYR in sync) Merging kvm-riscv/riscv_kvm_next (e325618349cd RISC-V: KVM: Redirect AMO lo= ad/store access fault traps to guest) CONFLICT (content): Merge conflict in tools/perf/arch/riscv/util/Build Merging kvm-x86/next (771df9ffadb8 Merge branch 'static_calls') Merging xen-tip/linux-next (e51d31c454fb xen/manage: Constify struct shutdo= wn_handler) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for= -next) Merging workqueues/for-next (03979a8f5adf Merge branch 'for-6.11' into for-= next) Merging sched-ext/for-next (b651d7c39289 sched_ext: Swap argument positions= in kcalloc() call to avoid compiler warning) Merging drivers-x86/for-next (4261031484d8 Merge branch 'pdx86/platform-dri= vers-x86-lenovo-c630' into review-ilpo) Merging chrome-platform/for-next (3664706e875f power: supply: cros_charge-c= ontrol: don't load if Framework control is present) Merging chrome-platform-firmware/for-firmware-next (fc2c1d716d4a firmware: = google: add missing MODULE_DESCRIPTION() macros) Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/g= pio.h) Merging leds-lj/for-leds-next (940b27161afc Revert "leds: led-core: Fix ref= count leak in of_led_get()") CONFLICT (content): Merge conflict in MAINTAINERS Merging ipmi/for-next (0627cef36145 ipmi: ssif_bmc: prevent integer overflo= w on 32bit systems) Merging driver-core/driver-core-next (6b521fc111a2 MAINTAINERS: add Rust de= vice abstractions to DRIVER CORE) CONFLICT (content): Merge conflict in drivers/fsi/fsi-occ.c CONFLICT (content): Merge conflict in drivers/reset/reset-meson-audio-arb.c Applying: net: ethernet: rtsn: Fix up for remove() coversion to return void Applying: drm: Fix up STM LVDS driver for void remove() conversion Merging usb/usb-next (f7697db8b1b3 Merge 6.10-rc6 into usb-next) Merging thunderbolt/next (49056c95df44 thunderbolt: debugfs: Use FIELD_GET(= )) Merging usb-serial/usb-next (6ba59ff42279 Linux 6.10-rc4) Merging tty/tty-next (33827dc4ad89 Merge 6.10-rc6 into tty-next) Merging char-misc/char-misc-next (19ed3bb5587b Merge 6.10-rc6 into char-mis= c-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ven= dor-prefixes.yaml CONFLICT (content): Merge conflict in MAINTAINERS Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-20= 24-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) Merging coresight/next (2e5657aa5966 hwtracing: use for_each_endpoint_of_no= de()) Merging fastrpc/for-next (47bf4198bf38 MAINTAINERS: CC dri-devel list on Qu= alcomm FastRPC patches) Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused = struct 'prop_map') Merging icc/icc-next (3c6ffb017091 Merge branch 'icc-msm8953' into icc-next) Merging iio/togreg (3587914bf61d iio: adc: Add support for MediaTek MT6357/= 8/9 Auxiliary ADC) Merging phy-next/next (d7d2818b9383 phy: airoha: Add PCIe PHY driver for EN= 7581 SoC.) Merging soundwire/next (5a4c1f0207d8 soundwire: bus: simplify by using loca= l slave->prop) Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB sw= itch driver) Merging gnss/gnss-next (6ba59ff42279 Linux 6.10-rc4) Merging vfio/next (abe8103da3c5 vfio/pci: Fix typo in macro to declare acce= ssors) Merging w1/for-next (26bf5fc86033 w1: Drop allocation error message) Merging spmi/spmi-next (1613e604df0c Linux 6.10-rc1) Merging staging/staging-next (d67f063101f5 Merge 6.10-rc6 into staging-next) Merging counter-next/counter-next (988609f2aaf1 counter: ti-eqep: Allow eQE= P driver to be built for K3 devices) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using dev= m_siox_* functions) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (316d1225b112 dmaengine: fsl-dpaa2-qdma: add missing= MODULE_DESCRIPTION() macro) Merging cgroup/for-next (147b4f64b42f Merge branch 'for-6.10-fixes' into fo= r-next) Merging scsi/for-next (dbe36d249533 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (06b91c00db39 Merge patch series "mpi3mr: Host di= ag buffer support") Merging vhost/linux-next (c8fae27d141a virtio-pci: Check if is_avq is NULL) Merging rpmsg/for-next (54fb559c5467 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (7828b7bbbf20 gpio: add sloppy logic analyz= er using polling) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (0cd9f140389b pinctrl: mlxbf3: Fix return value ch= eck for devm_platform_ioremap_resource) Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl-renesas/renesas-pinctrl (71062e52fc0a pinctrl: renesas: r8a= 779h0: Remove unneeded separators) Merging pinctrl-samsung/for-next (707807f4c112 pinctrl: samsung: Use scope = based of_node_put() cleanups) Merging pwm/pwm/for-next (b8689bb9b901 pwm-stm32: Make use of parametrised = register definitions) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly =3D 1 for 'mak= e_warnings_file' test type) Merging kselftest/next (15a783a493b0 selftests: Add information about TAP c= onformance in tests) Merging kunit/test (1613e604df0c Linux 6.10-rc1) Merging kunit-next/kunit (cf6219ee889f usercopy: Convert test_user_copy to = KUnit test) Merging livepatching/for-next (046635d2eb61 Merge branch 'for-6.11' into fo= r-next) Merging rtc/rtc-next (43696b3a9e46 rtc: isl1208: Update correct procedure f= or clearing alarm) Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE= _DESCRIPTION() macros) Merging at24/at24/for-next (1613e604df0c Linux 6.10-rc1) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (22cc0f3b4d0c selftests/seccomp: check tha= t a zombie leader doesn't affect others) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (1613e604df0c Linux 6.10-rc1) Merging nvmem/for-next (65f09ab3b3ef Merge branches 'nvmem-fixes' and 'for-= 6.11' into nvmem-for-next) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic()= doc) Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to= seed guest random number generator) Merging auxdisplay/for-next (2ccfe94bc3ac auxdisplay: ht16k33: Drop referen= ce after LED registration) Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr= _task()) Merging hmm/hmm (6613476e225e Linux 6.8-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (f08d4bdad612 bus: mhi: host: pci_generic: Use unique = 'mhi_pci_dev_info' for product families) Merging memblock/for-next (94ff46de4a73 memblock: Move late alloc warning d= own to phys alloc) CONFLICT (content): Merge conflict in mm/memblock.c Merging cxl/next (1613e604df0c Linux 6.10-rc1) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (d68cc8abc357 x86/efistub: Call Apple set_os protocol on d= ual GPU Intel Macs) Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() ma= cros) Merging slab/slab/for-next (f10d55c75472 slab: delete useless RED_INACTIVE = and RED_ACTIVE) CONFLICT (content): Merge conflict in lib/fortify_kunit.c Merging random/master (5036461514b4 x86: vdso: Wire up getrandom() vDSO imp= lementation) CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/sysca= ll.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32= .tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64= .tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32= .tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.t= bl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.= tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.t= bl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in mm/rmap.c Merging landlock/next (591561c2b47b landlock: Use bit-fields for storing ha= ndled layer access masks) Merging rust/rust-next (1613e604df0c Linux 6.10-rc1) Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname = element) Merging execve/for-next/execve (2a97388a807b ELF: fix kernel.randomize_va_s= pace double read) Merging bitmap/bitmap-for-next (e0eeb938adb0 bitops: Add a comment explaini= ng the double underscore macros) CONFLICT (content): Merge conflict in include/linux/cpumask.h Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCR= IPTION() macro) Merging kspp/for-next/kspp (350e853715b2 Merge branches 'for-linus/hardenin= g' and 'for-next/hardening' into for-next/kspp) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (1613e604df0c Linux 6.10-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation su= pport using TSM_REPORTS) Merging iommufd/for-next (53e6b65693b6 iommufd/iova_bitmap: Remove iterator= logic) Merging turbostat/next (c6bd6265bc18 tools/power turbostat: Group SMI count= er with APERF and MPERF) Merging pwrseq/pwrseq/for-next (6140d185a43d PCI/pwrctl: Add a PCI power co= ntrol driver for power sequenced devices) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing b= uild for PREEMPT_RT) --Sig_/HvzxS7E6YlmDgT8NKcItn1m Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaDsigACgkQAVBC80lX 0Gzu1Af/d5ju0N5qd3Wfcb3BvzQg1TXOl19opHe/tEDge7eQ89OgBvCkYclF/MFl 0b1Ls/yuIvkCNDAmohPxcbVwIycnf0wt/BByRgyfNYa3lOYHXdbh9OyGlXcNHQzn 5eLH4Xk+Yx/ogU1i+Lxev+Za940EmxBsB+Ub4dOQvfci+1g9ok+NqN4aiYCSHZsZ Qn5s/bkaYgNnm4qVQ7inJOzGymGJuuQwFQ6OURTa1zUEMklAfRBTyg+a3YlAuA/C NZx5LFsPn6djPhNlGxguQIf+ORHU6M2dtsSP4LC2u7JB3ubURRKmsPvW2k/SBIMv ijLYZRPixPAmWUWgfx5LuR3KoYMr3w== =7MUu -----END PGP SIGNATURE----- --Sig_/HvzxS7E6YlmDgT8NKcItn1m-- . From: Roman Storozhenko Date: Tue, 02 Jul 2024 09:56:25 +0200 Subject: [PATCH v2] cpupower: fix lib default installation path X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240702-fix-lib-install-v2-1-9b84dcd3c22b@gmail.com> To: Thomas Renninger , Shuah Khan Cc: Javier Carrasco , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Roman Storozhenko Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264980 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Invocation the tool built with the default settings fails: $ cpupower cpupower: error while loading shared libraries: libcpupower.so.1: cannot open shared object file: No such file or directory The issue is that Makefile puts the library to "/usr/lib64" dir for a 64 bit machine. This is wrong. According to the "File hierarchy standard specification: https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.pdf "/usr/lib" dirs are intended for alternative-format libraries (e.g., "/usr/lib32" for 32-bit libraries on a 64-bit machine (optional)). The utility is built for the current machine and doesn't handle 'CROSS_COMPILE' and 'ARCH' env variables. It also doesn't change bit depth. So the result is always the same - binary for x86_64 architecture. Therefore the library should be put in the '/usr/lib' dir regardless of the build options. This is the case for all the distros that comply with the 'File Hierarchy Standard 3.0" by Linux Foundation. Most of the distros comply with it. For example, one can check this by examining the "/usr/lb64" dir on debian-based distros and find that it contains only "/usr/lib64/ld-linux-x86-64.so.2". And examine that "/usr/lib" contains both 32 and 64 bit code: find /usr/lib -name "*.so*" -type f | xargs file | grep 32-bit find /usr/lib -name "*.so*" -type f | xargs file | grep 64-bit Fix the issue by changing library destination dir to "/usr/lib". Signed-off-by: Roman Storozhenko --- Changes in v2: - Enchance changelog by providing more details - Link to v1: https://lore.kernel.org/r/20240623-fix-lib-install-v1-1-bcbd03b78d87@gmail.com --- tools/power/cpupower/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index cd0225a312b4..6c02f401069e 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile @@ -67,6 +67,7 @@ LANGUAGES = de fr it cs pt ka bindir ?= /usr/bin sbindir ?= /usr/sbin mandir ?= /usr/man +libdir ?= /usr/lib includedir ?= /usr/include localedir ?= /usr/share/locale docdir ?= /usr/share/doc/packages/cpupower @@ -94,15 +95,6 @@ RANLIB = $(CROSS)ranlib HOSTCC = gcc MKDIR = mkdir -# 64bit library detection -include ../../scripts/Makefile.arch - -ifeq ($(IS_64_BIT), 1) -libdir ?= /usr/lib64 -else -libdir ?= /usr/lib -endif - # Now we set up the build system # --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240623-fix-lib-install-3b7dccdbdf45 Best regards, -- Roman Storozhenko . From: Xiu Jianfeng To: , , , , , CC: , , Subject: [PATCH v4 -next] cgroup/misc: Introduce misc.peak Date: Tue, 2 Jul 2024 07:57:18 +0000 Message-ID: <20240702075718.2657635-1-xiujianfeng@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264989 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kernel.vger.linux-doc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Introduce misc.peak to record the historical maximum usage of the resource, as in some scenarios the value of misc.max could be adjusted based on the peak usage of the resource. Signed-off-by: Xiu Jianfeng --- v4: fix the issue of unconditionally updating the watermark v3: fix while (0) v2: use cmpxchg to update the watermark --- Documentation/admin-guide/cgroup-v2.rst | 9 ++++++ include/linux/misc_cgroup.h | 2 ++ kernel/cgroup/misc.c | 41 +++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index ae0fdb6fc618..468a95379009 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -2646,6 +2646,15 @@ Miscellaneous controller provides 3 interface files. If two misc resources (res_ res_a 3 res_b 0 + misc.peak + A read-only flat-keyed file shown in all cgroups. It shows the + historical maximum usage of the resources in the cgroup and its + children.:: + + $ cat misc.peak + res_a 10 + res_b 8 + misc.max A read-write flat-keyed file shown in the non root cgroups. Allowed maximum usage of the resources in the cgroup and its children.:: diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h index e799b1f8d05b..faf72a537596 100644 --- a/include/linux/misc_cgroup.h +++ b/include/linux/misc_cgroup.h @@ -30,11 +30,13 @@ struct misc_cg; /** * struct misc_res: Per cgroup per misc type resource * @max: Maximum limit on the resource. + * @watermark: Historical maximum usage of the resource. * @usage: Current usage of the resource. * @events: Number of times, the resource limit exceeded. */ struct misc_res { u64 max; + u64 watermark; atomic64_t usage; atomic64_t events; }; diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c index 79a3717a5803..823589895c2c 100644 --- a/kernel/cgroup/misc.c +++ b/kernel/cgroup/misc.c @@ -121,6 +121,19 @@ static void misc_cg_cancel_charge(enum misc_res_type type, struct misc_cg *cg, misc_res_name[type]); } +static void misc_cg_update_watermark(struct misc_res *res, u64 new_usage) +{ + u64 old; + + do { + old = READ_ONCE(res->watermark); + if (new_usage <= old) + break; + if (cmpxchg(&res->watermark, old, new_usage) == old) + break; + } while (1); +} + /** * misc_cg_try_charge() - Try charging the misc cgroup. * @type: Misc res type to charge. @@ -159,6 +172,7 @@ int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg, u64 amount) ret = -EBUSY; goto err_charge; } + misc_cg_update_watermark(res, new_usage); } return 0; @@ -307,6 +321,29 @@ static int misc_cg_current_show(struct seq_file *sf, void *v) return 0; } +/** + * misc_cg_peak_show() - Show the peak usage of the misc cgroup. + * @sf: Interface file + * @v: Arguments passed + * + * Context: Any context. + * Return: 0 to denote successful print. + */ +static int misc_cg_peak_show(struct seq_file *sf, void *v) +{ + int i; + u64 watermark; + struct misc_cg *cg = css_misc(seq_css(sf)); + + for (i = 0; i < MISC_CG_RES_TYPES; i++) { + watermark = READ_ONCE(cg->res[i].watermark); + if (READ_ONCE(misc_res_capacity[i]) || watermark) + seq_printf(sf, "%s %llu\n", misc_res_name[i], watermark); + } + + return 0; +} + /** * misc_cg_capacity_show() - Show the total capacity of misc res on the host. * @sf: Interface file @@ -357,6 +394,10 @@ static struct cftype misc_cg_files[] = { .name = "current", .seq_show = misc_cg_current_show, }, + { + .name = "peak", + .seq_show = misc_cg_peak_show, + }, { .name = "capacity", .seq_show = misc_cg_capacity_show, -- 2.34.1 . From: Dhananjay Ugwekar To: , , , , , , , CC: , , "Dhananjay Ugwekar" Subject: [PATCH v2 0/2] AMD Pstate driver fixes Date: Tue, 2 Jul 2024 08:14:12 +0000 Message-ID: <20240702081413.5688-1-Dhananjay.Ugwekar@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264991 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 1. Handle the nominal freq units inconsistency in amd-pstate-ut, which was leading to the below error on inserting the amd-pstate-ut module. [ 4982.498864] amd_pstate_ut: 1 amd_pstate_ut_acpi_cpc_valid success! [ 4982.498873] amd_pstate_ut: 2 amd_pstate_ut_check_enabled success! [ 4982.509151] amd_pstate_ut: 3 amd_pstate_ut_check_perf success! [ 4982.509155] amd_pstate_ut: amd_pstate_ut_check_freq cpu0 max=3709000 >= nominal=2401 > lowest_nonlinear=1903000 > min=400000 > 0, the formula is incorrect! [ 4982.509157] amd_pstate_ut: 4 amd_pstate_ut_check_freq fail! 2. Setting the scaling_max_freq on shared memory CPPC systems was broken in amd-pstate-epp driver(amd_pstate=active mode). The scaling_max_freq value was not being propagated to the shared memory area, so the frequency capping was not being honored. Tested on a AMD Zen3 Milan machine(shared memory CPPC): stress-ng is running on the system to keep the CPU utilization at 100% to test the scaling_max_freq capping. Before the patch: We can see below, setting the scaling_max_freq is not taking effect. linux/tools/power/x86/turbostat# ./turbostat --Summary turbostat version 2023.11.07 - Len Brown [Snip] cpu0: cpufreq driver: amd-pstate-epp cpu0: cpufreq governor: performance [Snip] Avg_MHz Busy% Bzy_MHz TSC_MHz IPC IRQ POLL C1 C2 POLL% C1% C2% CorWatt PkgWatt 2620 100.00 2620 2026 0.80 164935 0 0 0 0.00 0.00 0.00 176.07 249.18 2580 100.00 2580 1995 0.80 162208 0 0 0 0.00 0.00 0.00 173.27 245.37 2584 100.00 2584 1998 0.79 162379 0 0 0 0.00 0.00 0.00 173.42 245.68 2577 100.00 2577 1996 0.79 162146 0 0 0 0.00 0.00 0.00 173.15 245.41 2578 100.00 2578 1996 0.80 162025 0 0 0 0.00 0.00 0.00 173.07 245.46 2575 100.00 2575 1996 0.80 162115 0 0 0 0.00 0.00 0.00 172.96 245.41 2576 100.00 2576 1996 0.79 161998 0 0 0 0.00 0.00 0.00 172.87 245.32 linux/tools/power/x86/turbostat# echo 2000000 | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq 2000000 linux/tools/power/x86/turbostat# cat /sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq | uniq 2000000 linux/tools/power/x86/turbostat# ./turbostat --Summary turbostat version 2023.11.07 - Len Brown [Snip] cpu0: cpufreq driver: amd-pstate-epp cpu0: cpufreq governor: performance [Snip] Avg_MHz Busy% Bzy_MHz TSC_MHz IPC IRQ POLL C1 C2 POLL% C1% C2% CorWatt PkgWatt 2620 100.00 2620 2038 0.79 166103 0 0 2 0.00 0.00 0.00 175.44 250.96 2566 100.00 2566 1996 0.79 162038 0 0 0 0.00 0.00 0.00 171.79 245.23 2566 100.00 2566 1996 0.79 162289 0 0 0 0.00 0.00 0.00 171.76 245.59 2571 100.00 2571 1996 0.80 162034 0 0 0 0.00 0.00 0.00 171.69 245.44 2566 100.00 2566 1996 0.79 162179 0 0 0 0.00 0.00 0.00 171.62 245.41 2567 100.00 2567 1996 0.79 162028 0 0 0 0.00 0.00 0.00 171.57 245.46 2567 100.00 2567 1996 0.80 162037 0 0 0 0.00 0.00 0.00 171.53 245.41 After applying the patch: On setting scaling_max_freq at 2GHz, the CPU frequency gets capped at 2GHz. linux/tools/power/x86/turbostat# ./turbostat --Summary turbostat version 2023.11.07 - Len Brown [Snip] cpu0: cpufreq driver: amd-pstate-epp cpu0: cpufreq governor: performance [Snip] Avg_MHz Busy% Bzy_MHz TSC_MHz IPC IRQ POLL C1 C2 POLL% C1% C2% CorWatt PkgWatt 2551 100.00 2551 1956 0.80 165998 0 0 0 0.00 0.00 0.00 171.34 231.22 2713 100.00 2713 2078 0.79 175801 0 0 0 0.00 0.00 0.00 181.92 266.13 2594 100.00 2594 1991 0.79 162183 0 0 1 0.00 0.00 0.00 173.99 244.50 2606 100.00 2606 2003 0.79 162632 0 0 0 0.00 0.00 0.00 174.81 246.51 2599 100.00 2599 1996 0.79 162168 0 0 0 0.00 0.00 0.00 174.05 245.46 linux/tools/power/x86/turbostat# echo 2000000 | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq 2000000 linux/tools/power/x86/turbostat# cat /sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq | uniq 2000000 linux/tools/power/x86/turbostat# ./turbostat --Summary turbostat version 2023.11.07 - Len Brown [Snip] cpu0: cpufreq driver: amd-pstate-epp cpu0: cpufreq governor: performance [Snip] Avg_MHz Busy% Bzy_MHz TSC_MHz IPC IRQ POLL C1 C2 POLL% C1% C2% CorWatt PkgWatt 2010 100.00 2010 2030 0.80 165565 0 0 0 0.00 0.00 0.00 101.22 173.52 1975 100.00 1975 1995 0.80 162042 0 0 0 0.00 0.00 0.00 99.03 169.88 1977 100.00 1977 1998 0.80 162559 0 0 0 0.00 0.00 0.00 99.16 170.20 1976 100.00 1976 1996 0.80 162243 0 0 0 0.00 0.00 0.00 99.09 170.08 1976 100.00 1976 1996 0.80 162490 0 0 0 0.00 0.00 0.00 99.17 170.16 1976 100.00 1976 1996 0.80 162056 0 0 0 0.00 0.00 0.00 99.11 170.17 Dhananjay Ugwekar (2): cpufreq/amd-pstate-ut: Convert nominal_freq to khz during comparisons cpufreq/amd-pstate: Fix the scaling_max_freq setting on shared memory CPPC systems drivers/cpufreq/amd-pstate-ut.c | 12 +++++---- drivers/cpufreq/amd-pstate.c | 43 ++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 25 deletions(-) -- 2.34.1 . From: Antoniu Miclaus To: Jonathan Cameron , Lars-Peter Clausen , Antoniu Miclaus , , Subject: [PATCH] ABI: testing: fix admv8818 attr description Date: Tue, 2 Jul 2024 11:18:50 +0300 Message-ID: <20240702081851.4663-1-antoniu.miclaus@analog.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1264996 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Fix description of the filter_mode_available attribute by pointing to the correct name of the attribute that can be written with valid values. Fixes: bf92d87 ("iio:filter:admv8818: Add sysfs ABI documentation") Signed-off-by: Antoniu Miclaus --- Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818 b/Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818 index 31dbb390573f..c431f0a13cf5 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818 +++ b/Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818 @@ -3,7 +3,7 @@ KernelVersion: Contact: linux-iio@vger.kernel.org Description: Reading this returns the valid values that can be written to the - on_altvoltage0_mode attribute: + filter_mode attribute: - auto -> Adjust bandpass filter to track changes in input clock rate. - manual -> disable/unregister the clock rate notifier / input clock tracking. -- 2.45.2 . Return-Path: From: Alexandre Ghiti To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Ved Shanbhogue , Matt Evans , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH v3 0/4] Svvptc extension to remove preventive sfence.vma Date: Tue, 2 Jul 2024 10:50:30 +0200 Message-Id: <20240702085034.48395-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79268 org.kernel.vger.linux-kernel:1265006 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In RISC-V, after a new mapping is established, a sfence.vma needs to be emitted for different reasons: - if the uarch caches invalid entries, we need to invalidate it otherwise we would trap on this invalid entry, - if the uarch does not cache invalid entries, a reordered access could fail to see the new mapping and then trap (sfence.vma acts as a fence). We can actually avoid emitting those (mostly) useless and costly sfence.vma by handling the traps instead: - for new kernel mappings: only vmalloc mappings need to be taken care of, other new mapping are rare and already emit the required sfence.vma if needed. That must be achieved very early in the exception path as explained in patch 3, and this also fixes our fragile way of dealing with vmalloc faults. - for new user mappings: Svvptc makes update_mmu_cache() a no-op but we can take some gratuitous page faults (which are very unlikely though). Patch 1 and 2 introduce Svvptc extension probing. On our uarch that does not cache invalid entries and a 6.5 kernel, the gains are measurable: * Kernel boot: 6% * ltp - mmapstress01: 8% * lmbench - lat_pagefault: 20% * lmbench - lat_mmap: 5% Here are the corresponding numbers of sfence.vma emitted: * Ubuntu boot to login: Before: ~630k sfence.vma After: ~200k sfence.vma * ltp - mmapstress01 Before: ~45k After: ~6.3k * lmbench - lat_pagefault Before: ~665k After: 832 (!) * lmbench - lat_mmap Before: ~546k After: 718 (!) Thanks to Ved and Matt Evans for triggering the discussion that led to this patchset! Any feedback, test or relevant benchmark are welcome :) Changes in v3: - Rebase on top of 6.10 - Remove the comment about xRET acting as a fence which is not part of the ratified specification - Add #sfence.vma to the cover letter (Andrea) - Remove the RFC as svvptc was ratified the 28th of June 2024 Changes in v2: - Rebase on top of 6.8-rc1 - Remove patch with runtime detection of tlb caching and debugfs patch - Add patch that probes Svvptc - Add patch that defines the new Svvptc dt-binding - Leave the behaviour as-is for uarchs that cache invalid TLB entries since I don't have any good perf numbers - Address comments from Christoph on v1 - Fix a race condition in new_vmalloc update: ld a2, 0(a0) <= this could load something which is != -1 not a1, a1 <= here or in the instruction after, flush_cache_vmap() could make the whole bitmap to 1 and a1, a2, a1 sd a1, 0(a0) <= here we would clear bits that should not be cleared! Instead, replace the whole sequence with: amoxor.w a0, a1, (a0) Alexandre Ghiti (4): riscv: Add ISA extension parsing for Svvptc dt-bindings: riscv: Add Svvptc ISA extension description riscv: Stop emitting preventive sfence.vma for new vmalloc mappings riscv: Stop emitting preventive sfence.vma for new userspace mappings with Svvptc .../devicetree/bindings/riscv/extensions.yaml | 7 ++ arch/riscv/include/asm/cacheflush.h | 18 +++- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/include/asm/pgtable.h | 16 +++- arch/riscv/include/asm/thread_info.h | 5 ++ arch/riscv/kernel/asm-offsets.c | 5 ++ arch/riscv/kernel/cpufeature.c | 1 + arch/riscv/kernel/entry.S | 84 +++++++++++++++++++ arch/riscv/mm/init.c | 2 + arch/riscv/mm/pgtable.c | 13 +++ 10 files changed, 150 insertions(+), 2 deletions(-) -- 2.39.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Huan Yang To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , "Matthew Wilcox (Oracle)" , David Hildenbrand , Ryan Roberts , Chris Li , Dan Schatzberg , Huan Yang , Kairui Song , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christian Brauner Cc: opensource.kernel@vivo.com Subject: [RFC PATCH 0/4] Introduce PMC(PER-MEMCG-CACHE) Date: Tue, 2 Jul 2024 16:44:03 +0800 Message-ID: <20240702084423.1717904-1-link@vivo.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265011 org.kvack.linux-mm:202130 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patchset like to talk abount a idea about PMC(PER-MEMCG-CACHE). Background === Modern computer systems always have performance gaps between hardware, such as the performance differences between CPU, memory, and disk. Due to the principle of locality of reference in data access: Programs often access data that has been accessed before Programs access the next set of data after accessing a particular data As a result: 1. CPU cache is used to speed up the access of already accessed data in memory 2. Disk prefetching techniques are used to prepare the next set of data to be accessed in advance (to avoid direct disk access) The basic utilization of locality greatly enhances computer performance. PMC (per-MEMCG-cache) is similar, utilizing a principle of locality to enhance program performance. In modern computers, especially in smartphones, services are provided to users on a per-application basis (such as Camera, Chat, etc.), where an application is composed of multiple processes working together to provide services. The basic unit for managing resources in a computer is the process, which in turn uses threads to share memory and accomplish tasks. Memory is shared among threads within a process. However, modern computers have the following issues, with a locality deficiency: 1. Different forms of memory exist and are not interconnected (anonymous pages, file pages, special memory such as DMA-BUF, various memory alloc in kernel mode, etc.) 2. Memory isolation exists between processes, and apart from specific shared memory, they do not communicate with each other. 3. During the transition of functionality within an application, a process usually releases memory, while another process requests memory, and in this process, memory has to be obtained from the lowest level through competition. For example abount camera application: Camera applications typically provide photo capture services as well as photo preview services. The photo capture process usually utilizes DMA-BUF to facilitate the sharing of image data between the CPU and DMA devices. When it comes to image preview, multiple algorithm processes are typically involved in processing the image data, which may also involve heap memory and other resources. During the switch between photo capture and preview, the application typically needs to release DMA-BUF memory and then the algorithms need to allocate heap memory. The flow of system memory during this process is managed by the PCP-BUDDY system. However, the PCP and BUDDY systems are shared, and subsequently requested memory may not be available due to previously allocated memory being used (such as for file reading), requiring a competitive (memory reclamation) process to obtain it. So, if it is possible to allow the released memory to be allocated with high priority within the application, then this can meet the locality requirement, improve performance, and avoid unnecessary memory reclaim. PMC solutions are similar to PCP, as they both establish cache pools according to certain rules. Why base on MEMCG? === The MEMCG container can allocate selected processes to a MEMCG based on certain grouping strategies (typical examples include grouping by app or UID). Processes within the same MEMCG can then be used for statistics, upper limit restrictions, and reclamation control. All processes within a MEMCG are considered as a single memory unit, sharing memory among themselves. As a result, when one process releases memory, another process within the same group can obtain it with the highest priority, fully utilizing the locality of memory allocation characteristics within the MEMCG (such as APP grouping). In addition, MEMCG provides feature interfaces that can be dynamically toggled and are fully controllable by the policy.This provides greater flexibility and does not impact performance when not enabled (controlled through static key). Abount PMC implement === Here, a cache switch is provided for each MEMCG(not on root). When the user enables the cache, processes within the MEMCG will share memory through this cache. The cache pool is positioned before the PCP. All order0 page released by processes in MEMCG will be released to the cache pool first, and when memory is requested, it will also be prioritized to be obtained from the cache pool. `memory.cache` is the sole entry point for controlling PMC, here are some nested keys to control PMC: 1. "enable=[y|n]" to enable or disable targeted MEMCG's cache 2. "keys=nid=%d,watermark=%u,reaper_time=%u,limit=%u" to control already enabled PMC's behavior. a) `nid` to targeted a node to change it's key. or else all node. b) The `watermark` is used to control cache behavior, caching only when zone free pages above the zone's high water mark + this watermark is exceeded during memory release. (unit byte, default 50MB, min 10MB per-node-all-zone) c) `reaper_time` to control reaper gap, if meet, reaper all cache in this MEMCG(unit us, default 5s, 0 is disable.) d) `limit` is to limit the maximum memory used by the cache pool(unit bytes, default 100MB, max 500MB per-node-all-zone) Performance === PMC is based on MEMCG and requires performance measurement through the sharing of complex workloads between application processes. Therefore, at the moment, we unable to provide a better testing solution for this patchset. Here is the internal testing situation we provide, using the camera application as an example. (1-NODE-1-ZONE-8GRAM) Test Case: Capture in rear portrait HDR mode 1. Test mode: rear portrait HDR mode. This scene needs more than 800M ram which memory types including dmabuf(470M), PSS(150M) and APU(200M) 2. Test steps: take a photo, then click thumbnail to view the full image The overall performance benefit from click shutter button to showing whole image improves 500ms, and the total slowpath cost of all camera threads reduced from 958ms to 495ms. Especially for the shot2shot in this mode, the preview dealy of each frame have a significant improve. Some question === 1. The current patchset ignores the migrate type because the original requirement is to share between DMA-BUF and heap memory. However, this behavior will cause serious system fragmentation, so is there a better solution? 2. Current patchset only supports order 0 and use reaper to reclaim cache. Maybe better adapt to drain work and high order. 3. Actually, above internal test set cache pool free before pcp, and alloc behind buddy free. So task will push common memory, and cace will only be used in emergency situations.(before into slowpath). This will result in better performance, but it may impact the system. Even if only when application start up, cache enable. So, which better? 4. Current patchset is simple to talk, some struct maybe need refcount/lock to fix race access. Huan Yang (4): mm: memcg: pmc framework mm: memcg: pmc support change attribute mm: memcg: pmc: support reaper mm: memcg: pmc: support oom release include/linux/memcontrol.h | 41 ++++ include/linux/mmzone.h | 34 +++ include/linux/swap.h | 1 + mm/memcontrol.c | 481 +++++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 147 ++++++++++++ 5 files changed, 704 insertions(+) base-commit: 727900b675b749c40ba1f6669c7ae5eb7eb8e837 -- 2.45.2 . From: William Qiu To: linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Hal Feng , Philipp Zabel , William Qiu Subject: [PATCH v13] pwm: opencores: Add PWM driver support Date: Tue, 2 Jul 2024 16:35:27 +0800 Message-Id: <20240702083527.1947413-1-william.qiu@starfivetech.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265016 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pwm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add driver for OpenCores PWM Controller. And add compatibility code which based on StarFive SoC. Co-developed-by: Hal Feng Signed-off-by: Hal Feng Signed-off-by: William Qiu --- MAINTAINERS | 7 ++ drivers/pwm/Kconfig | 12 ++ drivers/pwm/Makefile | 1 + drivers/pwm/pwm-ocores.c | 239 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 259 insertions(+) create mode 100644 drivers/pwm/pwm-ocores.c diff --git a/MAINTAINERS b/MAINTAINERS index 3c4fdf74a3f9..3b547ede2ce5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16824,6 +16824,13 @@ F: Documentation/i2c/busses/i2c-ocores.rst F: drivers/i2c/busses/i2c-ocores.c F: include/linux/platform_data/i2c-ocores.h +OPENCORES PWM DRIVER +M: William Qiu +M: Hal Feng +S: Supported +F: Documentation/devicetree/bindings/pwm/opencores,pwm.yaml +F: drivers/pwm/pwm-ocores.c + OPENRISC ARCHITECTURE M: Jonas Bonn M: Stefan Kristiansson diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 1dd7921194f5..42158bc1c8bc 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -440,6 +440,18 @@ config PWM_NTXEC controller found in certain e-book readers designed by the original design manufacturer Netronix. +config PWM_OCORES + tristate "OpenCores PTC PWM support" + depends on HAS_IOMEM && OF + depends on COMMON_CLK && RESET_CONTROLLER + depends on ARCH_STARFIVE || COMPILE_TEST + help + If you say yes to this option, support will be included for the + OpenCores PWM. For details see https://opencores.org/projects/ptc. + + To compile this driver as a module, choose M here: the module + will be called pwm-ocores. + config PWM_OMAP_DMTIMER tristate "OMAP Dual-Mode Timer PWM support" depends on OF diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index 90913519f11a..7a44d8afe044 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_PWM_MICROCHIP_CORE) += pwm-microchip-core.o obj-$(CONFIG_PWM_MTK_DISP) += pwm-mtk-disp.o obj-$(CONFIG_PWM_MXS) += pwm-mxs.o obj-$(CONFIG_PWM_NTXEC) += pwm-ntxec.o +obj-$(CONFIG_PWM_OCORES) += pwm-ocores.o obj-$(CONFIG_PWM_OMAP_DMTIMER) += pwm-omap-dmtimer.o obj-$(CONFIG_PWM_PCA9685) += pwm-pca9685.o obj-$(CONFIG_PWM_PXA) += pwm-pxa.o diff --git a/drivers/pwm/pwm-ocores.c b/drivers/pwm/pwm-ocores.c new file mode 100644 index 000000000000..c8f08aa14e44 --- /dev/null +++ b/drivers/pwm/pwm-ocores.c @@ -0,0 +1,239 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * OpenCores PWM Driver + * + * https://opencores.org/projects/ptc + * + * Copyright (C) 2018-2023 StarFive Technology Co., Ltd. + * + * Limitations: + * - The hardware only supports inverted polarity. + * - The hardware minimum period / duty_cycle is (1 / pwm_apb clock frequency) ns. + * - The hardware maximum period / duty_cycle is (U32_MAX / pwm_apb clock frequency) ns. + * - The hardware is set to a low level immediately when disabledThe hardware is set to + * a low level immediately when disabled. + * - The hardware will have a conversion cycle when reconfiguring. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* OpenCores Register offsets */ +#define REG_OCPWM_CNTR 0x0 +#define REG_OCPWM_HRC 0x4 +#define REG_OCPWM_LRC 0x8 +#define REG_OCPWM_CTRL 0xC + +/* OCPWM_CTRL register bits*/ +#define REG_OCPWM_CNTR_EN BIT(0) +#define REG_OCPWM_CNTR_ECLK BIT(1) +#define REG_OCPWM_CNTR_NEC BIT(2) +#define REG_OCPWM_CNTR_OE BIT(3) +#define REG_OCPWM_CNTR_SIGNLE BIT(4) +#define REG_OCPWM_CNTR_INTE BIT(5) +#define REG_OCPWM_CNTR_INT BIT(6) +#define REG_OCPWM_CNTR_RST BIT(7) +#define REG_OCPWM_CNTR_CAPTE BIT(8) + +struct ocores_pwm_device { + const struct ocores_pwm_data *data; + void __iomem *regs; + u32 clk_rate; /* PWM APB clock frequency */ +}; + +struct ocores_pwm_data { + void __iomem *(*get_ch_base)(void __iomem *base, unsigned int channel); +}; + +static inline u32 ocores_pwm_readl(struct ocores_pwm_device *ddata, + unsigned int channel, + unsigned int offset) +{ + void __iomem *base = ddata->data->get_ch_base ? + ddata->data->get_ch_base(ddata->regs, channel) : ddata->regs; + + return readl(base + offset); +} + +static inline void ocores_pwm_writel(struct ocores_pwm_device *ddata, + unsigned int channel, + unsigned int offset, u32 val) +{ + void __iomem *base = ddata->data->get_ch_base ? + ddata->data->get_ch_base(ddata->regs, channel) : ddata->regs; + + writel(val, base + offset); +} + +static inline struct ocores_pwm_device *chip_to_ocores(struct pwm_chip *chip) +{ + return pwmchip_get_drvdata(chip); +} + +static void __iomem *starfive_get_ch_base(void __iomem *base, + unsigned int channel) +{ + unsigned int offset = (channel & 4) << 13 | (channel & 3) << 4; + + return base + offset; +} + +static int ocores_pwm_get_state(struct pwm_chip *chip, + struct pwm_device *pwm, + struct pwm_state *state) +{ + struct ocores_pwm_device *ddata = chip_to_ocores(chip); + u32 period_data, duty_data, ctrl_data; + + period_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_LRC); + duty_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_HRC); + ctrl_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_CTRL); + + state->period = DIV_ROUND_UP_ULL((u64)period_data * NSEC_PER_SEC, ddata->clk_rate); + state->duty_cycle = DIV_ROUND_UP_ULL((u64)duty_data * NSEC_PER_SEC, ddata->clk_rate); + state->polarity = PWM_POLARITY_INVERSED; + state->enabled = (ctrl_data & REG_OCPWM_CNTR_EN) ? true : false; + + return 0; +} + +static int ocores_pwm_apply(struct pwm_chip *chip, + struct pwm_device *pwm, + const struct pwm_state *state) +{ + struct ocores_pwm_device *ddata = chip_to_ocores(chip); + u32 ctrl_data = 0; + u64 period_data, duty_data; + + if (state->polarity != PWM_POLARITY_INVERSED) + return -EINVAL; + + period_data = mul_u64_u32_div(state->period, ddata->clk_rate, NSEC_PER_SEC); + if (!period_data) + return -EINVAL; + + if (period_data > U32_MAX) + period_data = U32_MAX; + + ocores_pwm_writel(ddata, pwm->hwpwm, 0x8, (u32)period_data); + + duty_data = mul_u64_u32_div(state->duty_cycle, ddata->clk_rate, NSEC_PER_SEC); + if (duty_data <= U32_MAX) + ocores_pwm_writel(ddata, pwm->hwpwm, REG_OCPWM_HRC, (u32)duty_data); + else if (duty_data > U32_MAX) + duty_data = U32_MAX; + else + return -EINVAL; + + ctrl_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_CTRL); + if (state->enabled) + ocores_pwm_writel(ddata, pwm->hwpwm, REG_OCPWM_CTRL, + ctrl_data | REG_OCPWM_CNTR_EN | REG_OCPWM_CNTR_OE); + else + ocores_pwm_writel(ddata, pwm->hwpwm, REG_OCPWM_CTRL, + ctrl_data & ~(REG_OCPWM_CNTR_EN | REG_OCPWM_CNTR_OE)); + + return 0; +} + +static const struct pwm_ops ocores_pwm_ops = { + .get_state = ocores_pwm_get_state, + .apply = ocores_pwm_apply, +}; + +static const struct ocores_pwm_data starfive_pwm_data = { + .get_ch_base = starfive_get_ch_base, +}; + +static const struct of_device_id ocores_pwm_of_match[] = { + { .compatible = "opencores,pwm-v1" }, + { .compatible = "starfive,jh7100-pwm", .data = &starfive_pwm_data}, + { .compatible = "starfive,jh7110-pwm", .data = &starfive_pwm_data}, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ocores_pwm_of_match); + +static void ocores_pwm_reset_control_assert(void *data) +{ + reset_control_assert(data); +} + +static int ocores_pwm_probe(struct platform_device *pdev) +{ + const struct of_device_id *id; + struct device *dev = &pdev->dev; + struct ocores_pwm_device *ddata; + struct pwm_chip *chip; + struct clk *clk; + struct reset_control *rst; + int ret; + + id = of_match_device(ocores_pwm_of_match, dev); + if (!id) + return -EINVAL; + + chip = devm_pwmchip_alloc(&pdev->dev, 8, sizeof(*ddata)); + if (IS_ERR(chip)) + return -ENOMEM; + + ddata = chip_to_ocores(chip); + ddata->data = id->data; + chip->ops = &ocores_pwm_ops; + + ddata->regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(ddata->regs)) + return dev_err_probe(dev, PTR_ERR(ddata->regs), + "Unable to map IO resources\n"); + + clk = devm_clk_get_enabled(dev, NULL); + if (IS_ERR(clk)) + return dev_err_probe(dev, PTR_ERR(clk), + "Unable to get pwm's clock\n"); + + ret = devm_clk_rate_exclusive_get(dev, clk); + if (ret) + return ret; + + rst = devm_reset_control_get_optional_exclusive(dev, NULL); + if (IS_ERR(rst)) + return dev_err_probe(dev, PTR_ERR(rst), + "Unable to get pwm's reset\n"); + + reset_control_deassert(rst); + + ret = devm_add_action_or_reset(dev, ocores_pwm_reset_control_assert, rst); + if (ret) + return ret; + + ddata->clk_rate = clk_get_rate(clk); + if (ddata->clk_rate > NSEC_PER_SEC) + return dev_err_probe(dev, ddata->clk_rate, + "Unable to get clock's rate\n"); + + ret = devm_pwmchip_add(dev, chip); + if (ret < 0) + return dev_err_probe(dev, ret, "Could not register PWM chip\n"); + + return 0; +} + +static struct platform_driver ocores_pwm_driver = { + .probe = ocores_pwm_probe, + .driver = { + .name = "ocores-pwm", + .of_match_table = ocores_pwm_of_match, + }, +}; +module_platform_driver(ocores_pwm_driver); + +MODULE_AUTHOR("Jieqin Chen"); +MODULE_AUTHOR("Hal Feng "); +MODULE_DESCRIPTION("OpenCores PTC PWM driver"); +MODULE_LICENSE("GPL"); -- 2.34.1 . From: Zhenhua Huang To: , , , , CC: Zhenhua Huang , , , Subject: [PATCH] iommu/arm-smmu-qcom: record reason for deferring probe Date: Tue, 2 Jul 2024 17:01:10 +0800 Message-ID: <1719910870-25079-1-git-send-email-quic_zhenhuah@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265021 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail To avoid deferring probe smmu driver silently, record reason for it. It can be checked through ../debugfs/devices_deferred as well: /sys/kernel/debug# cat devices_deferred 15000000.iommu arm-smmu: qcom_scm not ready Signed-off-by: Zhenhua Huang --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 25f034677f56..971c6a2e592b 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -469,7 +469,8 @@ static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu, /* Check to make sure qcom_scm has finished probing */ if (!qcom_scm_is_available()) - return ERR_PTR(-EPROBE_DEFER); + return ERR_PTR(dev_err_probe(smmu->dev, -EPROBE_DEFER, + "qcom_scm not ready\n")); qsmmu = devm_krealloc(smmu->dev, smmu, sizeof(*qsmmu), GFP_KERNEL); if (!qsmmu) -- 2.7.4 . From: Dimitri Fedrau To: Cc: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Dimitri Fedrau Subject: [PATCH v6 0/2] power: supply: add support for MAX1720x standalone fuel Date: Tue, 2 Jul 2024 11:03:06 +0200 Message-Id: <20240702090308.8848-1-dima.fedrau@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265023 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Changes to max1721x_battery.c: - reading manufacturer, model name and serial number is only possible when SBS functions of the IC are enabled.(nNVCfg0.enSBS) Factory default is off. Manufacturer is "Maxim Integrated" and the model name can be derived by register MAX172XX_DEV_NAME. Serial number is not available anymore. - According to the datasheet MAX172XX_BAT_PRESENT is at BIT(3) not BIT(4). Furthermore the naming is misleading, when BIT(3) is set the battery is not present. - Removed DeviceName, ManufacturerName and SerialNumber from struct max17211_device_info Changes in V2: - Changed E-Mail in Patch (2/2) Signed-Off Changes in V3: - Changed E-Mail in Patch (2/2) Author Changes in V4: - add compatibles "maxim,max17201, "maxim,max17205" in bindings - use generic node name fuel-gauge@36 instead of max17201@36 in bindings - remove status in bindings - fix spelling mistakes in commit message - fix indentation in Kconfig - fix typos in max1720x_battery.c - Drop bat and bat_desc from info struct. - MAX172XX_DEV_NAME and MAX172XX_DESIGN_CAP aren't volatile, adjust regmap - constify max1720x_manufacturer, max17201_model, max17205_model - constify max1720x_battery_props - Remove braces around reg in max172xx_current_to_voltage - Skip initialization of reg_val in max1720x_battery_get_property - Remove braces around FIELD_GET() in max1720x_battery_get_property - In case POWER_SUPPLY_PROP_PRESENT there is an early return if ret < 0. Return 0 if regmap_read fails, device is not responding in case battery is not inserted - Implement multi-byte readings instead of i2c_smbus_read_word_data - Drop ancillary from info - Drop both calls to i2c_set_clientdata in max1720x_probe - Get rid of max1720x_remove - Remove comma after sentinel in max1720x_of_match - Fix alignment of max1720x_i2c_driver - Fix return value of dev_err_probe after max1720x_probe_sense_resistor to use ret instead of PTR_ERR(info->bat) Changes in V5: - oneOf with list and fallback in bindings - unevaluatedProperties: false in bindings - switch back to i2c_smbus_read_word_data when reading from ancillary - add psy_cfg.fwnode = dev_fwnode(dev) in max1720x_probe - set max_register in max1720x_regmap_cfg to MAX172XX_ATAVCAP - fix typo in define: MAX1720X_NRSENSE instead of MAX1720_NRSENSE Changes in V6: - s/1720x/17201/ in title and in the filename of the bindings - remove compatible "maxim,max17205" from max1720x_of_match - Added Reviewed-by: Sebastian Reichel , hope this is still okay due to changes in V5 and V6 Dimitri Fedrau (2): dt-bindings: power: supply: add support for MAX17201/MAX17205 fuel gauge power: supply: add support for MAX1720x standalone fuel gauge .../bindings/power/supply/maxim,max17201.yaml | 58 +++ drivers/power/supply/Kconfig | 12 + drivers/power/supply/Makefile | 1 + drivers/power/supply/max1720x_battery.c | 337 ++++++++++++++++++ 4 files changed, 408 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max17201.yaml create mode 100644 drivers/power/supply/max1720x_battery.c -- 2.39.2 . Return-Path: From: Haylen Chu To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen Wang , Inochi Amaoto , Paul Walmsley , Palmer Dabbelt , Albert Ou , Jisheng Zhang Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Haylen Chu Subject: [PATCH v3 0/3] riscv: sophgo: add thermal sensor support for cv180x/sg200x SoCs Date: Tue, 2 Jul 2024 09:28:19 +0000 Message-ID: MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79273 org.kernel.vger.linux-kernel:1265029 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series implements driver for Sophgo cv180x/sg200x on-chip thermal sensor and adds thermal zones for CV1800B SoCs. Changed from v2: 1. style and code improvements 2. use human-readable value for sensor parameters Changed from v1: 1. style and code improvements 2. make sample parameters configurable 3. generalize document temperature calculating formula Haylen Chu (3): dt-bindings: thermal: sophgo,cv1800-thermal: Add Sophgo CV1800 thermal riscv: dts: sophgo: cv18xx: Add sensor device and thermal zone thermal: cv180x: Add cv180x thermal driver support .../thermal/sophgo,cv1800-thermal.yaml | 74 +++++ arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 30 ++ arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 8 + drivers/thermal/Kconfig | 6 + drivers/thermal/Makefile | 1 + drivers/thermal/cv180x_thermal.c | 281 ++++++++++++++++++ 6 files changed, 400 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/sophgo,cv1800-thermal.yaml create mode 100644 drivers/thermal/cv180x_thermal.c -- 2.45.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Amit Pundir To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Bartosz Golaszewski , Neil Armstrong , linux-arm-msm , dt , lkml Subject: [PATCH] arm64: dts: qcom: sm8550-hdk: add the Wifi node Date: Tue, 2 Jul 2024 14:46:55 +0530 Message-Id: <20240702091655.278974-1-amit.pundir@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265032 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Describe the ath12k WLAN on-board the WCN7850 module present on the board. Signed-off-by: Amit Pundir --- Kanged verbatim from 490812872449 ("arm64: dts: qcom: sm8550-qrd: add the Wifi node"). arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 97 +++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts index 12d60a0ee095..c453d081a2df 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts @@ -279,6 +279,68 @@ platform { }; }; }; + + wcn7850-pmu { + compatible = "qcom,wcn7850-pmu"; + + pinctrl-names = "default"; + pinctrl-0 = <&wlan_en>, <&pmk8550_sleep_clk>; + + wlan-enable-gpios = <&tlmm 80 GPIO_ACTIVE_HIGH>; + /* + * TODO Add bt-enable-gpios once the Bluetooth driver is + * converted to using the power sequencer. + */ + + vdd-supply = <&vreg_s5g_0p85>; + vddio-supply = <&vreg_l15b_1p8>; + vddaon-supply = <&vreg_s2g_0p85>; + vdddig-supply = <&vreg_s4e_0p95>; + vddrfa1p2-supply = <&vreg_s4g_1p25>; + vddrfa1p8-supply = <&vreg_s6g_1p86>; + + regulators { + vreg_pmu_rfa_cmn: ldo0 { + regulator-name = "vreg_pmu_rfa_cmn"; + }; + + vreg_pmu_aon_0p59: ldo1 { + regulator-name = "vreg_pmu_aon_0p59"; + }; + + vreg_pmu_wlcx_0p8: ldo2 { + regulator-name = "vreg_pmu_wlcx_0p8"; + }; + + vreg_pmu_wlmx_0p85: ldo3 { + regulator-name = "vreg_pmu_wlmx_0p85"; + }; + + vreg_pmu_btcmx_0p85: ldo4 { + regulator-name = "vreg_pmu_btcmx_0p85"; + }; + + vreg_pmu_rfa_0p8: ldo5 { + regulator-name = "vreg_pmu_rfa_0p8"; + }; + + vreg_pmu_rfa_1p2: ldo6 { + regulator-name = "vreg_pmu_rfa_1p2"; + }; + + vreg_pmu_rfa_1p8: ldo7 { + regulator-name = "vreg_pmu_rfa_1p8"; + }; + + vreg_pmu_pcie_0p9: ldo8 { + regulator-name = "vreg_pmu_pcie_0p9"; + }; + + vreg_pmu_pcie_1p8: ldo9 { + regulator-name = "vreg_pmu_pcie_1p8"; + }; + }; + }; }; &apps_rsc { @@ -954,6 +1016,23 @@ &pcie0 { status = "okay"; }; +&pcieport0 { + wifi@0 { + compatible = "pci17cb,1107"; + reg = <0x10000 0x0 0x0 0x0 0x0>; + + vddrfacmn-supply = <&vreg_pmu_rfa_cmn>; + vddaon-supply = <&vreg_pmu_aon_0p59>; + vddwlcx-supply = <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply = <&vreg_pmu_wlmx_0p85>; + vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>; + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>; + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>; + }; +}; + &pcie0_phy { vdda-phy-supply = <&vreg_l1e_0p88>; vdda-pll-supply = <&vreg_l3e_1p2>; @@ -1046,6 +1125,17 @@ &pon_resin { status = "okay"; }; +&pmk8550_gpios { + pmk8550_sleep_clk: sleep-clk-state { + pins = "gpio3"; + function = "func1"; + input-disable; + output-enable; + bias-disable; + power-source = <0>; + }; +}; + &qupv3_id_0 { status = "okay"; }; @@ -1206,6 +1296,13 @@ wcd_default: wcd-reset-n-active-state { bias-disable; output-low; }; + + wlan_en: wlan-en-state { + pins = "gpio80"; + function = "gpio"; + drive-strength = <8>; + bias-pull-down; + }; }; &uart7 { -- 2.25.1 . From: Geert Uytterhoeven To: Marc Zyngier , Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2] irqchip/gic-v3: Pass #redistributor-regions to gic_of_setup_kvm_info() Date: Tue, 2 Jul 2024 11:24:14 +0200 Message-Id: <808286a3ac08f60585ae7e2c848e0f9b3cb79cf8.1719912215.git.geert+renesas@glider.be> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265037 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-renesas-soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The caller of gic_of_setup_kvm_info() already queried DT for the value of the #redistributor-regions property. So just pass this value, instead of doing the DT look-up again in the callee. Signed-off-by: Geert Uytterhoeven Acked-by: Marc Zyngier --- This is v2 of "irqchip/gic-v3: Pass GICV index to gic_of_setup_kvm_info()". v2: - Pass nr_redist_regions instead of gicv_idx, - Keep comment about skipping GICD, GICC, GICH, - Add Acked-by. --- drivers/irqchip/irq-gic-v3.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 1f70262742f3b7c7..79a8a2f189e94c7f 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -2185,11 +2185,10 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) of_node_put(parts_node); } -static void __init gic_of_setup_kvm_info(struct device_node *node) +static void __init gic_of_setup_kvm_info(struct device_node *node, u32 nr_redist_regions) { int ret; struct resource r; - u32 gicv_idx; gic_v3_kvm_info.type = GIC_V3; @@ -2197,12 +2196,8 @@ static void __init gic_of_setup_kvm_info(struct device_node *node) if (!gic_v3_kvm_info.maint_irq) return; - if (of_property_read_u32(node, "#redistributor-regions", - &gicv_idx)) - gicv_idx = 1; - - gicv_idx += 3; /* Also skip GICD, GICC, GICH */ - ret = of_address_to_resource(node, gicv_idx, &r); + /* Also skip GICD, GICC, GICH */ + ret = of_address_to_resource(node, nr_redist_regions + 3, &r); if (!ret) gic_v3_kvm_info.vcpu = r; @@ -2292,7 +2287,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare gic_populate_ppi_partitions(node); if (static_branch_likely(&supports_deactivate_key)) - gic_of_setup_kvm_info(node); + gic_of_setup_kvm_info(node, nr_redist_regions); return 0; out_unmap_rdist: -- 2.34.1 . From: Aleksandr Mishin To: Samuel Ortiz CC: Aleksandr Mishin , Krzysztof Kozlowski , , , Subject: [PATCH] nfc: pn533: Add poll mod list filling check Date: Tue, 2 Jul 2024 12:39:24 +0300 Message-ID: <20240702093924.12092-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186273 [Jul 02 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;t-argos.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;mx1.t-argos.ru.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/02 08:55:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/02 07:20:00 #25796017 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265051 org.kernel.vger.netdev:355455 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In case of im_protocols value is 1 and tm_protocols value is 0 this combination successfully passes the check 'if (!im_protocols && !tm_protocols)' in the nfc_start_poll(). But then after pn533_poll_create_mod_list() call in pn533_start_poll() poll mod list will remain empty and dev->poll_mod_count will remain 0 which lead to division by zero. Add poll mod list filling check. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: dfccd0f58044 ("NFC: pn533: Add some polling entropy") Signed-off-by: Aleksandr Mishin --- drivers/nfc/pn533/pn533.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index b19c39dcfbd9..e2bc67300a91 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -1723,6 +1723,11 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev, } pn533_poll_create_mod_list(dev, im_protocols, tm_protocols); + if (!dev->poll_mod_count) { + nfc_err(dev->dev, + "Poll mod list is empty\n"); + return -EINVAL; + } /* Do not always start polling from the same modulation */ get_random_bytes(&rand_mod, sizeof(rand_mod)); -- 2.30.2 . From: Li Wang To: mic@digikod.net, gnoack@google.com, paul@paul-moore.com Cc: linux-kernel@vger.kernel.org, ltp@lists.linux.it, Konstantin Meskhidze Subject: [RFC PATCH] landlock: fix minimal required size for landlock_ruleset_attr copying Date: Tue, 2 Jul 2024 17:47:45 +0800 Message-ID: <20240702094745.96521-1-liwang@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265057 Newsgroups: org.kernel.vger.linux-kernel,it.linux.lists.ltp Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail As kernel commit fff69fb03dde ("landlock: Support network rules with TCP bind and connect") introducing a new field 'handled_access_net' in the structure landlock_ruleset_attr, but in the landlock_create_ruleset() it still uses the first field 'handled_access_fs' to calculate minimal size, so that made decrease 1 is useless in LTP landlock01.c to test the too-small-size. Test code: rule_small_size = sizeof(struct landlock_ruleset_attr) - 1; tst_syscall(__NR_landlock_create_ruleset, ..., rule_small_size, 0) Result: landlock01.c:49: TFAIL: Size is too small expected EINVAL: ENOMSG (42) Signed-off-by: Li Wang Cc: Mickaël Salaün Cc: Konstantin Meskhidze Cc: Paul Moore --- Notes: Hi Mickael, I'm not quite sure if that is on purpose to use the first field or kernel bug, can you take a look? security/landlock/syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/landlock/syscalls.c b/security/landlock/syscalls.c index 03b470f5a85a..f3cd7def7624 100644 --- a/security/landlock/syscalls.c +++ b/security/landlock/syscalls.c @@ -198,7 +198,7 @@ SYSCALL_DEFINE3(landlock_create_ruleset, /* Copies raw user space buffer. */ err = copy_min_struct_from_user(&ruleset_attr, sizeof(ruleset_attr), offsetofend(typeof(ruleset_attr), - handled_access_fs), + handled_access_net), attr, size); if (err) return err; -- 2.45.2 . From: Dmitry Baryshkov Subject: [PATCH v3 0/4] drm: fix two issues related to HDMI Connector implementation Date: Tue, 02 Jul 2024 12:48:51 +0300 Message-Id: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Dave Stevenson Cc: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , dri-devel@lists.freedesktop.org, igt-dev@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265058 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.freedesktop.lists.igt-dev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Running IGT tests on Qualcomm Dragonboard820c uncovered two issues with the HDMI Connector implementation and with its integration into the drm_bridge_connector. Fix those issues. Note, I'm not fully satisfied with the drm_bridge_connector move. Maybe it's better to add drm_bridge_funcs::connector_reset() and call it from __drm_atomic_helper_connector_reset(). Signed-off-by: Dmitry Baryshkov --- Changes in v3: - Document the DRM_MODE_PROP_IMMUTABLE requirements currently exposed only via IGT tests (Maxime). - Move drm_bridge_connector to drm_display_helper. - Link to v2: https://lore.kernel.org/r/20240623-drm-bridge-connector-fix-hdmi-reset-v2-0-8590d44912ce@linaro.org Changes in v2: - Actually pass the flags to drm_property_create_range(). - Link to v1: https://lore.kernel.org/r/20240623-drm-bridge-connector-fix-hdmi-reset-v1-0-41e9894dcdec@linaro.org --- Dmitry Baryshkov (4): drm/drm_property: require DRM_MODE_PROP_IMMUTABLE for single-value props drm/connector: automatically set immutable flag for max_bpc property drm/bridge-connector: move to DRM_DISPLAY_HELPER module drm/bridge-connector: reset the HDMI connector state drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/display/Kconfig | 7 +++++++ drivers/gpu/drm/display/Makefile | 2 ++ drivers/gpu/drm/{ => display}/drm_bridge_connector.c | 13 ++++++++++++- drivers/gpu/drm/drm_connector.c | 7 ++++++- drivers/gpu/drm/imx/dcss/Kconfig | 2 ++ drivers/gpu/drm/imx/lcdc/Kconfig | 2 ++ drivers/gpu/drm/ingenic/Kconfig | 2 ++ drivers/gpu/drm/kmb/Kconfig | 2 ++ drivers/gpu/drm/mediatek/Kconfig | 2 ++ drivers/gpu/drm/meson/Kconfig | 2 ++ drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/omapdrm/Kconfig | 2 ++ drivers/gpu/drm/renesas/rcar-du/Kconfig | 2 ++ drivers/gpu/drm/renesas/rz-du/Kconfig | 2 ++ drivers/gpu/drm/renesas/shmobile/Kconfig | 2 ++ drivers/gpu/drm/rockchip/Kconfig | 4 ++++ drivers/gpu/drm/tegra/Kconfig | 1 + drivers/gpu/drm/tidss/Kconfig | 2 ++ drivers/gpu/drm/xlnx/Kconfig | 1 + include/drm/drm_property.h | 3 +++ 22 files changed, 60 insertions(+), 3 deletions(-) --- base-commit: 82e4255305c554b0bb18b7ccf2db86041b4c8b6e change-id: 20240623-drm-bridge-connector-fix-hdmi-reset-0ce86af053aa Best regards, -- Dmitry Baryshkov . From: Aleksandr Mishin To: Igal Liberman CC: Aleksandr Mishin , Madalin Bucur , Sean Anderson , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , Subject: [PATCH] fsl/fman: Validate cell-index value obtained from Device Tree Date: Tue, 2 Jul 2024 12:50:34 +0300 Message-ID: <20240702095034.12371-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186273 [Jul 02 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, t-argos.ru:7.1.1;127.0.0.199:7.1.2;mx1.t-argos.ru.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/02 08:55:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/02 07:20:00 #25796017 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265066 org.kernel.vger.netdev:355456 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Cell-index value is obtained from Device Tree and then used to calculate the index for accessing arrays port_mfl[], mac_mfl[] and intr_mng[]. In case of broken DT due to any error cell-index can contain any value and it is possible to go beyond the array boundaries which can lead at least to memory corruption. Validate cell-index value obtained from Device Tree. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 414fd46e7762 ("fsl/fman: Add FMan support") Signed-off-by: Aleksandr Mishin --- drivers/net/ethernet/freescale/fman/fman.c | 7 +++++++ drivers/net/ethernet/freescale/fman/fman.h | 2 ++ drivers/net/ethernet/freescale/fman/mac.c | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index d96028f01770..6929bca3f768 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -2933,3 +2933,10 @@ module_exit(fman_unload); MODULE_LICENSE("Dual BSD/GPL"); MODULE_DESCRIPTION("Freescale DPAA Frame Manager driver"); + +int check_mac_id(u32 mac_id) +{ + if (mac_id >= MAX_NUM_OF_MACS) + return -EINVAL; + return 0; +} diff --git a/drivers/net/ethernet/freescale/fman/fman.h b/drivers/net/ethernet/freescale/fman/fman.h index 2ea575a46675..3cedde4851e1 100644 --- a/drivers/net/ethernet/freescale/fman/fman.h +++ b/drivers/net/ethernet/freescale/fman/fman.h @@ -372,6 +372,8 @@ u16 fman_get_max_frm(void); int fman_get_rx_extra_headroom(void); +int check_mac_id(u32 mac_id); + #ifdef CONFIG_DPAA_ERRATUM_A050385 bool fman_has_errata_a050385(void); #endif diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index 9767586b4eb3..7a67b4c887e2 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -247,6 +247,11 @@ static int mac_probe(struct platform_device *_of_dev) dev_err(dev, "failed to read cell-index for %pOF\n", mac_node); return -EINVAL; } + err = check_mac_id(val); + if (err) { + dev_err(dev, "cell-index value is out of range for %pOF\n", mac_node); + return err; + } priv->cell_index = (u8)val; /* Get the MAC address */ -- 2.30.2 . From: Javier Carrasco Subject: [PATCH 0/3] hwmon: constify struct regmap_config Date: Tue, 02 Jul 2024 12:09:29 +0200 Message-Id: <20240702-hwmon-const-regmap-v1-0-63f6d4765fe0@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Jean Delvare , Guenter Roeck , Eric Tremblay , Robert Marko , Luka Perkov Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265078 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-hwmon Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series adds the const modifier to the remaining regmap_config structs within the hwmon subsystem that are effectively used as const (i.e., only read after their declaration), but kept ad writtable data. Signed-off-by: Javier Carrasco --- Javier Carrasco (3): hwmon: (ina238) Constify struct regmap_config hwmon: (tmp513) Constify struct regmap_config hwmon: (tps23861) Constify struct regmap_config drivers/hwmon/ina238.c | 2 +- drivers/hwmon/tmp513.c | 2 +- drivers/hwmon/tps23861.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- base-commit: 39b24cced70fdc336dbc0070f8b3bde61d8513a8 change-id: 20240702-hwmon-const-regmap-4d4e3c097d9e Best regards, -- Javier Carrasco . From: Muhammad Usama Anjum To: srinivas pandruvada , "Rafael J . Wysocki" , Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] selftests/thermel/intel: conform the test to TAP output Date: Tue, 2 Jul 2024 15:12:52 +0500 Message-Id: <20240702101259.1251377-1-usama.anjum@collabora.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265084 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. The test has infitie loop to read the value of index_str. Break the loop after successfully reading the value once and finished the test. Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - Use ksft_exit_fail_perror if read() returns error - Break the infinite loop after printing index_str --- .../intel/workload_hint/workload_hint_test.c | 103 ++++++++---------- 1 file changed, 43 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c b/tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c index 217c3a641c537..0e5f07efc8a2b 100644 --- a/tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c +++ b/tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c @@ -9,6 +9,7 @@ #include #include #include +#include "../../../kselftest.h" #define WORKLOAD_NOTIFICATION_DELAY_ATTRIBUTE "/sys/bus/pci/devices/0000:00:04.0/workload_hint/notification_delay_ms" #define WORKLOAD_ENABLE_ATTRIBUTE "/sys/bus/pci/devices/0000:00:04.0/workload_hint/workload_hint_enable" @@ -31,17 +32,13 @@ void workload_hint_exit(int signum) /* Disable feature via sysfs knob */ fd = open(WORKLOAD_ENABLE_ATTRIBUTE, O_RDWR); - if (fd < 0) { - perror("Unable to open workload type feature enable file\n"); - exit(1); - } + if (fd < 0) + ksft_exit_fail_perror("Unable to open workload type feature enable file"); - if (write(fd, "0\n", 2) < 0) { - perror("Can' disable workload hints\n"); - exit(1); - } + if (write(fd, "0\n", 2) < 0) + ksft_exit_fail_perror("Can' disable workload hints"); - printf("Disabled workload type prediction\n"); + ksft_print_msg("Disabled workload type prediction\n"); close(fd); } @@ -54,32 +51,27 @@ int main(int argc, char **argv) char delay_str[64]; int delay = 0; - printf("Usage: workload_hint_test [notification delay in milli seconds]\n"); + ksft_print_header(); + ksft_set_plan(1); + + ksft_print_msg("Usage: workload_hint_test [notification delay in milli seconds]\n"); if (argc > 1) { ret = sscanf(argv[1], "%d", &delay); - if (ret < 0) { - printf("Invalid delay\n"); - exit(1); - } + if (ret < 0) + ksft_exit_fail_perror("Invalid delay"); - printf("Setting notification delay to %d ms\n", delay); + ksft_print_msg("Setting notification delay to %d ms\n", delay); if (delay < 0) - exit(1); - - sprintf(delay_str, "%s\n", argv[1]); + ksft_exit_fail_msg("delay can never be negative\n"); sprintf(delay_str, "%s\n", argv[1]); fd = open(WORKLOAD_NOTIFICATION_DELAY_ATTRIBUTE, O_RDWR); - if (fd < 0) { - perror("Unable to open workload notification delay\n"); - exit(1); - } + if (fd < 0) + ksft_exit_fail_perror("Unable to open workload notification delay"); - if (write(fd, delay_str, strlen(delay_str)) < 0) { - perror("Can't set delay\n"); - exit(1); - } + if (write(fd, delay_str, strlen(delay_str)) < 0) + ksft_exit_fail_perror("Can't set delay"); close(fd); } @@ -93,65 +85,56 @@ int main(int argc, char **argv) /* Enable feature via sysfs knob */ fd = open(WORKLOAD_ENABLE_ATTRIBUTE, O_RDWR); - if (fd < 0) { - perror("Unable to open workload type feature enable file\n"); - exit(1); - } + if (fd < 0) + ksft_exit_fail_perror("Unable to open workload type feature enable file"); - if (write(fd, "1\n", 2) < 0) { - perror("Can' enable workload hints\n"); - exit(1); - } + if (write(fd, "1\n", 2) < 0) + ksft_exit_fail_perror("Can' enable workload hints"); close(fd); - printf("Enabled workload type prediction\n"); + ksft_print_msg("Enabled workload type prediction\n"); while (1) { fd = open(WORKLOAD_TYPE_INDEX_ATTRIBUTE, O_RDONLY); - if (fd < 0) { - perror("Unable to open workload type file\n"); - exit(1); - } + if (fd < 0) + ksft_exit_fail_perror("Unable to open workload type file"); - if ((lseek(fd, 0L, SEEK_SET)) < 0) { - fprintf(stderr, "Failed to set pointer to beginning\n"); - exit(1); - } + if ((lseek(fd, 0L, SEEK_SET)) < 0) + ksft_exit_fail_perror("Failed to set pointer to beginning"); - if (read(fd, index_str, sizeof(index_str)) < 0) { - fprintf(stderr, "Failed to read from:%s\n", - WORKLOAD_TYPE_INDEX_ATTRIBUTE); - exit(1); - } + if (read(fd, index_str, sizeof(index_str)) < 0) + ksft_exit_fail_perror("Failed to read from: workload_type_index"); ufd.fd = fd; ufd.events = POLLPRI; ret = poll(&ufd, 1, -1); if (ret < 0) { - perror("poll error"); - exit(1); + ksft_exit_fail_perror("poll error"); } else if (ret == 0) { - printf("Poll Timeout\n"); + ksft_print_msg("Poll Timeout\n"); } else { - if ((lseek(fd, 0L, SEEK_SET)) < 0) { - fprintf(stderr, "Failed to set pointer to beginning\n"); - exit(1); - } + if ((lseek(fd, 0L, SEEK_SET)) < 0) + ksft_exit_fail_perror("Failed to set pointer to beginning"); if (read(fd, index_str, sizeof(index_str)) < 0) - exit(0); + ksft_exit_fail_perror("Failed to read"); ret = sscanf(index_str, "%d", &index); if (ret < 0) + ksft_exit_fail_msg("Read negative value unexpectedly\n"); + if (index > WORKLOAD_TYPE_MAX_INDEX) { + ksft_print_msg("Invalid workload type index\n"); + } else { + ksft_print_msg("workload type:%s\n", workload_types[index]); break; - if (index > WORKLOAD_TYPE_MAX_INDEX) - printf("Invalid workload type index\n"); - else - printf("workload type:%s\n", workload_types[index]); + } } close(fd); } + + ksft_test_result_pass("Successfully read\n"); + ksft_finished(); } -- 2.39.2 . Return-Path: From: Mayuresh Chitale To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Mayuresh Chitale , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Samuel Holland , Andrew Jones Subject: [PATCH v8] riscv: mm: Add support for Svinval extension Date: Tue, 2 Jul 2024 15:56:37 +0530 Message-Id: <20240702102637.9074-1-mchitale@ventanamicro.com> MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79282 org.kernel.vger.linux-kernel:1265086 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The Svinval extension splits SFENCE.VMA instruction into finer-grained invalidation and ordering operations and is mandatory for RVA23S64 profile. When Svinval is enabled the local_flush_tlb_range_threshold_asid function should use the following sequence to optimize the tlb flushes instead of a simple sfence.vma: sfence.w.inval svinval.vma . . svinval.vma sfence.inval.ir The maximum number of consecutive svinval.vma instructions that can be executed in local_flush_tlb_range_threshold_asid function is limited to 64. This is required to avoid soft lockups and the approach is similar to that used in arm64. Signed-off-by: Mayuresh Chitale Reviewed-by: Andrew Jones --- Changes in v8: - Fix line wrap - Add RB tag Changes in v7: - Use existing svinval macros in the insn-def.h - Rename local_sinval_vma_asid to local_sinval_vma Changes in v6: - Rebase on latest torvalds/master Changes in v5: - Reduce tlb flush threshold to 64 - Improve implementation of local_flush_tlb* functions Changes in v4: - Rebase and refactor as per latest changes on torvalds/master - Drop patch 1 in the series Changes in v3: - Fix incorrect vma used for sinval instructions - Use unified static key mechanism for svinval - Rebased on torvalds/master Changes in v2: - Rebased on 5.18-rc3 - update riscv_fill_hwcap to probe Svinval extension arch/riscv/mm/tlbflush.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index 9b6e86ce3867..782147a63f3b 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -6,6 +6,27 @@ #include #include #include +#include + +#define has_svinval() riscv_has_extension_unlikely(RISCV_ISA_EXT_SVINVAL) + +static inline void local_sfence_inval_ir(void) +{ + asm volatile(SFENCE_INVAL_IR() ::: "memory"); +} + +static inline void local_sfence_w_inval(void) +{ + asm volatile(SFENCE_W_INVAL() ::: "memory"); +} + +static inline void local_sinval_vma(unsigned long vma, unsigned long asid) +{ + if (asid != FLUSH_TLB_NO_ASID) + asm volatile(SINVAL_VMA(%0, %1) : : "r" (vma), "r" (asid) : "memory"); + else + asm volatile(SINVAL_VMA(%0, zero) : : "r" (vma) : "memory"); +} /* * Flush entire TLB if number of entries to be flushed is greater @@ -26,6 +47,16 @@ static void local_flush_tlb_range_threshold_asid(unsigned long start, return; } + if (has_svinval()) { + local_sfence_w_inval(); + for (i = 0; i < nr_ptes_in_range; ++i) { + local_sinval_vma(start, asid); + start += stride; + } + local_sfence_inval_ir(); + return; + } + for (i = 0; i < nr_ptes_in_range; ++i) { local_flush_tlb_page_asid(start, asid); start += stride; -- 2.34.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Justin Piszcz Date: Tue, 2 Jul 2024 06:27:51 -0400 Message-ID: Subject: 6.9.7: kernel panic: RIP: 0010:btrfs_clone_write_end_io+0x1e/0x60 [btrfs] (dmesg included) To: LKML Cc: linux-scsi@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265101 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-scsi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, Note: dmesg from the crash is included at the bottom of this email. Arch: x86_64 Kernel: 6.9.7 Latest BIOS from Manufacturer:3603 (as of 7/2/2024) Latest NVME Firmware available from Manufacturer: 4B2QJXD7 (as of 7/2/2024) When not using the following kernel options: nvme_core.default_ps_max_latency_us=0 pcie_aspm=off With 6.1.x, the kernel still panics even with the above options. I am testing 6.9.7 to see if the same happens with this version. Does anyone know why this issue continues to occur? I did find a summary of this issue here from Claudio Luck: https://bugzilla.proxmox.com/show_bug.cgi?id=5306 -------------- My summary: Points not debunked: - Some People have success changing PSU - Some People see the problem disappear after NVMe firmware update - Different NVMe brands affected, both with/without DRAM Uncertain points: - A proposed patch for Linux to change amount/size of buffers towards NVMe drive - Some People get stability switching to FreeBSD (TrueNAS etc.) [a] Notable observations: - Different NVMe vendors / controller brands (though, many reports about WD products) - People get RMA-returns with newer firmware - Reproducible across batches of the same product - Most offen large reads/writes (e.g. ZFS resilver) just precede the crash - Some People have thermal imaging footage showing heat buildup before crash I remain with my gut feeling that internal housekeeping in the NVMe firmware controller produces either thermal overload or power regulator overload, locking up the controller. The shutdown sometimes doesn't seem to work as engineered, as in some instances we've had the NVMe not return online after a soft-reboot but then after a cold-boot. -------------- dmesg from the latest crash with 6.9.7 when the following options are NOT used: nvme_core.default_ps_max_latency_us=0 pcie_aspm=off [ 3718.137313] #PF: supervisor read access in kernel mode [ 3718.137321] #PF: error_code(0x0000) - not-present page [ 3718.137328] PGD 0 P4D 0 [ 3718.137333] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 3718.137364] CPU: 8 PID: 0 Comm: swapper/8 Not tainted 6.9.7 #2 [ 3718.137372] Hardware name: ASUSTeK COMPUTER INC. System Product Name/Pro WS W680-ACE IPMI [ 3718.137293] BUG: kernel NULL pointer dereference [ 3718.137382] RIP: 0010:btrfs_clone_write_end_io+0x1e/0x60 [btrfs] [ 3718.137474] RBP: ffff93a9766f8598 R08: ffff93a925547000 R09: 0000000080080007 [ 3718.137497] FS: 0000000000000000(0000) GS:ffff93c37f400000(0000) knlGS:0000000000000000 [ 3718.137531] [ 3718.137549] ? __slab_free+0xdf/0x2f0 [ 3718.137434] Code: 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f 44 00 00 55 53 48 8b 6f 40 48 89 fb 80 7f 19 00 48 8b 45 20 75 27 80 7f 10 07 74 13 <48> 8b 78 18 e8 a9 0d 39 d4 48 89 df 5b 5d e9 4f 09 39 d4 48 8b 57 [ 3718.137466] RDX: ffff93a480df4d40 RSI: ffff93a999c31900 RDI: ffff93a999c31900 [ 3718.137482] R10: 0000000080080007 R11: ffffa7ce00360ff8 R12: 0000000000000000 [ 3718.137506] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3718.137513] CR2: 0000000000000018 CR3: 00000001bddfc005 CR4: 0000000000770ef0 [ 3718.137521] PKRU: 55555554 [ 3718.137525] Call Trace: [ 3718.137536] ? __die+0x1f/0x60 [ 3718.137451] RSP: 0018:ffffa7ce00360e80 EFLAGS: 00010097 [ 3718.137458] RAX: 0000000000000000 RBX: ffff93a999c31900 RCX: ffff93a4a50c03b0 [ 3718.137489] R13: ffff93a999c31900 R14: 0000000000004000 R15: 0000000000004000 [ 3718.137543] ? page_fault_oops+0x179/0x560 [ 3718.137557] ? exc_page_fault+0x72/0x170 [ 3718.137564] ? asm_exc_page_fault+0x22/0x30 [ 3718.137620] ? kfree+0x24f/0x290 [ 3718.137642] nvme_irq+0x3e/0x80 [nvme] [ 3718.137572] ? btrfs_clone_write_end_io+0x1e/0x60 [btrfs] [ 3718.137626] blk_mq_end_request+0x18/0x30 [ 3718.137649] __handle_irq_event_percpu+0x43/0x1a0 [ 3718.137613] blk_update_request+0x110/0x470 [ 3718.137633] nvme_poll_cq+0x18f/0x360 [nvme] [ 3718.137657] handle_irq_event+0x34/0x70 [ 3718.137663] handle_edge_irq+0x87/0x220 [ 3718.137673] common_interrupt+0x7c/0xa0 [ 3718.137683] [ 3718.137693] RIP: 0010:cpuidle_enter_state+0xc8/0x430 [ 3718.137668] __common_interrupt+0x38/0xa0 [ 3718.137680] [ 3718.137687] asm_common_interrupt+0x22/0x40 [ 3718.137700] Code: 4e 44 54 ff e8 a9 f1 ff ff 8b 53 04 49 89 c5 0f 1f 44 00 00 31 ff e8 27 53 53 ff 45 84 ff 0f 85 50 02 00 00 fb 0f 1f 44 00 00 <45> 85 f6 0f 88 81 01 00 00 49 63 d6 48 8d 04 52 48 8d 04 82 49 8d [ 3718.137724] RAX: ffff93c37f400000 RBX: ffff93c37f43f4a0 RCX: 000000000000001f [ 3718.137748] R10: 0000000000000018 R11: ffff93c37f433ce4 R12: ffffffff965a2c80 [ 3718.137771] do_idle+0x1e7/0x240 [ 3718.137783] start_secondary+0x118/0x140 [ 3718.137732] RDX: 0000000000000008 RSI: 0000000028291fdf RDI: 0000000000000000 [ 3718.137764] cpuidle_enter+0x29/0x40 [ 3718.137790] common_startup_64+0x13e/0x141 [ 3718.137718] RSP: 0018:ffffa7ce001d3e90 EFLAGS: 00000246 [ 3718.137740] RBP: 0000000000000002 R08: 0000000000000000 R09: 000000000000004e [ 3718.137755] R13: 00000361b240a0fa R14: 0000000000000002 R15: 0000000000000000 [ 3718.137777] cpu_startup_entry+0x25/0x30 [ 3718.137797] [ 3718.137800] Modules linked in: tls bluetooth sha3_generic jitterentropy_rng drbg ansi_cprng ecdh_generic ecc crc16 xt_nat xt_tcpudp veth xt_conntrack xt_MASQUERADE nf_conntrack_netlink xfrm_user xt_addrtype nft_compat br_netfilter bridge nfsv3 nfs netfs tcp_bbr sch_fq tun netconsole nvme_fabrics overlay pps_ldisc cfg80211 8021q garp stp mrp llc lz4 lz4_compress zram zsmalloc binfmt_misc xfs nls_ascii nls_cp437 vfat fat nft_masq nft_redir nft_chain_nat nf_nat intel_rapl_msr intel_rapl_common intel_uncore_frequency intel_uncore_frequency_common x86_pkg_temp_thermal intel_powerclamp coretemp nft_ct nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 kvm_intel kvm ghash_clmulni_intel sha512_ssse3 sha512_generic sha256_ssse3 sha1_ssse3 snd_sof_pci_intel_tgl snd_sof_intel_hda_common soundwire_intel soundwire_generic_allocation snd_sof_intel_hda_mlink soundwire_cadence snd_sof_intel_hda snd_sof_pci snd_sof_xtensa_dsp snd_sof aesni_intel snd_sof_utils crypto_simd snd_soc_hdac_hda cryptd snd_hda_ext_ [ 3718.137839] snd_soc_acpi snd_soc_core snd_hda_codec_realtek snd_hda_codec_generic nfnetlink_log snd_compress rapl snd_hda_scodec_component nft_log soundwire_bus snd_hda_intel mei_wdt snd_intel_dspcfg mei_hdcp intel_cstate snd_intel_sdw_acpi snd_hda_codec snd_hda_core snd_hwdep snd_pcm_oss eeepc_wmi snd_mixer_oss asus_wmi snd_pcm iTCO_wdt intel_pmc_bxt snd_timer battery sd_mod sparse_keymap iTCO_vendor_support snd mei_me platform_profile ipmi_ssif rfkill pcspkr soundcore intel_uncore wmi_bmof mei watchdog acpi_ipmi cdc_acm ipmi_si ipmi_devintf joydev ipmi_msghandler intel_pmc_core intel_vsec pmt_telemetry pmt_class acpi_pad acpi_tad sg evdev nfsd parport_pc nf_tables auth_rpcgss nfs_acl ppdev lockd grace lp nfnetlink parport fuse loop efi_pstore dm_mod sunrpc configfs ip_tables x_tables autofs4 cdc_ether usbnet mii btrfs blake2b_generic efivarfs raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor uas usb_storage raid6_pq libcrc32c crc32c_generic raid1 raid0 md_mod hid_generic usbhid hid [ 3718.137957] sr_mod cdrom nvme nvme_core t10_pi ast ahci ixgbe i2c_algo_bit libahci drm_shmem_helper xhci_pci crc64_rocksoft xfrm_algo libata drm_kms_helper crc64 xhci_hcd dca mdio_devres crc_t10dif scsi_mod intel_lpss_pci crct10dif_generic i2c_i801 crc32_pclmul video usbcore libphy drm crct10dif_pclmul intel_lpss igc crc32c_intel i2c_smbus scsi_common mdio usb_common vmd wmi fan crct10dif_common idma64 pinctrl_alderlake button [ 3718.138083] CR2: 0000000000000018 [ 3718.138089] ---[ end trace 0000000000000000 ]--- [ 3741.360694] rcu: #011(detected by 25 [ 3741.360672] rcu: #0118-...!: (0 ticks this GP) idle=0d94/1/0x4000000000000004 softirq=106413/106413 fqs=11 [ 3741.360712] Sending NMI from CPU 25 to CPUs 8: [ 3741.360631] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: [ 3741.360743] Hardware name: ASUSTeK COMPUTER INC. System Product Name/Pro WS W680-ACE IPMI [ 3741.360737] NMI backtrace for cpu 8 [ 3741.360744] RIP: 0010:memchr+0x5/0x30 [ 3741.360756] RSP: 0018:ffffa7ce003609d0 EFLAGS: 00000097 [ 3741.360739] CPU: 8 PID: 0 Comm: swapper/8 Tainted: G D 6.9.7 #2 [ 3741.360754] Code: cc cc cc cc 48 89 fb 48 89 d8 5b 5d 41 5c 41 5d c3 cc cc cc cc 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 48 01 fa eb 0c <48> 8d 47 01 40 38 37 74 0f 48 89 c7 48 39 d7 75 ef 31 c0 c3 cc cc [ 3741.360764] FS: 0000000000000000(0000) GS:ffff93c37f400000(0000) knlGS:0000000000000000 [ 3741.360760] RDX: ffff93c3fff6eb0c RSI: 000000000000000a RDI: ffff93c3fff6eae9 [ 3741.360762] R10: 00003fffffffffff R11: ffff93c3fff3c8a0 R12: 0000000000000024 [ 3741.360765] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3741.360767] PKRU: 55555554 [ 3741.360759] RAX: ffff93c3fff6eae9 RBX: 0000000000000001 RCX: 0000000000000000 [ 3741.360761] RBP: 00000000ffffe0b4 R08: fffffffffffc3320 R09: ffffa7ce00360a08 [ 3741.360763] R13: 00000000000000b4 R14: ffffffff96f0bd20 R15: ffff93c3fff6eae8 [ 3741.360766] CR2: 0000000000000018 CR3: 00000001bddfc005 CR4: 0000000000770ef0 [ 3741.360768] Call Trace: [ 3741.360770] [ 3741.360774] ? nmi_cpu_backtrace+0x95/0x110 [ 3741.360778] ? nmi_cpu_backtrace_handler+0xd/0x20 [ 3741.360783] ? nmi_handle+0x5a/0x150 [ 3741.360787] ? default_do_nmi+0x40/0x100 [ 3741.360792] ? exc_nmi+0x11e/0x1a0 [ 3741.360794] ? end_repeat_nmi+0xf/0x53 [ 3741.360799] ? memchr+0x5/0x30 [ 3741.360801] ? memchr+0x5/0x30 [ 3741.360803] ? memchr+0x5/0x30 [ 3741.360804] [ 3741.360805] [ 3741.360805] _prb_read_valid+0x1d8/0x310 [ 3741.360810] prb_read_valid_info+0x41/0x60 [ 3741.360811] find_first_fitting_seq+0xd5/0x1b0 [ 3741.360815] kmsg_dump_get_buffer+0xe8/0x1d0 [ 3741.360818] pstore_dump+0x171/0x370 [ 3741.360825] kmsg_dump+0x43/0x60 [ 3741.360827] oops_end+0x68/0xe0 [ 3741.360829] page_fault_oops+0x19d/0x560 [ 3741.360832] ? __slab_free+0xdf/0x2f0 [ 3741.360840] exc_page_fault+0x72/0x170 [ 3741.360845] asm_exc_page_fault+0x22/0x30 [ 3741.360848] RIP: 0010:btrfs_clone_write_end_io+0x1e/0x60 [btrfs] [ 3741.360952] Code: 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f 44 00 00 55 53 48 8b 6f 40 48 89 fb 80 7f 19 00 48 8b 45 20 75 27 80 7f 10 07 74 13 <48> 8b 78 18 e8 a9 0d 39 d4 48 89 df 5b 5d e9 4f 09 39 d4 48 8b 57 [ 3741.360953] RSP: 0018:ffffa7ce00360e80 EFLAGS: 00010097 [ 3741.360954] RAX: 0000000000000000 RBX: ffff93a999c31900 RCX: ffff93a4a50c03b0 [ 3741.360954] RDX: ffff93a480df4d40 RSI: ffff93a999c31900 RDI: ffff93a999c31900 [ 3741.360955] RBP: ffff93a9766f8598 R08: ffff93a925547000 R09: 0000000080080007 [ 3741.360956] R10: 0000000080080007 R11: ffffa7ce00360ff8 R12: 0000000000000000 [ 3741.360957] R13: ffff93a999c31900 R14: 0000000000004000 R15: 0000000000004000 [ 3741.360960] blk_update_request+0x110/0x470 [ 3741.360965] ? kfree+0x24f/0x290 [ 3741.360967] blk_mq_end_request+0x18/0x30 [ 3741.360969] nvme_poll_cq+0x18f/0x360 [nvme] [ 3741.360976] nvme_irq+0x3e/0x80 [nvme] [ 3741.360980] __handle_irq_event_percpu+0x43/0x1a0 [ 3741.360983] handle_irq_event+0x34/0x70 [ 3741.360985] handle_edge_irq+0x87/0x220 [ 3741.360990] __common_interrupt+0x38/0xa0 [ 3741.360992] common_interrupt+0x7c/0xa0 [ 3741.360996] [ 3741.360996] [ 3741.360997] asm_common_interrupt+0x22/0x40 [ 3741.360999] RIP: 0010:cpuidle_enter_state+0xc8/0x430 [ 3741.361000] Code: 4e 44 54 ff e8 a9 f1 ff ff 8b 53 04 49 89 c5 0f 1f 44 00 00 31 ff e8 27 53 53 ff 45 84 ff 0f 85 50 02 00 00 fb 0f 1f 44 00 00 <45> 85 f6 0f 88 81 01 00 00 49 63 d6 48 8d 04 52 48 8d 04 82 49 8d [ 3741.361002] RSP: 0018:ffffa7ce001d3e90 EFLAGS: 00000246 [ 3741.361003] RAX: ffff93c37f400000 RBX: ffff93c37f43f4a0 RCX: 000000000000001f [ 3741.361003] RDX: 0000000000000008 RSI: 0000000028291fdf RDI: 0000000000000000 [ 3741.361004] RBP: 0000000000000002 R08: 0000000000000000 R09: 000000000000004e [ 3741.361005] R10: 0000000000000018 R11: ffff93c37f433ce4 R12: ffffffff965a2c80 [ 3741.361005] R13: 00000361b240a0fa R14: 0000000000000002 R15: 0000000000000000 [ 3741.361007] cpuidle_enter+0x29/0x40 [ 3741.361012] do_idle+0x1e7/0x240 [ 3741.361016] cpu_startup_entry+0x25/0x30 [ 3741.361018] start_secondary+0x118/0x140 [ 3741.361021] common_startup_64+0x13e/0x141 [ 3741.361025] [ 3742.257557] RIP: 0010:btrfs_clone_write_end_io+0x1e/0x60 [btrfs] [ 3742.279785] Code: 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f 44 00 00 55 53 48 8b 6f 40 48 89 fb 80 7f 19 00 48 8b 45 20 75 27 80 7f 10 07 74 13 <48> 8b 78 18 e8 a9 0d 39 d4 48 89 df 5b 5d e9 4f 09 39 d4 48 8b 57 [ 3742.280179] RSP: 0018:ffffa7ce00360e80 EFLAGS: 00010097 [ 3742.280565] RAX: 0000000000000000 RBX: ffff93a999c31900 RCX: ffff93a4a50c03b0 [ 3742.280954] RDX: ffff93a480df4d40 RSI: ffff93a999c31900 RDI: ffff93a999c31900 [ 3742.281344] RBP: ffff93a9766f8598 R08: ffff93a925547000 R09: 0000000080080007 [ 3742.281744] R10: 0000000080080007 R11: ffffa7ce00360ff8 R12: 0000000000000000 [ 3742.282135] R13: ffff93a999c31900 R14: 0000000000004000 R15: 0000000000004000 [ 3742.282517] FS: 0000000000000000(0000) GS:ffff93c37f400000(0000) knlGS:0000000000000000 [ 3742.282898] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3742.283268] CR2: 0000000000000018 CR3: 00000001bddfc005 CR4: 0000000000770ef0 [ 3742.283635] PKRU: 55555554 [ 3742.283995] Kernel panic - not syncing: Fatal exception in interrupt [ 3742.284361] Kernel Offset: 0x13800000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) [ 3745.782698] ---[ end Kernel panic - not syncing: Fatal exception in interrupt ]--- [ 15.181985] netconsole-setup: Test log message to verify netconsole configuration. [ 15.467680] NFSD: Using nfsdcld client tracking operations. [ 15.468142] NFSD: no clients to reclaim . From: Aleksandr Mishin To: Jiri Pirko CC: Aleksandr Mishin , Ido Schimmel , Petr Machata , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , Subject: [PATCH net] mlxsw: core_linecards: Fix double memory deallocation in case of invalid INI file Date: Tue, 2 Jul 2024 13:33:52 +0300 Message-ID: <20240702103352.15315-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186273 [Jul 02 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;t-argos.ru:7.1.1;127.0.0.199:7.1.2;mx1.t-argos.ru.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/02 10:26:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/02 07:20:00 #25796017 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265110 org.kernel.vger.netdev:355458 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In case of invalid INI file mlxsw_linecard_types_init() deallocates memory but doesn't reset pointer to NULL and returns 0. In case of any error occured after mlxsw_linecard_types_init() call, mlxsw_linecards_init() calls mlxsw_linecard_types_fini() which perform memory deallocation again. Add pointer reset to NULL. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: b217127e5e4e ("mlxsw: core_linecards: Add line card objects and implement provisioning") Signed-off-by: Aleksandr Mishin --- drivers/net/ethernet/mellanox/mlxsw/core_linecards.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c b/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c index 025e0db983fe..b032d5a4b3b8 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c @@ -1484,6 +1484,7 @@ static int mlxsw_linecard_types_init(struct mlxsw_core *mlxsw_core, vfree(types_info->data); err_data_alloc: kfree(types_info); + linecards->types_info = NULL; return err; } -- 2.30.2 . From: Richard Fitzgerald To: CC: , , , , "Richard Fitzgerald" Subject: [PATCH] firmware: cs_dsp: Don't allow writes to read-only controls Date: Tue, 2 Jul 2024 12:08:09 +0100 Message-ID: <20240702110809.16836-1-rf@opensource.cirrus.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265131 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add a check to cs_dsp_coeff_write_ctrl() to abort if the control is not writeable. The cs_dsp code originated as an ASoC driver (wm_adsp) where all controls were exported as ALSA controls. It relied on ALSA to enforce the read-only permission. Now that the code has been separated from ALSA/ASoC it must perform its own permission check. This isn't currently causing any problems so there shouldn't be any need to backport this. If the client of cs_dsp exposes the control as an ALSA control, it should set permissions on that ALSA control to protect it. The few uses of cs_dsp_coeff_write_ctrl() inside drivers are for writable controls. Signed-off-by: Richard Fitzgerald --- drivers/firmware/cirrus/cs_dsp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c index 16484ab9b09d..be8747d227db 100644 --- a/drivers/firmware/cirrus/cs_dsp.c +++ b/drivers/firmware/cirrus/cs_dsp.c @@ -796,6 +796,9 @@ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, lockdep_assert_held(&ctl->dsp->pwr_lock); + if (ctl->flags && !(ctl->flags & WMFW_CTL_FLAG_WRITEABLE)) + return -EPERM; + if (len + off * sizeof(u32) > ctl->len) return -EINVAL; -- 2.39.2 . From: Aleksandr Mishin To: Michael Walle CC: Aleksandr Mishin , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , Subject: [PATCH net] net: phy: mscc-miim: Validate bus frequency obtained from Device Tree Date: Tue, 2 Jul 2024 14:06:50 +0300 Message-ID: <20240702110650.17563-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186273 [Jul 02 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;mx1.t-argos.ru.ru:7.1.1;t-argos.ru:7.1.1;127.0.0.199:7.1.2, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/02 10:26:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/02 07:20:00 #25796017 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265133 org.kernel.vger.netdev:355460 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In mscc_miim_clk_set() miim->bus_freq is taken from Device Tree and can contain any value in case of any error or broken DT. A value of 2147483648 multiplied by 2 will result in an overflow and division by 0. Add bus frequency value check to avoid overflow. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: bb2a1934ca01 ("net: phy: mscc-miim: add support to set MDIO bus frequency") Signed-off-by: Aleksandr Mishin --- drivers/net/mdio/mdio-mscc-miim.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c index c29377c85307..6380c22567ea 100644 --- a/drivers/net/mdio/mdio-mscc-miim.c +++ b/drivers/net/mdio/mdio-mscc-miim.c @@ -254,6 +254,11 @@ static int mscc_miim_clk_set(struct mii_bus *bus) if (!miim->bus_freq) return 0; + if (miim->bus_freq == 2147483648) { + dev_err(&bus->dev, "Incorrect bus frequency\n"); + return -EINVAL; + } + rate = clk_get_rate(miim->clk); div = DIV_ROUND_UP(rate, 2 * miim->bus_freq) - 1; -- 2.30.2 . From: Chris Lu To: Marcel Holtmann , Johan Hedberg , Luiz Von Dentz CC: Sean Wang , Aaron Hou , Steve Lee , linux-bluetooth , linux-kernel , linux-mediatek , Chris Lu Subject: [PATCH v6 0/8] Bluetooth: btmtk: MediaTek ISO data transmission support Date: Tue, 2 Jul 2024 19:30:43 +0800 Message-ID: <20240702113051.24372-1-chris.lu@mediatek.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265145 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-bluetooth Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Since SIG has not yet clearly defined the specification for ISO data transmission over USB, MediaTek has adopted a method of adding an additional interrupt endpoint for ISO data transmission. This approach differs from the current method used in the Bluetooth upstream driver, which utilizes existing bulk endpoints. The interrupt endpoint provides guaranteed bandwidth, sufficient maximum data length for ISO packets and error checking. Driver sets up ISO interface and endpoints in btusb_mtk_setup and clears the setup in btusb_mtk_shutdown. These flow can't move to btmtk.c due to btusb_driver is only defined in btusb.c when claiming/relaesing interface. Once ISO interface is claimed, driver can use specific interrupt endpoint to send and receive iso data. ISO packet anchor stops when driver suspending and resubmit interrupt urb for ISO data when driver resuming. --- Change from v5 to v6: fix test bot report error -move usb.h declaration position to each c file. -fix returned value in btmtk.h when returning a pointer. -simplify commit message to avoid word number limitation. --- Chris Lu (8): Bluetooth: btusb: mediatek: remove the unnecessary goto tag Bluetooth: btusb: mediatek: return error for failed reg access Bluetooth: btmtk: rename btmediatek_data Bluetooth: btusb: add callback function in btusb suspend/resume Bluetooth: btmtk: move btusb_mtk_hci_wmt_sync to btmtk.c Bluetooth: btmtk: move btusb_mtk_[setup, shutdown] to btmtk.c Bluetooth: btmtk: move btusb_recv_acl_mtk to btmtk.c Bluetooth: btusb: mediatek: add ISO data transmission functions drivers/bluetooth/btmtk.c | 1059 ++++++++++++++++++++++++++++++++- drivers/bluetooth/btmtk.h | 91 ++- drivers/bluetooth/btmtksdio.c | 1 + drivers/bluetooth/btmtkuart.c | 1 + drivers/bluetooth/btusb.c | 751 +++-------------------- 5 files changed, 1219 insertions(+), 684 deletions(-) -- 2.18.0 . From: Robin Murphy To: Will Deacon , Joerg Roedel Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, Rob Herring , Saravana Kannan , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , "Rafael J. Wysocki" , Len Brown , Jean-Philippe Brucker , Andy Shevchenko , Yong Wu Subject: [PATCH v3 0/5] iommu: Remove iommu_fwspec ops Date: Tue, 2 Jul 2024 12:40:46 +0100 Message-Id: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265157 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-acpi,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail v2: https://lore.kernel.org/linux-iommu/cover.1718994350.git.robin.murphy@arm.com/ Hi all, Just a quick update with an extra patch to avoid the mediatek-v1 driver breaking (and I have now build-tested ARCH=arm to make sure, apologies for being lazy before...) Thanks, Robin. Robin Murphy (5): iommu/mediatek-v1: Clean up redundant fwspec checks iommu: Resolve fwspec ops automatically ACPI: Retire acpi_iommu_fwspec_ops() OF: Simplify of_iommu_configure() iommu: Remove iommu_fwspec ops drivers/acpi/arm64/iort.c | 19 +++------- drivers/acpi/scan.c | 36 +++++-------------- drivers/acpi/viot.c | 11 ++---- drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 +- drivers/iommu/iommu-priv.h | 7 ++++ drivers/iommu/iommu.c | 20 +++++------ drivers/iommu/mtk_iommu_v1.c | 12 ++----- drivers/iommu/of_iommu.c | 50 ++++++++++----------------- drivers/iommu/tegra-smmu.c | 2 +- drivers/of/device.c | 30 ++++++---------- include/acpi/acpi_bus.h | 3 +- include/linux/iommu.h | 15 ++------ 12 files changed, 67 insertions(+), 141 deletions(-) -- 2.39.2.101.g768bb238c484.dirty . From: Bartosz Golaszewski To: Dmitry Baryshkov , Krzysztof Kozlowski , Amit Pundir Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH] power: sequencing: qcom-wcn: don't request BT enable GPIOs for wcn7850 Date: Tue, 2 Jul 2024 13:41:03 +0200 Message-ID: <20240702114103.16068-1-brgl@bgdev.pl> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265160 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Bartosz Golaszewski Due to having many existing users of wcn7850 in the kernel, conversion of the hci_qca driver to using pwrseq exclusively must be done carefully. Right now, the Bluetooth driver requests and controls the BT enable GPIO and so the PMU pwrseq driver must not do it or we will run into problems depending on the probe ordering. Add a flag that tells the driver not to request the BT-enable GPIO. We will remove it once the conversion of the Bluetooth driver is complete. Signed-off-by: Bartosz Golaszewski --- drivers/power/sequencing/pwrseq-qcom-wcn.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/power/sequencing/pwrseq-qcom-wcn.c b/drivers/power/sequencing/pwrseq-qcom-wcn.c index 42dacfda745e..68bcd6ec4269 100644 --- a/drivers/power/sequencing/pwrseq-qcom-wcn.c +++ b/drivers/power/sequencing/pwrseq-qcom-wcn.c @@ -22,6 +22,7 @@ struct pwrseq_qcom_wcn_pdata { size_t num_vregs; unsigned int pwup_delay_ms; unsigned int gpio_enable_delay_ms; + bool no_bt_gpio; }; struct pwrseq_qcom_wcn_ctx { @@ -212,6 +213,11 @@ static const struct pwrseq_qcom_wcn_pdata pwrseq_wcn7850_of_data = { .vregs = pwrseq_wcn7850_vregs, .num_vregs = ARRAY_SIZE(pwrseq_wcn7850_vregs), .pwup_delay_ms = 50, + /* + * FIXME: Remove it once the entire hci_qca driver is converted to + * using the power sequencer. + */ + .no_bt_gpio = true, }; static int pwrseq_qcom_wcn_match(struct pwrseq_device *pwrseq, @@ -277,10 +283,13 @@ static int pwrseq_qcom_wcn_probe(struct platform_device *pdev) return dev_err_probe(dev, ret, "Failed to get all regulators\n"); - ctx->bt_gpio = devm_gpiod_get_optional(dev, "bt-enable", GPIOD_OUT_LOW); - if (IS_ERR(ctx->bt_gpio)) - return dev_err_probe(dev, PTR_ERR(ctx->bt_gpio), - "Failed to get the Bluetooth enable GPIO\n"); + if (!ctx->pdata->no_bt_gpio) { + ctx->bt_gpio = devm_gpiod_get_optional(dev, "bt-enable", + GPIOD_OUT_LOW); + if (IS_ERR(ctx->bt_gpio)) + return dev_err_probe(dev, PTR_ERR(ctx->bt_gpio), + "Failed to get the Bluetooth enable GPIO\n"); + } ctx->wlan_gpio = devm_gpiod_get_optional(dev, "wlan-enable", GPIOD_OUT_LOW); -- 2.43.0 . Message-ID: <5866a20e-4b36-4eb9-b589-8135f86ceb6a@gmail.com> Date: Tue, 2 Jul 2024 20:42:44 +0900 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Language: en-US To: "Paul E. McKenney" , Will Deacon Cc: Alan Stern , Andrea Parri , Peter Zijlstra , Boqun Feng , Nicholas Piggin , David Howells , Jade Alglave , Luc Maranget , Daniel Lustig , Joel Fernandes , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Akira Yokosawa From: Akira Yokosawa Subject: [PATCH lkmm] docs/memory-barriers.txt: Remove left-over references to "CACHE COHERENCY" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265167 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arch Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Commit 8ca924aeb4f2 ("Documentation/barriers: Remove references to [smp_]read_barrier_depends()") removed the entire section of "CACHE COHERENCY", without getting rid of its traces. Remove them. Signed-off-by: Akira Yokosawa Cc: Will Deacon --- Documentation/memory-barriers.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 4202174a6262..93d58d9a428b 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt @@ -88,7 +88,6 @@ CONTENTS (*) The effects of the cpu cache. - - Cache coherency. - Cache coherency vs DMA. - Cache coherency vs MMIO. @@ -677,8 +676,6 @@ include/linux/rcupdate.h. This permits the current target of an RCU'd pointer to be replaced with a new modified target, without the replacement target appearing to be incompletely initialised. -See also the subsection on "Cache Coherency" for a more thorough example. - CONTROL DEPENDENCIES -------------------- base-commit: 7579cedf8efed9a05b2537f4c276571e4753a907 -- 2.34.1 . Return-Path: From: Thomas Bonnefille Subject: [PATCH 0/3] Add SARADC support on Sophgo SoC Date: Tue, 02 Jul 2024 13:52:20 +0200 Message-Id: <20240702-sg2002-adc-v1-0-ac66e076a756@bootlin.com> MIME-Version: 1.0 To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen Wang , Inochi Amaoto , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Thomas Petazzoni , =?utf-8?q?Miqu=C3=A8l_Raynal?= , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Thomas Bonnefille X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79283 org.kernel.vger.linux-kernel:1265169 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-iio,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patchset adds initial ADC support for Sophgo SoC. This driver can work with or without interrupt and in "Active" and "No-Die" domains depending on if a clock is provided. Link: https://github.com/sophgo/sophgo-doc/releases/download/sg2002-trm-v1.0/sg2002_trm_en.pdf Signed-off-by: Thomas Bonnefille --- Thomas Bonnefille (3): dt-bindings: iio: adc: sophgo,cv18xx-saradc.yaml: Add Sophgo SARADC binding documentation iio: adc: sophgo-saradc: Add driver for Sophgo SARADC riscv: dts: sophgo: Add SARADC configuration .../bindings/iio/adc/sophgo,cv18xx-saradc.yaml | 51 +++++ MAINTAINERS | 6 + arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 14 ++ drivers/iio/adc/Kconfig | 9 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/sophgo-adc.c | 223 +++++++++++++++++++++ 6 files changed, 304 insertions(+) --- base-commit: be18997d95c888e7a432d46045644f396286775b change-id: 20240527-sg2002-adc-924b862cd3f2 Best regards, -- Thomas Bonnefille _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Abhash Jha To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, lars@metafoo.de, linux-kernel@vger.kernel.org, Abhash Jha Subject: [PATCH] iio: light: apds9960: Add proximity and gesture offset calibration Date: Tue, 2 Jul 2024 17:26:48 +0530 Message-ID: <20240702115648.160511-1-abhashkumarjha123@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265178 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Proximity and gesture offset registers perform offset correction to improve cross-talk performance. Add support for reading from and writing to proximity and gesture offset registers. Create sysfs attributes for them via iio to expose them to userspace. Signed-off-by: Abhash Jha --- drivers/iio/light/apds9960.c | 245 +++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c index 1065a340b..bccf9a8c7 100644 --- a/drivers/iio/light/apds9960.c +++ b/drivers/iio/light/apds9960.c @@ -101,6 +101,10 @@ #define APDS9960_MAX_ALS_THRES_VAL 0xffff #define APDS9960_MAX_INT_TIME_IN_US 1000000 +/* MIN and MAX offset from pg: 26 of the datasheet */ +#define MIN_OFFSET -127 +#define MAX_OFFSET 127 + enum apds9960_als_channel_idx { IDX_ALS_CLEAR, IDX_ALS_RED, IDX_ALS_GREEN, IDX_ALS_BLUE, }; @@ -316,6 +320,234 @@ static const struct iio_chan_spec apds9960_channels[] = { APDS9960_INTENSITY_CHANNEL(BLUE), }; +static ssize_t apds9960_proximity_offset_ur_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + if (kstrtoint(buf, 10, &offset)) + return -EINVAL; + + if (offset < MIN_OFFSET || offset > MAX_OFFSET) + return -EINVAL; + + ret = regmap_write(data->regmap, APDS9960_REG_POFFSET_UR, offset); + if (ret < 0) { + dev_err(&data->client->dev, "proximity offset reg write failed\n"); + return ret; + } + + return count; +} + +static ssize_t apds9960_proximity_offset_dl_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + if (kstrtoint(buf, 10, &offset)) + return -EINVAL; + + if (offset < MIN_OFFSET || offset > MAX_OFFSET) + return -EINVAL; + + ret = regmap_write(data->regmap, APDS9960_REG_POFFSET_DL, offset); + if (ret < 0) { + dev_err(&data->client->dev, "proximity offset reg write failed\n"); + return ret; + } + + return count; +} + +static ssize_t apds9960_proximity_offset_ur_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + ret = regmap_read(data->regmap, APDS9960_REG_POFFSET_UR, &offset); + if (ret < 0) { + dev_err(&data->client->dev, "proximity offset reg read failed\n"); + return ret; + } + + return scnprintf(buf, PAGE_SIZE, "%d\n", offset); +} + +static ssize_t apds9960_proximity_offset_dl_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + ret = regmap_read(data->regmap, APDS9960_REG_POFFSET_DL, &offset); + if (ret < 0) { + dev_err(&data->client->dev, "proximity offset reg read failed\n"); + return ret; + } + + return scnprintf(buf, PAGE_SIZE, "%d\n", offset); +} + +static ssize_t apds9960_gesture_offset_u_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + if (kstrtoint(buf, 10, &offset)) + return -EINVAL; + + if (offset < MIN_OFFSET || offset > MAX_OFFSET) + return -EINVAL; + + ret = regmap_write(data->regmap, APDS9960_REG_GOFFSET_U, offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg write failed\n"); + return ret; + } + + return count; +} + +static ssize_t apds9960_gesture_offset_d_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + if (kstrtoint(buf, 10, &offset)) + return -EINVAL; + + if (offset < MIN_OFFSET || offset > MAX_OFFSET) + return -EINVAL; + + ret = regmap_write(data->regmap, APDS9960_REG_GOFFSET_D, offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg write failed\n"); + return ret; + } + + return count; +} + +static ssize_t apds9960_gesture_offset_l_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + if (kstrtoint(buf, 10, &offset)) + return -EINVAL; + + if (offset < MIN_OFFSET || offset > MAX_OFFSET) + return -EINVAL; + + ret = regmap_write(data->regmap, APDS9960_REG_GOFFSET_L, offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg write failed\n"); + return ret; + } + + return count; +} + +static ssize_t apds9960_gesture_offset_r_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + if (kstrtoint(buf, 10, &offset)) + return -EINVAL; + + if (offset < MIN_OFFSET || offset > MAX_OFFSET) + return -EINVAL; + + ret = regmap_write(data->regmap, APDS9960_REG_GOFFSET_R, offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg write failed\n"); + return ret; + } + + return count; +} + +static ssize_t apds9960_gesture_offset_u_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + ret = regmap_read(data->regmap, APDS9960_REG_GOFFSET_U, &offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg read failed\n"); + return ret; + } + + return scnprintf(buf, PAGE_SIZE, "%d\n", offset); +} + +static ssize_t apds9960_gesture_offset_d_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + ret = regmap_read(data->regmap, APDS9960_REG_GOFFSET_D, &offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg read failed\n"); + return ret; + } + + return scnprintf(buf, PAGE_SIZE, "%d\n", offset); +} + +static ssize_t apds9960_gesture_offset_l_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + ret = regmap_read(data->regmap, APDS9960_REG_GOFFSET_L, &offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg read failed\n"); + return ret; + } + + return scnprintf(buf, PAGE_SIZE, "%d\n", offset); +} + +static ssize_t apds9960_gesture_offset_r_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct apds9960_data *data = iio_priv(indio_dev); + int offset; + int ret; + + ret = regmap_read(data->regmap, APDS9960_REG_GOFFSET_R, &offset); + if (ret < 0) { + dev_err(&data->client->dev, "gesture offset reg read failed\n"); + return ret; + } + + return scnprintf(buf, PAGE_SIZE, "%d\n", offset); +} + /* integration time in us */ static const int apds9960_int_time[][2] = { { 28000, 246}, @@ -332,10 +564,23 @@ static IIO_CONST_ATTR(proximity_scale_available, "1 2 4 8"); static IIO_CONST_ATTR(intensity_scale_available, "1 4 16 64"); static IIO_CONST_ATTR_INT_TIME_AVAIL("0.028 0.1 0.2 0.7"); +static IIO_DEVICE_ATTR(proximity_offset_ur, S_IRUGO | S_IWUSR, apds9960_proximity_offset_ur_show, apds9960_proximity_offset_ur_store, 0); +static IIO_DEVICE_ATTR(proximity_offset_dl, S_IRUGO | S_IWUSR, apds9960_proximity_offset_dl_show, apds9960_proximity_offset_dl_store, 0); +static IIO_DEVICE_ATTR(gesture_offset_u, S_IRUGO | S_IWUSR, apds9960_gesture_offset_u_show, apds9960_gesture_offset_u_store, 0); +static IIO_DEVICE_ATTR(gesture_offset_d, S_IRUGO | S_IWUSR, apds9960_gesture_offset_d_show, apds9960_gesture_offset_d_store, 0); +static IIO_DEVICE_ATTR(gesture_offset_l, S_IRUGO | S_IWUSR, apds9960_gesture_offset_l_show, apds9960_gesture_offset_l_store, 0); +static IIO_DEVICE_ATTR(gesture_offset_r, S_IRUGO | S_IWUSR, apds9960_gesture_offset_r_show, apds9960_gesture_offset_r_store, 0); + static struct attribute *apds9960_attributes[] = { &iio_const_attr_proximity_scale_available.dev_attr.attr, &iio_const_attr_intensity_scale_available.dev_attr.attr, &iio_const_attr_integration_time_available.dev_attr.attr, + &iio_dev_attr_proximity_offset_ur.dev_attr.attr, + &iio_dev_attr_proximity_offset_dl.dev_attr.attr, + &iio_dev_attr_gesture_offset_u.dev_attr.attr, + &iio_dev_attr_gesture_offset_d.dev_attr.attr, + &iio_dev_attr_gesture_offset_l.dev_attr.attr, + &iio_dev_attr_gesture_offset_r.dev_attr.attr, NULL, }; -- 2.43.0 . From: Animesh Agarwal To: Cc: animeshagarwal28@gmail.com, Rob Herring , Daniel Baluta , Liam Girdwood , Mark Brown , Krzysztof Kozlowski , Conor Dooley , linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ASoC: dt-bindings: realtek,rt5645: Convert to dtschema Date: Tue, 2 Jul 2024 17:30:58 +0530 Message-ID: <20240702120106.17100-1-animeshagarwal28@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265183 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Convert the RT5650/RT5645 audio CODEC bindings to DT schema. Reviewed-by: Rob Herring (Arm) Signed-off-by: Animesh Agarwal Cc: Daniel Baluta --- Changes in v2: - Added maxItems: 1 for cbj-sleeve-gpios and hp-detect-gpios. --- .../bindings/sound/realtek,rt5645.yaml | 131 ++++++++++++++++++ .../devicetree/bindings/sound/rt5645.txt | 82 ----------- 2 files changed, 131 insertions(+), 82 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5645.yaml delete mode 100644 Documentation/devicetree/bindings/sound/rt5645.txt diff --git a/Documentation/devicetree/bindings/sound/realtek,rt5645.yaml b/Documentation/devicetree/bindings/sound/realtek,rt5645.yaml new file mode 100644 index 000000000000..13f09f1bc800 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/realtek,rt5645.yaml @@ -0,0 +1,131 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/realtek,rt5645.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: RT5650/RT5645 audio CODEC + +maintainers: + - Animesh Agarwal + +description: | + This device supports I2C only. + + Pins on the device (for linking into audio routes) for RT5645/RT5650: + * DMIC L1 + * DMIC R1 + * DMIC L2 + * DMIC R2 + * IN1P + * IN1N + * IN2P + * IN2N + * Haptic Generator + * HPOL + * HPOR + * LOUTL + * LOUTR + * PDM1L + * PDM1R + * SPOL + * SPOR + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + enum: + - realtek,rt5645 + - realtek,rt5650 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + description: The CODEC's interrupt output. + + avdd-supply: + description: Power supply for AVDD, providing 1.8V. + + cpvdd-supply: + description: Power supply for CPVDD, providing 3.5V. + + hp-detect-gpios: + description: + A GPIO spec for the external headphone detect pin. If jd-mode = 0, we + will get the JD status by getting the value of hp-detect-gpios. + maxItems: 1 + + cbj-sleeve-gpios: + description: + A GPIO spec to control the external combo jack circuit to tie the + sleeve/ring2 contacts to the ground or floating. It could avoid some + electric noise from the active speaker jacks. + maxItems: 1 + + realtek,in2-differential: + description: + Indicate MIC2 input are differential, rather than single-ended. + type: boolean + + realtek,dmic1-data-pin: + description: Specify which pin to be used as DMIC1 data pin. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: + - 0 # dmic1 is not used + - 1 # using IN2P pin as dmic1 data pin + - 2 # using GPIO6 pin as dmic1 data pin + - 3 # using GPIO10 pin as dmic1 data pin + - 4 # using GPIO12 pin as dmic1 data pin + + realtek,dmic2-data-pin: + description: Specify which pin to be used as DMIC2 data pin. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: + - 0 # dmic2 is not used + - 1 # using IN2N pin as dmic2 data pin + - 2 # using GPIO5 pin as dmic2 data pin + - 3 # using GPIO11 pin as dmic2 data pin + + realtek,jd-mode: + description: The JD mode of rt5645/rt5650. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: + - 0 # rt5645/rt5650 JD function is not used + - 1 # Mode-0 (VDD=3.3V), two port jack detection + - 2 # Mode-1 (VDD=3.3V), one port jack detection + - 3 # Mode-2 (VDD=1.8V), one port jack detection + +required: + - compatible + - reg + - interrupts + - avdd-supply + - cpvdd-supply + +unevaluatedProperties: false + +examples: + - | + #include + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + codec@1a { + compatible = "realtek,rt5650"; + reg = <0x1a>; + hp-detect-gpios = <&gpio 19 0>; + cbj-sleeve-gpios = <&gpio 20 0>; + interrupt-parent = <&gpio>; + interrupts = <7 IRQ_TYPE_EDGE_FALLING>; + avdd-supply = <&avdd_reg>; + cpvdd-supply = <&cpvdd_supply>; + realtek,jd-mode = <3>; + }; + }; diff --git a/Documentation/devicetree/bindings/sound/rt5645.txt b/Documentation/devicetree/bindings/sound/rt5645.txt deleted file mode 100644 index c1fa379f5f3e..000000000000 --- a/Documentation/devicetree/bindings/sound/rt5645.txt +++ /dev/null @@ -1,82 +0,0 @@ -RT5650/RT5645 audio CODEC - -This device supports I2C only. - -Required properties: - -- compatible : One of "realtek,rt5645" or "realtek,rt5650". - -- reg : The I2C address of the device. - -- interrupts : The CODEC's interrupt output. - -- avdd-supply: Power supply for AVDD, providing 1.8V. - -- cpvdd-supply: Power supply for CPVDD, providing 3.5V. - -Optional properties: - -- hp-detect-gpios: - a GPIO spec for the external headphone detect pin. If jd-mode = 0, - we will get the JD status by getting the value of hp-detect-gpios. - -- cbj-sleeve-gpios: - a GPIO spec to control the external combo jack circuit to tie the sleeve/ring2 - contacts to the ground or floating. It could avoid some electric noise from the - active speaker jacks. - -- realtek,in2-differential - Boolean. Indicate MIC2 input are differential, rather than single-ended. - -- realtek,dmic1-data-pin - 0: dmic1 is not used - 1: using IN2P pin as dmic1 data pin - 2: using GPIO6 pin as dmic1 data pin - 3: using GPIO10 pin as dmic1 data pin - 4: using GPIO12 pin as dmic1 data pin - -- realtek,dmic2-data-pin - 0: dmic2 is not used - 1: using IN2N pin as dmic2 data pin - 2: using GPIO5 pin as dmic2 data pin - 3: using GPIO11 pin as dmic2 data pin - --- realtek,jd-mode : The JD mode of rt5645/rt5650 - 0 : rt5645/rt5650 JD function is not used - 1 : Mode-0 (VDD=3.3V), two port jack detection - 2 : Mode-1 (VDD=3.3V), one port jack detection - 3 : Mode-2 (VDD=1.8V), one port jack detection - -Pins on the device (for linking into audio routes) for RT5645/RT5650: - - * DMIC L1 - * DMIC R1 - * DMIC L2 - * DMIC R2 - * IN1P - * IN1N - * IN2P - * IN2N - * Haptic Generator - * HPOL - * HPOR - * LOUTL - * LOUTR - * PDM1L - * PDM1R - * SPOL - * SPOR - -Example: - -codec: rt5650@1a { - compatible = "realtek,rt5650"; - reg = <0x1a>; - hp-detect-gpios = <&gpio 19 0>; - cbj-sleeve-gpios = <&gpio 20 0>; - interrupt-parent = <&gpio>; - interrupts = <7 IRQ_TYPE_EDGE_FALLING>; - realtek,dmic-en = "true"; - realtek,en-jd-func = "true"; - realtek,jd-mode = <3>; -}; -- 2.45.2 . From: Mark-PK Tsai To: Jonathan Corbet , Matthias Brugger , AngeloGioacchino Del Regno CC: , Mark-PK Tsai , , , , Subject: [PATCH] docs: iommu: Remove outdated Documentation/userspace-api/iommu.rst Date: Tue, 2 Jul 2024 20:05:39 +0800 Message-ID: <20240702120617.26882-1-mark-pk.tsai@mediatek.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265188 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-doc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The Documentation/userspace-api/iommu.rst file has become outdated due to the removal of associated structures and APIs. Specifically, struct such as iommu_cache_invalidate_info and guest pasid related uapi were removed in commit 0c9f17877891 ("iommu: Remove guest pasid related interfaces and definitions"). And the corresponding uapi/linux/iommu.h file was removed in commit 00a9bc607043 ("iommu: Move iommu fault data to linux/iommu.h"). Signed-off-by: Mark-PK Tsai --- Documentation/userspace-api/iommu.rst | 209 -------------------------- MAINTAINERS | 1 - 2 files changed, 210 deletions(-) delete mode 100644 Documentation/userspace-api/iommu.rst diff --git a/Documentation/userspace-api/iommu.rst b/Documentation/userspace-api/iommu.rst deleted file mode 100644 index d3108c1519d5..000000000000 --- a/Documentation/userspace-api/iommu.rst +++ /dev/null @@ -1,209 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0 -.. iommu: - -===================================== -IOMMU Userspace API -===================================== - -IOMMU UAPI is used for virtualization cases where communications are -needed between physical and virtual IOMMU drivers. For baremetal -usage, the IOMMU is a system device which does not need to communicate -with userspace directly. - -The primary use cases are guest Shared Virtual Address (SVA) and -guest IO virtual address (IOVA), wherein the vIOMMU implementation -relies on the physical IOMMU and for this reason requires interactions -with the host driver. - -.. contents:: :local: - -Functionalities -=============== -Communications of user and kernel involve both directions. The -supported user-kernel APIs are as follows: - -1. Bind/Unbind guest PASID (e.g. Intel VT-d) -2. Bind/Unbind guest PASID table (e.g. ARM SMMU) -3. Invalidate IOMMU caches upon guest requests -4. Report errors to the guest and serve page requests - -Requirements -============ -The IOMMU UAPIs are generic and extensible to meet the following -requirements: - -1. Emulated and para-virtualised vIOMMUs -2. Multiple vendors (Intel VT-d, ARM SMMU, etc.) -3. Extensions to the UAPI shall not break existing userspace - -Interfaces -========== -Although the data structures defined in IOMMU UAPI are self-contained, -there are no user API functions introduced. Instead, IOMMU UAPI is -designed to work with existing user driver frameworks such as VFIO. - -Extension Rules & Precautions ------------------------------ -When IOMMU UAPI gets extended, the data structures can *only* be -modified in two ways: - -1. Adding new fields by re-purposing the padding[] field. No size change. -2. Adding new union members at the end. May increase the structure sizes. - -No new fields can be added *after* the variable sized union in that it -will break backward compatibility when offset moves. A new flag must -be introduced whenever a change affects the structure using either -method. The IOMMU driver processes the data based on flags which -ensures backward compatibility. - -Version field is only reserved for the unlikely event of UAPI upgrade -at its entirety. - -It's *always* the caller's responsibility to indicate the size of the -structure passed by setting argsz appropriately. -Though at the same time, argsz is user provided data which is not -trusted. The argsz field allows the user app to indicate how much data -it is providing; it's still the kernel's responsibility to validate -whether it's correct and sufficient for the requested operation. - -Compatibility Checking ----------------------- -When IOMMU UAPI extension results in some structure size increase, -IOMMU UAPI code shall handle the following cases: - -1. User and kernel has exact size match -2. An older user with older kernel header (smaller UAPI size) running on a - newer kernel (larger UAPI size) -3. A newer user with newer kernel header (larger UAPI size) running - on an older kernel. -4. A malicious/misbehaving user passing illegal/invalid size but within - range. The data may contain garbage. - -Feature Checking ----------------- -While launching a guest with vIOMMU, it is strongly advised to check -the compatibility upfront, as some subsequent errors happening during -vIOMMU operation, such as cache invalidation failures cannot be nicely -escalated to the guest due to IOMMU specifications. This can lead to -catastrophic failures for the users. - -User applications such as QEMU are expected to import kernel UAPI -headers. Backward compatibility is supported per feature flags. -For example, an older QEMU (with older kernel header) can run on newer -kernel. Newer QEMU (with new kernel header) may refuse to initialize -on an older kernel if new feature flags are not supported by older -kernel. Simply recompiling existing code with newer kernel header should -not be an issue in that only existing flags are used. - -IOMMU vendor driver should report the below features to IOMMU UAPI -consumers (e.g. via VFIO). - -1. IOMMU_NESTING_FEAT_SYSWIDE_PASID -2. IOMMU_NESTING_FEAT_BIND_PGTBL -3. IOMMU_NESTING_FEAT_BIND_PASID_TABLE -4. IOMMU_NESTING_FEAT_CACHE_INVLD -5. IOMMU_NESTING_FEAT_PAGE_REQUEST - -Take VFIO as example, upon request from VFIO userspace (e.g. QEMU), -VFIO kernel code shall query IOMMU vendor driver for the support of -the above features. Query result can then be reported back to the -userspace caller. Details can be found in -Documentation/driver-api/vfio.rst. - - -Data Passing Example with VFIO ------------------------------- -As the ubiquitous userspace driver framework, VFIO is already IOMMU -aware and shares many key concepts such as device model, group, and -protection domain. Other user driver frameworks can also be extended -to support IOMMU UAPI but it is outside the scope of this document. - -In this tight-knit VFIO-IOMMU interface, the ultimate consumer of the -IOMMU UAPI data is the host IOMMU driver. VFIO facilitates user-kernel -transport, capability checking, security, and life cycle management of -process address space ID (PASID). - -VFIO layer conveys the data structures down to the IOMMU driver. It -follows the pattern below:: - - struct { - __u32 argsz; - __u32 flags; - __u8 data[]; - }; - -Here data[] contains the IOMMU UAPI data structures. VFIO has the -freedom to bundle the data as well as parse data size based on its own flags. - -In order to determine the size and feature set of the user data, argsz -and flags (or the equivalent) are also embedded in the IOMMU UAPI data -structures. - -A "__u32 argsz" field is *always* at the beginning of each structure. - -For example: -:: - - struct iommu_cache_invalidate_info { - __u32 argsz; - #define IOMMU_CACHE_INVALIDATE_INFO_VERSION_1 1 - __u32 version; - /* IOMMU paging structure cache */ - #define IOMMU_CACHE_INV_TYPE_IOTLB (1 << 0) /* IOMMU IOTLB */ - #define IOMMU_CACHE_INV_TYPE_DEV_IOTLB (1 << 1) /* Device IOTLB */ - #define IOMMU_CACHE_INV_TYPE_PASID (1 << 2) /* PASID cache */ - #define IOMMU_CACHE_INV_TYPE_NR (3) - __u8 cache; - __u8 granularity; - __u8 padding[6]; - union { - struct iommu_inv_pasid_info pasid_info; - struct iommu_inv_addr_info addr_info; - } granu; - }; - -VFIO is responsible for checking its own argsz and flags. It then -invokes appropriate IOMMU UAPI functions. The user pointers are passed -to the IOMMU layer for further processing. The responsibilities are -divided as follows: - -- Generic IOMMU layer checks argsz range based on UAPI data in the - current kernel version. - -- Generic IOMMU layer checks content of the UAPI data for non-zero - reserved bits in flags, padding fields, and unsupported version. - This is to ensure not breaking userspace in the future when these - fields or flags are used. - -- Vendor IOMMU driver checks argsz based on vendor flags. UAPI data - is consumed based on flags. Vendor driver has access to - unadulterated argsz value in case of vendor specific future - extensions. Currently, it does not perform the copy_from_user() - itself. A __user pointer can be provided in some future scenarios - where there's vendor data outside of the structure definition. - -IOMMU code treats UAPI data in two categories: - -- structure contains vendor data - (Example: iommu_uapi_cache_invalidate()) - -- structure contains only generic data - (Example: iommu_uapi_sva_bind_gpasid()) - - - -Sharing UAPI with in-kernel users ---------------------------------- -For UAPIs that are shared with in-kernel users, a wrapper function is -provided to distinguish the callers. For example, - -Userspace caller :: - - int iommu_uapi_sva_unbind_gpasid(struct iommu_domain *domain, - struct device *dev, - void __user *udata) - -In-kernel caller :: - - int iommu_sva_unbind_gpasid(struct iommu_domain *domain, - struct device *dev, ioasid_t ioasid); diff --git a/MAINTAINERS b/MAINTAINERS index 0748d6bd0c4f..1359ed17337e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11544,7 +11544,6 @@ L: iommu@lists.linux.dev S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git F: Documentation/devicetree/bindings/iommu/ -F: Documentation/userspace-api/iommu.rst F: drivers/iommu/ F: include/linux/iommu.h F: include/linux/iova.h -- 2.18.0 . From: Thomas Huth To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Geert Uytterhoeven Cc: linux-kernel@vger.kernel.org, David Airlie , Daniel Vetter , Javier Martinez Canillas , Thomas Huth Subject: [PATCH] drm/fbdev-dma: Fix framebuffer mode for big endian devices Date: Tue, 2 Jul 2024 14:17:37 +0200 Message-ID: <20240702121737.522878-1-thuth@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265196 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The drm_mode_legacy_fb_format() function only generates formats suitable for little endian devices. switch to drm_driver_legacy_fb_format() here instead to take the device endianness into consideration, too. Suggested-by: Thomas Zimmermann Signed-off-by: Thomas Huth --- Note: Patch has only been compile-tested since I lack an environment for testing it. But it's the same fix as I required for the drm_mode_legacy_fb_format() in drm_fbdev_generic.c / drm_fbdev_ttm.c so I think this should be fine. drivers/gpu/drm/drm_fbdev_dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c index 97ef6300d47e..fdef4a2f883f 100644 --- a/drivers/gpu/drm/drm_fbdev_dma.c +++ b/drivers/gpu/drm/drm_fbdev_dma.c @@ -101,7 +101,8 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, sizes->surface_width, sizes->surface_height, sizes->surface_bpp); - format = drm_mode_legacy_fb_format(sizes->surface_bpp, sizes->surface_depth); + format = drm_driver_legacy_fb_format(dev, sizes->surface_bpp, + sizes->surface_depth); buffer = drm_client_framebuffer_create(client, sizes->surface_width, sizes->surface_height, format); if (IS_ERR(buffer)) -- 2.45.2 . From: Sandor Yu To: dmitry.baryshkov@linaro.org, andrzej.hajda@intel.com, neil.armstrong@linaro.org, Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, airlied@gmail.com, daniel@ffwll.ch, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, vkoul@kernel.org, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, mripard@kernel.org Cc: kernel@pengutronix.de, linux-imx@nxp.com, Sandor.yu@nxp.com, oliver.brown@nxp.com, alexander.stein@ew.tq-group.com, sam@ravnborg.org Subject: [PATCH v16 0/8] Initial support Cadence MHDP8501(HDMI/DP) for i.MX8MQ Date: Tue, 2 Jul 2024 20:22:32 +0800 Message-Id: Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265197 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patchset sits on top Dmitry's 'make use of the HDMI connector infrastructure' patchset ([2]). The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale i.MX8MQ. The patch set compose of DRM bridge drivers and PHY driver. Both of them need by patch #1 and #2 to pass build. DRM bridges driver patches: #1: drm: bridge: Cadence: Creat mhdp helper driver #2: phy: Add HDMI configuration options #3: dt-bindings: display: bridge: Add Cadence MHDP8501 #4: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver PHY driver patches: #1: drm: bridge: Cadence: Creat mhdp helper driver #2: phy: Add HDMI configuration options #5: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #6: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ i.MX8M/TQMa8Mx DT patches: #7: Add DT nodes for DCSS/HDMI pipeline #8: Enable HDMI for TQMa8Mx/MBa8Mx [2] https://patchwork.freedesktop.org/series/130888/ v15->v16: Patch #2: - Remove pixel_clk_rate, bpc and color_space fields from struct phy_configure_opts_hdmi, they were replaced by unsigned long long tmds_char_rate. - Remove r-b and a-c tags because this patch have important change. Patch #4: - Add DRM_BRIDGE_OP_HDMI flags for HDMI driver, - Introduce the hdmi info frame helper functions, added hdmi_clear_infoframe(), hdmi_write_infoframe() and hdmi_tmds_char_rate_valid() according Dmitry's patch 'make use of the HDMI connector infrastructure' patchset ([2]). - mode_fixup() is replaced by atomic_check(). - Fix video mode 4Kp30 did not work on some displays that support LTE_340Mcsc_scramble. - updated for tmds_char_rate added in patch #2. Patch #6: - updated for tmds_char_rate added in patch #2. v14->v15: Patch #6 + #7: - Merged PHY driver into a single combo PHY driver Patch #7 + #8: - Add DT patches for a running HDMI setup v13->v14: Patch #4: - Rebase to next-20240219, replace get_edid function by edid_read function as commits d807ad80d811b ("drm/bridge: add ->edid_read hook and drm_bridge_edid_read()") and 27b8f91c08d99 ("drm/bridge: remove ->get_edid callback") had change the API. v12->v13: Patch #4: - Explicitly include linux/platform_device.h for cdns-mhdp8501-core.c - Fix build warning - Order bit bpc and color_space in descending shit. Patch #7: - Fix build warning v11->v12: Patch #1: - Move status initialize out of mbox_mutex. - Reorder API functions in alphabetical. - Add notes for malibox access functions. - Add year 2024 to copyright. Patch #4: - Replace DRM_INFO with dev_info or dev_warn. - Replace DRM_ERROR with dev_err. - Return ret when cdns_mhdp_dpcd_read failed in function cdns_dp_aux_transferi(). - Remove unused parmeter in function cdns_dp_get_msa_misc and use two separate variables for color space and bpc. - Add year 2024 to copyright. Patch #6: - Return error code to replace -1 for function wait_for_ack(). - Set cdns_phy->power_up = false in phy_power_down function. - Remove "RATE_8_1 = 810000", it is not used in driver. - Add year 2024 to copyright. Patch #7: - Adjust clk disable order. - Return error code to replace -1 for function wait_for_ack(). - Use bool for variable pclk_in. - Add year 2024 to copyright. v10->v11: - rewrite cdns_mhdp_set_firmware_active() in mhdp8546 core driver, use cdns_mhdp_mailbox_send() to replace cdns_mhdp_mailbox_write() same as the other mailbox access functions. - use static for cdns_mhdp_mailbox_write() and cdns_mhdp_mailbox_read() and remove them from EXPORT_SYMBOL_GPL(). - remove MODULE_ALIAS() from mhdp8501 driver. v9->v10: - Create mhdp helper driver to replace macro functions, move all mhdp mailbox access functions and common functions into the helper driver. Patch #1:drm: bridge: Cadence: Creat mhdp helper driver it is totaly different with v9. v8->v9: - Remove compatible string "cdns,mhdp8501" that had removed from dt-bindings file in v8. - Add Dmitry's R-b tag to patch #2 - Add Krzysztof's R-b tag to patch #3 v7->v8: MHDP8501 HDMI/DP: - Correct DT node name to "display-bridge". - Remove "cdns,mhdp8501" from mhdp8501 dt-binding doc. HDMI/DP PHY: - Introduced functions `wait_for_ack` and `wait_for_ack_clear` to handle waiting with acknowledgment bits set and cleared respectively. - Use FIELD_PRE() to set bitfields for both HDMI and DP PHY. v6->v7: MHDP8501 HDMI/DP: - Combine HDMI and DP driver into one mhdp8501 driver. Use the connector type to load the corresponding functions. - Remove connector init functions. - Add in phy_hdmi.h to reuse 'enum hdmi_colorspace'. HDMI/DP PHY: - Lowercase hex values - Fix parameters indent issue on some functions - Replace 'udelay' with 'usleep_range' v5->v6: HDMI/DP bridge driver - 8501 is the part number of Cadence MHDP on i.MX8MQ. Use MHDP8501 to name hdmi/dp drivers and files. - Add compatible "fsl,imx8mq-mhdp8501-dp" for i.MX8MQ DP driver - Add compatible "fsl,imx8mq-mhdp8501-hdmi" for i.MX8MQ HDMI driver - Combine HDMI and DP dt-bindings into one file cdns,mhdp8501.yaml - Fix HDMI scrambling is not enable issue when driver working in 4Kp60 mode. - Add HDMI/DP PHY API mailbox protect. HDMI/DP PHY driver: - Rename DP and HDMI PHY files and move to folder phy/freescale/ - Remove properties num_lanes and link_rate from DP PHY driver. - Combine HDMI and DP dt-bindings into one file fsl,imx8mq-dp-hdmi-phy.yaml - Update compatible string to "fsl,imx8mq-dp-phy". - Update compatible string to "fsl,imx8mq-hdmi-phy". v4->v5: - Drop "clk" suffix in clock name. - Add output port property in the example of hdmi/dp. v3->v4: dt-bindings: - Correct dt-bindings coding style and address review comments. - Add apb_clk description. - Add output port for HDMI/DP connector PHY: - Alphabetically sorted in Kconfig and Makefile for DP and HDMI PHY - Remove unused registers define from HDMI and DP PHY drivers. - More description in phy_hdmi.h. - Add apb_clk to HDMI and DP phy driver. HDMI/DP: - Use get_unaligned_le32() to replace hardcode type conversion in HDMI AVI infoframe data fill function. - Add mailbox mutex lock in HDMI/DP driver for phy functions to reslove race conditions between HDMI/DP and PHY drivers. - Add apb_clk to both HDMI and DP driver. - Rename some function names and add prefix with "cdns_hdmi/cdns_dp". - Remove bpc 12 and 16 optional that not supported. v2->v3: Address comments for dt-bindings files. - Correct dts-bindings file names Rename phy-cadence-hdptx-dp.yaml to cdns,mhdp-imx8mq-dp.yaml Rename phy-cadence-hdptx-hdmi.yaml to cdns,mhdp-imx8mq-hdmi.yaml - Drop redundant words and descriptions. - Correct hdmi/dp node name. v2 is a completely different version compared to v1. Previous v1 can be available here [1]. v1->v2: - Reuse Cadence mailbox access functions from mhdp8546 instead of rockchip DP. - Mailbox access functions be convert to marco functions that will be referenced by HDP-TX PHY(HDMI/DP) driver too. - Plain bridge instead of component driver. - Standalone Cadence HDP-TX PHY(HDMI/DP) driver. - Audio driver are removed from the patch set, it will be add in another patch set later. [1] https://patchwork.kernel.org/project/linux-rockchip/cover/cover.1590982881.git.Sandor.yu@nxp.com/ Alexander Stein (2): arm64: dts: imx8mq: Add DCSS + HDMI/DP display pipeline arm64: dts: imx8mq: tqma8mq-mba8mx: Enable HDMI support Sandor Yu (6): drm: bridge: Cadence: Create mhdp helper driver phy: Add HDMI configuration options dt-bindings: display: bridge: Add Cadence MHDP8501 drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ .../display/bridge/cdns,mhdp8501.yaml | 104 ++ .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 51 + .../dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 20 + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 68 + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 11 + drivers/gpu/drm/bridge/cadence/Kconfig | 20 + drivers/gpu/drm/bridge/cadence/Makefile | 3 + .../gpu/drm/bridge/cadence/cdns-mhdp-helper.c | 304 ++++ .../drm/bridge/cadence/cdns-mhdp8501-core.c | 330 ++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 367 +++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 700 +++++++++ .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 595 ++++++++ .../drm/bridge/cadence/cdns-mhdp8546-core.c | 403 +---- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 44 +- drivers/phy/freescale/Kconfig | 10 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c | 1340 +++++++++++++++++ include/drm/bridge/cdns-mhdp-helper.h | 97 ++ include/linux/phy/phy-hdmi.h | 20 + include/linux/phy/phy.h | 7 +- 20 files changed, 4120 insertions(+), 375 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp-helper.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.h create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c create mode 100644 include/drm/bridge/cdns-mhdp-helper.h create mode 100644 include/linux/phy/phy-hdmi.h -- 2.34.1 . X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1719923121; bh=ojo8wkfSFDTTQ+tYwEoPp0kEyAweQJADnia1W5e98f4=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=e9e1EtIgvfoxLMx1LoRRC/LYpIeMTfSUiQNHMWo2/ltJEuqTDMIfAqWO9XlRrQRs9pDr7YNcNeBIk/EDh98233xthDEbkrEsrg2o1epd2kEXJFjxkw3GViykcpZ1K5Smk6gQfi81HihIbbCIdHm2qr8m8Y9FTZr2w5k8E6ft6/lpOH1Ja2j23IFiFAtKvBiFaDW3XcJha9FvFwD59GsnqD4i6mHuHjBH1uFDwFCuJ0RkRFtgem/Z22/qaKDcSFBb/KvKHcy8ZTZokkz/lV9qFTkO03HK4o8BQdXzNdivi8dT8itX7MoUQ89er8MBxi4TjxEbMi0fS858lJOaz1ET9w== X-YMail-OSG: INJqqsoVM1nUAl02a13QJLORw6oGZokgB9tm0D_u0t7.L.3_e8rDkhW0asv59PQ wUB7ez8C6hw2C66ImTssx46a7xqfLZpGmx.b9PxJWj6kMkbk64d5wPuFePSRhmRcdNyCR1FYP5EV HPwhTSavDu9zWK73CFsTIJ76uI_LLg1EaSbwpwyGLYzIgOM5O.o_MIXcgvPiIhrYSw6mBe3lNrIF jgHTL6oGsYRrG2D7FPo2FJbsuP2dCxBIX8l3hRK4nry77Gx9Cpi8eApdfhHc5Jgot9uzDbvjykd8 ySZnsdbxn6lXbl4uOmZEQBpslc7CVG1GbH8NXZj_PRXBf.WbA0XKOugzTRGPRKLYuH4F8W7EIf76 vZuukz7ZQofO9EugcmV2HV2qCcV_GRAqahcjlPhP5aNzgE4c39JwdeBD5FLnLUS5lfhhCSFiF4kX Qdfp4Rwx_V3ygH.1g.xRcwtMO4HP7c253DxO8Y3FwdrS37n9AYS.B3ogqPOy94PCXTfSsrRmNsBw TDno83H0N_p37.mARmrXa5qZvxnLd8JobcTS9yViaetHuSpq0y6Rcrvv1xPOrPDSpAJnHrLXEJuM xiB35FeIU4WwsZ2RpttSmIkZxbfS2OdBkC3zcOkEhPh6c_EsjilB5uF4EPo0QRjjgclx4BEoSG2G RTomCdub9A2Kl5fXW3Iyb3JwTLzUuWcOAzIZiRCVb9wmbt.XPpwMNJVFm1WCH5tIg7mMY2ul5msE Y0cv0S2XxxVJ.raBl1mPpPlsr2tANCk5SoSzsfo0Ydc31xE_Mz6yk0rahRsWYlKm6iAP1FLq1_XN Gpbm_sXubjjeg4bvX1TUMCi6rUSBLa.DhK6TGHz9uAhOaEjFh8OMWTL4DwsRsg62nNPtgSCCOOZe O7PJHKPLTGt37sH21x0csJy6Oa20jG.gQeoRg_g9EranMPJDfS59anwWW7UzrDQOqOCsd6BRTVqr oejA9rlIXRU1awHyrz4ICGNPfb.6IpUeyAkz70QXHeV54M_asDv3Mr3vQR4xXWjokvgJnHZKPrAD vcYV_9rtdjJPgQBpVw79wTw.tr5FzF1jhyuiUiGfGeNCVg4DbOnoatnxnDxw3gtVgnCfR6HP_LEZ O_nOnTJ4z_58kWOuoNMRoanxUUk_a2mm2Ntyj4DIEVTnj9GKO6ndWlkxQO.kUEpUbWHvlFxKrjiT q1o6Lv5ZxlifJ3hRwcx_D2DdTs_1bQnDw6qvuAT4uOdIS.jLKi9DoabPle203FeAx_KQmUdOR8L0 5lWF8Lzwg23ZDW1Hpxoxx.TNG74ZUD_t4AspQXJHWizYo0poqnlJ5zeaQZDelLEcrLvgNHGRe6Nr wpUHPQ9f2yQJDsQ3ADVppsNcRZME951iXAWtPRzry.Mtw.9T9zFWIHhA5pRnpIz174IvXawZnFRZ 0QQDJ9F9nb_EUfzn6hVlslQ8hngLGtFw4VStOBn4e0l_BLdkRVNPLXAZdglMs.8lWSCOxyq5XNot T7uzchyjW7FpQm9NrgYIyrb22lSGN91uX9ujSf7D.BM4kv5_gt1plXDcEaVy.A0r7NsDgXofBZB6 EnOk1gpi7SbbBRqv1.7sigXnuzeiJTsIN0oBSl62Y_lvcoXe9VAUni8IxulWDnYqdZjw.JoO80p_ rWBlfnY3qLL3b_V_Iav0oYgVVx74zkvTHWY0tG3ytP8x0CqwROaETxlE8l0Wwz.MyeWCZwO3zyKk szoeKme69weeGHYsKK5klMTM98WrvkQNRxgGfL4WPfJob0q1ORg94cY0nEoRRfDydfq6YY7jlj17 6pXXd9GpBoeTENmft6HgwEC4mlxBmTB7EwEU4xUYlJNa0oEr9Xu4IRCsTG_WP8_Z2DkWUDfb5Crs rRhr2isIezCmRjRJPjuFar.eAvUupu1ljHnjmeY_oMHAifaXy.Op1KhAEHRS4riDxqZZleB4HqZO S7w2nfRaXNrw.BTFuw_kRrFKfD9NGYerZ9rFIRRHox1cky96VzGe3aDFBUHJQ5sPtIXuvx08G5.j LfaBCHbFQnjWtjvgSI45zi1kt58OLLxOoH0s9wjdHRCWx3Zd6GMrpBE3z5zwYV08YN.UgdNk6UPg E3Ik49m7izLziYezWdonBe4OJf3z8yuPGwy3uED77zpFK4fr.PDwDg_xtZURZoRpfDkW.edw- X-Sonic-MF: X-Sonic-ID: 22345d43-bb8b-4137-a272-4ea238d35601 From: Alex Vdovydchenko To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sean Anderson , Guenter Roeck , Jean Delvare , Jonathan Corbet , Delphine CC Chiu Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org, linux-i2c@vger.kernel.org, Alex Vdovydchenko Subject: [PATCH v4 0/2] Add MPS MP5920 Host-Swap controller Date: Tue, 2 Jul 2024 14:52:49 +0300 Message-ID: <20240702115252.981416-1-xzeol@yahoo.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit References: <20240702115252.981416-1-xzeol.ref@yahoo.com> Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265208 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-doc,org.kernel.vger.linux-hwmon,org.kernel.vger.linux-i2c Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series of patches adds the MP5920 Host-swap controller, which is used as a protection and control IC for devices that are being inserted into a live backplane. MP5920 acts as a voltage regulator (MP5911 etc) supervisor. IC utilizes pmbus and provides monitoring, statistics and limits to electrical and thermal characteristics such as: - input and output voltage - output current - output power - IC temperature One must take into account the nonlinear character of readings, so there will be a statistical error in the range 5–10 percents, depending on current passing through. In order to use the IC, make sure to specify a valid I2C address (consult to datasheet and dts-bindings) MP5920 datasheet: https://www.monolithicpower.com/en/mp5920.html Changes in v2: - fixed typos Changes in v3: - removed unnecessary license blob - removed unnecessary headers - edited device tables style - added chip name checking in probing - fixed typos in pmbus_driver_info struct initialization Changes in v4: - added i2c_check_functionality in probing - refactored usage of dev_err_probe insted of dev_err - edited chip name string handling while printing - restored .driver.of_match_table, keeping i2c_driver "old" style Alex Vdovydchenko (2): dt-bindings: hwmon: Add MPS mp5920 hwmon: add MP5920 driver .../devicetree/bindings/trivial-devices.yaml | 2 + Documentation/hwmon/index.rst | 1 + Documentation/hwmon/mp5920.rst | 91 ++++++++++++++++++ drivers/hwmon/pmbus/Kconfig | 9 ++ drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/mp5920.c | 93 +++++++++++++++++++ 6 files changed, 197 insertions(+) create mode 100644 Documentation/hwmon/mp5920.rst create mode 100644 drivers/hwmon/pmbus/mp5920.c -- 2.43.0 . X-MD-Sfrom: suhui@nfschina.com X-MD-SrcIP: 180.167.10.98 From: Su Hui To: arend.vanspriel@broadcom.com, kvalo@kernel.org Cc: Su Hui , johannes.berg@intel.com, kees@kernel.org, a@bayrepo.ru, quic_alokad@quicinc.com, zyytlz.wz@163.com, marcan@marcan.st, petr.tesarik.ext@huawei.com, duoming@zju.edu.cn, colin.i.king@gmail.com, u.kleine-koenig@pengutronix.de, quic_jjohnson@quicinc.com, linville@tuxdriver.com, pieterpg@broadcom.com, meuleman@broadcom.com, frankyl@broadcom.com, stanley.hsu@cypress.com, wright.feng@cypress.com, ian.lin@infineon.com, chi-hsien.lin@cypress.com, zajec5@gmail.com, antonio@open-mesh.com, franky.lin@broadcom.com, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH wireless 0/9] wifi: cfg80211: avoid some garbage values Date: Tue, 2 Jul 2024 20:24:42 +0800 Message-Id: <20240702122450.2213833-1-suhui@nfschina.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265216 org.kernel.vger.linux-wireless:85573 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.brcm80211,org.kernel.vger.kernel-janitors,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Clang static checker (scan-build) has some warnings as follows. included from drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c:16 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h:123:2: warning:Assigned value is garbage or undefined [core.uninitialized.Assign] 123 | __le32 data_le = cpu_to_le32(*data); | ^~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c:138:3:warning Value stored to 'err' is never read [deadcode.DeadStores] There are some functions like brcmf_fil_{cmd,iovar,basscfg}_int_get() which read the value of its parameter, but some callers have not initialized these parameters which will be read. And this patchset fixes these problems. BTW, maybe merge this patchset into one patch is more better because the num of changed code is small. I split it into multiple patches because of these different 'Fixes' tags. Su Hui (9): wifi: cfg80211: avoid garbage value of 'io_type' in brcmf_cfg80211_attach() wifi: brcmfmac: avoid garbage value of 'status' in brcmf_c_download_blob() wifi: cfg80211: avoid garbage value of 'noise' in brcmf_cfg80211_dump_survey() wifi: cfg80211: avoid garbage value of 'chanspec' in brcmf_cfg80211_get_channel() wifi: cfg80211: avoid garbage value of 'freq' in brcmf_cfg80211_mgmt_tx() wifi: cfg80211: avoid garbage value of 'wsec' in brcmf_cfg80211_reconfigure_wep() wifi: cfg80211: avoid garbage value of 'wsec' in brcmf_cfg80211_add_key() wifi: cfg80211: avoid garbage value of 'val' in brcmf_set_key_mgmt() wifi: cfg80211: avoid garbage value of 'wsec' in brcmf_cfg80211_{get,config_default}_key() .../broadcom/brcm80211/brcmfmac/cfg80211.c | 18 +++++++++--------- .../broadcom/brcm80211/brcmfmac/common.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) -- 2.30.2 . From: Jocelyn Falempe To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N. Rao" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Kees Cook , Tony Luck , "Guilherme G. Piccoli" , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Jocelyn Falempe , Andrew Morton , Jani Nikula , Greg Kroah-Hartman , Kefeng Wang , Thomas Gleixner , Uros Bizjak , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, linux-mtd@lists.infradead.org, linux-hardening@vger.kernel.org Subject: [PATCH v2] printk: Add a short description string to kmsg_dump() Date: Tue, 2 Jul 2024 14:26:04 +0200 Message-ID: <20240702122639.248110-1-jfalempe@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265219 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-mtd,org.kernel.vger.linux-hardening,org.kernel.vger.linux-hyperv,org.ozlabs.lists.linuxppc-dev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail kmsg_dump doesn't forward the panic reason string to the kmsg_dumper callback. This patch adds a new struct kmsg_dump_detail, that will hold the reason and description, and pass it to the dump() callback. To avoid updating all kmsg_dump() call, it adds a kmsg_dump_desc() function and a macro for backward compatibility. I've written this for drm_panic, but it can be useful for other kmsg_dumper. It allows to see the panic reason, like "sysrq triggered crash" or "VFS: Unable to mount root fs on xxxx" on the drm panic screen. v2: * Use a struct kmsg_dump_detail to hold the reason and description pointer, for more flexibility if we want to add other parameters. (Kees Cook) * Fix powerpc/nvram_64 build, as I didn't update the forward declaration of oops_to_nvram() Signed-off-by: Jocelyn Falempe --- arch/powerpc/kernel/nvram_64.c | 8 ++++---- arch/powerpc/platforms/powernv/opal-kmsg.c | 4 ++-- arch/um/kernel/kmsg_dump.c | 2 +- drivers/gpu/drm/drm_panic.c | 4 ++-- drivers/hv/hv_common.c | 4 ++-- drivers/mtd/mtdoops.c | 2 +- fs/pstore/platform.c | 10 +++++----- include/linux/kmsg_dump.h | 22 +++++++++++++++++++--- kernel/panic.c | 2 +- kernel/printk/printk.c | 11 ++++++++--- 10 files changed, 45 insertions(+), 24 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index e385d3164648..f9c6568a9137 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -73,7 +73,7 @@ static const char *nvram_os_partitions[] = { }; static void oops_to_nvram(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason); + struct kmsg_dump_detail *detail); static struct kmsg_dumper nvram_kmsg_dumper = { .dump = oops_to_nvram @@ -643,7 +643,7 @@ void __init nvram_init_oops_partition(int rtas_partition_exists) * partition. If that's too much, go back and capture uncompressed text. */ static void oops_to_nvram(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason) + struct kmsg_dump_detail *detail) { struct oops_log_info *oops_hdr = (struct oops_log_info *)oops_buf; static unsigned int oops_count = 0; @@ -655,7 +655,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper, unsigned int err_type = ERR_TYPE_KERNEL_PANIC_GZ; int rc = -1; - switch (reason) { + switch (detail->reason) { case KMSG_DUMP_SHUTDOWN: /* These are almost always orderly shutdowns. */ return; @@ -671,7 +671,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper, break; default: pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n", - __func__, (int) reason); + __func__, (int) detail->reason); return; } diff --git a/arch/powerpc/platforms/powernv/opal-kmsg.c b/arch/powerpc/platforms/powernv/opal-kmsg.c index 6c3bc4b4da98..bb4218fa796e 100644 --- a/arch/powerpc/platforms/powernv/opal-kmsg.c +++ b/arch/powerpc/platforms/powernv/opal-kmsg.c @@ -20,13 +20,13 @@ * message, it just ensures that OPAL completely flushes the console buffer. */ static void kmsg_dump_opal_console_flush(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason) + struct kmsg_dump_detail *detail) { /* * Outside of a panic context the pollers will continue to run, * so we don't need to do any special flushing. */ - if (reason != KMSG_DUMP_PANIC) + if (detail->reason != KMSG_DUMP_PANIC) return; opal_flush_console(0); diff --git a/arch/um/kernel/kmsg_dump.c b/arch/um/kernel/kmsg_dump.c index 4382cf02a6d1..419021175272 100644 --- a/arch/um/kernel/kmsg_dump.c +++ b/arch/um/kernel/kmsg_dump.c @@ -8,7 +8,7 @@ #include static void kmsg_dumper_stdout(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason) + struct kmsg_dump_detail *detail) { static struct kmsg_dump_iter iter; static DEFINE_SPINLOCK(lock); diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 948aed00595e..8794c7f6c0ee 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -655,11 +655,11 @@ static struct drm_plane *to_drm_plane(struct kmsg_dumper *kd) return container_of(kd, struct drm_plane, kmsg_panic); } -static void drm_panic(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason) +static void drm_panic(struct kmsg_dumper *dumper, struct kmsg_dump_detail *detail) { struct drm_plane *plane = to_drm_plane(dumper); - if (reason == KMSG_DUMP_PANIC) + if (detail->reason == KMSG_DUMP_PANIC) draw_panic_plane(plane); } diff --git a/drivers/hv/hv_common.c b/drivers/hv/hv_common.c index 9c452bfbd571..7a35c82976e0 100644 --- a/drivers/hv/hv_common.c +++ b/drivers/hv/hv_common.c @@ -207,13 +207,13 @@ static int hv_die_panic_notify_crash(struct notifier_block *self, * buffer and call into Hyper-V to transfer the data. */ static void hv_kmsg_dump(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason) + struct kmsg_dump_detail *detail) { struct kmsg_dump_iter iter; size_t bytes_written; /* We are only interested in panics. */ - if (reason != KMSG_DUMP_PANIC || !sysctl_record_panic_msg) + if (detail->reason != KMSG_DUMP_PANIC || !sysctl_record_panic_msg) return; /* diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c index 2f11585b5613..86d49db9196d 100644 --- a/drivers/mtd/mtdoops.c +++ b/drivers/mtd/mtdoops.c @@ -298,7 +298,7 @@ static void find_next_position(struct mtdoops_context *cxt) } static void mtdoops_do_dump(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason) + struct kmsg_dump_detail *detail) { struct mtdoops_context *cxt = container_of(dumper, struct mtdoops_context, dump); diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 3497ede88aa0..9c6b7c97fa3c 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -275,7 +275,7 @@ void pstore_record_init(struct pstore_record *record, * end of the buffer. */ static void pstore_dump(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason) + struct kmsg_dump_detail *detail) { struct kmsg_dump_iter iter; unsigned long total = 0; @@ -285,9 +285,9 @@ static void pstore_dump(struct kmsg_dumper *dumper, int saved_ret = 0; int ret; - why = kmsg_dump_reason_str(reason); + why = kmsg_dump_reason_str(detail->reason); - if (pstore_cannot_block_path(reason)) { + if (pstore_cannot_block_path(detail->reason)) { if (!spin_trylock_irqsave(&psinfo->buf_lock, flags)) { pr_err("dump skipped in %s path because of concurrent dump\n", in_nmi() ? "NMI" : why); @@ -311,7 +311,7 @@ static void pstore_dump(struct kmsg_dumper *dumper, pstore_record_init(&record, psinfo); record.type = PSTORE_TYPE_DMESG; record.count = oopscount; - record.reason = reason; + record.reason = detail->reason; record.part = part; record.buf = psinfo->buf; @@ -352,7 +352,7 @@ static void pstore_dump(struct kmsg_dumper *dumper, } ret = psinfo->write(&record); - if (ret == 0 && reason == KMSG_DUMP_OOPS) { + if (ret == 0 && detail->reason == KMSG_DUMP_OOPS) { pstore_new_entry = 1; pstore_timer_kick(); } else { diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h index 906521c2329c..65f5a47727bc 100644 --- a/include/linux/kmsg_dump.h +++ b/include/linux/kmsg_dump.h @@ -39,6 +39,17 @@ struct kmsg_dump_iter { u64 next_seq; }; +/** + *struct kmsg_dump_detail - kernel crash detail + * @reason: reason for the crash, see kmsg_dump_reason. + * @description: optional short string, to provide additional information. + */ + +struct kmsg_dump_detail { + enum kmsg_dump_reason reason; + const char *description; +}; + /** * struct kmsg_dumper - kernel crash message dumper structure * @list: Entry in the dumper list (private) @@ -49,13 +60,13 @@ struct kmsg_dump_iter { */ struct kmsg_dumper { struct list_head list; - void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason); + void (*dump)(struct kmsg_dumper *dumper, struct kmsg_dump_detail *detail); enum kmsg_dump_reason max_reason; bool registered; }; #ifdef CONFIG_PRINTK -void kmsg_dump(enum kmsg_dump_reason reason); +void kmsg_dump_desc(enum kmsg_dump_reason reason, const char *desc); bool kmsg_dump_get_line(struct kmsg_dump_iter *iter, bool syslog, char *line, size_t size, size_t *len); @@ -71,7 +82,7 @@ int kmsg_dump_unregister(struct kmsg_dumper *dumper); const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason); #else -static inline void kmsg_dump(enum kmsg_dump_reason reason) +static inline void kmsg_dump_desc(enum kmsg_dump_reason reason, const char *desc) { } @@ -107,4 +118,9 @@ static inline const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason) } #endif +static inline void kmsg_dump(enum kmsg_dump_reason reason) +{ + kmsg_dump_desc(reason, NULL); +} + #endif /* _LINUX_KMSG_DUMP_H */ diff --git a/kernel/panic.c b/kernel/panic.c index 0843a275531a..0a8b29c44f3c 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -378,7 +378,7 @@ void panic(const char *fmt, ...) panic_print_sys_info(false); - kmsg_dump(KMSG_DUMP_PANIC); + kmsg_dump_desc(KMSG_DUMP_PANIC, buf); /* * If you doubt kdump always works fine in any situation, diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 5dcc05e1aa56..19bc414be5f0 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -4272,16 +4272,21 @@ const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason) EXPORT_SYMBOL_GPL(kmsg_dump_reason_str); /** - * kmsg_dump - dump kernel log to kernel message dumpers. + * kmsg_dump_desc - dump kernel log to kernel message dumpers. * @reason: the reason (oops, panic etc) for dumping + * @desc: a short string to describe what caused the panic or oops. Can be NULL + * if no additional description is available. * * Call each of the registered dumper's dump() callback, which can * retrieve the kmsg records with kmsg_dump_get_line() or * kmsg_dump_get_buffer(). */ -void kmsg_dump(enum kmsg_dump_reason reason) +void kmsg_dump_desc(enum kmsg_dump_reason reason, const char *desc) { struct kmsg_dumper *dumper; + struct kmsg_dump_detail detail = { + .reason = reason, + .description = desc}; rcu_read_lock(); list_for_each_entry_rcu(dumper, &dump_list, list) { @@ -4299,7 +4304,7 @@ void kmsg_dump(enum kmsg_dump_reason reason) continue; /* invoke dumper which will iterate over records */ - dumper->dump(dumper, reason); + dumper->dump(dumper, &detail); } rcu_read_unlock(); } base-commit: 82e4255305c554b0bb18b7ccf2db86041b4c8b6e -- 2.45.2 . From: George Stark To: , , , , , , , , CC: , , , , , , George Stark Subject: [PATCH v3 0/2] pwm: meson: add pwm support for A1 Date: Tue, 2 Jul 2024 15:34:23 +0300 Message-ID: <20240702123425.584610-1-gnstark@salutedevices.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186278 [Jul 02 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: gnstark@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_uf_ne_domains}, {Tracking_from_domain_doesnt_match_to}, lore.kernel.org:7.1.1;salutedevices.com:7.1.1;smtp.sberdevices.ru:5.0.1,7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2;127.0.0.199:7.1.2, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/02 10:26:00 X-KSMG-LinksScanning: Clean, bases: 2024/07/02 10:26:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/07/02 07:59:00 #25796134 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265235 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-amlogic,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pwm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add support for Amlogic meson A1 SoC family PWM Changes in v2: add patch with optional power-domains to pwm bindings; fix syntax in a1 bindigns patch: - use enum over const for amlogic,meson-a1-pwm beacuse adding more devices here are expected - leave only base compatible amlogic,meson-s4-pwm in check section dt_binding_check and dtbs_check run ok now; previous version: [1] Changes in v3: squash power-domains patch into main bindigns patch add conditional to bindings that power-domains property is required only for a1 previous version: [2] [1] https://lore.kernel.org/lkml/20240701130113.433169-3-gnstark@salutedevices.com/T/ [2] https://lore.kernel.org/lkml/20240701172016.523402-1-gnstark@salutedevices.com/T/ George Stark (2): dt-bindings: pwm: amlogic: Add new bindings for meson A1 PWM arm64: dts: meson: a1: add definitions for meson PWM .../devicetree/bindings/pwm/pwm-amlogic.yaml | 17 ++ arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 215 ++++++++++++++++++ 2 files changed, 232 insertions(+) -- 2.25.1 . X-Loopia-Auth: user X-Loopia-User: fredrik@frelon.se X-Loopia-Originating-IP: IPv6:2001:2042:34bd:7800:4e1d:96ff:fe79:894d From: =?UTF-8?q?Fredrik=20L=C3=B6nnegren?= To: Ping-Ke Shih , Kalle Valo Cc: =?UTF-8?q?Fredrik=20L=C3=B6nnegren?= , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rtlwifi: fix comment typo Date: Tue, 2 Jul 2024 14:30:44 +0200 Message-ID: <20240702123048.14829-1-fredrik@frelon.se> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265241 org.kernel.vger.linux-wireless:85576 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Change 'defult' to 'default' in comments in several rtlwifi drivers. Signed-off-by: Fredrik Lönnegren --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c index 37bb59fa8bfa..35875cda30fc 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c @@ -27,7 +27,7 @@ static void rtl88e_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c index e20f2bec45c4..ce7c28d9c874 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c @@ -31,7 +31,7 @@ static void rtl92c_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 * */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c index 5f6311c2aac4..1b7a08315fc9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c @@ -32,7 +32,7 @@ static void rtl92d_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 * */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c index 7bde20fdbeab..162e734d5b08 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c @@ -31,7 +31,7 @@ static void rtl92ee_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c index 675bdd32feb1..bbf8ff63dced 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c @@ -27,7 +27,7 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 * */ rtlpci->const_pci_aspm = 2; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c index dd7505e2f22c..1b144fbd4d26 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c @@ -33,7 +33,7 @@ static void rtl8723e_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c index 162c34f0e9b7..0a92d0325098 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c @@ -32,7 +32,7 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c index 7b911695db33..a65503c5ae5a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c @@ -30,7 +30,7 @@ static void rtl8821ae_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; -- 2.45.2 . From: Guillaume Stols Date: Tue, 02 Jul 2024 12:52:51 +0000 Subject: [PATCH v3] iio: adc: ad7606: remove frstdata check for serial mode X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240702-cleanup-ad7606-v3-1-18d5ea18770e@baylibre.com> To: Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Greg Kroah-Hartman Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron , Michael Hennerich , jstephan@baylibre.com, dlechner@baylibre.com, Guillaume Stols Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265246 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The current implementation attempts to recover from an eventual glitch in the clock by checking frstdata state after reading the first channel's sample: If frstdata is low, it will reset the chip and return -EIO. This will only work in parallel mode, where frstdata pin is set low after the 2nd sample read starts. For the serial mode, according to the datasheet, "The FRSTDATA output returns to a logic low following the 16th SCLK falling edge.", thus after the Xth pulse, X being the number of bits in a sample, the check will always be true, and the driver will not work at all in serial mode if frstdata(optional) is defined in the devicetree as it will reset the chip, and return -EIO every time read_sample is called. Hence, this check must be removed for serial mode. Fixes: b9618c0cacd7 ("staging: IIO: ADC: New driver for AD7606/AD7606-6/AD7606-4") Signed-off-by: Guillaume Stols --- Changes in v3: - Improve commit message. - Add Fixes tag: the fixes tag is the initial commit since the issue have been there from then on, probably overlooked because removing frstdata from DT solved the issue. - Remove extra linebreak. - Link to v2: https://lore.kernel.org/r/20240618-cleanup-ad7606-v2-1-b0fd015586aa@baylibre.com iio: adc: ad7606: remove frstdata check for serial modei Changes in v2: - Remove frstdata check only for the serial interface as suggested by Michael Hennerich. - Link to v1: https://lore.kernel.org/r/20240417-cleanup-ad7606-v1-1-5c2a29662c0a@baylibre.com --- drivers/iio/adc/ad7606.c | 28 ++------------------------ drivers/iio/adc/ad7606.h | 2 ++ drivers/iio/adc/ad7606_par.c | 48 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index 3a417595294f..c321c6ef48df 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -49,7 +49,7 @@ static const unsigned int ad7616_oversampling_avail[8] = { 1, 2, 4, 8, 16, 32, 64, 128, }; -static int ad7606_reset(struct ad7606_state *st) +int ad7606_reset(struct ad7606_state *st) { if (st->gpio_reset) { gpiod_set_value(st->gpio_reset, 1); @@ -60,6 +60,7 @@ static int ad7606_reset(struct ad7606_state *st) return -ENODEV; } +EXPORT_SYMBOL_NS_GPL(ad7606_reset, IIO_AD7606); static int ad7606_reg_access(struct iio_dev *indio_dev, unsigned int reg, @@ -88,31 +89,6 @@ static int ad7606_read_samples(struct ad7606_state *st) { unsigned int num = st->chip_info->num_channels - 1; u16 *data = st->data; - int ret; - - /* - * The frstdata signal is set to high while and after reading the sample - * of the first channel and low for all other channels. This can be used - * to check that the incoming data is correctly aligned. During normal - * operation the data should never become unaligned, but some glitch or - * electrostatic discharge might cause an extra read or clock cycle. - * Monitoring the frstdata signal allows to recover from such failure - * situations. - */ - - if (st->gpio_frstdata) { - ret = st->bops->read_block(st->dev, 1, data); - if (ret) - return ret; - - if (!gpiod_get_value(st->gpio_frstdata)) { - ad7606_reset(st); - return -EIO; - } - - data++; - num--; - } return st->bops->read_block(st->dev, num, data); } diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h index 0c6a88cc4695..6649e84d25de 100644 --- a/drivers/iio/adc/ad7606.h +++ b/drivers/iio/adc/ad7606.h @@ -151,6 +151,8 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, const char *name, unsigned int id, const struct ad7606_bus_ops *bops); +int ad7606_reset(struct ad7606_state *st); + enum ad7606_supported_device_ids { ID_AD7605_4, ID_AD7606_8, diff --git a/drivers/iio/adc/ad7606_par.c b/drivers/iio/adc/ad7606_par.c index d8408052262e..6bc587b20f05 100644 --- a/drivers/iio/adc/ad7606_par.c +++ b/drivers/iio/adc/ad7606_par.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -21,8 +22,29 @@ static int ad7606_par16_read_block(struct device *dev, struct iio_dev *indio_dev = dev_get_drvdata(dev); struct ad7606_state *st = iio_priv(indio_dev); - insw((unsigned long)st->base_address, buf, count); + /* + * On the parallel interface, the frstdata signal is set to high while + * and after reading the sample of the first channel and low for all + * other channels. This can be used to check that the incoming data is + * correctly aligned. During normal operation the data should never + * become unaligned, but some glitch or electrostatic discharge might + * cause an extra read or clock cycle. Monitoring the frstdata signal + * allows to recover from such failure situations. + */ + int num = count; + u16 *_buf = buf; + + if (st->gpio_frstdata) { + insw((unsigned long)st->base_address, _buf, 1); + if (!gpiod_get_value(st->gpio_frstdata)) { + ad7606_reset(st); + return -EIO; + } + _buf++; + num--; + } + insw((unsigned long)st->base_address, _buf, num); return 0; } @@ -35,8 +57,28 @@ static int ad7606_par8_read_block(struct device *dev, { struct iio_dev *indio_dev = dev_get_drvdata(dev); struct ad7606_state *st = iio_priv(indio_dev); - - insb((unsigned long)st->base_address, buf, count * 2); + /* + * On the parallel interface, the frstdata signal is set to high while + * and after reading the sample of the first channel and low for all + * other channels. This can be used to check that the incoming data is + * correctly aligned. During normal operation the data should never + * become unaligned, but some glitch or electrostatic discharge might + * cause an extra read or clock cycle. Monitoring the frstdata signal + * allows to recover from such failure situations. + */ + int num = count; + u16 *_buf = buf; + + if (st->gpio_frstdata) { + insb((unsigned long)st->base_address, _buf, 2); + if (!gpiod_get_value(st->gpio_frstdata)) { + ad7606_reset(st); + return -EIO; + } + _buf++; + num--; + } + insb((unsigned long)st->base_address, _buf, num * 2); return 0; } --- base-commit: 07d4d0bb4a8ddcc463ed599b22f510d5926c2495 change-id: 20240416-cleanup-ad7606-161e2ed9818b Best regards, -- Guillaume Stols . From: Audra Mitchell To: kunit-dev@googlegroups.com Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, npache@redhat.com, raquini@redhat.com Subject: [PATCH] Disable Clk-gate_tests for s390 Date: Tue, 2 Jul 2024 08:55:39 -0400 Message-ID: <20240702125539.524489-1-audra@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265248 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-clk Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Currently clk-gate tests for s390 fail as the tests create a pretend clk-gate and use a "fake_reg" to emulate the expected behavior of the clk_gate->reg. I added some debug statements to the driver and noticed that the reg changes after initialization to -1, which is coming from an error coming from zpci_load(). This is likely because the test is using fake iomem and the s390 architecture likely isn't designed to handle that. Turn off the clk-gate tests for s390 for now as there is no clear work around for this problem as discussed in upstream conversation [1]. [1] https://lore.kernel.org/all/301cd41e6283c12ac67fb8c0f8d5c929.sboyd@kernel.org/T/#t Signed-off-by: Audra Mitchell --- drivers/clk/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 3e9099504fad..3c3e0b969020 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -514,6 +514,7 @@ config CLK_KUNIT_TEST config CLK_GATE_KUNIT_TEST tristate "Basic gate type Kunit test" if !KUNIT_ALL_TESTS depends on KUNIT + depends on !S390 default KUNIT_ALL_TESTS help Kunit test for the basic clk gate type. -- 2.44.0 . From: Cong Yang To: sam@ravnborg.org, neil.armstrong@linaro.org, daniel@ffwll.ch, dianders@chromium.org, linus.walleij@linaro.org, swboyd@chromium.org, airlied@gmail.com, dmitry.baryshkov@linaro.org, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, conor+dt@kernel.org Cc: lvzhaoxiong@huaqin.corp-partner.google.com, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Cong Yang Subject: [PATCH v1 0/2] Support for Melfas lmfbx101117480 MIPI-DSI panel Date: Tue, 2 Jul 2024 21:01:36 +0800 Message-Id: <20240702130138.2543711-1-yangcong5@huaqin.corp-partner.google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265253 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Melfas lmfbx101117480 is a 10.1" WXGA TFT LCD panel with jadard-jd9365da controller, which fits in nicely with the existing panel-jadard-jd9365da-h3 driver. Add compatible for melfas lmfbx101117480 in dt-bindings. Cong Yang (2): dt-bindings: display: panel: Add compatible for melfas lmfbx101117480 drm/panel: jd9365da: Support for Melfas lmfbx101117480 MIPI-DSI panel .../display/panel/jadard,jd9365da-h3.yaml | 1 + .../gpu/drm/panel/panel-jadard-jd9365da-h3.c | 246 ++++++++++++++++++ 2 files changed, 247 insertions(+) -- 2.25.1 . From: Xiu Jianfeng To: , , , , CC: , , , Subject: [PATCH -next] mm/hugetlb_cgroup: introduce peak and rsvd.peak to v2 Date: Tue, 2 Jul 2024 12:57:28 +0000 Message-ID: <20240702125728.2743143-1-xiujianfeng@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265259 org.kvack.linux-mm:202157 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kernel.vger.linux-doc,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Introduce peak and rsvd.peak to v2 to show the historical maximum usage of resources, as in some scenarios it is necessary to configure the value of max/rsvd.max based on the peak usage of resources. Signed-off-by: Xiu Jianfeng --- Documentation/admin-guide/cgroup-v2.rst | 8 ++++++++ mm/hugetlb_cgroup.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index ae0fdb6fc618..97d19968230a 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -2607,6 +2607,14 @@ HugeTLB Interface Files hugetlb pages of in this cgroup. Only active in use hugetlb pages are included. The per-node values are in bytes. + hugetlb..peak + Show historical maximum usage for "hugepagesize" hugetlb. It exists + for all the cgroup except root. + + hugetlb..rsvd.peak + Show historical maximum usage for "hugepagesize" hugetlb reservations. + It exists for all the cgroup except root. + Misc ---- diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index 4ff238ba1250..f443a56409a9 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -583,6 +583,13 @@ static int hugetlb_cgroup_read_u64_max(struct seq_file *seq, void *v) else seq_printf(seq, "%llu\n", val * PAGE_SIZE); break; + case RES_RSVD_MAX_USAGE: + counter = &h_cg->rsvd_hugepage[idx]; + fallthrough; + case RES_MAX_USAGE: + val = (u64)counter->watermark; + seq_printf(seq, "%llu\n", val * PAGE_SIZE); + break; default: BUG(); } @@ -739,6 +746,18 @@ static struct cftype hugetlb_dfl_tmpl[] = { .seq_show = hugetlb_cgroup_read_u64_max, .flags = CFTYPE_NOT_ON_ROOT, }, + { + .name = "peak", + .private = RES_MAX_USAGE, + .seq_show = hugetlb_cgroup_read_u64_max, + .flags = CFTYPE_NOT_ON_ROOT, + }, + { + .name = "rsvd.peak", + .private = RES_RSVD_MAX_USAGE, + .seq_show = hugetlb_cgroup_read_u64_max, + .flags = CFTYPE_NOT_ON_ROOT, + }, { .name = "events", .seq_show = hugetlb_events_show, -- 2.34.1 . From: Lu Baolu To: Joerg Roedel , Will Deacon Cc: Jacob Pan , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 0/7] [PULL REQUEST] Intel IOMMU updates for v6.11 Date: Tue, 2 Jul 2024 21:08:32 +0800 Message-Id: <20240702130839.108139-1-baolu.lu@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265265 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Will, The following changes have been queued for v6.11-rc1. They are all about small refactoring, including: - Use READ_ONCE to read volatile descriptor status - Remove support for handling Execute-Requested requests - Downgrade warning for pre-enabled interrupt remapping - Remove calling iommu_domain_alloc() - Refactor the PRI enable/disable flows - Cleanups These patches are based on v6.10-rc5. The complete patches are also available at: https://github.com/LuBaolu/intel-iommu/commits/vtd-update-for-v6.11 Please consider them for iommu next. Best regards, baolu Jacob Pan (1): iommu/vt-d: Handle volatile descriptor status read Lu Baolu (6): iommu/vt-d: Remove comment for def_domain_type iommu/vt-d: Remove control over Execute-Requested requests iommu/vt-d: Downgrade warning for pre-enabled IR iommu/vt-d: Add helper to allocate paging domain iommu/vt-d: Add helper to flush caches for context change iommu/vt-d: Refactor PCI PRI enabling/disabling callbacks drivers/iommu/intel/iommu.h | 19 ++- drivers/iommu/intel/pasid.h | 10 -- drivers/iommu/intel/dmar.c | 2 +- drivers/iommu/intel/iommu.c | 194 +++++++++++++++++++--------- drivers/iommu/intel/irq_remapping.c | 4 +- drivers/iommu/intel/pasid.c | 109 ++++++++++++---- 6 files changed, 241 insertions(+), 97 deletions(-) -- 2.34.1 . From: Tao Chen To: Quentin Monnet Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , bpf@vger.kernel.org, Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , linux-kernel@vger.kernel.org, chen.dylane@gmail.com Subject: [PATCH bpf-next] bpftool: Mount bpffs when pinmaps path not under the bpffs Date: Tue, 2 Jul 2024 21:11:50 +0800 Message-Id: <20240702131150.15622-1-chen.dylane@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265273 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail As qmonnet said [1], map pinning will fail if the pinmaps path not under the bpffs, like: libbpf: specified path /home/ubuntu/test/sock_ops_map is not on BPF FS Error: failed to pin all maps [1]: https://github.com/libbpf/bpftool/issues/146 Fixes: 3767a94b3253 ("bpftool: add pinmaps argument to the load/loadall") Signed-off-by: Tao Chen --- tools/bpf/bpftool/prog.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 1a501cf09e78..40ea743d139f 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -1813,6 +1813,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) } if (pinmaps) { + err = create_and_mount_bpffs_dir(pinmaps); + if (err) + goto err_unpin; + err = bpf_object__pin_maps(obj, pinmaps); if (err) { p_err("failed to pin all maps"); -- 2.34.1 . From: Sean Young To: linux-media@vger.kernel.org, Maxim Levitsky , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/2] media: rc: remove unused tx_resolution field Date: Tue, 2 Jul 2024 14:17:02 +0100 Message-ID: <20240702131705.1073761-1-sean@mess.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265278 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The tx_resolution field is never read. In theory you can imagine this field being useful for detecting whether the transmitter has the resolution for the message you are trying to send, but I am not aware of any hardware where this could be an issue. Just remove. Signed-off-by: Sean Young --- drivers/media/rc/ene_ir.c | 3 --- drivers/media/rc/ite-cir.c | 1 - drivers/media/rc/rc-loopback.c | 1 - include/media/rc-core.h | 2 -- 4 files changed, 7 deletions(-) diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c index 11ee21a7db8f0..67722e2e47ff7 100644 --- a/drivers/media/rc/ene_ir.c +++ b/drivers/media/rc/ene_ir.c @@ -451,9 +451,6 @@ static void ene_rx_setup(struct ene_device *dev) dev->rdev->max_timeout = 200000; } - if (dev->hw_learning_and_tx_capable) - dev->rdev->tx_resolution = sample_period; - if (dev->rdev->timeout > dev->rdev->max_timeout) dev->rdev->timeout = dev->rdev->max_timeout; if (dev->rdev->timeout < dev->rdev->min_timeout) diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c index fcfadd7ea31cf..2bacecb022623 100644 --- a/drivers/media/rc/ite-cir.c +++ b/drivers/media/rc/ite-cir.c @@ -1380,7 +1380,6 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id rdev->timeout = IR_DEFAULT_TIMEOUT; rdev->max_timeout = 10 * IR_DEFAULT_TIMEOUT; rdev->rx_resolution = ITE_BAUDRATE_DIVISOR * sample_period / 1000; - rdev->tx_resolution = ITE_BAUDRATE_DIVISOR * sample_period / 1000; /* set up transmitter related values */ rdev->tx_ir = ite_tx_ir; diff --git a/drivers/media/rc/rc-loopback.c b/drivers/media/rc/rc-loopback.c index b356041c5c00e..8288366f891fc 100644 --- a/drivers/media/rc/rc-loopback.c +++ b/drivers/media/rc/rc-loopback.c @@ -230,7 +230,6 @@ static int __init loop_init(void) rc->min_timeout = 1; rc->max_timeout = IR_MAX_TIMEOUT; rc->rx_resolution = 1; - rc->tx_resolution = 1; rc->s_tx_mask = loop_set_tx_mask; rc->s_tx_carrier = loop_set_tx_carrier; rc->s_tx_duty_cycle = loop_set_tx_duty_cycle; diff --git a/include/media/rc-core.h b/include/media/rc-core.h index 803349599c272..d095908073ef9 100644 --- a/include/media/rc-core.h +++ b/include/media/rc-core.h @@ -127,7 +127,6 @@ struct lirc_fh { * @min_timeout: minimum timeout supported by device * @max_timeout: maximum timeout supported by device * @rx_resolution : resolution (in us) of input sampler - * @tx_resolution: resolution (in us) of output sampler * @lirc_dev: lirc device * @lirc_cdev: lirc char cdev * @gap_start: start time for gap after timeout if non-zero @@ -194,7 +193,6 @@ struct rc_dev { u32 min_timeout; u32 max_timeout; u32 rx_resolution; - u32 tx_resolution; #ifdef CONFIG_LIRC struct device lirc_dev; struct cdev lirc_cdev; -- 2.45.2 . Date: Tue, 2 Jul 2024 13:21:36 +0000 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: <20240702132139.3332013-1-yosryahmed@google.com> Subject: [RESEND PATCH v3 0/3] x86/mm: LAM fixups and cleanups From: Yosry Ahmed To: x86@kernel.org Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , "Kirill A. Shutemov" , Rick Edgecombe , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yosry Ahmed Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265284 org.kvack.linux-mm:202162 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series has fixups and cleanups for LAM. Most importantly, patch 1 fixes a sycnhronization issue that may cause crashes of userspace applications. This is a resend of v3, rebased on top of v6.10-rc6. v3: https://lore.kernel.org/lkml/20240418012835.3360429-1-yosryahmed@google.com/ v2: https://lore.kernel.org/lkml/20240312155641.4003683-1-yosryahmed@google.com/ v1: https://lore.kernel.org/lkml/20240312035951.3535980-1-yosryahmed@google.com/ RFC: https://lore.kernel.org/lkml/20240307133916.3782068-1-yosryahmed@google.com/ Yosry Ahmed (3): x86/mm: Use IPIs to synchronize LAM enablement x86/mm: Fix LAM inconsistency during context switch x86/mm: Cleanup prctl_enable_tagged_addr() nr_bits error checking arch/x86/include/asm/mmu_context.h | 8 +++++++- arch/x86/include/asm/tlbflush.h | 9 ++++----- arch/x86/kernel/process_64.c | 25 ++++++++++++++++--------- arch/x86/mm/tlb.c | 15 ++++++++------- 4 files changed, 35 insertions(+), 22 deletions(-) -- 2.45.2.803.g4e1b14247a-goog . From: Junlin Li To: mchehab@kernel.org, tzimmermann@suse.de, peda@axentia.se, wsa+renesas@sang-engineering.com, hkallweit1@gmail.com, laurent.pinchart+renesas@ideasonboard.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Junlin Li Subject: [PATCH] drivers: media: dvb-frontends/rtl2832: fix an out-of-bounds write error Date: Tue, 2 Jul 2024 21:24:13 +0800 Message-Id: <20240702132413.4318-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265289 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Ensure index in rtl2830_pid_filter does not exceed 31 to prevent out-of-bounds access. dev->filters is a 32-bit value, so set_bit and clear_bit functions should only operate on indices from 0 to 31. If index is 32, it will attempt to access a non-existent 33rd bit, leading to out-of-bounds access. Change the boundary check from index > 32 to index >= 32 to resolve this issue. Signed-off-by: Junlin Li --- drivers/media/dvb-frontends/rtl2832.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index 5142820b1b3d..76c3f40443b2 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -983,7 +983,7 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, index, pid, onoff, dev->slave_ts); /* skip invalid PIDs (0x2000) */ - if (pid > 0x1fff || index > 32) + if (pid > 0x1fff || index >= 32) return 0; if (onoff) -- 2.34.1 . From: libaokun@huaweicloud.com To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ritesh.list@gmail.com, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li Subject: [PATCH 0/2] ext4: fix unable to handle kernel paging request in do_split() Date: Tue, 2 Jul 2024 21:23:47 +0800 Message-Id: <20240702132349.2600605-1-libaokun@huaweicloud.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265291 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-ext4 Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Baokun Li "kvm-xfstests -c ext4/all -g auto" has been executed with no new failures. Baokun Li (2): ext4: check dot and dotdot of dx_root before making dir indexed ext4: make sure the first directory block is not a hole fs/ext4/namei.c | 73 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 16 deletions(-) -- 2.39.2 . From: Suzuki K Poulose To: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, anshuman.khandual@arm.com, mike.leach@linaro.org, Suzuki K Poulose , James Clark Subject: [PATCH] coresight: tmc: sg: Do not leak sg_table Date: Tue, 2 Jul 2024 14:28:46 +0100 Message-Id: <20240702132846.1677261-1-suzuki.poulose@arm.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265297 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Running perf with cs_etm on Juno triggers the following kmemleak warning ! :~# cat /sys/kernel/debug/kmemleak unreferenced object 0xffffff8806b6d720 (size 96): comm "perf", pid 562, jiffies 4297810960 hex dump (first 32 bytes): 38 d8 13 07 88 ff ff ff 00 d0 9e 85 c0 ff ff ff 8............... 00 10 00 88 c0 ff ff ff 00 f0 ff f7 ff 00 00 00 ................ backtrace (crc 1dbf6e00): [] kmemleak_alloc+0xbc/0xd8 [] kmalloc_trace_noprof+0x220/0x2e8 [] tmc_alloc_sg_table+0x48/0x208 [coresight_tmc] [] tmc_etr_alloc_sg_buf+0xac/0x240 [coresight_tmc] [] tmc_alloc_etr_buf.constprop.0+0x1f0/0x260 [coresight_tmc] [] alloc_etr_buf.constprop.0.isra.0+0x74/0xa8 [coresight_tmc] [] tmc_alloc_etr_buffer+0x110/0x260 [coresight_tmc] [] etm_setup_aux+0x204/0x3b0 [coresight] [] rb_alloc_aux+0x20c/0x318 [] perf_mmap+0x2e4/0x7a0 [] mmap_region+0x3b0/0xa08 [] do_mmap+0x3a0/0x500 [] vm_mmap_pgoff+0x100/0x1d0 [] ksys_mmap_pgoff+0xb8/0x110 [] __arm64_sys_mmap+0x38/0x58 [] invoke_syscall.constprop.0+0x58/0x100 This due to the fact that we do not free the "sg_table" itself while freeing up the SG table and data pages. Fix this by freeing the sg_table in tmc_free_sg_table(). Fixes: 99443ea19e8b ("coresight: Add generic TMC sg table framework") Cc: Mike Leach Cc: James Clark Signed-off-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index e75428fa1592..610ad51cda65 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -261,6 +261,7 @@ void tmc_free_sg_table(struct tmc_sg_table *sg_table) { tmc_free_table_pages(sg_table); tmc_free_data_pages(sg_table); + kfree(sg_table); } EXPORT_SYMBOL_GPL(tmc_free_sg_table); @@ -342,7 +343,6 @@ struct tmc_sg_table *tmc_alloc_sg_table(struct device *dev, rc = tmc_alloc_table_pages(sg_table); if (rc) { tmc_free_sg_table(sg_table); - kfree(sg_table); return ERR_PTR(rc); } -- 2.34.1 . Date: Tue, 2 Jul 2024 21:48:02 +0800 From: Gao Xiang To: Linus Torvalds Cc: linux-erofs@lists.ozlabs.org, LKML , Sandeep Dhavale , Huang Xiaojia , Chao Yu Subject: [GIT PULL] erofs fixes for 6.10-rc7 Message-ID: Mail-Followup-To: Linus Torvalds , linux-erofs@lists.ozlabs.org, LKML , Sandeep Dhavale , Huang Xiaojia , Chao Yu X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265313 Newsgroups: org.kernel.vger.linux-kernel,org.ozlabs.lists.linux-erofs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Linus, Could you consider these patches for 6.10-rc7? The most important one fixes possible infinite loops reported by a smartphone vendor OPPO recently due to some unexpected zero-sized compressed pcluster out of interrupted I/Os, storage failures, etc. Another patch fixes global buffer memory leak on unloading, and the remaining one switches to use super_set_uuid() to keep with the other filesystems. All commits have been in -next for a while and no potential merge conflict is observed. Thanks, Gao Xiang The following changes since commit f2661062f16b2de5d7b6a5c42a9a5c96326b8454: Linux 6.10-rc5 (2024-06-23 17:08:54 -0400) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.10-rc7-fixes for you to fetch changes up to 9b32b063be1001e322c5f6e01f2a649636947851: erofs: ensure m_llen is reset to 0 if metadata is invalid (2024-06-30 10:54:28 +0800) ---------------------------------------------------------------- Changes since last update: - Fix possible global buffer memory leak when unloading EROFS module; - Fix FS_IOC_GETFSUUID ioctl by using super_set_uuid(); - Reset m_llen to 0 so then it can retry if metadata is invalid. ---------------------------------------------------------------- Gao Xiang (1): erofs: ensure m_llen is reset to 0 if metadata is invalid Huang Xiaojia (1): erofs: convert to use super_set_uuid to support for FS_IOC_GETFSUUID Sandeep Dhavale (1): erofs: fix possible memory leak in z_erofs_gbuf_exit() fs/erofs/super.c | 2 +- fs/erofs/zmap.c | 2 ++ fs/erofs/zutil.c | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) . From: Yasin Lee Subject: [PATCH v9 0/3] iio: proximity: Add TYHX HX9023S sensor driver Date: Tue, 02 Jul 2024 22:12:31 +0800 Message-Id: <20240702-add-tyhx-hx9023s-sensor-driver-v9-0-c030f1801d9b@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jonathan Cameron , Lars-Peter Clausen , yasin.lee.x@outlook.com Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Yasin Lee , Krzysztof Kozlowski Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265348 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Signed-off-by: Yasin Lee --- Changes in v9: - Macro definitions: - Deleted: HX9023S_2BYTES, HX9023S_3BYTES, HX9023S_BYTES_MAX, and replaced them with numbers in the code for better readability. - struct hx9023s_ch_data: - Changed the types of raw, lp, bl, and diff from int to s16. - Function hx9023s_sample: - Removed unnecessary local variables: data_size, offset_data_size, *p, size. - Added comments to explain the data length. - Stored the result of get_unaligned_le16() directly in s16 and removed sign_extend32. - Function hx9023s_property_get: - Replaced device_for_each_child_node with device_for_each_child_node_scoped and removed fwnode_handle_put(). - Bugfix: changed sizeof(array) to ARRAY_SIZE(array). - Function hx9023s_push_events: - Added error handling for hx9023s_sample() and hx9023s_get_prox_state(). - Function hx9023s_id_check: - Returns an error only when the ID cannot be read. If the read ID is different from the expected one, it only prints a warning and does not return an error. This helps with backward compatibility of the driver. - Link to v8: https://lore.kernel.org/r/20240625-add-tyhx-hx9023s-sensor-driver-v8-0-0c224e3bddbc@gmail.com Changes in v8: - Removed incorrect tags from the commit messages - Removed duplicate properties in the dt-binding. - Link to v7: https://lore.kernel.org/r/20240625-add-tyhx-hx9023s-sensor-driver-v7-0-b1d65b221811@gmail.com Changes in v7: **tyhx,hx9023s.yaml:** - Removed the unused reference to iio.yaml - Removed the `input-channel` property and switched to inheriting the `single-channel` property from adc.yaml - Sorted the items in the `required` list **hx9023s.c:** - Header Files Section: - Added `` - Removed `` - Replaced `` with `` - Register Initialization: - Deleted the `struct hx9023s_addr_val_pair` - Changed the type of `hx9023s_reg_init_list` to `struct reg_sequence` - Deleted the `hx9023s_reg_init` function and used `regmap_multi_reg_write` for register initialization in `probe` - struct hx9023s_ch_data: - Added a comment to the member `mutex` explaining the data it protects - Function hx9023s_sample: - Fixed the error related to `hx9023s_data_lock` calls - Function hx9023s_property_get: - Added boundary protection for `reg` - Function hx9023s_id_check: - Optimized the function - Function hx9023s_probe: - Changed the call to `devm_iio_device_register` to `return devm_iio_device_register()` - Functions hx9023s_suspend and hx9023s_resume: - Added `guard(mutex)(&data->mutex)` - Code Check: - Ran `checkpatch.pl --strict` and fixed the identified issues - Link to v6: https://lore.kernel.org/r/20240621-add-tyhx-hx9023s-sensor-driver-v6-0-65196a9020f1@gmail.com Changes in v6: **vendor-prefixes.yaml:** - Formatted the description in the commit **tyhx,hx9023s.yaml:** - Added a link to the DataSheet - Added `#address-cells` and `#size-cells` - Removed the following properties: - `channel-in-use` - `channel-positive` - `channel-negative` - Corrected the reference path to `adc.yaml` - Inherited `diff-channels` from `adc.yaml` as differential channels - Added `input-channel` property as a single-ended configuration channel - Made `vdd-supply` a required option - Used the generic name `proximity` instead of the chip name in the DTS example **hx9023s.c:** - Removed the following headers: - `#include ` - `#include ` - `#include ` - Added `#include ` - Updated some macro names: - `HX9023S_DATA_2BYTES` ---> `HX9023S_2BYTES` - `HX9023S_DATA_3BYTES` ---> `HX9023S_3BYTES` - `HX9023S_DATA_BYTES_MAX` ---> `HX9023S_BYTES_MAX` - Added the following macro definitions: - `#define HX9023S_POS 0x03` - `#define HX9023S_NEG 0x02` - `#define HX9023S_NOT_CONNECTED 16` - `#define HX9023S_GLOBAL_CTRL0 0x00` - `struct hx9023s_ch_data`: - Added comments explaining the members `raw`, `lp`, `bl`, `diff` - Changed the type of struct member `thre` from `int` to `unsigned int` - Removed member `cs_position` - Changed the type of `struct buffer` member `channels[HX9023S_CH_NUM]` from `__be16` to `__le16` - Moved `struct hx9023s_ch_data ch_data` to the bottom - Updated comments in the array `hx9023s_reg_init_list`: - Changed `adc` to `ADC`, `avg` to `average`, and `osr` to `OSR` - Provided a more detailed comment for the register `HX9023S_RAW_BL_RD_CFG` - `struct regmap_config hx9023s_regmap_config`: - Added `.rd_type` member - Changed `.cache_type` from `REGCACHE_RBTREE` to `REGCACHE_MAPLE` - Bugfix: The function `hx9023s_data_lock` now only operates on one bit instead of two - `hx9023s_ch_cfg` function: - Replaced magic characters with meaningful macro definitions - Changed byte concatenation operations to use `put_unaligned_le16` - Reviewed each function and made the following changes: - Some returns now directly return `regmap_read/write()` - For single-byte write operations, changed from `regmap_bulk_write(,,,1)` to `regmap_write(,,)` - Changed the type of loop variable `i` to `unsigned` - `hx9023s_write_far_debounce` and `hx9023s_write_near_debounce` functions: - Removed magic numbers and optimized the code - `hx9023s_get_thres_near` and `hx9023s_get_thres_far` functions: - Used intermediate variables for readability and simplified the code logic - `hx9023s_set_thres_near` and `hx9023s_set_thres_far` functions: - Optimized the logic and simplified the code - `hx9023s_get_prox_state` function: - Changed the return value type to `int` - `hx9023s_data_select` function: - Changed the return value type to `int` - `hx9023s_sample` function: - Added intermediate variables for better readability - `hx9023s_ch_en` function: - Optimized the code logic to reduce line count - `hx9023s_property_get` function: - Rewritten due to DTS changes, and calls `fwnode_handle_put` on error to prevent memory leaks - `hx9023s_get_proximity` function: - Added error handling logic for data - `hx9023s_get_samp_freq` function: - Used macro definitions from `units.h` instead of specific numbers for frequency calculation - `hx9023s_set_samp_freq` function: - Used macro definitions from `units.h` instead of specific numbers for frequency calculation - `hx9023s_write_raw` function: - Changed the type of local variable `dir` to `unsigned` - `hx9023s_write_event_config` function: - Replaced `set_bit` and `clear_bit` with `__assign_bit` - `hx9023s_trigger_handler` function: - Added error handling logic for data; fixed uninitialized variable `i` bug - `hx9023s_buffer_preenable` function: - Fixed uninitialized variable `channel` bug - Added `hx9023s_id_check` function - `hx9023s_probe` function: - Returns directly on `devm_iio_device_alloc` error, without logging; removed `fsleep` - `hx9023s_resume` function: - Calls `hx9023s_interrupt_enable` only when `data->trigger_enabled` is true - Removed `hx9023s_acpi_match` - Link to v5: https://lore.kernel.org/linux-iio/SN7PR12MB8101B6D0AB1246797C67E25BA4CE2@SN7PR12MB8101.namprd12.prod.outlook.com/ Changes in v5: - I have addressed all the issues mentioned in the email responses. Additionally, regarding the IIO-related header files, I have checked and found no unused headers. - Link to v4: https://lore.kernel.org/linux-iio/SN7PR12MB810129D8180B1C9593A8E078A4FB2@SN7PR12MB8101.namprd12.prod.outlook.com/ Changes in v4: - Removed hardware-irrelevant properties from dt-bindings, retaining only channel configuration related `channel-positive` and `channel-negative`. Grouped by channel. Retained `channel-in-use` as it is hardware-related. - Removed redundant register definitions. - Reorganized `struct hx9023s_data`, extracting channel-related attributes into a new `struct hx9023s_ch_data`. - Optimized bit operation related code. - Replaced `of_` versions with generic firmware parsing functions. - Fixed other issues mentioned in the email feedback. - Link to v3: https://lore.kernel.org/linux-iio/20240602152638.2c674930@jic23-huawei/ --- Yasin Lee (3): dt-bindings: vendor-prefixes: add tyhx dt-bindings: iio: proximity: Add TYHX HX9023S iio: proximity: Add driver support for TYHX's HX9023S capacitive proximity sensor .../bindings/iio/proximity/tyhx,hx9023s.yaml | 93 ++ .../devicetree/bindings/vendor-prefixes.yaml | 2 + drivers/iio/proximity/Kconfig | 14 + drivers/iio/proximity/Makefile | 1 + drivers/iio/proximity/hx9023s.c | 1124 ++++++++++++++++++++ 5 files changed, 1234 insertions(+) --- base-commit: 1231e065edd236295c31904fe760117551608efa change-id: 20240616-add-tyhx-hx9023s-sensor-driver-e7dbe3bfe596 Best regards, -- Yasin Lee . From: "Masami Hiramatsu (Google)" To: "Rafael J . Wysocki" , Pavel Machek , Len Brown , Randy Dunlap Cc: suleiman@google.com, briannorris@google.com, Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v8 0/1] PM: sleep: Expose last succeeded resumed timestamp in sysfs Date: Tue, 2 Jul 2024 23:24:43 +0900 Message-ID: <171993028355.95379.9391483220285994310.stgit@mhiramat.roam.corp.google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265356 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, Here is the 8th version of the patch to expose last succeeded resumed timestamp in sysfs as /sys/power/suspend_stats/last_success_resume_time. The previous version is here. https://lore.kernel.org/lkml/170359668692.1864392.6909734045167510522.stgit@mhiramat.roam.corp.google.com/ This version is just update against for the upstream kernel. On some system like the ChromeOS, the system suspend and resume are controlled by a power management process. The user-space tasks will be noticed the suspend and the resume signal from it. To improve the suspend/resume performance and/or to find regressions, we would like to know how long the resume processes are taken in kernel and in user-space. This patch introduces a last succeeded resumed timestamp (just before thawing processes) on sysfs which allows us to find when the kernel resume process successfully done in MONOTONIC clock. Thus user processes can measure the elapsed time taken by its resume process at any point in time. This will help us to detect abnormal value (longer time) process in the resuming and quickly decide the root cause is in the kernel or user-space. The kernel side we can use many tools (e.g. printk or ftrace) but for user-space we need to define the starting point of the resuming process. Actually, the kernel side needs to use local clock because the clock subsystem is also suspended. But in that case, user space can not use that timestamp because the local clock is not exposed. So this will be used something like where_the_user_space_resume_finish() { clock_gettime(CLOCK_MONOTONIC, &etime_ts); fileread("/sys/.../last_success_resume_time", stime); convert_timespec(stime, &stime_ts); user_resume_time = timespec_delta(&etime_ts, &stime_ts); ... } Thank you, --- Masami Hiramatsu (1): PM: sleep: Expose last succeeded resumed timestamp in sysfs Documentation/ABI/testing/sysfs-power | 11 +++++++++++ kernel/power/main.c | 28 ++++++++++++++++++++++++++++ kernel/power/power.h | 1 + kernel/power/suspend.c | 1 + 4 files changed, 41 insertions(+) -- Masami Hiramatsu (Google) . From: Sebastian Wick To: dri-devel@lists.freedesktop.org Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org, Pekka Paalanen Subject: [PATCH v2] drm/drm_connector: Document Colorspace property variants Date: Tue, 2 Jul 2024 16:30:16 +0200 Message-ID: <20240702143017.2429975-1-sebastian.wick@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265360 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The initial idea of the Colorspace prop was that this maps 1:1 to InfoFrames/SDP but KMS does not give user space enough information nor control over the output format to figure out which variants can be used for a given KMS commit. At the same time, properties like Broadcast RGB expect full range quantization range being produced by user space from the CRTC and drivers to convert to the range expected by the sink for the chosen output format, mode, InfoFrames, etc. This change documents the reality of the Colorspace property. The Default variant unfortunately is very much driver specific and not reflected by the EDID. The BT2020 variants are in active use by generic compositors which have expectations from the driver about the conversions it has to do when selecting certain output formats. Everything else is also marked as undefined. Coming up with valid behavior that makes it usable from user space and consistent with other KMS properties for those variants is left as an exercise for whoever wants to use them. v2: * Talk about "pixel operation properties" that user space configures * Mention that user space is responsible for checking the EDID for sink support * Make it clear that drivers can choose between RGB and YCbCr on their own Signed-off-by: Sebastian Wick Reviewed-by: Pekka Paalanen --- drivers/gpu/drm/drm_connector.c | 79 +++++++++++++++++++++++++-------- include/drm/drm_connector.h | 8 ---- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git ./drivers/gpu/drm/drm_connector.c ../drivers/gpu/drm/drm_connector.c index ab6ab7ff7ea8..b4f4d2f908d1 100644 --- ./drivers/gpu/drm/drm_connector.c +++ ../drivers/gpu/drm/drm_connector.c @@ -2315,24 +2315,67 @@ EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); * DOC: standard connector properties * * Colorspace: - * This property helps select a suitable colorspace based on the sink - * capability. Modern sink devices support wider gamut like BT2020. - * This helps switch to BT2020 mode if the BT2020 encoded video stream - * is being played by the user, same for any other colorspace. Thereby - * giving a good visual experience to users. - * - * The expectation from userspace is that it should parse the EDID - * and get supported colorspaces. Use this property and switch to the - * one supported. Sink supported colorspaces should be retrieved by - * userspace from EDID and driver will not explicitly expose them. - * - * Basically the expectation from userspace is: - * - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink - * colorspace - * - Set this new property to let the sink know what it - * converted the CRTC output to. - * - This property is just to inform sink what colorspace - * source is trying to drive. + * This property is used to inform the driver about the color encoding + * user space configured the pixel operation properties to produce. + * The variants set the colorimetry, transfer characteristics, and which + * YCbCr conversion should be used when necessary. + * The transfer characteristics from HDR_OUTPUT_METADATA takes precedence + * over this property. + * User space always configures the pixel operation properties to produce + * full quantization range data (see the Broadcast RGB property). + * + * Drivers inform the sink about what colorimetry, transfer + * characteristics, YCbCr conversion, and quantization range to expect + * (this can depend on the output mode, output format and other + * properties). Drivers also convert the user space provided data to what + * the sink expects. + * + * User space has to check if the sink supports all of the possible + * colorimetries that the driver is allowed to pick by parsing the EDID. + * + * For historical reasons this property exposes a number of variants which + * result in undefined behavior. + * + * Default: + * The behavior is driver-specific. + * BT2020_RGB: + * BT2020_YCC: + * User space configures the pixel operation properties to produce + * RGB content with Rec. ITU-R BT.2020 colorimetry, Rec. + * ITU-R BT.2020 (Table 4, RGB) transfer characteristics and full + * quantization range. + * User space can use the HDR_OUTPUT_METADATA property to set the + * transfer characteristics to PQ (Rec. ITU-R BT.2100 Table 4) or + * HLG (Rec. ITU-R BT.2100 Table 5) in which case, user space + * configures pixel operation properties to produce content with + * the respective transfer characteristics. + * User space has to make sure the sink supports Rec. + * ITU-R BT.2020 R'G'B' and Rec. ITU-R BT.2020 Y'C'BC'R + * colorimetry. + * Drivers can configure the sink to use an RGB format, tell the + * sink to expect Rec. ITU-R BT.2020 R'G'B' colorimetry and convert + * to the appropriate quantization range. + * Drivers can configure the sink to use a YCbCr format, tell the + * sink to expect Rec. ITU-R BT.2020 Y'C'BC'R colorimetry, convert + * to YCbCr using the Rec. ITU-R BT.2020 non-constant luminance + * conversion matrix and convert to the appropriate quantization + * range. + * The variants BT2020_RGB and BT2020_YCC are equivalent and the + * driver chooses between RGB and YCbCr on its own. + * SMPTE_170M_YCC: + * BT709_YCC: + * XVYCC_601: + * XVYCC_709: + * SYCC_601: + * opYCC_601: + * opRGB: + * BT2020_CYCC: + * DCI-P3_RGB_D65: + * DCI-P3_RGB_Theater: + * RGB_WIDE_FIXED: + * RGB_WIDE_FLOAT: + * BT601_YCC: + * The behavior is undefined. * * Because between HDMI and DP have different colorspaces, * drm_mode_create_hdmi_colorspace_property() is used for HDMI connector and diff --git ./include/drm/drm_connector.h ../include/drm/drm_connector.h index c754651044d4..e3fa43291f44 100644 --- ./include/drm/drm_connector.h +++ ../include/drm/drm_connector.h @@ -471,14 +471,6 @@ enum drm_privacy_screen_status { * * DP definitions come from the DP v2.0 spec * HDMI definitions come from the CTA-861-H spec - * - * A note on YCC and RGB variants: - * - * Since userspace is not aware of the encoding on the wire - * (RGB or YCbCr), drivers are free to pick the appropriate - * variant, regardless of what userspace selects. E.g., if - * BT2020_RGB is selected by userspace a driver will pick - * BT2020_YCC if the encoding on the wire is YUV444 or YUV420. * * @DRM_MODE_COLORIMETRY_DEFAULT: * Driver specific behavior. -- 2.45.1 . From: David Howells To: Steve French cc: dhowells@redhat.com, Paulo Alcantara , Jeff Layton , Christian Brauner , Matthew Wilcox , linux-cifs@vger.kernel.org, netfs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] cifs: Fix read-performance regression by dropping readahead expansion X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Date: Tue, 02 Jul 2024 15:50:09 +0100 Message-ID: <3042271.1719931809@warthog.procyon.org.uk> Xref: photonic.trudheim.com org.kernel.vger.linux-cifs:43222 org.kernel.vger.linux-kernel:1265365 org.kvack.linux-mm:202200 Newsgroups: org.kernel.vger.linux-cifs,dev.linux.lists.netfs,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail cifs_expand_read() is causing a performance regression of around 30% by causing extra pagecache to be allocated for an inode in the readahead path before we begin actually dispatching RPC requests, thereby delaying the actual I/O. The expansion is sized according to the rsize parameter, whic= h seems to be 4MiB on my test system; this is a big step up from the first requests made by the fio test program. Fix this by removing cifs_expand_readahead(). Readahead expansion is mostly useful for when we're using the local cache if the local cache has = a block size greater than PAGE_SIZE, so we can dispense with it when not caching. Signed-off-by: David Howells cc: Steve French cc: Paulo Alcantara cc: Jeff Layton cc: Matthew Wilcox cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/smb/client/file.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index f1f2573bb18d..1374635e89fa 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -245,35 +245,6 @@ static int cifs_init_request(struct netfs_io_request = *rreq, struct file *file) return 0; } = -/* - * Expand the size of a readahead to the size of the rsize, if at least a= s - * large as a page, allowing for the possibility that rsize is not pow-2 - * aligned. - */ -static void cifs_expand_readahead(struct netfs_io_request *rreq) -{ - unsigned int rsize =3D rreq->rsize; - loff_t misalignment, i_size =3D i_size_read(rreq->inode); - - if (rsize < PAGE_SIZE) - return; - - if (rsize < INT_MAX) - rsize =3D roundup_pow_of_two(rsize); - else - rsize =3D ((unsigned int)INT_MAX + 1) / 2; - - misalignment =3D rreq->start & (rsize - 1); - if (misalignment) { - rreq->start -=3D misalignment; - rreq->len +=3D misalignment; - } - - rreq->len =3D round_up(rreq->len, rsize); - if (rreq->start < i_size && rreq->len > i_size - rreq->start) - rreq->len =3D i_size - rreq->start; -} - /* * Completion of a request operation. */ @@ -329,7 +300,6 @@ const struct netfs_request_ops cifs_req_ops =3D { .init_request =3D cifs_init_request, .free_request =3D cifs_free_request, .free_subrequest =3D cifs_free_subrequest, - .expand_readahead =3D cifs_expand_readahead, .clamp_length =3D cifs_clamp_length, .issue_read =3D cifs_req_issue_read, .done =3D cifs_rreq_done, . From: Ryan Roberts To: Andrew Morton , Jonathan Corbet , David Hildenbrand , Barry Song , Baolin Wang , Lance Yang , Yang Shi Cc: Ryan Roberts , linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v1] mm: Fix khugepaged activation policy Date: Tue, 2 Jul 2024 15:46:14 +0100 Message-ID: <20240702144617.2291480-1-ryan.roberts@arm.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265366 org.kvack.linux-mm:202201 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.stable,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Since the introduction of mTHP, the docuementation has stated that khugepaged would be enabled when any mTHP size is enabled, and disabled when all mTHP sizes are disabled. There are 2 problems with this; 1. this is not what was implemented by the code and 2. this is not the desirable behavior. Desirable behavior is for khugepaged to be enabled when any PMD-sized THP is enabled, anon or file. (Note that file THP is still controlled by the top-level control so we must always consider that, as well as the PMD-size mTHP control for anon). khugepaged only supports collapsing to PMD-sized THP so there is no value in enabling it when PMD-sized THP is disabled. So let's change the code and documentation to reflect this policy. Further, per-size enabled control modification events were not previously forwarded to khugepaged to give it an opportunity to start or stop. Consequently the following was resulting in khugepaged eroneously not being activated: echo never > /sys/kernel/mm/transparent_hugepage/enabled echo always > /sys/kernel/mm/transparent_hugepage/hugepages-2048kB/enabled Signed-off-by: Ryan Roberts Fixes: 3485b88390b0 ("mm: thp: introduce multi-size THP sysfs interface") Closes: https://lore.kernel.org/linux-mm/7a0bbe69-1e3d-4263-b206-da007791a5c4@redhat.com/ Cc: stable@vger.kernel.org --- Hi All, Applies on top of today's mm-unstable (9bb8753acdd8). No regressions observed in mm selftests. When fixing this I also noticed that khugepaged doesn't get (and never has been) activated/deactivated by `shmem_enabled=`. I'm not sure if khugepaged knows how to collapse shmem - perhaps it should be activated in this case? Thanks, Ryan Documentation/admin-guide/mm/transhuge.rst | 11 +++++------ include/linux/huge_mm.h | 13 +++++++------ mm/huge_memory.c | 7 +++++++ mm/khugepaged.c | 13 ++++++------- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 709fe10b60f4..fc321d40b8ac 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -202,12 +202,11 @@ PMD-mappable transparent hugepage:: cat /sys/kernel/mm/transparent_hugepage/hpage_pmd_size -khugepaged will be automatically started when one or more hugepage -sizes are enabled (either by directly setting "always" or "madvise", -or by setting "inherit" while the top-level enabled is set to "always" -or "madvise"), and it'll be automatically shutdown when the last -hugepage size is disabled (either by directly setting "never", or by -setting "inherit" while the top-level enabled is set to "never"). +khugepaged will be automatically started when PMD-sized THP is enabled +(either of the per-size anon control or the top-level control are set +to "always" or "madvise"), and it'll be automatically shutdown when +PMD-sized THP is disabled (when both the per-size anon control and the +top-level control are "never") Khugepaged controls ------------------- diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 4d155c7a4792..ce1b47b49cc3 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -128,16 +128,17 @@ static inline bool hugepage_global_always(void) (1< 0) { + int err; + + err = start_stop_khugepaged(); + if (err) + ret = err; + } return ret; } diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 409f67a817f1..708d0e74b61f 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -449,7 +449,7 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, unsigned long vm_flags) { if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && - hugepage_flags_enabled()) { + hugepage_pmd_enabled()) { if (thp_vma_allowable_order(vma, vm_flags, TVA_ENFORCE_SYSFS, PMD_ORDER)) __khugepaged_enter(vma->vm_mm); @@ -2462,8 +2462,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, static int khugepaged_has_work(void) { - return !list_empty(&khugepaged_scan.mm_head) && - hugepage_flags_enabled(); + return !list_empty(&khugepaged_scan.mm_head) && hugepage_pmd_enabled(); } static int khugepaged_wait_event(void) @@ -2536,7 +2535,7 @@ static void khugepaged_wait_work(void) return; } - if (hugepage_flags_enabled()) + if (hugepage_pmd_enabled()) wait_event_freezable(khugepaged_wait, khugepaged_wait_event()); } @@ -2567,7 +2566,7 @@ static void set_recommended_min_free_kbytes(void) int nr_zones = 0; unsigned long recommended_min; - if (!hugepage_flags_enabled()) { + if (!hugepage_pmd_enabled()) { calculate_min_free_kbytes(); goto update_wmarks; } @@ -2617,7 +2616,7 @@ int start_stop_khugepaged(void) int err = 0; mutex_lock(&khugepaged_mutex); - if (hugepage_flags_enabled()) { + if (hugepage_pmd_enabled()) { if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL, "khugepaged"); @@ -2643,7 +2642,7 @@ int start_stop_khugepaged(void) void khugepaged_min_free_kbytes_update(void) { mutex_lock(&khugepaged_mutex); - if (hugepage_flags_enabled() && khugepaged_thread) + if (hugepage_pmd_enabled() && khugepaged_thread) set_recommended_min_free_kbytes(); mutex_unlock(&khugepaged_mutex); } -- 2.43.0 . From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH] arm64: dts: mediatek: mt8183-kukui: align thermal node names with bindings Date: Tue, 2 Jul 2024 16:51:02 +0200 Message-ID: <20240702145102.46953-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265371 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Bindings expect thermal zones node name to follow certain pattern. This fixes dtbs_check warning: mt8183-kukui-jacuzzi-burnet.dtb: thermal-zones: 'tboard1', 'tboard2' do not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,10}-thermal$', 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index 6345e969efae..3aea2643f21c 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -974,13 +974,13 @@ &ssusb { }; &thermal_zones { - tboard1 { + tboard1-thermal { polling-delay = <1000>; /* milliseconds */ polling-delay-passive = <0>; /* milliseconds */ thermal-sensors = <&tboard_thermistor1>; }; - tboard2 { + tboard2-thermal { polling-delay = <1000>; /* milliseconds */ polling-delay-passive = <0>; /* milliseconds */ thermal-sensors = <&tboard_thermistor2>; -- 2.43.0 . From: Krzysztof Kozlowski To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Amit Kucheria , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , stable@vger.kernel.org Subject: [PATCH v2] dt-bindings: thermal: correct thermal zone node name limit Date: Tue, 2 Jul 2024 16:52:48 +0200 Message-ID: <20240702145248.47184-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265373 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pm,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Linux kernel uses thermal zone node name during registering thermal zones and has a hard-coded limit of 20 characters, including terminating NUL byte. The bindings expect node names to finish with '-thermal' which is eight bytes long, thus we have only 11 characters for the reset of the node name (thus 10 for the pattern after leading fixed character). Reported-by: Rob Herring Closes: https://lore.kernel.org/all/CAL_JsqKogbT_4DPd1n94xqeHaU_J8ve5K09WOyVsRX3jxxUW3w@mail.gmail.com/ Fixes: 1202a442a31f ("dt-bindings: thermal: Add yaml bindings for thermal zones") Cc: Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Shorten the pattern and mention source of size requirement (Rob). --- Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml index 68398e7e8655..606b80965a44 100644 --- a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml +++ b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml @@ -49,7 +49,10 @@ properties: to take when the temperature crosses those thresholds. patternProperties: - "^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$": + # Node name is limited in size due to Linux kernel requirements - 19 + # characters in total (see THERMAL_NAME_LENGTH, including terminating NUL + # byte): + "^[a-zA-Z][a-zA-Z0-9\\-]{1,10}-thermal$": type: object description: Each thermal zone node contains information about how frequently it -- 2.43.0 . From: Krzysztof Kozlowski To: Shawn Guo , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] arm64: dts: layerscape: fix thermal node names length Date: Tue, 2 Jul 2024 16:54:17 +0200 Message-ID: <20240702145417.47423-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265376 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Linux kernel expects thermal zone node names to be maximum of 19 characters (see THERMAL_NAME_LENGTH, including terminating NUL byte) and bindings/dtbs_check points that: fsl-ls2088a-rdb.dtb: thermal-zones: 'core-cluster1-thermal', 'core-cluster2-thermal', 'core-cluster3-thermal', 'core-cluster4-thermal' do not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,10}-thermal$', 'pinctrl-[0-9]+' Name longer than 19 characters leads to driver probe errors when registering such thermal zone. Signed-off-by: Krzysztof Kozlowski --- See also: https://lore.kernel.org/linux-devicetree/20240702145248.47184-1-krzysztof.kozlowski@linaro.org/T/#u --- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 8 ++++---- arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 6b6e3ee950e5..acf293310f7a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -175,7 +175,7 @@ ddr-ctrler-crit { }; }; - core-cluster-thermal { + cluster-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 1>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index 17f4e3171120..ab4c919e3e16 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -214,7 +214,7 @@ fman-crit { }; }; - core-cluster-thermal { + cluster-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 3>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi index 200e52622f99..55019866d6a2 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -182,7 +182,7 @@ fman-crit { }; }; - core-cluster-thermal { + cluster-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 3>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi index 8ce4b6aae79d..e3a7db21fe29 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi @@ -131,7 +131,7 @@ its: msi-controller@6020000 { }; thermal-zones { - core-cluster-thermal { + cluster-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 0>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index bde89de2576e..1b306d6802ce 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -122,7 +122,7 @@ ddr-ctrler3-crit { }; }; - core-cluster1-thermal { + cluster1-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 4>; @@ -151,7 +151,7 @@ map0 { }; }; - core-cluster2-thermal { + cluster2-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 5>; @@ -180,7 +180,7 @@ map0 { }; }; - core-cluster3-thermal { + cluster3-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 6>; @@ -209,7 +209,7 @@ map0 { }; }; - core-cluster4-thermal { + cluster4-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 7>; diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi index 26c7ca31e22e..bd75a658767d 100644 --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi @@ -492,7 +492,7 @@ map0 { }; }; - ddr-cluster5-thermal { + ddr-ctrl5-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 1>; -- 2.43.0 . From: Petar Stoykov via B4 Relay Subject: [PATCH v3 0/3] Add support for Sensirion SDP500 Date: Tue, 02 Jul 2024 16:59:07 +0200 Message-Id: <20240702-mainline_sdp500-v3-0-0902047b3eee@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: linux-iio@vger.kernel.org, Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Shevchenko Cc: Petar Stoykov , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Original-From: Petar Stoykov Reply-To: pd.pstoykov@gmail.com Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265382 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch series introduces support for Sensirion SDP500 in the IIO subsystem. The series is split into three patches: 1. The first patch adds the device tree bindings. 2. The second patch implements the device driver. 3. The third patch updates the MAINTAINERS file. The driver is relatively simple. It provides a way to read the measured differential pressure directly in Pa, as the device has a fixed scale factor of 1/60. When an applications wants to read the pressure value, 3 bytes are read from the device, 2 are data and 1 is CRC8. If the crc check passes, the raw value is made available. The initialization of the device just starts the measurement process. We have been using this device and driver in a product development for almost a year now. There the pressure is read every 25ms and is used in a control loop. We have not even seen crc errors. We are using the "linux-imx" repository and not the mainline one but I see no risky kernel functions in use so it should be fine here too. All feedback is appreciated! Thank you for taking the time to review this. Changelog v1->v2: driver code: * Removed the use of wrapper functions for logging * Using built-in crc function instead of a custom one * Removed the use of a wrapper function for i2c send and receive data * Use get_unaligned_be16 instead of custom calculation * Removed error log if devm_iio_device_alloc fails * indio_dev->name set directly to "sdp500" * Updated error logging to use "dev_err_probe" in probe function * Added a sensor readout in the probe function (first one is always bad) * Used devm_iio_device_register instead of iio_device_register * Removed trailing comma in "sdp500_id" data * Deleted sdp500_remove after using devm_iio_device_register in probe dt-bindings: * Fixed dt-bindings example wording * Added vdd-supply in dt-bindings example v2->v3: driver code: * Added link to datasheet at the start of the driver code * Removed some unnecessary defines * Removed an unused argument of sdp500_start_measurement function * Renamed variable that holds the received CRC to "received_crc" * Switched to returning RAW and SCALE values instead of PROCESSED * Change logging to use data->dev instead of indio_dev->dev.parent * Removed unnecessary debug log of the read value from the sensor * Added vdd regulator handling * Added "sensirion,sdp510" as compatible * Removed the aligning of '=' in the sdp500_driver struct dt-bindings: * Added "sensirion,sdp510" as possible compatible value in dt-bindings example Signed-off-by: Petar Stoykov --- Petar Stoykov (3): dt-bindings: iio: pressure: Add Sensirion SDP500 iio: pressure: Add driver for Sensirion SDP500 MAINTAINERS: Add Sensirion SDP500 .../bindings/iio/pressure/sensirion,sdp500.yaml | 41 ++++++ MAINTAINERS | 6 + drivers/iio/pressure/Kconfig | 9 ++ drivers/iio/pressure/Makefile | 1 + drivers/iio/pressure/sdp500.c | 153 +++++++++++++++++++++ 5 files changed, 210 insertions(+) --- base-commit: ab27740f76654ed58dd32ac0ba0031c18a6dea3b change-id: 20240702-mainline_sdp500-0d9f8c499228 Best regards, -- Petar Stoykov . From: Huacai Chen To: Huacai Chen Cc: loongarch@lists.linux.dev, Xuefeng Li , Guo Ren , Xuerui Wang , Jiaxun Yang , linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, Huacai Chen Subject: [PATCH] LoongArch: Use correct API to map cmdline in relocate_kernel() Date: Tue, 2 Jul 2024 23:14:15 +0800 Message-ID: <20240702151415.1160566-1-chenhuacai@loongson.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265398 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.loongarch Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail fw_arg1 is in memory space rather than I/O space, so we should use early_memremap_ro() instead of early_ioremap() to map the cmdline. Moreover, we should unmap it after using. Suggested-by: Jiaxun Yang Signed-off-by: Huacai Chen --- arch/loongarch/kernel/relocate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/kernel/relocate.c b/arch/loongarch/kernel/relocate.c index 1acfa704c8d0..0eddd4a66b87 100644 --- a/arch/loongarch/kernel/relocate.c +++ b/arch/loongarch/kernel/relocate.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -170,7 +171,7 @@ unsigned long __init relocate_kernel(void) unsigned long kernel_length; unsigned long random_offset = 0; void *location_new = _text; /* Default to original kernel start */ - char *cmdline = early_ioremap(fw_arg1, COMMAND_LINE_SIZE); /* Boot command line is passed in fw_arg1 */ + char *cmdline = early_memremap_ro(fw_arg1, COMMAND_LINE_SIZE); /* Boot command line is passed in fw_arg1 */ strscpy(boot_command_line, cmdline, COMMAND_LINE_SIZE); @@ -182,6 +183,7 @@ unsigned long __init relocate_kernel(void) random_offset = (unsigned long)location_new - (unsigned long)(_text); #endif reloc_offset = (unsigned long)_text - VMLINUX_LOAD_ADDRESS; + early_memunmap(cmdline, COMMAND_LINE_SIZE); if (random_offset) { kernel_length = (long)(_end) - (long)(_text); -- 2.43.0 . From: Huacai Chen To: Huacai Chen Cc: loongarch@lists.linux.dev, Xuefeng Li , Guo Ren , Xuerui Wang , Jiaxun Yang , linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, Huacai Chen Subject: [PATCH] LoongArch: Add ARCH_HAS_PTE_DEVMAP support Date: Tue, 2 Jul 2024 23:14:31 +0800 Message-ID: <20240702151431.1160915-1-chenhuacai@loongson.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265400 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.loongarch Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In order for things like get_user_pages() to work on ZONE_DEVICE memory, we need a software PTE bit to identify device-backed PFNs. Hook this up along with the relevant helpers to join in with ARCH_HAS_PTE_DEVMAP. Signed-off-by: Huacai Chen --- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/pgtable-bits.h | 6 ++++-- arch/loongarch/include/asm/pgtable.h | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index ddc042895d01..d8ca8b1b01f3 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -22,6 +22,7 @@ config LOONGARCH select ARCH_HAS_KERNEL_FPU_SUPPORT if CPU_HAS_FPU select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE + select ARCH_HAS_PTE_DEVMAP select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_INLINE_READ_LOCK if !PREEMPTION diff --git a/arch/loongarch/include/asm/pgtable-bits.h b/arch/loongarch/include/asm/pgtable-bits.h index 21319c1e045c..82cd3a9f094b 100644 --- a/arch/loongarch/include/asm/pgtable-bits.h +++ b/arch/loongarch/include/asm/pgtable-bits.h @@ -22,6 +22,7 @@ #define _PAGE_PFN_SHIFT 12 #define _PAGE_SWP_EXCLUSIVE_SHIFT 23 #define _PAGE_PFN_END_SHIFT 48 +#define _PAGE_DEVMAP_SHIFT 59 #define _PAGE_PRESENT_INVALID_SHIFT 60 #define _PAGE_NO_READ_SHIFT 61 #define _PAGE_NO_EXEC_SHIFT 62 @@ -35,6 +36,7 @@ #define _PAGE_MODIFIED (_ULCAST_(1) << _PAGE_MODIFIED_SHIFT) #define _PAGE_PROTNONE (_ULCAST_(1) << _PAGE_PROTNONE_SHIFT) #define _PAGE_SPECIAL (_ULCAST_(1) << _PAGE_SPECIAL_SHIFT) +#define _PAGE_DEVMAP (_ULCAST_(1) << _PAGE_DEVMAP_SHIFT) /* We borrow bit 23 to store the exclusive marker in swap PTEs. */ #define _PAGE_SWP_EXCLUSIVE (_ULCAST_(1) << _PAGE_SWP_EXCLUSIVE_SHIFT) @@ -74,8 +76,8 @@ #define __READABLE (_PAGE_VALID) #define __WRITEABLE (_PAGE_DIRTY | _PAGE_WRITE) -#define _PAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PFN_MASK | _CACHE_MASK | _PAGE_PLV) -#define _HPAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PFN_MASK | _CACHE_MASK | _PAGE_PLV | _PAGE_HUGE) +#define _PAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PAGE_DEVMAP | _PFN_MASK | _CACHE_MASK | _PAGE_PLV) +#define _HPAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PAGE_DEVMAP | _PFN_MASK | _CACHE_MASK | _PAGE_PLV | _PAGE_HUGE) #define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_NO_READ | \ _PAGE_USER | _CACHE_CC) diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index af3acdf3481a..0e821be63268 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -424,6 +424,9 @@ static inline int pte_special(pte_t pte) { return pte_val(pte) & _PAGE_SPECIAL; static inline pte_t pte_mkspecial(pte_t pte) { pte_val(pte) |= _PAGE_SPECIAL; return pte; } #endif /* CONFIG_ARCH_HAS_PTE_SPECIAL */ +static inline int pte_devmap(pte_t pte) { return !!(pte_val(pte) & _PAGE_DEVMAP); } +static inline pte_t pte_mkdevmap(pte_t pte) { pte_val(pte) |= _PAGE_DEVMAP; return pte; } + #define pte_accessible pte_accessible static inline unsigned long pte_accessible(struct mm_struct *mm, pte_t a) { @@ -558,6 +561,17 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd) return pmd; } +static inline int pmd_devmap(pmd_t pmd) +{ + return !!(pmd_val(pmd) & _PAGE_DEVMAP); +} + +static inline pmd_t pmd_mkdevmap(pmd_t pmd) +{ + pmd_val(pmd) |= _PAGE_DEVMAP; + return pmd; +} + static inline struct page *pmd_page(pmd_t pmd) { if (pmd_trans_huge(pmd)) @@ -613,6 +627,11 @@ static inline long pmd_protnone(pmd_t pmd) #define pmd_leaf(pmd) ((pmd_val(pmd) & _PAGE_HUGE) != 0) #define pud_leaf(pud) ((pud_val(pud) & _PAGE_HUGE) != 0) +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#define pud_devmap(pud) (0) +#define pgd_devmap(pgd) (0) +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + /* * We provide our own get_unmapped area to cope with the virtual aliasing * constraints placed on us by the cache architecture. -- 2.43.0 . From: Huacai Chen To: Huacai Chen Cc: loongarch@lists.linux.dev, Xuefeng Li , Guo Ren , Xuerui Wang , Jiaxun Yang , linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, Huacai Chen Subject: [PATCH] LoongArch: Add ARCH_HAS_DEBUG_VM_PGTABLE support Date: Tue, 2 Jul 2024 23:14:46 +0800 Message-ID: <20240702151446.1161159-1-chenhuacai@loongson.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265403 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.loongarch Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add ARCH_HAS_DEBUG_VM_PGTABLE selection in Kconfig, in order to make corresponding vm debug features usable on LoongArch. Also update the corresponding arch-support.txt document. Signed-off-by: Huacai Chen --- Documentation/features/debug/debug-vm-pgtable/arch-support.txt | 2 +- arch/loongarch/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/features/debug/debug-vm-pgtable/arch-support.txt b/Documentation/features/debug/debug-vm-pgtable/arch-support.txt index bbf029f095cb..156687a7436d 100644 --- a/Documentation/features/debug/debug-vm-pgtable/arch-support.txt +++ b/Documentation/features/debug/debug-vm-pgtable/arch-support.txt @@ -12,7 +12,7 @@ | arm64: | ok | | csky: | TODO | | hexagon: | TODO | - | loongarch: | TODO | + | loongarch: | ok | | m68k: | TODO | | microblaze: | TODO | | mips: | TODO | diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index d8ca8b1b01f3..e346b5b0a5ca 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -16,6 +16,7 @@ config LOONGARCH select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER + select ARCH_HAS_DEBUG_VM_PGTABLE select ARCH_HAS_FAST_MULTIPLIER select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_KCOV -- 2.43.0 . From: Huacai Chen To: "Rafael J . Wysocki" , Viresh Kumar , Huacai Chen Cc: loongarch@lists.linux.dev, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Xuerui Wang , Jiaxun Yang , Huacai Chen Subject: [PATCH V2 0/2] LoongArch: Add Loongson-3 CPUFreq driver support Date: Tue, 2 Jul 2024 23:27:35 +0800 Message-ID: <20240702152737.1184244-1-chenhuacai@loongson.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265417 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.loongarch,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series add architectural preparation and CPUFreq driver for Loongson-3 (based on LoongArch). Some of LoongArch processors support DVFS, their IOCSR.FEATURES has IOCSRF_FREQSCALE set. And they has a micro-core in the package called SMC (System Management Controller) to scale frequency, voltage, etc. V1 -> V2: 1, Use module_platform_driver() instead of module_init()/module_exit(); 2, Move the lock protection into do_service_request(); 3, Add light-weight hotplug support with help of online()/offline() callbacks; 4, Simplify loongson3_freq_data by removing cur_cpu_freq; 5, Remove unneeded cpu_online() checking. Huacai Chen(2): LoongArch: Add architectural preparation for CPUFreq. cpufreq: Add Loongson-3 CPUFreq driver support. Signed-off-by: Huacai Chen --- 2.27.0 . From: Frank Li To: Will Deacon , Bjorn Helgaas , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-pci@vger.kernel.org (open list:PCI DRIVER FOR GENERIC OF HOSTS), linux-arm-kernel@lists.infradead.org (moderated list:PCI DRIVER FOR GENERIC OF HOSTS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Cc: imx@lists.linux.dev Subject: [PATCH 1/1] dt-bindings: PCI: host-generic-pci: Increase maxItems to 8 of ranges Date: Tue, 2 Jul 2024 11:37:02 -0400 Message-Id: <20240702153702.3827386-1-Frank.Li@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265432 org.kernel.vger.linux-pci:144793 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail IEEE Std 1275-1994 is Inactive-Withdrawn Standard according to https://standards.ieee.org/ieee/1275/1932/. "require at least one non-prefetchable memory and One or both of prefetchable Memory and IO Space may also be provided". But it does not limit maximum ranges number is 3. Inscrease maximum to 8 because freescale ls1028 and iMX95 use more than 3 ranges. Fix below CHECK_DTBS warning. arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dtb: pcie@1f0000000: ranges: [[2181038080, 1, 4160749568, 1, 4160749568, 0, 1441792], [3254779904, 1, 4162191360, 1, 4162191360, 0, 458752], [2181038080, 1, 4162650112, 1, 4162650112, 0, 131072], [3254779904, 1, 4162781184, 1, 4162781184, 0, 131072], [2181038080, 1, 4162912256, 1, 4162912256, 0, 131072], [3254779904, 1, 4163043328, 1, 4163043328, 0, 131072], [2181038080, 1, 4227858432, 1, 4227858432, 0, 4194304]] is too long Signed-off-by: Frank Li --- Documentation/devicetree/bindings/pci/host-generic-pci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pci/host-generic-pci.yaml b/Documentation/devicetree/bindings/pci/host-generic-pci.yaml index 3484e0b4b412e..506eed7f6c63d 100644 --- a/Documentation/devicetree/bindings/pci/host-generic-pci.yaml +++ b/Documentation/devicetree/bindings/pci/host-generic-pci.yaml @@ -103,7 +103,7 @@ properties: definition of non-prefetchable memory. One or both of prefetchable Memory and IO Space may also be provided. minItems: 1 - maxItems: 3 + maxItems: 8 dma-coherent: true iommu-map: true -- 2.34.1 . From: Frieder Schrempf To: Conor Dooley , devicetree@vger.kernel.org, imx@lists.linux.dev, Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Li Yang , Rob Herring , Sascha Hauer , Shawn Guo Cc: Frieder Schrempf , Alexander Stein , Bjorn Helgaas , Conor Dooley , Fabio Estevam , Francesco Dolcini , Gregor Herburger , Hiago De Franco , Hugo Villeneuve , Joao Paulo Goncalves , Krzysztof Kozlowski , Marco Felsch , Markus Niebel , Pengutronix Kernel Team , Tim Harvey Subject: [PATCH 0/3] Add support for Kontron OSM-S i.MX8MP SoM and carrier boards Date: Tue, 2 Jul 2024 17:43:18 +0200 Message-ID: <20240702154413.968044-1-frieder@fris.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265442 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Frieder Schrempf Patch 1: board DT bindings Patch 2: OSM-S i.MX8MP SoM and BL carrier board devicetrees Patch 3: i.MX8MP SMARC module and eval carrier board devicetrees Frieder Schrempf (3): dt-bindings: arm: fsl: Add Kontron i.MX8MP OSM-S based boards arm64: dts: Add support for Kontron OSM-S i.MX8MP SoM and BL carrier board arm64: dts: Add support for Kontron i.MX8MP SMARC module and eval carrier .../devicetree/bindings/arm/fsl.yaml | 13 + arch/arm64/boot/dts/freescale/Makefile | 6 + .../dts/freescale/imx8mp-kontron-bl-osm-s.dts | 307 ++++++ .../boot/dts/freescale/imx8mp-kontron-dl.dtso | 112 +++ .../dts/freescale/imx8mp-kontron-osm-s.dtsi | 908 ++++++++++++++++++ .../imx8mp-kontron-smarc-eval-carrier.dts | 224 +++++ .../dts/freescale/imx8mp-kontron-smarc.dtsi | 271 ++++++ 7 files changed, 1841 insertions(+) create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-kontron-dl.dtso create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-kontron-osm-s.dtsi create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-kontron-smarc-eval-carrier.dts create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-kontron-smarc.dtsi -- 2.45.2 . From: WangYuli To: gregkh@linuxfoundation.org, hgajjar@de.adit-jv.com, stern@rowland.harvard.edu, lb@semihalf.com, wangyuli@uniontech.com Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, guanwentao@uniontech.com Subject: [PATCH] USB: Add USB_QUIRK_NO_SET_INTF quirk for START BP-850k Date: Tue, 2 Jul 2024 23:44:08 +0800 Message-ID: <202E4B2BD0F0FEA4+20240702154408.631201-1-wangyuli@uniontech.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265448 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-usb Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail START BP-850K is a dot matrix printer that crashes when it receives a Set-Interface request and needs USB_QUIRK_NO_SET_INTF to work properly. Signed-off-by: jinxiaobo Signed-off-by: WangYuli --- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index b4783574b8e6..13171454f959 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -506,6 +506,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1b1c, 0x1b38), .driver_info = USB_QUIRK_DELAY_INIT | USB_QUIRK_DELAY_CTRL_MSG }, + /* START BP-850k Printer */ + { USB_DEVICE(0x1bc3, 0x0003), .driver_info = USB_QUIRK_NO_SET_INTF }, + /* MIDI keyboard WORLDE MINI */ { USB_DEVICE(0x1c75, 0x0204), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, -- 2.43.4 . From: Satya Priya Kakitapalli Subject: [PATCH v2 0/6] clk: qcom: sm8150: Add camera clock controller support for SM8150 Date: Tue, 2 Jul 2024 21:20:38 +0530 Message-ID: <20240702-camcc-support-sm8150-v2-0-4baf54ec7333@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Bjorn Andersson , Konrad Dybcio , Michael Turquette , Stephen Boyd , Abhishek Sahu , "Rob Herring" , Krzysztof Kozlowski , Conor Dooley CC: Stephen Boyd , , , , , Ajit Pandey , "Imran Shaik" , Taniya Das , Jagadeesh Kona , Satya Priya Kakitapalli , , Krzysztof Kozlowski , Bryan O'Donoghue Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265452 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add camcc support and Regera PLL ops. Also, fix the pll post div mask. Signed-off-by: Satya Priya Kakitapalli --- Changes in v2: - As per Konrad's comments, re-use the zonda pll code for regera, as both are mostly same. - Fix the zonda_set_rate API and also the pll_post_div shift used in trion pll post div set rate API - Link to v1: https://lore.kernel.org/r/20240229-camcc-support-sm8150-v1-0-8c28c6c87990@quicinc.com --- Satya Priya Kakitapalli (5): clk: qcom: alpha-pll: Fix the pll post div mask and shift clk: qcom: clk-alpha-pll: Update set_rate for Zonda PLL dt-bindings: clock: qcom: Add SM8150 camera clock controller clk: qcom: Add camera clock controller driver for SM8150 arm64: dts: qcom: Add camera clock controller for sm8150 Taniya Das (1): clk: qcom: clk-alpha-pll: Add support for Regera PLL ops .../bindings/clock/qcom,sm8150-camcc.yaml | 77 + arch/arm64/boot/dts/qcom/sa8155p.dtsi | 4 + arch/arm64/boot/dts/qcom/sm8150.dtsi | 13 + drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/camcc-sm8150.c | 2159 ++++++++++++++++++++ drivers/clk/qcom/clk-alpha-pll.c | 56 +- drivers/clk/qcom/clk-alpha-pll.h | 5 + include/dt-bindings/clock/qcom,sm8150-camcc.h | 135 ++ 9 files changed, 2455 insertions(+), 4 deletions(-) --- base-commit: 20af1ca418d2c0b11bc2a1fe8c0c88f67bcc2a7e change-id: 20240229-camcc-support-sm8150-d3f72a4a1a2b Best regards, -- Satya Priya Kakitapalli . From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, frankja@linux.ibm.com, borntraeger@de.ibm.com, nrb@linux.ibm.com, nsg@linux.ibm.com, seiden@linux.ibm.com, david@redhat.com Subject: [PATCH v1 1/1] KVM: s390: remove useless include Date: Tue, 2 Jul 2024 17:56:06 +0200 Message-ID: <20240702155606.71398-1-imbrenda@linux.ibm.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265461 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kvm,org.kernel.vger.linux-s390 Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail arch/s390/include/asm/kvm_host.h includes linux/kvm_host.h, but linux/kvm_host.h includes asm/kvm_host.h . It turns out that arch/s390/include/asm/kvm_host.h only needs linux/kvm_types.h, which it already includes. Stop including linux/kvm_host.h from arch/s390/include/asm/kvm_host.h . Due to the #ifdef guards, the code works as it is today, but it's ugly and it will get in the way of future patches. Signed-off-by: Claudio Imbrenda --- arch/s390/include/asm/kvm_host.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 95990461888f..736cc88f497d 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include -- 2.45.2 . From: Vlastimil Babka To: linux-mm@kvack.org, David Rientjes , Christoph Lameter Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , Kees Cook , Alice Ryhl , Boqun Feng , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Vlastimil Babka Subject: [PATCH] mm, slab: extend kmalloc() alignment for non power-of-two sizes Date: Tue, 2 Jul 2024 17:58:01 +0200 Message-ID: <20240702155800.166503-2-vbabka@suse.cz> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265463 org.kvack.linux-mm:202217 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.rust-for-linux,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Slab allocators have been guaranteeing natural alignment for power-of-two sizes since commit 59bb47985c1d ("mm, sl[aou]b: guarantee natural alignment for kmalloc(power-of-two)"), while any other sizes are aligned only to ARCH_KMALLOC_MINALIGN bytes. Rust's allocator API specifies size and alignment per allocation, which have to satisfy the following rules, per Alice Ryhl [1]: 1. The alignment is a power of two. 2. The size is non-zero. 3. When you round up the size to the next multiple of the alignment, then it must not overflow the signed type isize / ssize_t. In order to map this to kmalloc()'s guarantees, some requested allocation sizes have to be enlarged to the next power-of-two size [2]. For example, an allocation of size 96 and alignment of 32 will be enlarged to an allocation of size 128, because the existing kmalloc-96 bucket doesn't guarantee alignent above ARCH_KMALLOC_MINALIGN. Without slab debugging active, the layout of the kmalloc-96 slabs however naturally aligns the objects to 32 bytes, so extending the size to 128 bytes is wasteful. To improve the situation we can extend the kmalloc() alignment guarantees in a way that 1) doesn't change the current slab layout (and thus does not increase internal fragmentation) when slab debugging is not active 2) reduces waste in the Rust allocator use case 3) is a superset of the current guarantee for power-of-two sizes. The extended guarantee is that alignment is at least the largest power-of-two divisor of the requested size. For power-of-two sizes the largest divisor is the size itself, but let's keep this case documented separately for clarity. For current kmalloc size buckets, it means kmalloc-96 will guarantee alignment of 32 bytes and kmalloc-196 will guarantee 64 bytes. This covers the rules 1 and 2 above of Rust's API as long as the size is a multiple of the alignment. The Rust layer should now only need to round up the size to the next multiple if it isn't, while enforcing the rule 3. Implementation-wise, this changes the alignment calculation in create_boot_cache(). While at it also do the calulation only for caches with the SLAB_KMALLOC flag, because the function is also used to create the initial kmem_cache and kmem_cache_node caches, where no alignment guarantee is necessary. Link: https://lore.kernel.org/all/CAH5fLggjrbdUuT-H-5vbQfMazjRDpp2%2Bk3%3DYhPyS17ezEqxwcw@mail.gmail.com/ [1] Link: https://lore.kernel.org/all/CAH5fLghsZRemYUwVvhk77o6y1foqnCeDzW4WZv6ScEWna2+_jw@mail.gmail.com/ [2] Signed-off-by: Vlastimil Babka --- Documentation/core-api/memory-allocation.rst | 6 ++++-- include/linux/slab.h | 3 ++- mm/slab_common.c | 9 +++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Documentation/core-api/memory-allocation.rst b/Documentation/core-api/memory-allocation.rst index 1c58d883b273..8b84eb4bdae7 100644 --- a/Documentation/core-api/memory-allocation.rst +++ b/Documentation/core-api/memory-allocation.rst @@ -144,8 +144,10 @@ configuration, but it is a good practice to use `kmalloc` for objects smaller than page size. The address of a chunk allocated with `kmalloc` is aligned to at least -ARCH_KMALLOC_MINALIGN bytes. For sizes which are a power of two, the -alignment is also guaranteed to be at least the respective size. +ARCH_KMALLOC_MINALIGN bytes. For sizes which are a power of two, the +alignment is also guaranteed to be at least the respective size. For other +sizes, the alignment is guaranteed to be at least the largest power-of-two +divisor of the size. Chunks allocated with kmalloc() can be resized with krealloc(). Similarly to kmalloc_array(): a helper for resizing arrays is provided in the form of diff --git a/include/linux/slab.h b/include/linux/slab.h index ed6bee5ec2b6..640cea6e6323 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -604,7 +604,8 @@ void *__kmalloc_large_node_noprof(size_t size, gfp_t flags, int node) * * The allocated object address is aligned to at least ARCH_KMALLOC_MINALIGN * bytes. For @size of power of two bytes, the alignment is also guaranteed - * to be at least to the size. + * to be at least to the size. For other sizes, the alignment is guaranteed to + * be at least the largest power-of-two divisor of @size. * * The @flags argument may be one of the GFP flags defined at * include/linux/gfp_types.h and described at diff --git a/mm/slab_common.c b/mm/slab_common.c index 1560a1546bb1..7272ef7bc55f 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -617,11 +617,12 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, s->size = s->object_size = size; /* - * For power of two sizes, guarantee natural alignment for kmalloc - * caches, regardless of SL*B debugging options. + * kmalloc caches guarantee alignment of at least the largest + * power-of-two divisor of the size. For power-of-two sizes, + * it is the size itself. */ - if (is_power_of_2(size)) - align = max(align, size); + if (flags & SLAB_KMALLOC) + align = max(align, 1U << (ffs(size) - 1)); s->align = calculate_alignment(flags, align, size); #ifdef CONFIG_HARDENED_USERCOPY -- 2.45.2 . From: "Rob Herring (Arm)" To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N. Rao" Cc: linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH] tpm: atmel: Drop PPC64 specific MMIO setup Date: Tue, 2 Jul 2024 10:10:48 -0600 Message-ID: <20240702161052.3563599-1-robh@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265469 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-integrity,org.ozlabs.lists.linuxppc-dev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The PPC64 specific MMIO setup open codes DT address functions rather than using standard address parsing functions. The open-coded version fails to handle any address translation and is not endian safe. I haven't found any evidence of what platform used this. The only thing that turned up was a PPC405 platform, but that is 32-bit and PPC405 support is being removed as well. CONFIG_TCG_ATMEL is not enabled for any powerpc config and never was. The support was added in 2005 and hasn't been touched since. Rather than try to modernize and fix this code, just remove it. Signed-off-by: Rob Herring (Arm) --- drivers/char/tpm/Kconfig | 2 +- drivers/char/tpm/tpm_atmel.c | 64 +++++++++++++++- drivers/char/tpm/tpm_atmel.h | 140 ----------------------------------- 3 files changed, 62 insertions(+), 144 deletions(-) delete mode 100644 drivers/char/tpm/tpm_atmel.h diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index e63a6a17793c..9b655e9fc7ab 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -162,7 +162,7 @@ config TCG_NSC config TCG_ATMEL tristate "Atmel TPM Interface" - depends on PPC64 || HAS_IOPORT_MAP + depends on HAS_IOPORT_MAP depends on HAS_IOPORT help If you have a TPM security chip from Atmel say Yes and it diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c index 9fb2defa9dc4..622c4abe8cb3 100644 --- a/drivers/char/tpm/tpm_atmel.c +++ b/drivers/char/tpm/tpm_atmel.c @@ -15,7 +15,67 @@ */ #include "tpm.h" -#include "tpm_atmel.h" + +struct tpm_atmel_priv { + int region_size; + int have_region; + unsigned long base; + void __iomem *iobase; +}; + +#define atmel_getb(chip, offset) inb(atmel_get_priv(chip)->base + offset) +#define atmel_putb(val, chip, offset) \ + outb(val, atmel_get_priv(chip)->base + offset) +#define atmel_request_region request_region +#define atmel_release_region release_region +/* Atmel definitions */ +enum tpm_atmel_addr { + TPM_ATMEL_BASE_ADDR_LO = 0x08, + TPM_ATMEL_BASE_ADDR_HI = 0x09 +}; + +static inline int tpm_read_index(int base, int index) +{ + outb(index, base); + return inb(base+1) & 0xFF; +} + +/* Verify this is a 1.1 Atmel TPM */ +static int atmel_verify_tpm11(void) +{ + + /* verify that it is an Atmel part */ + if (tpm_read_index(TPM_ADDR, 4) != 'A' || + tpm_read_index(TPM_ADDR, 5) != 'T' || + tpm_read_index(TPM_ADDR, 6) != 'M' || + tpm_read_index(TPM_ADDR, 7) != 'L') + return 1; + + /* query chip for its version number */ + if (tpm_read_index(TPM_ADDR, 0x00) != 1 || + tpm_read_index(TPM_ADDR, 0x01) != 1) + return 1; + + /* This is an atmel supported part */ + return 0; +} + +/* Determine where to talk to device */ +static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) +{ + int lo, hi; + + if (atmel_verify_tpm11() != 0) + return NULL; + + lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO); + hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI); + + *base = (hi << 8) | lo; + *region_size = 2; + + return ioport_map(*base, *region_size); +} /* write status bits */ enum tpm_atmel_write_status { @@ -142,7 +202,6 @@ static void atml_plat_remove(void) tpm_chip_unregister(chip); if (priv->have_region) atmel_release_region(priv->base, priv->region_size); - atmel_put_base_addr(priv->iobase); platform_device_unregister(pdev); } @@ -211,7 +270,6 @@ static int __init init_atmel(void) err_unreg_dev: platform_device_unregister(pdev); err_rel_reg: - atmel_put_base_addr(iobase); if (have_region) atmel_release_region(base, region_size); diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h deleted file mode 100644 index 7ac3f69dcf0f..000000000000 --- a/drivers/char/tpm/tpm_atmel.h +++ /dev/null @@ -1,140 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2005 IBM Corporation - * - * Authors: - * Kylene Hall - * - * Maintained by: - * - * Device driver for TCG/TCPA TPM (trusted platform module). - * Specifications at www.trustedcomputinggroup.org - * - * These difference are required on power because the device must be - * discovered through the device tree and iomap must be used to get - * around the need for holes in the io_page_mask. This does not happen - * automatically because the tpm is not a normal pci device and lives - * under the root node. - */ - -struct tpm_atmel_priv { - int region_size; - int have_region; - unsigned long base; - void __iomem *iobase; -}; - -#ifdef CONFIG_PPC64 - -#include - -#define atmel_getb(priv, offset) readb(priv->iobase + offset) -#define atmel_putb(val, priv, offset) writeb(val, priv->iobase + offset) -#define atmel_request_region request_mem_region -#define atmel_release_region release_mem_region - -static inline void atmel_put_base_addr(void __iomem *iobase) -{ - iounmap(iobase); -} - -static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) -{ - struct device_node *dn; - unsigned long address, size; - const unsigned int *reg; - int reglen; - int naddrc; - int nsizec; - - dn = of_find_node_by_name(NULL, "tpm"); - - if (!dn) - return NULL; - - if (!of_device_is_compatible(dn, "AT97SC3201")) { - of_node_put(dn); - return NULL; - } - - reg = of_get_property(dn, "reg", ®len); - naddrc = of_n_addr_cells(dn); - nsizec = of_n_size_cells(dn); - - of_node_put(dn); - - - if (naddrc == 2) - address = ((unsigned long) reg[0] << 32) | reg[1]; - else - address = reg[0]; - - if (nsizec == 2) - size = - ((unsigned long) reg[naddrc] << 32) | reg[naddrc + 1]; - else - size = reg[naddrc]; - - *base = address; - *region_size = size; - return ioremap(*base, *region_size); -} -#else -#define atmel_getb(chip, offset) inb(atmel_get_priv(chip)->base + offset) -#define atmel_putb(val, chip, offset) \ - outb(val, atmel_get_priv(chip)->base + offset) -#define atmel_request_region request_region -#define atmel_release_region release_region -/* Atmel definitions */ -enum tpm_atmel_addr { - TPM_ATMEL_BASE_ADDR_LO = 0x08, - TPM_ATMEL_BASE_ADDR_HI = 0x09 -}; - -static inline int tpm_read_index(int base, int index) -{ - outb(index, base); - return inb(base+1) & 0xFF; -} - -/* Verify this is a 1.1 Atmel TPM */ -static int atmel_verify_tpm11(void) -{ - - /* verify that it is an Atmel part */ - if (tpm_read_index(TPM_ADDR, 4) != 'A' || - tpm_read_index(TPM_ADDR, 5) != 'T' || - tpm_read_index(TPM_ADDR, 6) != 'M' || - tpm_read_index(TPM_ADDR, 7) != 'L') - return 1; - - /* query chip for its version number */ - if (tpm_read_index(TPM_ADDR, 0x00) != 1 || - tpm_read_index(TPM_ADDR, 0x01) != 1) - return 1; - - /* This is an atmel supported part */ - return 0; -} - -static inline void atmel_put_base_addr(void __iomem *iobase) -{ -} - -/* Determine where to talk to device */ -static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) -{ - int lo, hi; - - if (atmel_verify_tpm11() != 0) - return NULL; - - lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO); - hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI); - - *base = (hi << 8) | lo; - *region_size = 2; - - return ioport_map(*base, *region_size); -} -#endif -- 2.43.0 . From: William Qiu To: linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Hal Feng , Philipp Zabel , William Qiu Subject: [PATCH v13] pwm: opencores: Add PWM driver support Date: Tue, 2 Jul 2024 16:38:48 +0800 Message-Id: <20240702083848.1947449-1-william.qiu@starfivetech.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265471 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pwm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add driver for OpenCores PWM Controller. And add compatibility code which based on StarFive SoC. Co-developed-by: Hal Feng Signed-off-by: Hal Feng Signed-off-by: William Qiu --- MAINTAINERS | 7 ++ drivers/pwm/Kconfig | 12 ++ drivers/pwm/Makefile | 1 + drivers/pwm/pwm-ocores.c | 239 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 259 insertions(+) create mode 100644 drivers/pwm/pwm-ocores.c diff --git a/MAINTAINERS b/MAINTAINERS index 3c4fdf74a3f9..3b547ede2ce5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16824,6 +16824,13 @@ F: Documentation/i2c/busses/i2c-ocores.rst F: drivers/i2c/busses/i2c-ocores.c F: include/linux/platform_data/i2c-ocores.h +OPENCORES PWM DRIVER +M: William Qiu +M: Hal Feng +S: Supported +F: Documentation/devicetree/bindings/pwm/opencores,pwm.yaml +F: drivers/pwm/pwm-ocores.c + OPENRISC ARCHITECTURE M: Jonas Bonn M: Stefan Kristiansson diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 1dd7921194f5..42158bc1c8bc 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -440,6 +440,18 @@ config PWM_NTXEC controller found in certain e-book readers designed by the original design manufacturer Netronix. +config PWM_OCORES + tristate "OpenCores PTC PWM support" + depends on HAS_IOMEM && OF + depends on COMMON_CLK && RESET_CONTROLLER + depends on ARCH_STARFIVE || COMPILE_TEST + help + If you say yes to this option, support will be included for the + OpenCores PWM. For details see https://opencores.org/projects/ptc. + + To compile this driver as a module, choose M here: the module + will be called pwm-ocores. + config PWM_OMAP_DMTIMER tristate "OMAP Dual-Mode Timer PWM support" depends on OF diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index 90913519f11a..7a44d8afe044 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_PWM_MICROCHIP_CORE) += pwm-microchip-core.o obj-$(CONFIG_PWM_MTK_DISP) += pwm-mtk-disp.o obj-$(CONFIG_PWM_MXS) += pwm-mxs.o obj-$(CONFIG_PWM_NTXEC) += pwm-ntxec.o +obj-$(CONFIG_PWM_OCORES) += pwm-ocores.o obj-$(CONFIG_PWM_OMAP_DMTIMER) += pwm-omap-dmtimer.o obj-$(CONFIG_PWM_PCA9685) += pwm-pca9685.o obj-$(CONFIG_PWM_PXA) += pwm-pxa.o diff --git a/drivers/pwm/pwm-ocores.c b/drivers/pwm/pwm-ocores.c new file mode 100644 index 000000000000..c8f08aa14e44 --- /dev/null +++ b/drivers/pwm/pwm-ocores.c @@ -0,0 +1,239 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * OpenCores PWM Driver + * + * https://opencores.org/projects/ptc + * + * Copyright (C) 2018-2023 StarFive Technology Co., Ltd. + * + * Limitations: + * - The hardware only supports inverted polarity. + * - The hardware minimum period / duty_cycle is (1 / pwm_apb clock frequency) ns. + * - The hardware maximum period / duty_cycle is (U32_MAX / pwm_apb clock frequency) ns. + * - The hardware is set to a low level immediately when disabledThe hardware is set to + * a low level immediately when disabled. + * - The hardware will have a conversion cycle when reconfiguring. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* OpenCores Register offsets */ +#define REG_OCPWM_CNTR 0x0 +#define REG_OCPWM_HRC 0x4 +#define REG_OCPWM_LRC 0x8 +#define REG_OCPWM_CTRL 0xC + +/* OCPWM_CTRL register bits*/ +#define REG_OCPWM_CNTR_EN BIT(0) +#define REG_OCPWM_CNTR_ECLK BIT(1) +#define REG_OCPWM_CNTR_NEC BIT(2) +#define REG_OCPWM_CNTR_OE BIT(3) +#define REG_OCPWM_CNTR_SIGNLE BIT(4) +#define REG_OCPWM_CNTR_INTE BIT(5) +#define REG_OCPWM_CNTR_INT BIT(6) +#define REG_OCPWM_CNTR_RST BIT(7) +#define REG_OCPWM_CNTR_CAPTE BIT(8) + +struct ocores_pwm_device { + const struct ocores_pwm_data *data; + void __iomem *regs; + u32 clk_rate; /* PWM APB clock frequency */ +}; + +struct ocores_pwm_data { + void __iomem *(*get_ch_base)(void __iomem *base, unsigned int channel); +}; + +static inline u32 ocores_pwm_readl(struct ocores_pwm_device *ddata, + unsigned int channel, + unsigned int offset) +{ + void __iomem *base = ddata->data->get_ch_base ? + ddata->data->get_ch_base(ddata->regs, channel) : ddata->regs; + + return readl(base + offset); +} + +static inline void ocores_pwm_writel(struct ocores_pwm_device *ddata, + unsigned int channel, + unsigned int offset, u32 val) +{ + void __iomem *base = ddata->data->get_ch_base ? + ddata->data->get_ch_base(ddata->regs, channel) : ddata->regs; + + writel(val, base + offset); +} + +static inline struct ocores_pwm_device *chip_to_ocores(struct pwm_chip *chip) +{ + return pwmchip_get_drvdata(chip); +} + +static void __iomem *starfive_get_ch_base(void __iomem *base, + unsigned int channel) +{ + unsigned int offset = (channel & 4) << 13 | (channel & 3) << 4; + + return base + offset; +} + +static int ocores_pwm_get_state(struct pwm_chip *chip, + struct pwm_device *pwm, + struct pwm_state *state) +{ + struct ocores_pwm_device *ddata = chip_to_ocores(chip); + u32 period_data, duty_data, ctrl_data; + + period_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_LRC); + duty_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_HRC); + ctrl_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_CTRL); + + state->period = DIV_ROUND_UP_ULL((u64)period_data * NSEC_PER_SEC, ddata->clk_rate); + state->duty_cycle = DIV_ROUND_UP_ULL((u64)duty_data * NSEC_PER_SEC, ddata->clk_rate); + state->polarity = PWM_POLARITY_INVERSED; + state->enabled = (ctrl_data & REG_OCPWM_CNTR_EN) ? true : false; + + return 0; +} + +static int ocores_pwm_apply(struct pwm_chip *chip, + struct pwm_device *pwm, + const struct pwm_state *state) +{ + struct ocores_pwm_device *ddata = chip_to_ocores(chip); + u32 ctrl_data = 0; + u64 period_data, duty_data; + + if (state->polarity != PWM_POLARITY_INVERSED) + return -EINVAL; + + period_data = mul_u64_u32_div(state->period, ddata->clk_rate, NSEC_PER_SEC); + if (!period_data) + return -EINVAL; + + if (period_data > U32_MAX) + period_data = U32_MAX; + + ocores_pwm_writel(ddata, pwm->hwpwm, 0x8, (u32)period_data); + + duty_data = mul_u64_u32_div(state->duty_cycle, ddata->clk_rate, NSEC_PER_SEC); + if (duty_data <= U32_MAX) + ocores_pwm_writel(ddata, pwm->hwpwm, REG_OCPWM_HRC, (u32)duty_data); + else if (duty_data > U32_MAX) + duty_data = U32_MAX; + else + return -EINVAL; + + ctrl_data = ocores_pwm_readl(ddata, pwm->hwpwm, REG_OCPWM_CTRL); + if (state->enabled) + ocores_pwm_writel(ddata, pwm->hwpwm, REG_OCPWM_CTRL, + ctrl_data | REG_OCPWM_CNTR_EN | REG_OCPWM_CNTR_OE); + else + ocores_pwm_writel(ddata, pwm->hwpwm, REG_OCPWM_CTRL, + ctrl_data & ~(REG_OCPWM_CNTR_EN | REG_OCPWM_CNTR_OE)); + + return 0; +} + +static const struct pwm_ops ocores_pwm_ops = { + .get_state = ocores_pwm_get_state, + .apply = ocores_pwm_apply, +}; + +static const struct ocores_pwm_data starfive_pwm_data = { + .get_ch_base = starfive_get_ch_base, +}; + +static const struct of_device_id ocores_pwm_of_match[] = { + { .compatible = "opencores,pwm-v1" }, + { .compatible = "starfive,jh7100-pwm", .data = &starfive_pwm_data}, + { .compatible = "starfive,jh7110-pwm", .data = &starfive_pwm_data}, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ocores_pwm_of_match); + +static void ocores_pwm_reset_control_assert(void *data) +{ + reset_control_assert(data); +} + +static int ocores_pwm_probe(struct platform_device *pdev) +{ + const struct of_device_id *id; + struct device *dev = &pdev->dev; + struct ocores_pwm_device *ddata; + struct pwm_chip *chip; + struct clk *clk; + struct reset_control *rst; + int ret; + + id = of_match_device(ocores_pwm_of_match, dev); + if (!id) + return -EINVAL; + + chip = devm_pwmchip_alloc(&pdev->dev, 8, sizeof(*ddata)); + if (IS_ERR(chip)) + return -ENOMEM; + + ddata = chip_to_ocores(chip); + ddata->data = id->data; + chip->ops = &ocores_pwm_ops; + + ddata->regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(ddata->regs)) + return dev_err_probe(dev, PTR_ERR(ddata->regs), + "Unable to map IO resources\n"); + + clk = devm_clk_get_enabled(dev, NULL); + if (IS_ERR(clk)) + return dev_err_probe(dev, PTR_ERR(clk), + "Unable to get pwm's clock\n"); + + ret = devm_clk_rate_exclusive_get(dev, clk); + if (ret) + return ret; + + rst = devm_reset_control_get_optional_exclusive(dev, NULL); + if (IS_ERR(rst)) + return dev_err_probe(dev, PTR_ERR(rst), + "Unable to get pwm's reset\n"); + + reset_control_deassert(rst); + + ret = devm_add_action_or_reset(dev, ocores_pwm_reset_control_assert, rst); + if (ret) + return ret; + + ddata->clk_rate = clk_get_rate(clk); + if (ddata->clk_rate > NSEC_PER_SEC) + return dev_err_probe(dev, ddata->clk_rate, + "Unable to get clock's rate\n"); + + ret = devm_pwmchip_add(dev, chip); + if (ret < 0) + return dev_err_probe(dev, ret, "Could not register PWM chip\n"); + + return 0; +} + +static struct platform_driver ocores_pwm_driver = { + .probe = ocores_pwm_probe, + .driver = { + .name = "ocores-pwm", + .of_match_table = ocores_pwm_of_match, + }, +}; +module_platform_driver(ocores_pwm_driver); + +MODULE_AUTHOR("Jieqin Chen"); +MODULE_AUTHOR("Hal Feng "); +MODULE_DESCRIPTION("OpenCores PTC PWM driver"); +MODULE_LICENSE("GPL"); -- 2.34.1 . From: matthew.gerlach@linux.intel.com To: lpieralisi@kernel.org, kw@linux.com, robh@kernel.org, bhelgaas@google.com, krzk+dt@kernel.org, conor+dt@kernel.org, joyce.ooi@intel.com, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Gerlach Subject: [PATCH v8] dt-bindings: PCI: altera: Convert to YAML Date: Tue, 2 Jul 2024 11:26:52 -0500 Message-Id: <20240702162652.1349121-1-matthew.gerlach@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265481 org.kernel.vger.linux-pci:144794 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Matthew Gerlach Convert the device tree bindings for the Altera Root Port PCIe controller from text to YAML. Update the entries in the interrupt-map field to have the correct number of address cells for the interrupt parent. Signed-off-by: Matthew Gerlach --- v8: - Precisely constrain the number of items for reg and reg-names properties. Constrain maxItems to 2 for altr,pcie-root-port-1.0. Constrain minItems to 3 for altr,pcie-root-port-2.0. v7: - Keep original example dts, but fix warnings of interrupt-map field. v6: - Fix dt_binding_check warnings by creating interrupt-controller subnode and fixing interrupt-map. - Updated filename in MAINTAINERS. v5: - add interrupt-controller #interrupt-cells to required field - don't touch original example dts v4: - reorder reg-names to match original binding - move reg and reg-names to top level with limits. v3: - Added years to copyright - Correct order in file of allOf and unevaluatedProperties - remove items: in compatible field - fix reg and reg-names constraints - replace deprecated pci-bus.yaml with pci-host-bridge.yaml - fix entries in ranges property - remove device_type from required v2: - Move allOf: to bottom of file, just like example-schema is showing - add constraint for reg and reg-names - remove unneeded device_type - drop #address-cells and #size-cells - change minItems to maxItems for interrupts: - change msi-parent to just "msi-parent: true" - cleaned up required: - make subject consistent with other commits coverting to YAML - s/overt/onvert/g v8 fix --- .../devicetree/bindings/pci/altera-pcie.txt | 50 -------- .../bindings/pci/altr,pcie-root-port.yaml | 114 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 115 insertions(+), 51 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml diff --git a/Documentation/devicetree/bindings/pci/altera-pcie.txt b/Documentation/devicetree/bindings/pci/altera-pcie.txt deleted file mode 100644 index 816b244a221e..000000000000 --- a/Documentation/devicetree/bindings/pci/altera-pcie.txt +++ /dev/null @@ -1,50 +0,0 @@ -* Altera PCIe controller - -Required properties: -- compatible : should contain "altr,pcie-root-port-1.0" or "altr,pcie-root-port-2.0" -- reg: a list of physical base address and length for TXS and CRA. - For "altr,pcie-root-port-2.0", additional HIP base address and length. -- reg-names: must include the following entries: - "Txs": TX slave port region - "Cra": Control register access region - "Hip": Hard IP region (if "altr,pcie-root-port-2.0") -- interrupts: specifies the interrupt source of the parent interrupt - controller. The format of the interrupt specifier depends - on the parent interrupt controller. -- device_type: must be "pci" -- #address-cells: set to <3> -- #size-cells: set to <2> -- #interrupt-cells: set to <1> -- ranges: describes the translation of addresses for root ports and - standard PCI regions. -- interrupt-map-mask and interrupt-map: standard PCI properties to define the - mapping of the PCIe interface to interrupt numbers. - -Optional properties: -- msi-parent: Link to the hardware entity that serves as the MSI controller - for this PCIe controller. -- bus-range: PCI bus numbers covered - -Example - pcie_0: pcie@c00000000 { - compatible = "altr,pcie-root-port-1.0"; - reg = <0xc0000000 0x20000000>, - <0xff220000 0x00004000>; - reg-names = "Txs", "Cra"; - interrupt-parent = <&hps_0_arm_gic_0>; - interrupts = <0 40 4>; - interrupt-controller; - #interrupt-cells = <1>; - bus-range = <0x0 0xFF>; - device_type = "pci"; - msi-parent = <&msi_to_gic_gen_0>; - #address-cells = <3>; - #size-cells = <2>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_0 1>, - <0 0 0 2 &pcie_0 2>, - <0 0 0 3 &pcie_0 3>, - <0 0 0 4 &pcie_0 4>; - ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000 - 0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>; - }; diff --git a/Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml b/Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml new file mode 100644 index 000000000000..52533fccc134 --- /dev/null +++ b/Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml @@ -0,0 +1,114 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright (C) 2015, 2019, 2024, Intel Corporation +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/altr,pcie-root-port.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Altera PCIe Root Port + +maintainers: + - Matthew Gerlach + +properties: + compatible: + enum: + - altr,pcie-root-port-1.0 + - altr,pcie-root-port-2.0 + + reg: + items: + - description: TX slave port region + - description: Control register access region + - description: Hard IP region + minItems: 2 + + reg-names: + items: + - const: Txs + - const: Cra + - const: Hip + minItems: 2 + + interrupts: + maxItems: 1 + + interrupt-controller: true + + interrupt-map-mask: + items: + - const: 0 + - const: 0 + - const: 0 + - const: 7 + + interrupt-map: + maxItems: 4 + + "#interrupt-cells": + const: 1 + + msi-parent: true + +required: + - compatible + - reg + - reg-names + - interrupts + - "#interrupt-cells" + - interrupt-controller + - interrupt-map + - interrupt-map-mask + +allOf: + - $ref: /schemas/pci/pci-host-bridge.yaml# + - if: + properties: + compatible: + enum: + - altr,pcie-root-port-1.0 + then: + properties: + reg: + maxItems: 2 + + reg-names: + maxItems: 2 + + else: + properties: + reg: + minItems: 3 + + reg-names: + minItems: 3 + + +unevaluatedProperties: false + +examples: + - | + #include + #include + pcie_0: pcie@c00000000 { + compatible = "altr,pcie-root-port-1.0"; + reg = <0xc0000000 0x20000000>, + <0xff220000 0x00004000>; + reg-names = "Txs", "Cra"; + interrupt-parent = <&hps_0_arm_gic_0>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <1>; + bus-range = <0x0 0xff>; + device_type = "pci"; + msi-parent = <&msi_to_gic_gen_0>; + #address-cells = <3>; + #size-cells = <2>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie_0 0 0 0 1>, + <0 0 0 2 &pcie_0 0 0 0 2>, + <0 0 0 3 &pcie_0 0 0 0 3>, + <0 0 0 4 &pcie_0 0 0 0 4>; + ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000>, + <0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index cbc186250383..ff2d2c110e41 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17274,7 +17274,7 @@ PCI DRIVER FOR ALTERA PCIE IP M: Joyce Ooi L: linux-pci@vger.kernel.org S: Supported -F: Documentation/devicetree/bindings/pci/altera-pcie.txt +F: Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml F: drivers/pci/controller/pcie-altera.c PCI DRIVER FOR APPLIEDMICRO XGENE -- 2.34.1 . From: Andrew Davis To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Vaishnav M A , Derek Kiernan , Dragan Cvetic , Arnd Bergmann , Michael Walle , Jason Kridner , Robert Nelson , Robert Nelson , Ayush Singh , Ayush Singh CC: , , , Andrew Davis Subject: [PATCH RFC 0/3] Add generic Overlay for Grove Sunlight Sensor Date: Tue, 2 Jul 2024 11:44:00 -0500 Message-ID: <20240702164403.29067-1-afd@ti.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265497 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello all, A new attempt at solving the long standing "add-on board" problem was recently posted[0]. The current out-of-tree solutions usually involve Device Tree Overlays. Recently, Overlays have started being accepted into the kernel repo, this makes now the perfect time to solve this issue. Here is my attempt at a generic solution. Problem statement ----------------- The Device tree(DT) system provides hardware descriptions to the Linux kernel (or other DT compatible SW). When the hardware is modular this description becomes dynamic. For this we use DT Overlays which take a base hardware description and append the description of the add-on hardware. Due to the design of DT, these DT overlays are specific to a given base hardware board. The add-on itself is usually not specific to a single board. Some examples of add-on ecosystems to consider: Beaglebone Cape Raspberry Pi HAT MikroBUS Click Boards Seeed Grove SparkFun Qwiic etc.. Some of these ecosystems already have more than a thousand(!) add-on boards. If a DT description needed to be written specific to each of the multitude of base boards that support each add-on, the combinatorial explosion would be unmanageable. We need to define a scheme that allow for creating and applying generic add-on overlays. Goals ----- * Each add-on board should be described by only one DT overlay. That DT overlay should be generic enough to apply to the DT of any base board that supports that add-on. * Some base boards have multiple instances of a given add-ons connector port. An add-on's overlay must apply to any available connection port without modification to the overlay. * Some connectors are stackable, stacked application of overlays shall function as expected. Chained connectors from one ecosystem to another shall be supported also (i.g. This thing[1] which connects to a BeagleBone Cape connector and then exposes a number of Grove connectors). * We should reuse as much existing infrastructure as possible (ideally no changes should be needed). The basic application of DT overlays is well supported and documented. * An overlay for an add-on board that is not compatible with the base board shall fail to apply at application time, not silently later. Incompatibility includes add-ons which require a function from a pin for which the matching pin on the base board cannot provide. We see this with some HATs and Capes where they use non-standard muxing of pins that only work for some subset of base boards. For instance, the BeaglePlay's Grove connector supports Digital/UART/I2C functions but not "Analog". So any Grove module that uses Analog pins should fail to apply. * Nothing in this solution should preclude runtime application of these DT overlays. Hardware auto-detection and runtime DT modification are orthogonal problems. Solution -------- This is a classic many-to-many problem, we propose to solve this the same as the database folks, with an associative(join) table like adapter overlay. We add an adapter overlay in-between the base board and the add-on. This adapter overlay prepares the base DTB for the application of an add-on targeting a specific connector. Adapting the base board's specifics to accept the generic connector names contained in the add-on overlay. There will be one adapter overlay per base board connector. We already have the infrastructure to implement these adapter overlays today. The DT overlay system makes use of a symbol table in the base DT and a fixup table in the overlay. The magic is in using the __fixups__ table to modify the __symbols__ table itself. Let's use the Grove connector[2] as an example. Grove is a good example target as it has * Low pin count (2 signal pins keeps the example gasket DTBOs simple, everything here can be extended to any number of signal pins) * Multiple connectors per base board * Has an add-on board that exposes more add-on board connectors * Each pin can have multiple functions depending on the base board * Moderately sized collection of add-on boards which contain parts already supported in Linux/DT To make an overlay generic we need a standard name scheme which we use across base boards. For the connector pins the pinmux phandle shall be: __mux_ All capitalized to make it easy to identify that this name is not the final phandle name, but will instead be fixed during overlay application. Each pin will have a definition for each function it can take, so pin1 in the Grove ecosystem has 4 possible functions, and pin2 has the same, therefor 8 definitions are needed in the connector's adapter overlay: /* Grove connector 0 Pin1 options */ GROVE_PIN1_MUX_I2C_SCL = &grove_pins_i2c; GROVE_PIN1_MUX_DIGITAL = &grove_pins_digital; /* GROVE_PIN1_MUX_ANALOG not available on this pin on this connector on this board */ ... GROVE_PIN2_MUX_UART_TX = &grove_pins_uart; etc.. (see patch [2/3] for a complete example) By listing each pin/function combination separately we allow for add-on boards that only use a subset of pins, or mix pin functions (pin1->digital and pin2->uart_tx). This also means is if a given base board does not support some function on a connector pin, then it is not defined and application of an overlay which uses that pin/function will correctly fail as expected. For the parent provider phandle, we use a similar naming scheme: __ Note we list this per-pin. Even though one IP/bus may service multiple pins, we cannot know this in a generic way. For instance some boards may have all GPIO functions served by one controller, others may have some pins on different controllers. Patch [3/3] is a complete example overlay for an add-on board[3]. So what does this all look like? Let's take an example of a BeaglePlay with two Grove connectors for which we have physically attached a Sunlight module to the first connector, and an Air Quality sensor to the second. Doing ahead of time command-line DT overlay application: ./fdtoverlay \ -o output.dtb \ -i k3-am625-beagleplay.dtb k3-am625-beagleplay-grove-connector0.dtbo grove-sunlight-sensor.dtbo \ k3-am625-beagleplay-grove-connector1.dtbo grove-air-quality.dtbo We start with the base board, then apply the adapter overlay for the specific connector we are going to attach the add-on. The next add-on overlay applied will attach to the connector most recently applied. This can be continued as needed, simply apply the next connector's adapter overlay, then the next add-on, rinse, repeat. Note that the connector adapter overlay is board specific, but the add-on overlay is completely generic. It can be applied to any base board. ./fdtoverlay \ -o output.dtb \ -i bcm2837-rpi-3-b.dtb \ grove-base-hat.dtbo \ grove-base-hat-connector0.dtbo grove-sunlight-sensor.dtbo \ grove-base-hat-connector1.dtbo grove-air-quality.dtbo Should work just the same for any board supporting that extender HAT, for instance the BeagleY-AI would be: ./fdtoverlay \ -o output.dtb \ -i k3-am67a-beagley-ai.dtb \ grove-base-hat.dtbo \ grove-base-hat-connector0.dtbo grove-sunlight-sensor.dtbo \ grove-base-hat-connector1.dtbo grove-air-quality.dtbo \ grove-base-hat-connector4.dtbo etc.. All of the above works just the same at boot time (U-Boot overlay support) or runtime using the in-kernel runtime overlay support (when that is enabled). For connectors with board detection I'd expect the detector to be described in the base board connector node. On board identification, the adapter overlay for that connector would be loaded by the detector driver followed by th overlay for the identified board. Although this is an RFC, the patches in this series are functional and meet all the above goals. They require no additional DT schema nor kernel/tooling modifications. Nested adapters (add-ons on top of add-on connectors) require a small fix in DTC which will be sent separately. Open items ---------- Variable cell count providers. The provider specifies the cell count and meaning. For GPIO this is handled very well, there is a standard 2 cell format (GPIO number and flags). Any device can request a controllers' 4th GPIO with active high output the exact same way for all controllers. Interrupts on the other hand have providers with one, two, and even three cells variations. There is no universal way to say "I want this controller's 4th IRQ line with rising edge triggering". These cells may need some level of indirection in the connector node itself to handle variable cell counts/meanings. Where to store the add-on overlay source files. These are not specific to any one board, nor even to one architecture. For now I put the grove-sunlight-sensor.dtb in arch/arm64/boot/dts/ti but it needs a better home acceptable by all boards. More testing, I currently have very few add-on boards to test with right now (but I did just put some on order). Hopefully I can get some more complex ones to really exercise this idea. Maybe a stack like the one in the 4th image here[4], a RPi HAT that exposes a couple MikroBUS connectors, that then have 4 Grove ports on that. This isn't perfect, but the Goals section should be applicable to any solution, and the adapter overlay concept hopefully can be reused as needed for whatever solution the community chooses. Thanks, Andrew [0] https://lore.kernel.org/linux-arm-kernel/20240627-mikrobus-scratch-spi-v5-0-9e6c148bf5f0@beagleboard.org/ [1] https://wiki.seeedstudio.com/Grove_Base_Cape_for_BeagleBone_v2/ [2] https://wiki.seeedstudio.com/Grove_System/ [3] https://wiki.seeedstudio.com/Grove-Sunlight_Sensor/ [4] https://www.tindie.com/products/pmunts/mikrobus-grove-adapter-3/ Andrew Davis (3): arm64: dts: ti: k3-am625-beagleplay: Add Grove connector pinmux options arm64: dts: ti: k3-am625-beagleplay: Add Grove connector adapter overlays arm64: dts: ti: grove: Add Grove Sunlight Sensor overlay arch/arm64/boot/dts/ti/Makefile | 5 +++ .../boot/dts/ti/grove-sunlight-sensor.dtso | 31 ++++++++++++++ .../k3-am625-beagleplay-grove-connector0.dtso | 41 +++++++++++++++++++ .../k3-am625-beagleplay-grove-connector1.dtso | 22 ++++++++++ .../arm64/boot/dts/ti/k3-am625-beagleplay.dts | 32 +++++++++++---- 5 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/grove-sunlight-sensor.dtso create mode 100644 arch/arm64/boot/dts/ti/k3-am625-beagleplay-grove-connector0.dtso create mode 100644 arch/arm64/boot/dts/ti/k3-am625-beagleplay-grove-connector1.dtso -- 2.39.2 . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 6.9 000/222] 6.9.8-rc1 review Date: Tue, 2 Jul 2024 19:00:38 +0200 Message-ID: <20240702170243.963426416@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.9.8-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.9.8-rc1 X-KernelTest-Deadline: 2024-07-04T17:02+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265513 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 6.9.8 release. There are 222 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 04 Jul 2024 17:01:55 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.9.8-rc1.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 6.9.8-rc1 David Howells netfs: Fix netfs_page_mkwrite() to flush conflicting data, not wait David Howells netfs: Fix netfs_page_mkwrite() to check folio->mapping is valid Yao Xingtao cxl/region: check interleave capability Alison Schofield cxl/region: Avoid null pointer dereference in region lookup Alison Schofield cxl/region: Move cxl_dpa_to_region() work to the region driver Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 Andy Yan arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi 4B Mark Brown reset: gpio: Fix missing gpiolib dependency for GPIO reset controller FUKAUMI Naoki arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E Li Ming cxl/mem: Fix no cxl_nvd during pmem region auto-assembling Dan Williams cxl/region: Convert cxl_pmem_region_alloc to scope-based resource management FUKAUMI Naoki arm64: dts: rockchip: make poweroff(8) work on Radxa ROCK 5A FUKAUMI Naoki Revert "arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes" Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Hsin-Te Yuan arm64: dts: rockchip: Fix the value of `dlg,jack-det-rate` mismatch on rk3399-gru Heiko Stuebner arm64: dts: rockchip: set correct pwm0 pinctrl on rk3588-tiger Jonas Karlman arm64: dts: rockchip: Rename LED related pinctrl nodes on rk3308-rock-pi-s Jonas Karlman arm64: dts: rockchip: Fix SD NAND and eMMC init on rk3308-rock-pi-s Uwe Kleine-König pwm: stm32: Fix error message to not describe the previous error path Uwe Kleine-König pwm: stm32: Fix calculation of prescaler yangge mm/page_alloc: Separate THP PCP into movable and non-movable categories Greg Kroah-Hartman Revert "net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module" Kent Overstreet bcachefs: btree_gc can now handle unknown btrees Kent Overstreet bcachefs: Fix setting of downgrade recovery passes/errors Kent Overstreet bcachefs: Fix bch2_sb_downgrade_update() Kent Overstreet bcachefs: Fix sb-downgrade validation Kent Overstreet bcachefs: Fix sb_field_downgrade validation Arnd Bergmann syscalls: fix sys_fanotify_mark prototype Arnd Bergmann syscalls: fix compat_sys_io_pgetevents_time64 usage Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Niklas Cassel ata: libata-core: Add ATA_HORKAGE_NOLPM for all Crucial BX SSD1 models Niklas Cassel ata: ahci: Clean up sysfs file on error Vitor Soares can: mcp251xfd: fix infinite loop when xmit fails Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Jens Axboe io_uring: signal SQPOLL task_work with TWA_SIGNAL_NO_IPI Alex Deucher drm/amdgpu/atomfirmware: fix parsing of vram_info Michael Strauss drm/amd/display: Send DP_TOTAL_LTTPR_CNT during detection if LTTPR is present Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Janusz Krzysztofik drm/i915/gt: Fix potential UAF by revoke of fence registers Julia Zhang drm/amdgpu: avoid using null object of framebuffer Thomas Zimmermann drm/fbdev-dma: Only set smem_start is enable per module option Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Jann Horn drm/drm_file: Fix pid refcounting race Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Naohiro Aota btrfs: zoned: fix initial free space detection Arnd Bergmann sh: rework sync_file_range ABI Dragan Simic kbuild: Install dtb files as 0644 in Makefile.dtbinst Huacai Chen irqchip/loongson-liointc: Set different ISRs for different cores Yuntao Wang cpu/hotplug: Fix dynstate assignment in __cpuhp_setup_state_cpuslocked() Huacai Chen cpu: Fix broken cmdline "nosmp" and "maxcpus=0" Huacai Chen irqchip/loongson-eiointc: Use early_cpu_to_node() instead of cpu_to_node() Rafael J. Wysocki cpufreq: intel_pstate: Use HWP to initialize ITMT if CPPC is missing Nathan Chancellor nvmet-fc: Remove __counted_by from nvmet_fc_tgt_queue.fod[] Mostafa Saleh PCI/MSI: Fix UAF in msi_capability_init Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Nathan Chancellor tty: mxser: Remove __counted_by from mxser_board.ports[] Dirk Su ALSA: hda/realtek: fix mute/micmute LEDs don't work for EliteBook 645/665 G11. Jonas Gorski serial: bcm63xx-uart: fix tx after conversion to uart_port_tx_limited() Jonas Gorski serial: core: introduce uart_port_tx_limited_flags() Stefan Eichenberger serial: imx: set receiver level before starting uart Udit Kumar serial: 8250_omap: Implementation of Errata i2310 Crescent Hsieh tty: serial: 8250: Fix port count mismatch with the device Doug Brown Revert "serial: core: only stop transmit when HW fifo is empty" Jos Wang usb: dwc3: core: Workaround for CSR read timeout Fabrice Gasnier usb: ucsi: stm32: fix command completion handling Ferry Toth Revert "usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach" Ferry Toth Revert "usb: gadget: u_ether: Re-attach netif device to mirror detachment" Javier Carrasco usb: typec: ucsi: glink: fix child node release in probe function Jeremy Kerr usb: gadget: aspeed_udc: fix device address configuration Meng Li usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: fix races against disable Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Alexander Sverdlin iio: accel: fxls8962af: select IIO_BUFFER & IIO_KFIFO_BUF Fernando Yang iio: adc: ad7266: Fix variable checking bug Dimitri Fedrau iio: humidity: hdc3020: fix hysteresis representation Niklas Cassel ata,scsi: libata-core: Do not leak memory for ata_port struct members Niklas Cassel ata: libata-core: Fix null pointer dereference on error Wolfram Sang i2c: testunit: discard write requests while old command is running Wolfram Sang i2c: testunit: don't erase registers after STOP Masahiro Yamada kbuild: rpm-pkg: fix build error with CONFIG_MODULES=n Thayne Harbaugh kbuild: Fix build target deb-pkg: ln: failed to create hard link Mark-PK Tsai kbuild: doc: Update default INSTALL_MOD_DIR from extra to updates David Lechner counter: ti-eqep: enable clock at probe Chuck Lever SUNRPC: Fix backchannel reply, again Sean Anderson iio: xilinx-ams: Don't include ams_ctrl_channels in scan_mask Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Kamal Dasu mmc: sdhci-brcmstb: check R1_STATUS for erase/trim/discard Ilpo Järvinen mmc: sdhci-pci-o2micro: Convert PCIBIOS_* return codes to errnos Linus Walleij Revert "mmc: moxart-mmc: Use sg_miter for PIO" Andrew Bresticker mm/memory: don't require head page for do_set_pmd() Zhaoyang Huang mm: fix incorrect vbq reference in purge_fragmented_block Andrey Konovalov kasan: fix bad call to unpoison_slab_object Christoph Hellwig nfs: drop the incorrect assertion in nfs_swap_rw() Jan Kara ocfs2: fix DIO failure due to insufficient transaction credits Johan Hovold pinctrl: qcom: spmi-gpio: drop broken pm8008 support Thomas Bogendoerfer Revert "MIPS: pci: lantiq: restore reset gpio polarity" Arnd Bergmann parisc: use generic sys_fanotify_mark implementation Linus Torvalds x86: stop playing stack games in profile_pc() Kees Cook randomize_kstack: Remove non-functional per-arch entropy filtering David Arcari tools/power turbostat: option '-n' is ambiguous Kent Gibson gpiolib: cdev: Ignore reconfiguration without direction Kent Gibson gpiolib: cdev: Disallow reconfiguration without direction (uAPI v1) Vasant Hegde iommu/amd: Fix GT feature enablement again Vasant Hegde iommu/amd: Invalidate cache before removing device from domain list Vasant Hegde iommu/amd: Introduce per device DTE update function Andy Chiu riscv: stacktrace: convert arch_stack_walk() to noinstr Lijo Lazar drm/amdgpu: Fix pci state save during mode-1 reset Jesse Taube RISC-V: fix vector insn load/store width mask NeilBrown nfsd: initialise nfsd_info.mutex early. Zenghui Yu arm64: Clear the initial ID map correctly before remapping Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Liu Ying drm/panel: simple: Add missing display timing flags for KOE TX26D202VM0BWA Hannes Reinecke nvmet: make 'tsas' attribute idempotent for RDMA Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Hannes Reinecke nvmet: do not return 'reserved' for empty TSAS values Michal Wajdeczko drm/xe: Check pat.ops before dumping PAT settings Erick Archer drm/radeon/radeon_display: Decrease the size of allocated memory Stefan Berger evm: Enforce signatures on unsupported filesystem for EVM_INIT_X509 Andreas Gruenbacher gfs2: Fix NULL pointer dereference in gfs2_log_flush Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Jason Gunthorpe iommu/arm-smmu-v3: Do not allow a SVA domain to be set on the wrong PASID Tiezhu Yang irqchip/loongson: Select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP for IRQ_LOONGARCH_CPU Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Joachim Vandersmissen crypto: ecdh - explicitly zeroize private_key Chia-Yuan Li wifi: rtw89: download firmware with five times retry Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Wenchao Hao RDMA/restrack: Fix potential invalid address access Himal Prasad Ghimiray drm/xe/xe_devcoredump: Check NULL before assignments Martin KaFai Lau bpf: Mark bpf prog stack with kmsan_unposion_memory in interpreter mode Anton Protopopov bpf: Add a check for struct bpf_fib_lookup size Muhammad Ahmed drm/amd/display: Skip pipe if the pipe idx not set properly Johannes Berg wifi: ieee80211: check for NULL in ieee80211_mle_size_ok() Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Sherry Wang drm/amd/display: correct hostvm flag Nirmoy Das drm/xe: Add a NULL check in xe_ttm_stolen_mgr_init Uros Bizjak x86/fpu: Fix AMD X86_BUG_FXSAVE_LEAK fixup Maxime Coquelin vduse: Temporarily fail if control queue feature requested Maxime Coquelin vduse: validate block features only with block devices Nirmoy Das drm/xe: Fix potential integer overflow in page size calculation Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Christophe Leroy bpf: Take return from set_memory_rox() into account with bpf_jit_binary_lock_ro() Christophe Leroy bpf: Take return from set_memory_ro() into account with bpf_prog_lock_ro() Ma Ke net: mana: Fix possible double free in error handling path Kuniyuki Iwashima af_unix: Fix wrong ioctl(SIOCATMARK) when consumed OOB skb is at the head. Kuniyuki Iwashima af_unix: Don't stop recv() at consumed ex-OOB skb. Kuniyuki Iwashima af_unix: Don't stop recv(MSG_DONTWAIT) if consumed OOB skb is at the head. Kuniyuki Iwashima af_unix: Stop recv(MSG_PEEK) at consumed OOB skb. Yunseong Kim tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset() Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Takashi Iwai ALSA: seq: Fix missing MSB in MIDI2 SPP conversion Neal Cardwell tcp: fix tcp_rcv_fastopen_synack() to enter TCP_CA_Loss for failed TFO Shannon Nelson ionic: use dev_consume_skb_any outside of napi Arnd Bergmann powerpc: restore some missing spu syscalls Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() Tristram Ha net: dsa: microchip: fix wrong register write when masking interrupt Takashi Iwai ALSA: seq: Fix missing channel at encoding RPN/NRPN MIDI2 messages luoxuanqiang Fix race for duplicate reqsk on identical SYN Filipe Manana btrfs: use NOFS context when getting inodes during logging and log replay Jianguo Wu netfilter: fix undefined reference to 'netfilter_lwtunnel_*' when CONFIG_SYSCTL=n Chen-Yu Tsai ASoC: mediatek: mt8195: Add platform entry for ETDM1_OUT_BE dai link Daniil Dulov xdp: Remove WARN() from __xdp_reg_mem_model() Alexei Starovoitov bpf: Fix may_goto with negative offset. Jan Sokolowski ice: Rebuild TC queues on VSI queue reconfiguration Enguerrand de Ribaucourt net: dsa: microchip: use collision based back pressure mode Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Nick Child ibmvnic: Free any outstanding tx skbs during scrq reset Guillaume Nault vxlan: Pull inner IP header in vxlan_xmit_one(). Daniel Borkmann bpf: Fix overrunning reservations in ringbuf Alexei Starovoitov bpf: Fix the corner case with may_goto and jump to the 1st insn. Ido Schimmel mlxsw: spectrum_buffers: Fix memory corruptions on Spectrum-4 systems Ido Schimmel mlxsw: pci: Fix driver initialization with Spectrum-4 Taehee Yoo ionic: fix kernel panic due to multi-buffer handling Hangbin Liu bonding: fix incorrect software timestamping report Xin Long openvswitch: get related ct labels from its master if it is not confirmed Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Vijendar Mukunda ASoC: amd: acp: move chip->flag variable assignment Vijendar Mukunda ASoC: amd: acp: remove i2s configuration check in acp_i2s_probe() Vijendar Mukunda ASoC: amd: acp: add a null check for chip_pdev structure Alexei Starovoitov bpf: Fix remap of arena. Halil Pasic s390/virtio_ccw: Fix config change notifications Niklas Schnelle s390/pci: Add missing virt_to_phys() for directed DIBV Yonghong Song bpf: Add missed var_off setting in coerce_subreg_to_size_sx() Yonghong Song bpf: Add missed var_off setting in set_sext32_default_val() Srinivas Kandagatla ASoC: q6apm-lpass-dai: close graph on prepare errors Wenchao Hao workqueue: Increase worker desc's length to 32 Andrei Simion ASoC: atmel: atmel-classd: Re-add dai_link->platform to fix card init Hsin-Te Yuan ASoC: mediatek: mt8183-da7219-max98357: Fix kcontrol name collision Alibek Omarov ASoC: rockchip: i2s-tdm: Fix trcm mode by setting clock on right mclk Maciej Strozek ASoC: cs42l43: Increase default type detect time and button delay Uwe Kleine-König pwm: stm32: Refuse too small period requests Uwe Kleine-König pwm: stm32: Calculate prescaler with a division instead of a loop Uwe Kleine-König pwm: stm32: Fix for settings using period > UINT32_MAX Uwe Kleine-König pwm: stm32: Improve precision of calculation in .apply() Martin Schiller MIPS: pci: lantiq: restore reset gpio polarity Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: use dedicated pinctrl type for RK3328 Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER John Keeping Input: ili210x - fix ili251x_read_touch_data() return value Claudiu Beznea pinctrl: renesas: rzg2l: Use spin_{lock,unlock}_irq{save,restore} Heikki Krogerus usb: typec: ucsi: Ack also failed Get Error commands Christian A. Ehrhardt usb: typec: ucsi: Never send a lone connector change ack ------------- Diffstat: Documentation/kbuild/modules.rst | 8 +- Makefile | 4 +- arch/arm/boot/dts/rockchip/rk3066a.dtsi | 1 + arch/arm/net/bpf_jit_32.c | 25 +- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 18 +- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 1 + .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 1 + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 1 + arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 5 + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 2 + arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kernel/pi/map_kernel.c | 2 +- arch/arm64/kernel/syscall.c | 16 +- arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/loongarch/net/bpf_jit.c | 22 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/mips/net/bpf_jit_comp.c | 3 +- arch/parisc/Kconfig | 1 + arch/parisc/kernel/sys_parisc32.c | 9 - arch/parisc/kernel/syscalls/syscall.tbl | 6 +- arch/parisc/net/bpf_jit_core.c | 8 +- arch/powerpc/kernel/syscalls/syscall.tbl | 6 +- arch/riscv/include/asm/insn.h | 2 +- arch/riscv/kernel/stacktrace.c | 2 +- arch/s390/include/asm/entry-common.h | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/s390/net/bpf_jit_comp.c | 6 +- arch/s390/pci/pci_irq.c | 2 +- arch/sh/kernel/sys_sh32.c | 11 + arch/sh/kernel/syscalls/syscall.tbl | 3 +- arch/sparc/kernel/sys32.S | 221 -------------- arch/sparc/kernel/syscalls/syscall.tbl | 8 +- arch/sparc/net/bpf_jit_comp_64.c | 6 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/include/asm/entry-common.h | 15 +- arch/x86/kernel/fpu/core.c | 4 +- arch/x86/kernel/time.c | 20 +- arch/x86/net/bpf_jit_comp32.c | 3 +- crypto/ecdh.c | 2 + drivers/ata/ahci.c | 17 +- drivers/ata/libata-core.c | 32 +- drivers/counter/ti-eqep.c | 6 + drivers/cpufreq/intel_pstate.c | 13 +- drivers/cxl/core/core.h | 7 + drivers/cxl/core/hdm.c | 13 + drivers/cxl/core/memdev.c | 44 --- drivers/cxl/core/pmem.c | 16 +- drivers/cxl/core/region.c | 182 ++++++++++-- drivers/cxl/cxl.h | 6 +- drivers/cxl/cxlmem.h | 10 + drivers/cxl/mem.c | 17 +- drivers/gpio/gpio-davinci.c | 5 + drivers/gpio/gpiolib-cdev.c | 28 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 18 +- drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 5 + .../display/dc/link/protocols/link_dp_capability.c | 10 +- .../amd/display/dc/resource/dcn31/dcn31_resource.c | 2 +- drivers/gpu/drm/amd/display/include/dpcd_defs.h | 5 + drivers/gpu/drm/drm_fb_helper.c | 6 +- drivers/gpu/drm/drm_fbdev_dma.c | 5 +- drivers/gpu/drm/drm_file.c | 8 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/radeon/radeon.h | 1 - drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/gpu/drm/xe/xe_devcoredump.c | 10 +- drivers/gpu/drm/xe/xe_pat.c | 2 +- drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 5 + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 2 +- drivers/i2c/i2c-slave-testunit.c | 5 +- drivers/iio/accel/Kconfig | 2 + drivers/iio/adc/ad7266.c | 2 + drivers/iio/adc/xilinx-ams.c | 8 +- drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 +++- drivers/iio/humidity/hdc3020.c | 323 ++++++++++++++++----- drivers/infiniband/core/restrack.c | 51 +--- drivers/input/touchscreen/ili210x.c | 4 +- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/init.c | 1 + drivers/iommu/amd/iommu.c | 34 ++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 3 + drivers/irqchip/Kconfig | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 5 +- drivers/irqchip/irq-loongson-liointc.c | 4 +- drivers/media/dvb-core/dvbdev.c | 2 +- drivers/mmc/host/moxart-mmc.c | 78 ++--- drivers/mmc/host/sdhci-brcmstb.c | 4 + drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci-pci-o2micro.c | 41 +-- drivers/mmc/host/sdhci.c | 25 +- drivers/mtd/parsers/redboot.c | 2 +- drivers/net/bonding/bond_main.c | 3 + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 14 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c | 55 +++- drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 5 + drivers/net/dsa/microchip/ksz9477.c | 10 +- drivers/net/dsa/microchip/ksz9477_reg.h | 1 + drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 + drivers/net/ethernet/intel/ice/ice_main.c | 10 +- drivers/net/ethernet/mellanox/mlxsw/pci.c | 18 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 20 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 4 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 2 +- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 55 ++-- drivers/net/phy/micrel.c | 1 + drivers/net/phy/sfp.c | 18 +- drivers/net/usb/ax88179_178a.c | 6 +- drivers/net/vxlan/vxlan_core.c | 9 +- drivers/net/wireless/realtek/rtw89/fw.c | 27 +- drivers/nvme/target/configfs.c | 41 ++- drivers/nvme/target/fc.c | 2 +- drivers/pci/msi/msi.c | 10 +- drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 68 ++++- drivers/pinctrl/pinctrl-rockchip.h | 1 + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 - drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- drivers/pwm/pwm-stm32.c | 62 ++-- drivers/reset/Kconfig | 1 + drivers/s390/virtio/virtio_ccw.c | 4 +- drivers/scsi/libsas/sas_ata.c | 6 +- drivers/scsi/libsas/sas_discover.c | 2 +- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/tty/mxser.c | 2 +- drivers/tty/serial/8250/8250_omap.c | 25 +- drivers/tty/serial/8250/8250_pci.c | 13 +- drivers/tty/serial/bcm63xx_uart.c | 7 +- drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/mcf.c | 2 +- drivers/usb/atm/cxacru.c | 14 + drivers/usb/dwc3/core.c | 26 +- drivers/usb/gadget/function/f_printer.c | 40 ++- drivers/usb/gadget/function/u_ether.c | 4 +- drivers/usb/gadget/udc/aspeed_udc.c | 4 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/typec/ucsi/ucsi.c | 55 ++-- drivers/usb/typec/ucsi/ucsi_glink.c | 5 +- drivers/usb/typec/ucsi/ucsi_stm32g0.c | 19 +- drivers/vdpa/vdpa_user/vduse_dev.c | 14 +- fs/bcachefs/bcachefs.h | 44 +-- fs/bcachefs/btree_gc.c | 15 +- fs/bcachefs/btree_gc.h | 48 ++- fs/bcachefs/btree_gc_types.h | 29 ++ fs/bcachefs/ec.c | 2 +- fs/bcachefs/sb-downgrade.c | 17 +- fs/bcachefs/super-io.c | 12 +- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/tree-log.c | 43 ++- fs/gfs2/log.c | 3 +- fs/gfs2/super.c | 4 + fs/netfs/buffered_write.c | 12 +- fs/nfs/direct.c | 2 - fs/nfsd/nfsctl.c | 2 + fs/nfsd/nfssvc.c | 1 - fs/ocfs2/aops.c | 5 + fs/ocfs2/journal.c | 17 ++ fs/ocfs2/journal.h | 2 + fs/ocfs2/ocfs2_trace.h | 2 + fs/open.c | 4 +- include/linux/compat.h | 2 +- include/linux/filter.h | 10 +- include/linux/ieee80211.h | 2 +- include/linux/libata.h | 1 + include/linux/mmzone.h | 9 +- include/linux/nvme.h | 6 +- include/linux/serial_core.h | 21 +- include/linux/syscalls.h | 8 +- include/linux/workqueue.h | 2 +- include/net/inet_connection_sock.h | 2 +- include/net/netfilter/nf_tables.h | 5 + include/trace/events/qdisc.h | 2 +- include/uapi/asm-generic/unistd.h | 2 +- io_uring/io_uring.c | 4 +- kernel/bpf/arena.c | 16 +- kernel/bpf/core.c | 6 +- kernel/bpf/ringbuf.c | 31 +- kernel/bpf/verifier.c | 69 ++++- kernel/cpu.c | 11 +- kernel/sys_ni.c | 2 +- mm/kasan/common.c | 2 +- mm/memory.c | 3 +- mm/page_alloc.c | 9 +- mm/vmalloc.c | 21 +- net/batman-adv/originator.c | 27 ++ net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/filter.c | 3 + net/core/xdp.c | 4 +- net/dccp/ipv4.c | 7 +- net/dccp/ipv6.c | 7 +- net/ipv4/inet_connection_sock.c | 17 +- net/ipv4/tcp_input.c | 45 ++- net/iucv/iucv.c | 26 +- net/netfilter/nf_hooks_lwtunnel.c | 3 + net/netfilter/nf_tables_api.c | 8 +- net/netfilter/nft_lookup.c | 3 +- net/openvswitch/conntrack.c | 7 +- net/sunrpc/svc.c | 5 +- net/unix/af_unix.c | 37 ++- scripts/Makefile.dtbinst | 2 +- scripts/Makefile.package | 2 +- scripts/package/kernel.spec | 8 +- security/integrity/evm/evm_main.c | 12 +- sound/core/seq/seq_ump_convert.c | 10 +- sound/pci/hda/patch_realtek.c | 3 + sound/soc/amd/acp/acp-i2s.c | 8 - sound/soc/amd/acp/acp-pci.c | 12 +- sound/soc/atmel/atmel-classd.c | 7 +- sound/soc/codecs/cs42l43-jack.c | 4 +- sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 10 +- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 32 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 13 +- sound/synth/emux/soundfont.c | 17 +- tools/power/x86/turbostat/turbostat.c | 2 +- tools/testing/cxl/test/cxl.c | 4 + 234 files changed, 2103 insertions(+), 1184 deletions(-) . From: Mario Limonciello To: "Gautham R . Shenoy" CC: Meng Li , Perry Yuan , "open list:AMD PSTATE DRIVER" , open list , Dhananjay Ugwekar , Mario Limonciello Subject: [PATCH 1/2] cpufreq/amd-pstate-ut: Don't check for highest perf matching on prefcore Date: Tue, 2 Jul 2024 12:15:14 -0500 Message-ID: <20240702171515.6780-1-mario.limonciello@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265522 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail If a system is using preferred cores the highest perf will be inconsistent as it can change from system events. Skip the checks for it. Fixes: e571a5e2068e ("cpufreq: amd-pstate: Update amd-pstate preferred core ranking dynamically") Signed-off-by: Mario Limonciello --- drivers/cpufreq/amd-pstate-ut.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c index 66b73c308ce6..b7318669485e 100644 --- a/drivers/cpufreq/amd-pstate-ut.c +++ b/drivers/cpufreq/amd-pstate-ut.c @@ -160,14 +160,17 @@ static void amd_pstate_ut_check_perf(u32 index) lowest_perf = AMD_CPPC_LOWEST_PERF(cap1); } - if ((highest_perf != READ_ONCE(cpudata->highest_perf)) || - (nominal_perf != READ_ONCE(cpudata->nominal_perf)) || + if (highest_perf != READ_ONCE(cpudata->highest_perf) && !cpudata->hw_prefcore) { + pr_err("%s cpu%d highest=%d %d highest perf doesn't match\n", + __func__, cpu, highest_perf, cpudata->highest_perf); + goto skip_test; + } + if ((nominal_perf != READ_ONCE(cpudata->nominal_perf)) || (lowest_nonlinear_perf != READ_ONCE(cpudata->lowest_nonlinear_perf)) || (lowest_perf != READ_ONCE(cpudata->lowest_perf))) { amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL; - pr_err("%s cpu%d highest=%d %d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n", - __func__, cpu, highest_perf, cpudata->highest_perf, - nominal_perf, cpudata->nominal_perf, + pr_err("%s cpu%d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n", + __func__, cpu, nominal_perf, cpudata->nominal_perf, lowest_nonlinear_perf, cpudata->lowest_nonlinear_perf, lowest_perf, cpudata->lowest_perf); goto skip_test; -- 2.43.0 . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 6.6 000/163] 6.6.37-rc1 review Date: Tue, 2 Jul 2024 19:01:54 +0200 Message-ID: <20240702170233.048122282@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.37-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.6.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.6.37-rc1 X-KernelTest-Deadline: 2024-07-04T17:02+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265528 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 6.6.37 release. There are 163 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 04 Jul 2024 17:01:55 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.37-rc1.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 6.6.37-rc1 Yao Xingtao cxl/region: check interleave capability Alison Schofield cxl/region: Avoid null pointer dereference in region lookup Alison Schofield cxl/region: Move cxl_dpa_to_region() work to the region driver Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 FUKAUMI Naoki arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E FUKAUMI Naoki arm64: dts: rockchip: make poweroff(8) work on Radxa ROCK 5A Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Hsin-Te Yuan arm64: dts: rockchip: Fix the value of `dlg,jack-det-rate` mismatch on rk3399-gru Jonas Karlman arm64: dts: rockchip: Rename LED related pinctrl nodes on rk3308-rock-pi-s Jonas Karlman arm64: dts: rockchip: Fix SD NAND and eMMC init on rk3308-rock-pi-s yangge mm/page_alloc: Separate THP PCP into movable and non-movable categories Greg Kroah-Hartman Revert "cpufreq: amd-pstate: Fix the inconsistency in max frequency units" Uwe Kleine-König pwm: stm32: Refuse too small period requests Jingbo Xu erofs: fix NULL dereference of dif->bdev_handle in fscache mode Arnd Bergmann syscalls: fix sys_fanotify_mark prototype Arnd Bergmann syscalls: fix compat_sys_io_pgetevents_time64 usage Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Niklas Cassel ata: ahci: Clean up sysfs file on error Vitor Soares can: mcp251xfd: fix infinite loop when xmit fails Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Alex Deucher drm/amdgpu/atomfirmware: fix parsing of vram_info Michael Strauss drm/amd/display: Send DP_TOTAL_LTTPR_CNT during detection if LTTPR is present Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Janusz Krzysztofik drm/i915/gt: Fix potential UAF by revoke of fence registers Julia Zhang drm/amdgpu: avoid using null object of framebuffer Thomas Zimmermann drm/fbdev-dma: Only set smem_start is enable per module option Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Jann Horn drm/drm_file: Fix pid refcounting race Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Naohiro Aota btrfs: zoned: fix initial free space detection Arnd Bergmann sh: rework sync_file_range ABI Dragan Simic kbuild: Install dtb files as 0644 in Makefile.dtbinst Huacai Chen irqchip/loongson-liointc: Set different ISRs for different cores Yuntao Wang cpu/hotplug: Fix dynstate assignment in __cpuhp_setup_state_cpuslocked() Huacai Chen irqchip/loongson-eiointc: Use early_cpu_to_node() instead of cpu_to_node() Rafael J. Wysocki cpufreq: intel_pstate: Use HWP to initialize ITMT if CPPC is missing Mostafa Saleh PCI/MSI: Fix UAF in msi_capability_init Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Dirk Su ALSA: hda/realtek: fix mute/micmute LEDs don't work for EliteBook 645/665 G11. Jonas Gorski serial: bcm63xx-uart: fix tx after conversion to uart_port_tx_limited() Jonas Gorski serial: core: introduce uart_port_tx_limited_flags() Stefan Eichenberger serial: imx: set receiver level before starting uart Udit Kumar serial: 8250_omap: Implementation of Errata i2310 Doug Brown Revert "serial: core: only stop transmit when HW fifo is empty" Jos Wang usb: dwc3: core: Workaround for CSR read timeout Wesley Cheng usb: dwc3: core: Add DWC31 version 2.00a controller Fabrice Gasnier usb: ucsi: stm32: fix command completion handling Javier Carrasco usb: typec: ucsi: glink: fix child node release in probe function Jeremy Kerr usb: gadget: aspeed_udc: fix device address configuration Meng Li usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: fix races against disable Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Alexander Sverdlin iio: accel: fxls8962af: select IIO_BUFFER & IIO_KFIFO_BUF Fernando Yang iio: adc: ad7266: Fix variable checking bug Niklas Cassel ata,scsi: libata-core: Do not leak memory for ata_port struct members Niklas Cassel ata: libata-core: Fix null pointer dereference on error Wolfram Sang i2c: testunit: discard write requests while old command is running Wolfram Sang i2c: testunit: don't erase registers after STOP Thayne Harbaugh kbuild: Fix build target deb-pkg: ln: failed to create hard link Mark-PK Tsai kbuild: doc: Update default INSTALL_MOD_DIR from extra to updates David Lechner counter: ti-eqep: enable clock at probe Sean Anderson iio: xilinx-ams: Don't include ams_ctrl_channels in scan_mask Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Kamal Dasu mmc: sdhci-brcmstb: check R1_STATUS for erase/trim/discard Ilpo Järvinen mmc: sdhci-pci-o2micro: Convert PCIBIOS_* return codes to errnos Zhaoyang Huang mm: fix incorrect vbq reference in purge_fragmented_block Christoph Hellwig nfs: drop the incorrect assertion in nfs_swap_rw() Jan Kara ocfs2: fix DIO failure due to insufficient transaction credits Johan Hovold pinctrl: qcom: spmi-gpio: drop broken pm8008 support Thomas Bogendoerfer Revert "MIPS: pci: lantiq: restore reset gpio polarity" Arnd Bergmann parisc: use generic sys_fanotify_mark implementation Linus Torvalds x86: stop playing stack games in profile_pc() Kees Cook randomize_kstack: Remove non-functional per-arch entropy filtering Kent Gibson gpiolib: cdev: Disallow reconfiguration without direction (uAPI v1) Andy Chiu riscv: stacktrace: convert arch_stack_walk() to noinstr Lijo Lazar drm/amdgpu: Fix pci state save during mode-1 reset Jesse Taube RISC-V: fix vector insn load/store width mask Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Liu Ying drm/panel: simple: Add missing display timing flags for KOE TX26D202VM0BWA Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Erick Archer drm/radeon/radeon_display: Decrease the size of allocated memory Andreas Gruenbacher gfs2: Fix NULL pointer dereference in gfs2_log_flush Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Tiezhu Yang irqchip/loongson: Select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP for IRQ_LOONGARCH_CPU Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Joachim Vandersmissen crypto: ecdh - explicitly zeroize private_key Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Wenchao Hao RDMA/restrack: Fix potential invalid address access Martin KaFai Lau bpf: Mark bpf prog stack with kmsan_unposion_memory in interpreter mode Johannes Berg wifi: ieee80211: check for NULL in ieee80211_mle_size_ok() Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Uros Bizjak x86/fpu: Fix AMD X86_BUG_FXSAVE_LEAK fixup Maxime Coquelin vduse: Temporarily fail if control queue feature requested Maxime Coquelin vduse: validate block features only with block devices Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Christophe Leroy bpf: Take return from set_memory_rox() into account with bpf_jit_binary_lock_ro() Christophe Leroy bpf: Take return from set_memory_ro() into account with bpf_prog_lock_ro() Ma Ke net: mana: Fix possible double free in error handling path Yunseong Kim tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset() Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Takashi Iwai ALSA: seq: Fix missing MSB in MIDI2 SPP conversion Neal Cardwell tcp: fix tcp_rcv_fastopen_synack() to enter TCP_CA_Loss for failed TFO Arnd Bergmann powerpc: restore some missing spu syscalls Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() Tristram Ha net: dsa: microchip: fix wrong register write when masking interrupt Takashi Iwai ALSA: seq: Fix missing channel at encoding RPN/NRPN MIDI2 messages luoxuanqiang Fix race for duplicate reqsk on identical SYN Filipe Manana btrfs: use NOFS context when getting inodes during logging and log replay Jianguo Wu netfilter: fix undefined reference to 'netfilter_lwtunnel_*' when CONFIG_SYSCTL=n Daniil Dulov xdp: Remove WARN() from __xdp_reg_mem_model() Jan Sokolowski ice: Rebuild TC queues on VSI queue reconfiguration Enguerrand de Ribaucourt net: dsa: microchip: use collision based back pressure mode Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Nick Child ibmvnic: Free any outstanding tx skbs during scrq reset Daniel Borkmann bpf: Fix overrunning reservations in ringbuf Ido Schimmel mlxsw: spectrum_buffers: Fix memory corruptions on Spectrum-4 systems Xin Long openvswitch: get related ct labels from its master if it is not confirmed Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Vijendar Mukunda ASoC: amd: acp: remove i2s configuration check in acp_i2s_probe() Vijendar Mukunda ASoC: amd: acp: add a null check for chip_pdev structure Niklas Schnelle s390/pci: Add missing virt_to_phys() for directed DIBV Yonghong Song bpf: Add missed var_off setting in coerce_subreg_to_size_sx() Yonghong Song bpf: Add missed var_off setting in set_sext32_default_val() Srinivas Kandagatla ASoC: q6apm-lpass-dai: close graph on prepare errors Wenchao Hao workqueue: Increase worker desc's length to 32 Andrei Simion ASoC: atmel: atmel-classd: Re-add dai_link->platform to fix card init Kuninori Morimoto ASoC: atmel: convert not to use asoc_xxx() Hsin-Te Yuan ASoC: mediatek: mt8183-da7219-max98357: Fix kcontrol name collision Alibek Omarov ASoC: rockchip: i2s-tdm: Fix trcm mode by setting clock on right mclk Jeff Johnson wifi: mac80211: Use flexible array in struct ieee80211_tim_ie Matthieu Baerts (NGI0) selftests: mptcp: userspace_pm: fixed subtest names Geliang Tang selftests: mptcp: print_test out of verify_listener_events Martin Schiller MIPS: pci: lantiq: restore reset gpio polarity Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: use dedicated pinctrl type for RK3328 Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER John Keeping Input: ili210x - fix ili251x_read_touch_data() return value Jan Beulich x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node() Heikki Krogerus usb: typec: ucsi: Ack also failed Get Error commands Christian A. Ehrhardt usb: typec: ucsi: Never send a lone connector change ack Adam Rizkalla iio: pressure: bmp280: Fix BMP580 temperature reading Li peiyu <579lpy@gmail.com> iio: pressure: fix some word spelling errors ------------- Diffstat: Documentation/kbuild/modules.rst | 8 +- Makefile | 4 +- arch/arm/boot/dts/rockchip/rk3066a.dtsi | 1 + arch/arm/net/bpf_jit_32.c | 25 ++- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 18 +- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 + arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kernel/syscall.c | 16 +- arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/loongarch/net/bpf_jit.c | 22 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/mips/net/bpf_jit_comp.c | 3 +- arch/parisc/Kconfig | 1 + arch/parisc/kernel/sys_parisc32.c | 9 - arch/parisc/kernel/syscalls/syscall.tbl | 6 +- arch/parisc/net/bpf_jit_core.c | 8 +- arch/powerpc/kernel/syscalls/syscall.tbl | 6 +- arch/riscv/include/asm/insn.h | 2 +- arch/riscv/kernel/stacktrace.c | 2 +- arch/s390/include/asm/entry-common.h | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/s390/net/bpf_jit_comp.c | 6 +- arch/s390/pci/pci_irq.c | 2 +- arch/sh/kernel/sys_sh32.c | 11 + arch/sh/kernel/syscalls/syscall.tbl | 3 +- arch/sparc/kernel/sys32.S | 221 --------------------- arch/sparc/kernel/syscalls/syscall.tbl | 8 +- arch/sparc/net/bpf_jit_comp_64.c | 6 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/include/asm/entry-common.h | 15 +- arch/x86/kernel/fpu/core.c | 4 +- arch/x86/kernel/time.c | 20 +- arch/x86/mm/numa.c | 6 +- arch/x86/net/bpf_jit_comp32.c | 3 +- crypto/ecdh.c | 2 + drivers/ata/ahci.c | 17 +- drivers/ata/libata-core.c | 29 ++- drivers/counter/ti-eqep.c | 6 + drivers/cpufreq/amd-pstate.c | 2 +- drivers/cpufreq/intel_pstate.c | 13 +- drivers/cxl/core/core.h | 7 + drivers/cxl/core/hdm.c | 13 ++ drivers/cxl/core/memdev.c | 44 ---- drivers/cxl/core/region.c | 137 +++++++++++++ drivers/cxl/cxl.h | 2 + drivers/cxl/cxlmem.h | 10 + drivers/gpio/gpio-davinci.c | 5 + drivers/gpio/gpiolib-cdev.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 18 +- .../display/dc/link/protocols/link_dp_capability.c | 10 +- drivers/gpu/drm/amd/display/include/dpcd_defs.h | 5 + drivers/gpu/drm/drm_fb_helper.c | 6 +- drivers/gpu/drm/drm_fbdev_dma.c | 5 +- drivers/gpu/drm/drm_file.c | 8 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/radeon/radeon.h | 1 - drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/i2c/i2c-slave-testunit.c | 5 +- drivers/iio/accel/Kconfig | 2 + drivers/iio/adc/ad7266.c | 2 + drivers/iio/adc/xilinx-ams.c | 8 +- drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 +++++- drivers/iio/pressure/bmp280-core.c | 14 +- drivers/iio/pressure/bmp280.h | 2 +- drivers/infiniband/core/restrack.c | 51 +---- drivers/input/touchscreen/ili210x.c | 4 +- drivers/irqchip/Kconfig | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 5 +- drivers/irqchip/irq-loongson-liointc.c | 4 +- drivers/media/dvb-core/dvbdev.c | 2 +- drivers/mmc/host/sdhci-brcmstb.c | 4 + drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci-pci-o2micro.c | 41 ++-- drivers/mmc/host/sdhci.c | 25 ++- drivers/mtd/parsers/redboot.c | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 14 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c | 55 ++++- drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 5 + drivers/net/dsa/microchip/ksz9477.c | 10 +- drivers/net/dsa/microchip/ksz9477_reg.h | 1 + drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 + drivers/net/ethernet/intel/ice/ice_main.c | 10 +- .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 20 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 + drivers/net/phy/micrel.c | 1 + drivers/net/usb/ax88179_178a.c | 6 +- drivers/pci/msi/msi.c | 10 +- drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 68 ++++++- drivers/pinctrl/pinctrl-rockchip.h | 1 + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 - drivers/pwm/pwm-stm32.c | 3 + drivers/scsi/libsas/sas_ata.c | 6 +- drivers/scsi/libsas/sas_discover.c | 2 +- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/tty/serial/8250/8250_omap.c | 25 ++- drivers/tty/serial/bcm63xx_uart.c | 7 +- drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/mcf.c | 2 +- drivers/usb/atm/cxacru.c | 14 ++ drivers/usb/dwc3/core.c | 26 ++- drivers/usb/dwc3/core.h | 1 + drivers/usb/gadget/function/f_printer.c | 40 +++- drivers/usb/gadget/udc/aspeed_udc.c | 4 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/typec/ucsi/ucsi.c | 55 +++-- drivers/usb/typec/ucsi/ucsi_glink.c | 5 +- drivers/usb/typec/ucsi/ucsi_stm32g0.c | 19 +- drivers/vdpa/vdpa_user/vduse_dev.c | 14 +- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/tree-log.c | 43 ++-- fs/erofs/data.c | 5 +- fs/gfs2/log.c | 3 +- fs/gfs2/super.c | 4 + fs/nfs/direct.c | 2 - fs/ocfs2/aops.c | 5 + fs/ocfs2/journal.c | 17 ++ fs/ocfs2/journal.h | 2 + fs/ocfs2/ocfs2_trace.h | 2 + fs/open.c | 4 +- include/linux/compat.h | 2 +- include/linux/filter.h | 10 +- include/linux/ieee80211.h | 15 +- include/linux/libata.h | 1 + include/linux/mmzone.h | 9 +- include/linux/nvme.h | 4 +- include/linux/serial_core.h | 21 +- include/linux/syscalls.h | 8 +- include/linux/workqueue.h | 2 +- include/net/inet_connection_sock.h | 2 +- include/net/netfilter/nf_tables.h | 5 + include/trace/events/qdisc.h | 2 +- include/uapi/asm-generic/unistd.h | 2 +- kernel/bpf/core.c | 6 +- kernel/bpf/ringbuf.c | 31 ++- kernel/bpf/verifier.c | 10 +- kernel/cpu.c | 8 +- kernel/sys_ni.c | 2 +- mm/page_alloc.c | 9 +- mm/vmalloc.c | 21 +- net/batman-adv/originator.c | 27 +++ net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/xdp.c | 4 +- net/dccp/ipv4.c | 7 +- net/dccp/ipv6.c | 7 +- net/ipv4/inet_connection_sock.c | 17 +- net/ipv4/tcp_input.c | 45 +++-- net/iucv/iucv.c | 26 ++- net/netfilter/nf_hooks_lwtunnel.c | 3 + net/netfilter/nf_tables_api.c | 8 +- net/netfilter/nft_lookup.c | 3 +- net/openvswitch/conntrack.c | 7 +- scripts/Makefile.dtbinst | 2 +- scripts/Makefile.package | 2 +- sound/core/seq/seq_ump_convert.c | 10 +- sound/pci/hda/patch_realtek.c | 3 + sound/soc/amd/acp/acp-i2s.c | 8 - sound/soc/amd/acp/acp-pci.c | 10 +- sound/soc/atmel/atmel-classd.c | 17 +- sound/soc/atmel/atmel-pcm-dma.c | 8 +- sound/soc/atmel/atmel-pcm-pdc.c | 4 +- sound/soc/atmel/atmel-pdmic.c | 12 +- sound/soc/atmel/atmel_wm8904.c | 4 +- sound/soc/atmel/mikroe-proto.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/atmel/sam9x5_wm8731.c | 2 +- sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 10 +- sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 32 +-- sound/soc/rockchip/rockchip_i2s_tdm.c | 13 +- sound/synth/emux/soundfont.c | 17 +- tools/testing/cxl/test/cxl.c | 4 + tools/testing/selftests/net/mptcp/userspace_pm.sh | 50 +++-- 189 files changed, 1374 insertions(+), 859 deletions(-) . From: Andrii Nakryiko To: linux-trace-kernel@vger.kernel.org, peterz@infradead.org, rostedt@goodmis.org, mhiramat@kernel.org Cc: x86@kernel.org, mingo@redhat.com, tglx@linutronix.de, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, rihams@fb.com, linux-perf-users@vger.kernel.org, Andrii Nakryiko Subject: [PATCH v2] perf,x86: avoid missing caller address in stack traces captured in uprobe Date: Tue, 2 Jul 2024 10:18:58 -0700 Message-ID: <20240702171858.187562-1-andrii@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265529 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf,org.kernel.vger.linux-perf-users,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail When tracing user functions with uprobe functionality, it's common to install the probe (e.g., a BPF program) at the first instruction of the function. This is often going to be `push %rbp` instruction in function preamble, which means that within that function frame pointer hasn't been established yet. This leads to consistently missing an actual caller of the traced function, because perf_callchain_user() only records current IP (capturing traced function) and then following frame pointer chain (which would be caller's frame, containing the address of caller's caller). So when we have target_1 -> target_2 -> target_3 call chain and we are tracing an entry to target_3, captured stack trace will report target_1 -> target_3 call chain, which is wrong and confusing. This patch proposes a x86-64-specific heuristic to detect `push %rbp` (`push %ebp` on 32-bit architecture) instruction being traced. Given entire kernel implementation of user space stack trace capturing works under assumption that user space code was compiled with frame pointer register (%rbp/%ebp) preservation, it seems pretty reasonable to use this instruction as a strong indicator that this is the entry to the function. In that case, return address is still pointed to by %rsp/%esp, so we fetch it and add to stack trace before proceeding to unwind the rest using frame pointer-based logic. Signed-off-by: Andrii Nakryiko --- v1->v2: - use native unsigned long for ret_addr (Peter); - add same logic for compat logic in perf_callchain_user32 (Peter). arch/x86/events/core.c | 33 +++++++++++++++++++++++++++++++++ include/linux/uprobes.h | 2 ++ kernel/events/uprobes.c | 2 ++ 3 files changed, 37 insertions(+) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 5b0dd07b1ef1..60821c1ff2f3 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2833,6 +2833,19 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent fp = compat_ptr(ss_base + regs->bp); pagefault_disable(); + +#ifdef CONFIG_UPROBES + /* see perf_callchain_user() below for why we do this */ + if (current->utask) { + struct arch_uprobe *auprobe = current->utask->auprobe; + u32 ret_addr; + + if (auprobe && auprobe->insn[0] == 0x55 /* push %ebp */ && + !__get_user(ret_addr, (const u32 __user *)regs->sp)) + perf_callchain_store(entry, ret_addr); + } +#endif + while (entry->nr < entry->max_stack) { if (!valid_user_frame(fp, sizeof(frame))) break; @@ -2884,6 +2897,26 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs return; pagefault_disable(); + +#ifdef CONFIG_UPROBES + /* + * If we are called from uprobe handler, and we are indeed at the very + * entry to user function (which is normally a `push %rbp` instruction, + * under assumption of application being compiled with frame pointers), + * we should read return address from *regs->sp before proceeding + * to follow frame pointers, otherwise we'll skip immediate caller + * as %rbp is not yet setup. + */ + if (current->utask) { + struct arch_uprobe *auprobe = current->utask->auprobe; + unsigned long ret_addr; + + if (auprobe && auprobe->insn[0] == 0x55 /* push %rbp/%ebp */ && + !__get_user(ret_addr, (const unsigned long __user *)regs->sp)) + perf_callchain_store(entry, ret_addr); + } +#endif + while (entry->nr < entry->max_stack) { if (!valid_user_frame(fp, sizeof(frame))) break; diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index b503fafb7fb3..a270a5892ab4 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -76,6 +76,8 @@ struct uprobe_task { struct uprobe *active_uprobe; unsigned long xol_vaddr; + struct arch_uprobe *auprobe; + struct return_instance *return_instances; unsigned int depth; }; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 99be2adedbc0..6e22e4d80f1e 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -2082,6 +2082,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs) bool need_prep = false; /* prepare return uprobe, when needed */ down_read(&uprobe->register_rwsem); + current->utask->auprobe = &uprobe->arch; for (uc = uprobe->consumers; uc; uc = uc->next) { int rc = 0; @@ -2096,6 +2097,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs) remove &= rc; } + current->utask->auprobe = NULL; if (need_prep && !remove) prepare_uretprobe(uprobe, regs); /* put bp at return */ -- 2.43.0 . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 6.1 000/128] 6.1.97-rc1 review Date: Tue, 2 Jul 2024 19:03:21 +0200 Message-ID: <20240702170226.231899085@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.97-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.1.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.1.97-rc1 X-KernelTest-Deadline: 2024-07-04T17:02+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265535 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 6.1.97 release. There are 128 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 04 Jul 2024 17:01:55 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.97-rc1.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 6.1.97-rc1 Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 FUKAUMI Naoki arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Jonas Karlman arm64: dts: rockchip: Rename LED related pinctrl nodes on rk3308-rock-pi-s Jonas Karlman arm64: dts: rockchip: Fix SD NAND and eMMC init on rk3308-rock-pi-s Ard Biesheuvel efi/x86: Free EFI memory map only when installing a new one. Ard Biesheuvel efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures Ard Biesheuvel efi: memmap: Move manipulation routines into x86 arch tree Juntong Deng gfs2: Fix slab-use-after-free in gfs2_qd_dealloc yangge mm/page_alloc: Separate THP PCP into movable and non-movable categories Greg Kroah-Hartman Revert "cpufreq: amd-pstate: Fix the inconsistency in max frequency units" Uwe Kleine-König pwm: stm32: Refuse too small period requests Arnd Bergmann syscalls: fix sys_fanotify_mark prototype Arnd Bergmann syscalls: fix compat_sys_io_pgetevents_time64 usage Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Niklas Cassel ata: ahci: Clean up sysfs file on error Vitor Soares can: mcp251xfd: fix infinite loop when xmit fails Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Alex Deucher drm/amdgpu/atomfirmware: fix parsing of vram_info Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Janusz Krzysztofik drm/i915/gt: Fix potential UAF by revoke of fence registers Julia Zhang drm/amdgpu: avoid using null object of framebuffer Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Naohiro Aota btrfs: zoned: fix initial free space detection Arnd Bergmann sh: rework sync_file_range ABI Dragan Simic kbuild: Install dtb files as 0644 in Makefile.dtbinst Huacai Chen irqchip/loongson-liointc: Set different ISRs for different cores Yuntao Wang cpu/hotplug: Fix dynstate assignment in __cpuhp_setup_state_cpuslocked() Rafael J. Wysocki cpufreq: intel_pstate: Use HWP to initialize ITMT if CPPC is missing Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Dirk Su ALSA: hda/realtek: fix mute/micmute LEDs don't work for EliteBook 645/665 G11. Stefan Eichenberger serial: imx: set receiver level before starting uart Udit Kumar serial: 8250_omap: Implementation of Errata i2310 Fabrice Gasnier usb: ucsi: stm32: fix command completion handling Jeremy Kerr usb: gadget: aspeed_udc: fix device address configuration Meng Li usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: fix races against disable Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Alexander Sverdlin iio: accel: fxls8962af: select IIO_BUFFER & IIO_KFIFO_BUF Fernando Yang iio: adc: ad7266: Fix variable checking bug Wolfram Sang i2c: testunit: discard write requests while old command is running Wolfram Sang i2c: testunit: don't erase registers after STOP David Lechner counter: ti-eqep: enable clock at probe Sean Anderson iio: xilinx-ams: Don't include ams_ctrl_channels in scan_mask Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Kamal Dasu mmc: sdhci-brcmstb: check R1_STATUS for erase/trim/discard Christoph Hellwig nfs: drop the incorrect assertion in nfs_swap_rw() Jan Kara ocfs2: fix DIO failure due to insufficient transaction credits Johan Hovold pinctrl: qcom: spmi-gpio: drop broken pm8008 support Thomas Bogendoerfer Revert "MIPS: pci: lantiq: restore reset gpio polarity" Arnd Bergmann parisc: use generic sys_fanotify_mark implementation Linus Torvalds x86: stop playing stack games in profile_pc() Stefan Berger ima: Fix use-after-free on a dentry's dname.name Kees Cook randomize_kstack: Remove non-functional per-arch entropy filtering Kent Gibson gpiolib: cdev: Disallow reconfiguration without direction (uAPI v1) Andy Chiu riscv: stacktrace: convert arch_stack_walk() to noinstr Lijo Lazar drm/amdgpu: Fix pci state save during mode-1 reset Srinivasan Shanmugam drm/amd/amdgpu: Fix style errors in amdgpu_drv.c & amdgpu_device.c Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Liu Ying drm/panel: simple: Add missing display timing flags for KOE TX26D202VM0BWA Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Erick Archer drm/radeon/radeon_display: Decrease the size of allocated memory Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Joachim Vandersmissen crypto: ecdh - explicitly zeroize private_key Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Wenchao Hao RDMA/restrack: Fix potential invalid address access Martin KaFai Lau bpf: Mark bpf prog stack with kmsan_unposion_memory in interpreter mode Anton Protopopov bpf: Add a check for struct bpf_fib_lookup size Johannes Berg wifi: ieee80211: check for NULL in ieee80211_mle_size_ok() Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Uros Bizjak x86/fpu: Fix AMD X86_BUG_FXSAVE_LEAK fixup Maxime Coquelin vduse: Temporarily fail if control queue feature requested Maxime Coquelin vduse: validate block features only with block devices Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Christophe Leroy bpf: Take return from set_memory_ro() into account with bpf_prog_lock_ro() Yunseong Kim tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset() Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Neal Cardwell tcp: fix tcp_rcv_fastopen_synack() to enter TCP_CA_Loss for failed TFO Arnd Bergmann powerpc: restore some missing spu syscalls Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() Tristram Ha net: dsa: microchip: fix wrong register write when masking interrupt luoxuanqiang Fix race for duplicate reqsk on identical SYN Daniil Dulov xdp: Remove WARN() from __xdp_reg_mem_model() Enguerrand de Ribaucourt net: dsa: microchip: use collision based back pressure mode Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Nick Child ibmvnic: Free any outstanding tx skbs during scrq reset Daniel Borkmann bpf: Fix overrunning reservations in ringbuf Ido Schimmel mlxsw: spectrum_buffers: Fix memory corruptions on Spectrum-4 systems Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Vijendar Mukunda ASoC: amd: acp: remove i2s configuration check in acp_i2s_probe() Niklas Schnelle s390/pci: Add missing virt_to_phys() for directed DIBV Alibek Omarov ASoC: rockchip: i2s-tdm: Fix trcm mode by setting clock on right mclk Pablo Neira Ayuso netfilter: nf_tables: use timestamp to check for set element timeout Krzysztof Kozlowski dt-bindings: i2c: atmel,at91sam: correct path to i2c-controller schema Rob Herring dt-bindings: i2c: Drop unneeded quotes Martin Schiller MIPS: pci: lantiq: restore reset gpio polarity Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: use dedicated pinctrl type for RK3328 Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER John Keeping Input: ili210x - fix ili251x_read_touch_data() return value Mario Limonciello ACPI: x86: Force StorageD3Enable on more products Mario Limonciello ACPI: x86: utils: Add Picasso to the list for forcing StorageD3Enable Jan Beulich x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node() Heikki Krogerus usb: typec: ucsi: Ack also failed Get Error commands Christian A. Ehrhardt usb: typec: ucsi: Never send a lone connector change ack ------------- Diffstat: .../bindings/i2c/amlogic,meson6-i2c.yaml | 4 +- .../devicetree/bindings/i2c/apple,i2c.yaml | 4 +- .../devicetree/bindings/i2c/atmel,at91sam-i2c.yaml | 2 +- .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 4 +- .../devicetree/bindings/i2c/i2c-mux-gpio.yaml | 4 +- .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 4 +- .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 2 +- .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 4 +- Makefile | 4 +- arch/arm/boot/dts/rk3066a.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 18 +- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kernel/syscall.c | 16 +- arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/parisc/Kconfig | 1 + arch/parisc/kernel/sys_parisc32.c | 9 - arch/parisc/kernel/syscalls/syscall.tbl | 6 +- arch/powerpc/kernel/syscalls/syscall.tbl | 6 +- arch/riscv/kernel/stacktrace.c | 2 +- arch/s390/include/asm/entry-common.h | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/s390/pci/pci_irq.c | 2 +- arch/sh/kernel/sys_sh32.c | 11 + arch/sh/kernel/syscalls/syscall.tbl | 3 +- arch/sparc/kernel/sys32.S | 221 ------------------ arch/sparc/kernel/syscalls/syscall.tbl | 8 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/include/asm/efi.h | 11 + arch/x86/include/asm/entry-common.h | 15 +- arch/x86/kernel/fpu/core.c | 4 +- arch/x86/kernel/time.c | 20 +- arch/x86/mm/numa.c | 6 +- arch/x86/platform/efi/Makefile | 3 +- arch/x86/platform/efi/efi.c | 8 +- arch/x86/platform/efi/memmap.c | 249 +++++++++++++++++++++ crypto/ecdh.c | 2 + drivers/acpi/x86/utils.c | 23 +- drivers/ata/ahci.c | 17 +- drivers/ata/libata-core.c | 8 +- drivers/counter/ti-eqep.c | 6 + drivers/cpufreq/amd-pstate.c | 2 +- drivers/cpufreq/intel_pstate.c | 13 +- drivers/firmware/efi/fdtparams.c | 4 + drivers/firmware/efi/memmap.c | 238 +------------------- drivers/gpio/gpio-davinci.c | 5 + drivers/gpio/gpiolib-cdev.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 68 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 18 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/radeon/radeon.h | 1 - drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/i2c/i2c-slave-testunit.c | 5 +- drivers/iio/accel/Kconfig | 2 + drivers/iio/adc/ad7266.c | 2 + drivers/iio/adc/xilinx-ams.c | 8 +- drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 ++++- drivers/infiniband/core/restrack.c | 51 +---- drivers/input/touchscreen/ili210x.c | 4 +- drivers/irqchip/irq-loongson-liointc.c | 4 +- drivers/media/dvb-core/dvbdev.c | 2 +- drivers/mmc/host/sdhci-brcmstb.c | 4 + drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci.c | 25 ++- drivers/mtd/parsers/redboot.c | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 14 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c | 55 ++++- drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 5 + drivers/net/dsa/microchip/ksz9477.c | 10 +- drivers/net/dsa/microchip/ksz9477_reg.h | 1 + drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 20 +- drivers/net/phy/micrel.c | 1 + drivers/net/usb/ax88179_178a.c | 6 +- drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 68 +++++- drivers/pinctrl/pinctrl-rockchip.h | 1 + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 - drivers/pwm/pwm-stm32.c | 3 + drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/tty/serial/8250/8250_omap.c | 25 ++- drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/mcf.c | 2 +- drivers/usb/atm/cxacru.c | 14 ++ drivers/usb/dwc3/core.c | 6 - drivers/usb/gadget/function/f_printer.c | 40 +++- drivers/usb/gadget/udc/aspeed_udc.c | 4 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/typec/ucsi/ucsi.c | 55 +++-- drivers/usb/typec/ucsi/ucsi_stm32g0.c | 19 +- drivers/vdpa/vdpa_user/vduse_dev.c | 14 +- fs/btrfs/free-space-cache.c | 2 +- fs/gfs2/super.c | 2 + fs/nfs/direct.c | 2 - fs/ocfs2/aops.c | 5 + fs/ocfs2/journal.c | 17 ++ fs/ocfs2/journal.h | 2 + fs/ocfs2/ocfs2_trace.h | 2 + fs/open.c | 4 +- include/linux/compat.h | 2 +- include/linux/efi.h | 10 +- include/linux/filter.h | 5 +- include/linux/ieee80211.h | 2 +- include/linux/mmzone.h | 9 +- include/linux/nvme.h | 4 +- include/linux/syscalls.h | 8 +- include/net/inet_connection_sock.h | 2 +- include/net/netfilter/nf_tables.h | 21 +- include/trace/events/qdisc.h | 2 +- include/uapi/asm-generic/unistd.h | 2 +- kernel/bpf/core.c | 6 +- kernel/bpf/ringbuf.c | 31 ++- kernel/bpf/verifier.c | 8 +- kernel/cpu.c | 8 +- kernel/sys_ni.c | 2 +- mm/page_alloc.c | 8 +- net/batman-adv/originator.c | 27 +++ net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/filter.c | 3 + net/core/xdp.c | 4 +- net/dccp/ipv4.c | 7 +- net/dccp/ipv6.c | 7 +- net/ipv4/inet_connection_sock.c | 17 +- net/ipv4/tcp_input.c | 45 +++- net/iucv/iucv.c | 26 ++- net/netfilter/nf_tables_api.c | 12 +- net/netfilter/nft_lookup.c | 3 +- net/netfilter/nft_set_hash.c | 8 +- net/netfilter/nft_set_pipapo.c | 18 +- net/netfilter/nft_set_rbtree.c | 6 +- scripts/Makefile.dtbinst | 2 +- security/integrity/ima/ima_api.c | 16 +- security/integrity/ima/ima_template_lib.c | 17 +- sound/pci/hda/patch_realtek.c | 3 + sound/soc/amd/acp/acp-i2s.c | 8 - sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 13 +- sound/synth/emux/soundfont.c | 17 +- 153 files changed, 1232 insertions(+), 947 deletions(-) . From: superm1@kernel.org To: Bjorn Helgaas , Bartosz Golaszewski Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Mario Limonciello , Amit Pundir , Neil Armstrong , Caleb Connolly , Praveenkumar Patil Subject: [PATCH] PCI/pwrctl: Decrease message about child OF nodes to debug Date: Tue, 2 Jul 2024 12:32:55 -0500 Message-ID: <20240702173255.39932-1-superm1@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265538 org.kernel.vger.linux-pci:144800 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Mario Limonciello commit 8fb18619d910 ("PCI/pwrctl: Create platform devices for child OF nodes of the port node") introduced a new error message about populating OF nodes. This message isn't relevant on non-OF platforms, so downgrade it to debug instead. Cc: Bartosz Golaszewski Cc: Amit Pundir Cc: Neil Armstrong # on SM8550-QRD, SM8650-QRD & SM8650-HDK Cc: Caleb Connolly # OnePlus 8T Reported-by: Praveenkumar Patil Fixes: 8fb18619d910 ("PCI/pwrctl: Create platform devices for child OF nodes of the port node") Signed-off-by: Mario Limonciello --- drivers/pci/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index e4735428814d..f21c4ec979b5 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -354,7 +354,7 @@ void pci_bus_add_device(struct pci_dev *dev) retval = of_platform_populate(dev->dev.of_node, NULL, NULL, &dev->dev); if (retval) - pci_err(dev, "failed to populate child OF nodes (%d)\n", + pci_dbg(dev, "failed to populate child OF nodes (%d)\n", retval); } } -- 2.43.0 . From: Guillaume Stols Subject: [PATCH v3 0/8] iio: adc: ad7606: Improvements Date: Tue, 02 Jul 2024 17:34:04 +0000 Message-Id: <20240702-cleanup-ad7606-v3-0-57fd02a4e2aa@baylibre.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Hennerich , linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org, Jonathan Cameron , Guillaume Stols , jstephan@baylibre.com, dlechner@baylibre.com, Conor Dooley Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265541 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-fbdev,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series adds the following improvements over the current AD7606's driver implementation: - Fix wrong usage of gpio array - Fix standby that was documented as ACTIVE_LOW but handled in the driver as if it was ACTIVE_HIGH - Improve dt-bindings documentation - Switch mutex lock to scoped guard Signed-off-by: Guillaume Stols --- Changes in v3: - Remove the two first patches that were already picked up. - Add styling corrections. - [Patch 6/8] Improve commit message. - [Patch 8/8] Replace every scoped_guard by simple guard. - Link to v2: https://lore.kernel.org/r/20240628-cleanup-ad7606-v2-0-96e02f90256d@baylibre.com Changes in v2: - Change scoped guard to guard(mutex)(&st->lock). This was tested with Rob's bot condition, and seems not to generate warning anymore. - Reorder the commits for avoiding bisection issues and respect commit priority rules. - Add vdrive-supply to required properties. - Separate cosmetic changes from content ones in dt-binding descriptions. - Move maxItems changes (and plural in descriptions) to the commit that adds conditions. - Link to v1: https://lore.kernel.org/r/20240618-cleanup-ad7606-v1-0-f1854d5c779d@baylibre.com --- Guillaume Stols (8): dt-bindings: iio: adc: adi,ad7606: normalize textwidth dt-bindings: iio: adc: adi,ad7606: improve descriptions dt-bindings: iio: adc: adi,ad7606: add supply properties dt-bindings: iio: adc: adi,ad7606: fix example dt-bindings: iio: adc: adi,ad7606: add conditions iio: adc: ad7606: fix oversampling gpio array iio: adc: ad7606: fix standby gpio state to match the documentation iio: adc: ad7606: switch mutexes to scoped_guard .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 123 ++++++++++++++++----- drivers/iio/adc/ad7606.c | 47 ++++---- drivers/iio/adc/ad7606_spi.c | 5 +- 3 files changed, 115 insertions(+), 60 deletions(-) --- base-commit: 340fa834ae229a952db04a57ed13fd5d35d75818 change-id: 20240416-cleanup-ad7606-161e2ed9818b Best regards, -- Guillaume Stols . From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH parts 14, 17] Add support for Sub-NUMA cluster (SNC) systems Date: Tue, 2 Jul 2024 10:38:18 -0700 Message-ID: <20240702173820.90368-1-tony.luck@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265552 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Updated parts 14 & 17 addressing Boris' comments on v23 of this series: Link: https://lore.kernel.org/all/20240628215619.76401-1-tony.luck@intel.com/ Signed-off-by: Tony Luck Tony Luck (19): x86/resctrl: Handle removing directories in Sub-NUMA Cluster (SNC) mode x86/resctrl: Enable shared RMID mode on Sub-NUMA Cluster (SNC) systems . From: Junlin Li To: mchehab@kernel.org, laurent.pinchart+renesas@ideasonboard.com, tzimmermann@suse.de, wsa+renesas@sang-engineering.com, hkallweit1@gmail.com, robh@kernel.org, crope@iki.fi Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Junlin Li Subject: [PATCH] drivers: media: dvb-frontends/rtl2830: fix an out-of-bounds write error Date: Wed, 3 Jul 2024 01:50:23 +0800 Message-Id: <20240702175023.3921-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265562 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Ensure index in rtl2830_pid_filter does not exceed 31 to prevent out-of-bounds access. dev->filters is a 32-bit value, so set_bit and clear_bit functions should only operate on indices from 0 to 31. If index is 32, it will attempt to access a non-existent 33rd bit, leading to out-of-bounds access. Change the boundary check from index > 32 to index >= 32 to resolve this issue. Fixes: df70ddad81b4 ("[media] rtl2830: implement PID filter") Signed-off-by: Junlin Li --- drivers/media/dvb-frontends/rtl2830.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c index 30d10fe4b33e..320aa2bf99d4 100644 --- a/drivers/media/dvb-frontends/rtl2830.c +++ b/drivers/media/dvb-frontends/rtl2830.c @@ -609,7 +609,7 @@ static int rtl2830_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, int on index, pid, onoff); /* skip invalid PIDs (0x2000) */ - if (pid > 0x1fff || index > 32) + if (pid > 0x1fff || index >= 32) return 0; if (onoff) -- 2.34.1 . From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nicolas Schier Subject: [PATCH v2 1/3] kbuild: deb-pkg: remove support for EMAIL environment variable Date: Wed, 3 Jul 2024 03:02:40 +0900 Message-ID: <20240702180332.398978-1-masahiroy@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265575 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-kbuild Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Commit edec611db047 ("kbuild, deb-pkg: improve maintainer identification") added the EMAIL and NAME environment variables. Commit d5940c60e057 ("kbuild: deb-pkg improve maintainer address generation") removed support for NAME, but kept support for EMAIL. The EMAIL and NAME environment variables are still supported by some tools (see 'man debchange'), but not by all. We should support both of them, or neither of them. We should not stop halfway. Signed-off-by: Masahiro Yamada --- Changes in v2: - New patch scripts/package/mkdebian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index b9a5b789c655..589f92b88c42 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -125,7 +125,7 @@ gen_source () rm -rf debian mkdir debian -email=${DEBEMAIL-$EMAIL} +email=${DEBEMAIL} # use email string directly if it contains if echo "${email}" | grep -q '<.*>'; then -- 2.43.0 . From: superm1@kernel.org To: Bjorn Helgaas , Bartosz Golaszewski Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Mario Limonciello , Amit Pundir , Neil Armstrong , Caleb Connolly , Praveenkumar Patil Subject: [PATCH v2] PCI/pwrctl: Don't show error when missing OF nodes Date: Tue, 2 Jul 2024 13:08:39 -0500 Message-ID: <20240702180839.71491-1-superm1@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265581 org.kernel.vger.linux-pci:144804 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Mario Limonciello commit 8fb18619d910 ("PCI/pwrctl: Create platform devices for child OF nodes of the port node") introduced a new error message about populating OF nodes. This message isn't relevant on non-OF platforms and of_platform_populate() returns -ENODEV in this case, so don't show the message on non-OF platforms. Cc: Bartosz Golaszewski Cc: Amit Pundir Cc: Neil Armstrong # on SM8550-QRD, SM8650-QRD & SM8650-HDK Cc: Caleb Connolly # OnePlus 8T Reported-by: Praveenkumar Patil Fixes: 8fb18619d910 ("PCI/pwrctl: Create platform devices for child OF nodes of the port node") Signed-off-by: Mario Limonciello --- v1->v2: * Catch -ENODEV case instead (Bartosz) --- drivers/pci/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index e4735428814d..231bc796ba04 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -353,7 +353,7 @@ void pci_bus_add_device(struct pci_dev *dev) if (pci_is_bridge(dev)) { retval = of_platform_populate(dev->dev.of_node, NULL, NULL, &dev->dev); - if (retval) + if (retval && retval != -ENODEV) pci_err(dev, "failed to populate child OF nodes (%d)\n", retval); } -- 2.43.0 . Message-ID: <3bd738a7-379f-4b93-befd-e6ee96e802b5@gmail.com> Date: Tue, 2 Jul 2024 20:23:24 +0200 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Johan Jonker Subject: [PATCH v8] drm/rockchip: rk3066_hdmi: add sound support To: heiko@sntech.de Cc: hjc@rock-chips.com, andy.yan@rock-chips.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, lgirdwood@gmail.com, broonie@kernel.org, linux-sound@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265587 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add sound support to the RK3066 HDMI driver. The HDMI TX audio source is connected to I2S_8CH. Signed-off-by: Zheng Yang Signed-off-by: Johan Jonker --- Changed V8: return -EPROBE_DEFER as early as possible move rk3066_hdmi_audio_codec_init() function after rk3066_hdmi_register() restyle Changed V7: rebase --- drivers/gpu/drm/rockchip/Kconfig | 2 + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 296 +++++++++++++++++++++++-- 2 files changed, 283 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index 1bf3e2829cd0..a32ee558408c 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -102,6 +102,8 @@ config ROCKCHIP_RGB config ROCKCHIP_RK3066_HDMI bool "Rockchip specific extensions for RK3066 HDMI" depends on DRM_ROCKCHIP + select SND_SOC_HDMI_CODEC if SND_SOC + select SND_SOC_ROCKCHIP_I2S if SND_SOC help This selects support for Rockchip SoC specific extensions for the RK3066 HDMI driver. If you want to enable diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c index 784de990da1b..296094a3c405 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -15,12 +15,20 @@ #include #include +#include + #include "rk3066_hdmi.h" #include "rockchip_drm_drv.h" #define DEFAULT_PLLA_RATE 30000000 +struct audio_info { + int channels; + int sample_rate; + int sample_width; +}; + struct hdmi_data_info { int vic; /* The CEA Video ID (VIC) of the current drm display mode. */ unsigned int enc_out_format; @@ -40,7 +48,6 @@ struct rk3066_hdmi_i2c { struct rk3066_hdmi { struct device *dev; - struct drm_device *drm_dev; struct regmap *grf_regmap; int irq; struct clk *hclk; @@ -54,9 +61,15 @@ struct rk3066_hdmi { unsigned int tmdsclk; + struct platform_device *audio_pdev; + struct audio_info audio; + bool audio_enable; + struct hdmi_data_info hdmi_data; }; +static int rk3066_hdmi_config_audio(struct rk3066_hdmi *hdmi, struct audio_info *audio); + static struct rk3066_hdmi *encoder_to_rk3066_hdmi(struct drm_encoder *encoder) { struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder); @@ -214,6 +227,23 @@ static int rk3066_hdmi_config_avi(struct rk3066_hdmi *hdmi, HDMI_INFOFRAME_AVI, 0, 0, 0); } +static int rk3066_hdmi_config_aai(struct rk3066_hdmi *hdmi, + struct audio_info *audio) +{ + union hdmi_infoframe frame; + int rc; + + rc = hdmi_audio_infoframe_init(&frame.audio); + + frame.audio.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM; + frame.audio.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; + frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; + frame.audio.channels = hdmi->audio.channels; + + return rk3066_hdmi_upload_frame(hdmi, rc, &frame, + HDMI_INFOFRAME_AAI, 0, 0, 0); +} + static int rk3066_hdmi_config_video_timing(struct rk3066_hdmi *hdmi, struct drm_display_mode *mode) { @@ -364,6 +394,7 @@ static int rk3066_hdmi_setup(struct rk3066_hdmi *hdmi, hdmi_modb(hdmi, HDMI_HDCP_CTRL, HDMI_VIDEO_MODE_MASK, HDMI_VIDEO_MODE_HDMI); rk3066_hdmi_config_avi(hdmi, mode); + rk3066_hdmi_config_audio(hdmi, &hdmi->audio); } else { hdmi_modb(hdmi, HDMI_HDCP_CTRL, HDMI_VIDEO_MODE_MASK, 0); } @@ -380,9 +411,20 @@ static int rk3066_hdmi_setup(struct rk3066_hdmi *hdmi, */ rk3066_hdmi_i2c_init(hdmi); - /* Unmute video output. */ + /* Unmute video and audio output. */ hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_VIDEO_AUDIO_DISABLE_MASK, HDMI_AUDIO_DISABLE); + if (hdmi->audio_enable) { + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_AUDIO_DISABLE, 0); + /* Reset audio capture logic. */ + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, + HDMI_AUDIO_CP_LOGIC_RESET); + usleep_range(900, 1000); + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, 0); + } + return 0; } @@ -431,6 +473,7 @@ static void rk3066_hdmi_encoder_disable(struct drm_encoder *encoder, HDMI_AUDIO_CP_LOGIC_RESET); usleep_range(500, 510); } + rk3066_hdmi_set_power_mode(hdmi, HDMI_SYS_POWER_MODE_A); } @@ -534,23 +577,228 @@ struct drm_connector_helper_funcs rk3066_hdmi_connector_helper_funcs = { .best_encoder = rk3066_hdmi_connector_best_encoder, }; -static int -rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) +static int rk3066_hdmi_config_audio(struct rk3066_hdmi *hdmi, struct audio_info *audio) { - struct drm_encoder *encoder = &hdmi->encoder.encoder; - struct device *dev = hdmi->dev; + u32 rate, channel, word_length, N, CTS; + u64 tmp; + + if (audio->channels < 3) + channel = HDMI_AUDIO_I2S_CHANNEL_1_2; + else if (audio->channels < 5) + channel = HDMI_AUDIO_I2S_CHANNEL_3_4; + else if (audio->channels < 7) + channel = HDMI_AUDIO_I2S_CHANNEL_5_6; + else + channel = HDMI_AUDIO_I2S_CHANNEL_7_8; + + switch (audio->sample_rate) { + case 32000: + rate = HDMI_AUDIO_SAMPLE_FRE_32000; + N = N_32K; + break; + case 44100: + rate = HDMI_AUDIO_SAMPLE_FRE_44100; + N = N_441K; + break; + case 48000: + rate = HDMI_AUDIO_SAMPLE_FRE_48000; + N = N_48K; + break; + case 88200: + rate = HDMI_AUDIO_SAMPLE_FRE_88200; + N = N_882K; + break; + case 96000: + rate = HDMI_AUDIO_SAMPLE_FRE_96000; + N = N_96K; + break; + case 176400: + rate = HDMI_AUDIO_SAMPLE_FRE_176400; + N = N_1764K; + break; + case 192000: + rate = HDMI_AUDIO_SAMPLE_FRE_192000; + N = N_192K; + break; + default: + DRM_DEV_ERROR(hdmi->dev, "no support for sample rate %d\n", + audio->sample_rate); + return -ENOENT; + } - encoder->possible_crtcs = - drm_of_find_possible_crtcs(drm, dev->of_node); + switch (audio->sample_width) { + case 16: + word_length = 0x02; + break; + case 20: + word_length = 0x0a; + break; + case 24: + word_length = 0x0b; + break; + default: + DRM_DEV_ERROR(hdmi->dev, "no support for word length %d\n", + audio->sample_width); + return -ENOENT; + } + + tmp = (u64)hdmi->tmdsclk * N; + do_div(tmp, 128 * audio->sample_rate); + CTS = tmp; + + /* Set_audio source I2S. */ + hdmi_writeb(hdmi, HDMI_AUDIO_CTRL1, 0x00); + hdmi_writeb(hdmi, HDMI_AUDIO_CTRL2, 0x40); + hdmi_writeb(hdmi, HDMI_I2S_AUDIO_CTRL, + HDMI_AUDIO_I2S_FORMAT_STANDARD | channel); + hdmi_writeb(hdmi, HDMI_I2S_SWAP, 0x00); + hdmi_modb(hdmi, HDMI_AV_CTRL1, HDMI_AUDIO_SAMPLE_FRE_MASK, rate); + hdmi_writeb(hdmi, HDMI_AUDIO_SRC_NUM_AND_LENGTH, word_length); + + /* Set N value. */ + hdmi_modb(hdmi, HDMI_LR_SWAP_N3, + HDMI_AUDIO_N_19_16_MASK, (N >> 16) & 0x0F); + hdmi_writeb(hdmi, HDMI_N2, (N >> 8) & 0xFF); + hdmi_writeb(hdmi, HDMI_N1, N & 0xFF); + + /* Set CTS value. */ + hdmi_writeb(hdmi, HDMI_CTS_EXT1, CTS & 0xff); + hdmi_writeb(hdmi, HDMI_CTS_EXT2, (CTS >> 8) & 0xff); + hdmi_writeb(hdmi, HDMI_CTS_EXT3, (CTS >> 16) & 0xff); + + if (audio->channels > 2) + hdmi_modb(hdmi, HDMI_LR_SWAP_N3, + HDMI_AUDIO_LR_SWAP_MASK, + HDMI_AUDIO_LR_SWAP_SUBPACKET1); + rate = (~(rate >> 4)) & 0x0f; + hdmi_writeb(hdmi, HDMI_AUDIO_STA_BIT_CTRL1, rate); + hdmi_writeb(hdmi, HDMI_AUDIO_STA_BIT_CTRL2, 0); + + return rk3066_hdmi_config_aai(hdmi, audio); +} + +static int rk3066_hdmi_audio_hw_params(struct device *dev, void *d, + struct hdmi_codec_daifmt *daifmt, + struct hdmi_codec_params *params) +{ + struct rk3066_hdmi *hdmi = dev_get_drvdata(dev); + struct drm_display_info *display = &hdmi->connector.display_info; + + if (!display->has_audio) { + DRM_DEV_ERROR(hdmi->dev, "no audio support\n"); + return -ENODEV; + } + + if (!hdmi->encoder.encoder.crtc) + return -ENODEV; + + switch (daifmt->fmt) { + case HDMI_I2S: + break; + default: + DRM_DEV_ERROR(dev, "invalid format %d\n", daifmt->fmt); + return -EINVAL; + } + + hdmi->audio.channels = params->channels; + hdmi->audio.sample_rate = params->sample_rate; + hdmi->audio.sample_width = params->sample_width; + + return rk3066_hdmi_config_audio(hdmi, &hdmi->audio); +} + +static void rk3066_hdmi_audio_shutdown(struct device *dev, void *d) +{ + /* do nothing */ +} + +static int rk3066_hdmi_audio_mute_stream(struct device *dev, void *d, bool mute, int direction) +{ + struct rk3066_hdmi *hdmi = dev_get_drvdata(dev); + struct drm_display_info *display = &hdmi->connector.display_info; + + if (!display->has_audio) { + DRM_DEV_ERROR(hdmi->dev, "no audio support\n"); + return -ENODEV; + } + + hdmi->audio_enable = !mute; + + if (mute) + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_DISABLE, HDMI_AUDIO_DISABLE); + else + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_AUDIO_DISABLE, 0); /* - * If we failed to find the CRTC(s) which this encoder is - * supposed to be connected to, it's because the CRTC has - * not been registered yet. Defer probing, and hope that - * the required CRTC is added later. + * Under power mode E we need to reset the audio capture logic to + * make the audio setting update. */ - if (encoder->possible_crtcs == 0) - return -EPROBE_DEFER; + if (rk3066_hdmi_get_power_mode(hdmi) == HDMI_SYS_POWER_MODE_E) { + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, + HDMI_AUDIO_CP_LOGIC_RESET); + usleep_range(900, 1000); + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, 0); + } + + return 0; +} + +static int rk3066_hdmi_audio_get_eld(struct device *dev, void *d, u8 *buf, size_t len) +{ + struct rk3066_hdmi *hdmi = dev_get_drvdata(dev); + struct drm_mode_config *config = &hdmi->encoder.encoder.dev->mode_config; + struct drm_connector *connector; + int ret = -ENODEV; + + mutex_lock(&config->mutex); + list_for_each_entry(connector, &config->connector_list, head) { + if (&hdmi->encoder.encoder == connector->encoder) { + memcpy(buf, connector->eld, + min(sizeof(connector->eld), len)); + ret = 0; + } + } + mutex_unlock(&config->mutex); + + return ret; +} + +static const struct hdmi_codec_ops audio_codec_ops = { + .hw_params = rk3066_hdmi_audio_hw_params, + .audio_shutdown = rk3066_hdmi_audio_shutdown, + .mute_stream = rk3066_hdmi_audio_mute_stream, + .get_eld = rk3066_hdmi_audio_get_eld, + .no_capture_mute = 1, +}; + +static int rk3066_hdmi_audio_codec_init(struct rk3066_hdmi *hdmi, struct device *dev) +{ + struct hdmi_codec_pdata codec_data = { + .i2s = 1, + .ops = &audio_codec_ops, + .max_i2s_channels = 8, + }; + + hdmi->audio.channels = 2; + hdmi->audio.sample_rate = 48000; + hdmi->audio.sample_width = 16; + hdmi->audio_enable = false; + hdmi->audio_pdev = + platform_device_register_data(dev, + HDMI_CODEC_DRV_NAME, + PLATFORM_DEVID_NONE, + &codec_data, + sizeof(codec_data)); + + return PTR_ERR_OR_ZERO(hdmi->audio_pdev); +} + +static int rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) +{ + struct drm_encoder *encoder = &hdmi->encoder.encoder; drm_encoder_helper_add(encoder, &rk3066_hdmi_encoder_helper_funcs); drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); @@ -740,6 +988,7 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master, { struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = data; + struct drm_encoder *encoder; struct rk3066_hdmi *hdmi; int irq; int ret; @@ -748,8 +997,21 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master, if (!hdmi) return -ENOMEM; + encoder = &hdmi->encoder.encoder; + + encoder->possible_crtcs = + drm_of_find_possible_crtcs(drm, dev->of_node); + + /* + * If we failed to find the CRTC(s) which this encoder is + * supposed to be connected to, it's because the CRTC has + * not been registered yet. Defer probing, and hope that + * the required CRTC is added later. + */ + if (encoder->possible_crtcs == 0) + return -EPROBE_DEFER; + hdmi->dev = dev; - hdmi->drm_dev = drm; hdmi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hdmi->regs)) return PTR_ERR(hdmi->regs); @@ -800,6 +1062,8 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master, if (ret) goto err_disable_i2c; + rk3066_hdmi_audio_codec_init(hdmi, dev); + dev_set_drvdata(dev, hdmi); ret = devm_request_threaded_irq(dev, irq, rk3066_hdmi_hardirq, @@ -813,6 +1077,7 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master, return 0; err_cleanup_hdmi: + platform_device_unregister(hdmi->audio_pdev); hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); err_disable_i2c: @@ -828,6 +1093,7 @@ static void rk3066_hdmi_unbind(struct device *dev, struct device *master, { struct rk3066_hdmi *hdmi = dev_get_drvdata(dev); + platform_device_unregister(hdmi->audio_pdev); hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); -- 2.39.2 . Message-ID: Date: Tue, 2 Jul 2024 20:31:06 +0200 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Ronald Warsow To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org Content-Language: de-DE, en-US Subject: Re: [PATCH 6.9 000/222] 6.9.8-rc1 review Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265590 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Greg no regressions here on x86_64 (RKL, Intel 11th Gen. CPU) Thanks Tested-by: Ronald Warsow . From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro Date: Wed, 3 Jul 2024 03:35:12 +0900 Message-Id: <20240702183512.6390-1-konishi.ryusuke@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265593 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-nilfs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail According to the C standard 3.4.3p3, the result of signed integer overflow is undefined. The macro nilfs_cnt32_ge(), which compares two sequence numbers, uses signed integer subtraction that can overflow, and therefore the result of the calculation may differ from what is expected due to undefined behavior in different environments. Similar to an earlier change to the jiffies-related comparison macros in commit 5a581b367b5d ("jiffies: Avoid undefined behavior from signed overflow"), avoid this potential issue by changing the definition of the macro to perform the subtraction as unsigned integers, then cast the result to a signed integer for comparison. Link: https://lkml.kernel.org/r/20130727225828.GA11864@linux.vnet.ibm.com Signed-off-by: Ryusuke Konishi Fixes: 9ff05123e3bf ("nilfs2: segment constructor") --- Andrew, please add this to the queue for the next cycle. This fixes a potential issue with undefined behavior on signed integer overflow. Thanks, Ryusuke Konishi fs/nilfs2/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 36e0bb38e1aa..0ca3110d6386 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -136,7 +136,7 @@ static void nilfs_dispose_list(struct the_nilfs *, struct list_head *, int); #define nilfs_cnt32_ge(a, b) \ (typecheck(__u32, a) && typecheck(__u32, b) && \ - ((__s32)(a) - (__s32)(b) >= 0)) + ((__s32)((a) - (b)) >= 0)) static int nilfs_prepare_segment_lock(struct super_block *sb, struct nilfs_transaction_info *ti) -- 2.34.1 . From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: Daniel Lezcano , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH] clocksource/drivers/sh_cmt: Address race condition for clock events Date: Tue, 2 Jul 2024 21:02:30 +0200 Message-ID: <20240702190230.3825292-1-niklas.soderlund+renesas@ragnatech.se> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265620 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-renesas-soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail There is a race condition in the CMT interrupt handler. In the interrupt handler the driver sets a driver private flag, FLAG_IRQCONTEXT. This flag is used to indicate any call to set_next_event() should not be directly propagated to the device, but instead cached. This is done as the interrupt handler itself reprograms the device when needed before it completes and this avoids this operation to take place twice. It is unclear why this design was chosen, my suspicion is to allow the struct clock_event_device.event_handler callback, which is called while the FLAG_IRQCONTEXT is set, can update the next event without having to write to the device twice. Unfortunately there is a race between when the FLAG_IRQCONTEXT flag is set and later cleared where the interrupt handler have already started to write the next event to the device. If set_next_event() is called in this window the value is only cached in the driver but not written. This leads to the board to misbehave, or worse lockup and produce a splat. rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: rcu: 0-...!: (0 ticks this GP) idle=f5e0/0/0x0 softirq=519/519 fqs=0 (false positive?) rcu: (detected by 1, t=6502 jiffies, g=-595, q=77 ncpus=2) Sending NMI from CPU 1 to CPUs 0: NMI backtrace for cpu 0 CPU: 0 PID: 0 Comm: swapper/0 Not tainted 6.10.0-rc5-arm64-renesas-00019-g74a6f86eaf1c-dirty #20 Hardware name: Renesas Salvator-X 2nd version board based on r8a77965 (DT) pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : tick_check_broadcast_expired+0xc/0x40 lr : cpu_idle_poll.isra.0+0x8c/0x168 sp : ffff800081c63d70 x29: ffff800081c63d70 x28: 00000000580000c8 x27: 00000000bfee5610 x26: 0000000000000027 x25: 0000000000000000 x24: 0000000000000000 x23: ffff00007fbb9100 x22: ffff8000818f1008 x21: ffff8000800ef07c x20: ffff800081c79ec0 x19: ffff800081c70c28 x18: 0000000000000000 x17: 0000000000000000 x16: 0000000000000000 x15: 0000ffffc2c717d8 x14: 0000000000000000 x13: ffff000009c18080 x12: ffff8000825f7fc0 x11: 0000000000000000 x10: ffff8000818f3cd4 x9 : 0000000000000028 x8 : ffff800081c79ec0 x7 : ffff800081c73000 x6 : 0000000000000000 x5 : 0000000000000000 x4 : ffff7ffffe286000 x3 : 0000000000000000 x2 : ffff7ffffe286000 x1 : ffff800082972900 x0 : ffff8000818f1008 Call trace: tick_check_broadcast_expired+0xc/0x40 do_idle+0x9c/0x280 cpu_startup_entry+0x34/0x40 kernel_init+0x0/0x11c do_one_initcall+0x0/0x260 __primary_switched+0x80/0x88 rcu: rcu_preempt kthread timer wakeup didn't happen for 6501 jiffies! g-595 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x402 rcu: Possible timer handling issue on cpu=0 timer-softirq=262 rcu: rcu_preempt kthread starved for 6502 jiffies! g-595 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x402 ->cpu=0 rcu: Unless rcu_preempt kthread gets sufficient CPU time, OOM is now expected behavior. rcu: RCU grace-period kthread stack dump: task:rcu_preempt state:I stack:0 pid:15 tgid:15 ppid:2 flags:0x00000008 Call trace: __switch_to+0xbc/0x100 __schedule+0x358/0xbe0 schedule+0x48/0x148 schedule_timeout+0xc4/0x138 rcu_gp_fqs_loop+0x12c/0x764 rcu_gp_kthread+0x208/0x298 kthread+0x10c/0x110 ret_from_fork+0x10/0x20 The design have been part of the driver since it was first merged in early 2009. It becomes increasingly harder to trigger the issue the older kernel version one tries. It only takes a few boots on v6.10-rc5, while hundreds of boots are needed to trigger it on v5.10. Close the race condition by using the CMT channel lock for the two competing sections. The channel lock was added to the driver after its initial design. Signed-off-by: Niklas Söderlund --- Hello, I only have access to R-Car based SoCs and that is what I have tested this change on. I have not been able to test on any SH platforms which also uses this driver. --- drivers/clocksource/sh_cmt.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 26919556ef5f..b72b36e0abed 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -528,6 +528,7 @@ static void sh_cmt_set_next(struct sh_cmt_channel *ch, unsigned long delta) static irqreturn_t sh_cmt_interrupt(int irq, void *dev_id) { struct sh_cmt_channel *ch = dev_id; + unsigned long flags; /* clear flags */ sh_cmt_write_cmcsr(ch, sh_cmt_read_cmcsr(ch) & @@ -558,6 +559,8 @@ static irqreturn_t sh_cmt_interrupt(int irq, void *dev_id) ch->flags &= ~FLAG_SKIPEVENT; + raw_spin_lock_irqsave(&ch->lock, flags); + if (ch->flags & FLAG_REPROGRAM) { ch->flags &= ~FLAG_REPROGRAM; sh_cmt_clock_event_program_verify(ch, 1); @@ -570,6 +573,8 @@ static irqreturn_t sh_cmt_interrupt(int irq, void *dev_id) ch->flags &= ~FLAG_IRQCONTEXT; + raw_spin_unlock_irqrestore(&ch->lock, flags); + return IRQ_HANDLED; } @@ -780,12 +785,18 @@ static int sh_cmt_clock_event_next(unsigned long delta, struct clock_event_device *ced) { struct sh_cmt_channel *ch = ced_to_sh_cmt(ced); + unsigned long flags; BUG_ON(!clockevent_state_oneshot(ced)); + + raw_spin_lock_irqsave(&ch->lock, flags); + if (likely(ch->flags & FLAG_IRQCONTEXT)) ch->next_match_value = delta - 1; else - sh_cmt_set_next(ch, delta - 1); + __sh_cmt_set_next(ch, delta - 1); + + raw_spin_unlock_irqrestore(&ch->lock, flags); return 0; } -- 2.45.2 . From: Muhammad Qasim Abdul Majeed To: rafael@kernel.org, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Muhammad Qasim Abdul Majeed Subject: [PATCH v2] Updating a vulnerable use of strcpy. Date: Tue, 2 Jul 2024 23:55:24 +0500 Message-Id: <20240702185523.17716-1-qasim.majeed20@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265621 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-acpi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Replacing strcpy with strscpy and memory bound the copy. strcpy is a deprecated function. It should be removed from the kernel source. Reference: https://github.com/KSPP/linux/issues/88 Signed-off-by: Muhammad Qasim Abdul Majeed > In what way exactly is it vulnerable? strcpy is a deprecated interface (reference: https://github.com/KSPP/linux/issues/88). It should be removed from kernel source. It is reported as vulnerable in Enabling Linux in Safety Critical Applications (ELISA) builder. > Why is a runtime check needed here if all of the sizes in question are known at compile time? Runtime check has been replaced with compile time check. --- v1 -> v2: Commit message has been updated and runtime check is replace with compile time check. drivers/acpi/acpi_video.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c index 1fda30388297..be8346a66374 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -1128,8 +1128,8 @@ static int acpi_video_bus_get_one_device(struct acpi_device *device, void *arg) return -ENOMEM; } - strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME); - strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS); + strscpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME, sizeof(ACPI_VIDEO_DEVICE_NAME)); + strscpy(acpi_device_class(device), ACPI_VIDEO_CLASS, sizeof(ACPI_VIDEO_CLASS)); data->device_id = device_id; data->video = video; @@ -2010,8 +2010,8 @@ static int acpi_video_bus_add(struct acpi_device *device) } video->device = device; - strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME); - strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS); + strscpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME, sizeof(ACPI_VIDEO_BUS_NAME)); + strscpy(acpi_device_class(device), ACPI_VIDEO_CLASS, sizeof(ACPI_VIDEO_CLASS)); device->driver_data = video; acpi_video_bus_find_cap(video); -- 2.34.1 . From: Sibi Sankar To: , , , , , CC: , , , , , , , Subject: [RFC V3 0/4] arm_scmi: vendors: ARM SCMI Qualcomm Vendor Protocol Date: Wed, 3 Jul 2024 00:44:36 +0530 Message-ID: <20240702191440.2161623-1-quic_sibis@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265624 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The SCMI QCOM vendor protocol provides a generic way of exposing a number of Qualcomm SoC specific features (like memory bus scaling) through a mixture of pre-determined algorithm strings and param_id pairs hosted on the SCMI controller. Introduce a client driver that uses the memlat algorithm string hosted on QCOM SCMI Vendor Protocol to detect memory latency workloads and control frequency/level of the various memory buses (DDR/LLCC/DDR_QOS). Generic QCOM Vendor protocol background: It was found that a lot of the vendor protocol used internally was for debug/internal development purposes that would either be super SoC specific or had to be disabled because of some features being fused out during production. This lead to a large number of vendor protocol numbers being quickly consumed and were never released either. Using a generic vendor protocol with functionality abstracted behind algorithm strings gave us the flexibility of allowing such functionality exist during initial development/debugging while still being able to expose functionality like memlat once they have matured enough. The param-ids are certainly expected to act as ABI for algorithms strings like MEMLAT. Thanks in advance for taking time to review the series. Opens: * opp-tables are used but they don't get to be added to the scmi device (thus we rely on a lot of manual parsing) because the memlat client driver doesn't vote on these resources clocks/interconnects/power-domain from the kernel and some of the resources aren't modeled in the first place like DDR_QOS. To Dos: * More documentation [Sudeep/Dmitry/Konrad] * Use alternate bindings instead of freq-table-Hz. [Dmitry] * Prevent duplication of code using vendor protocol driver. [Dmitry] V2: * Drop container dvfs memlat container node. [Rob] * Move scmi-memlat.yaml to protocol level given that a lot of vendors might end up using the same protocol number. [Rob] * Replace qcom,cpulist with the standard "cpus" property. [Rob] * Fix up compute-type/ipm-ceil required. [Rob] * Make driver changes to the accommodate bindings changes. [Rob] * Minor fixups in subjects/coverletter. * Minor style fixes in dts. V1: * Add missing bindings for the protocol. [Konrad/Dmitry] * Use alternate bindings. [Dmitry/Konrad] * Rebase on top of Cristian's "SCMI multiple vendor protocol support" series. [Cristian] * Add more documentation wherever possible. [Sudeep] * Replace pr_err/info with it's dev equivalents. * Mixed tabs and initialization cleanups in the memlat driver. [Konrad] * Commit message update for the memlat driver. [Dmitry] * Cleanups/Fixes suggested for the client driver. [Dmitry/Konrad/Cristian] * Use opp-tables instead of memfreq-tbl. [Dmitry/Konrad] * Detect physical cpu to deal with variants with reduced cpu count. * Add support for DDR_QOS mem_type. Sibi Sankar (4): dt-bindings: firmware: Document bindings for ARM SCMI QCOM Vendor Protocol firmware: arm_scmi: vendors: Add ARM SCMI QCOM vendor protocol v1.0 soc: qcom: Introduce SCMI based Memlat (Memory Latency) governor arm64: dts: qcom: x1e80100: Enable LLCC/DDR/DDR_QOS dvfs .../bindings/firmware/arm,scmi.yaml | 15 + .../bindings/soc/qcom/qcom,scmi-memlat.yaml | 242 ++++++++ arch/arm64/boot/dts/qcom/x1e80100.dtsi | 138 +++++ drivers/firmware/arm_scmi/vendors/Kconfig | 12 + drivers/firmware/arm_scmi/vendors/Makefile | 2 +- .../arm_scmi/vendors/qcom_scmi_vendor.c | 184 ++++++ drivers/soc/qcom/Kconfig | 12 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/qcom_scmi_client.c | 583 ++++++++++++++++++ include/dt-bindings/soc/qcom,scmi-vendor.h | 22 + include/linux/qcom_scmi_vendor.h | 39 ++ 11 files changed, 1249 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,scmi-memlat.yaml create mode 100644 drivers/firmware/arm_scmi/vendors/qcom_scmi_vendor.c create mode 100644 drivers/soc/qcom/qcom_scmi_client.c create mode 100644 include/dt-bindings/soc/qcom,scmi-vendor.h create mode 100644 include/linux/qcom_scmi_vendor.h -- 2.34.1 . From: Jeff Johnson Date: Tue, 2 Jul 2024 12:29:38 -0700 Subject: [PATCH] sh: push-switch: add missing MODULE_DESCRIPTION() macro X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20240702-md-sh-arch-sh-drivers-v1-1-2c5d439a5479@quicinc.com> To: Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz CC: , , , Jeff Johnson Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265643 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kernel-janitors,org.kernel.vger.linux-sh Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With ARCH=sh, make allmodconfig && make W=1 C=1 reports: WARNING: modpost: missing MODULE_DESCRIPTION() in arch/sh/drivers/push-switch.o Add the missing invocation of the MODULE_DESCRIPTION() macro. Signed-off-by: Jeff Johnson --- MODULE_DESCRIPTION copied from file prologue: /* * Generic push-switch framework * * Copyright (C) 2006 Paul Mundt */ --- arch/sh/drivers/push-switch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c index 362e4860bf52..1dea43381b5a 100644 --- a/arch/sh/drivers/push-switch.c +++ b/arch/sh/drivers/push-switch.c @@ -131,4 +131,5 @@ module_exit(switch_exit); MODULE_VERSION(DRV_VERSION); MODULE_AUTHOR("Paul Mundt"); +MODULE_DESCRIPTION("Generic push-switch framework"); MODULE_LICENSE("GPL v2"); --- base-commit: 1dfe225e9af5bd3399a1dbc6a4df6a6041ff9c23 change-id: 20240702-md-sh-arch-sh-drivers-40af731eb66c . Date: Tue, 2 Jul 2024 15:33:54 -0400 From: Steven Rostedt To: LKML , Linux trace kernel Cc: Masami Hiramatsu , Mathieu Desnoyers , "Dmitry V. Levin" , Jonathan Corbet , linux-doc@vger.kernel.org Subject: [PATCH] tracing: Have memmapped ring buffer use ioctl of "R" range 0x20-2F Message-ID: <20240702153354.367861db@rorschach.local.home> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265646 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-doc,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: "Steven Rostedt (Google)" To prevent conflicts with other ioctl numbers to allow strace to have an idea of what is happening, add the rang of ioctls for the trace buffer mapping from _IO("T", 0x1) to the range of "R" 0x20 - 0x2F. Link: https://lore.kernel.org/linux-trace-kernel/20240630105322.GA17573@altlinux.org/ Reported-by: "Dmitry V. Levin" Signed-off-by: Steven Rostedt (Google) --- Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + include/uapi/linux/trace_mmap.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index a141e8e65c5d..9a97030c6c8d 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -186,6 +186,7 @@ Code Seq# Include File Comments 'Q' all linux/soundcard.h 'R' 00-1F linux/random.h conflict! 'R' 01 linux/rfkill.h conflict! +'R' 20-2F linux/trace_mmap.h 'R' C0-DF net/bluetooth/rfcomm.h 'R' E0 uapi/linux/fsl_mc.h 'S' all linux/cdrom.h conflict! diff --git a/include/uapi/linux/trace_mmap.h b/include/uapi/linux/trace_mmap.h index bd1066754220..c102ef35d11e 100644 --- a/include/uapi/linux/trace_mmap.h +++ b/include/uapi/linux/trace_mmap.h @@ -43,6 +43,6 @@ struct trace_buffer_meta { __u64 Reserved2; }; -#define TRACE_MMAP_IOCTL_GET_READER _IO('T', 0x1) +#define TRACE_MMAP_IOCTL_GET_READER _IO('R', 0x20) #endif /* _TRACE_MMAP_H_ */ -- 2.43.0 . From: Christian Brauner To: Linus Torvalds Cc: Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] vfs fixes Date: Tue, 2 Jul 2024 21:44:27 +0200 Message-ID: <20240702-vfs-fixes-7b80dba61b09@brauner> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265656 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hey Linus, /* Summary */ This contains three fixes: VFS: - Improve handling of deep ancestor chains in is_subdir(). - Release locks cleanly when fctnl_setlk() races with close(). When setting a file lock fails the VFS tries to cleanup the already created lock. The helper used for this calls back into the LSM layer which may cause it to fail, leaving the lock accessible via /proc/locks. AFS: - Fix a comma/semicolon typo. /* Testing */ clang: Debian clang version 16.0.6 (27) gcc: (Debian 13.2.0-25) 13.2.0 All patches are based on v6.10-rc6. No build failures or warnings were observed. /* Conflicts */ No known conflicts. The following changes since commit 22a40d14b572deb80c0648557f4bd502d7e83826: Linux 6.10-rc6 (2024-06-30 14:40:44 -0700) are available in the Git repository at: git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.10-rc7.fixes.2 for you to fetch changes up to 655593a40efc577edc651f1d5c5dfde83367c477: afs: Convert comma to semicolon (2024-07-02 21:23:00 +0200) Please consider pulling these changes from the signed vfs-6.10-rc7.fixes.2 tag. Thanks! Christian ---------------------------------------------------------------- vfs-6.10-rc7.fixes.2 ---------------------------------------------------------------- Chen Ni (1): afs: Convert comma to semicolon Christian Brauner (1): fs: better handle deep ancestor chains in is_subdir() Jann Horn (1): filelock: Remove locks reliably when fcntl/close race is detected fs/afs/inode.c | 4 ++-- fs/dcache.c | 31 ++++++++++++++----------------- fs/locks.c | 9 ++++----- 3 files changed, 20 insertions(+), 24 deletions(-) . From: Jeff Johnson Date: Tue, 2 Jul 2024 12:50:02 -0700 Subject: [PATCH] um: harddog: add missing MODULE_DESCRIPTION() macro X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20240702-md-um-arch-um-drivers-v1-1-79e4f50b5bab@quicinc.com> To: Richard Weinberger , Anton Ivanov , Johannes Berg CC: , , , Jeff Johnson Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265660 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-um,org.kernel.vger.kernel-janitors Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With ARCH=um, make allmodconfig && make W=1 C=1 reports: WARNING: modpost: missing MODULE_DESCRIPTION() in arch/um/drivers/harddog.o Add the missing invocation of the MODULE_DESCRIPTION() macro. Signed-off-by: Jeff Johnson --- Description taken from the file prologue: /* UML hardware watchdog, shamelessly stolen from: --- arch/um/drivers/harddog_kern.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c index 60d1c6cab8a9..99a7144b229f 100644 --- a/arch/um/drivers/harddog_kern.c +++ b/arch/um/drivers/harddog_kern.c @@ -49,6 +49,7 @@ #include "mconsole.h" #include "harddog.h" +MODULE_DESCRIPTION("UML hardware watchdog"); MODULE_LICENSE("GPL"); static DEFINE_MUTEX(harddog_mutex); --- base-commit: 1dfe225e9af5bd3399a1dbc6a4df6a6041ff9c23 change-id: 20240702-md-um-arch-um-drivers-a84a42d077b5 . From: Jeff Johnson Date: Tue, 2 Jul 2024 13:10:18 -0700 Subject: [PATCH] virtio: add missing MODULE_DESCRIPTION() macros X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20240702-md-sh-drivers-virtio-v1-1-cf7325ab6ccc@quicinc.com> To: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= CC: , , , Jeff Johnson Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265667 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.virtualization,org.kernel.vger.kernel-janitors Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With ARCH=sh, make allmodconfig && make W=1 C=1 reports: WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/virtio/virtio.o WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/virtio/virtio_ring.o Add the missing invocations of the MODULE_DESCRIPTION() macro. Signed-off-by: Jeff Johnson --- drivers/virtio/virtio.c | 1 + drivers/virtio/virtio_ring.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index b968b2aa5f4d..396d3cd49a1b 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -609,4 +609,5 @@ static void __exit virtio_exit(void) core_initcall(virtio_init); module_exit(virtio_exit); +MODULE_DESCRIPTION("Virtio core interface"); MODULE_LICENSE("GPL"); diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 2a972752ff1b..1cac7d5b3062 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -3244,4 +3244,5 @@ void virtqueue_dma_sync_single_range_for_device(struct virtqueue *_vq, } EXPORT_SYMBOL_GPL(virtqueue_dma_sync_single_range_for_device); +MODULE_DESCRIPTION("Virtio ring implementation"); MODULE_LICENSE("GPL"); --- base-commit: 1dfe225e9af5bd3399a1dbc6a4df6a6041ff9c23 change-id: 20240702-md-sh-drivers-virtio-704eb84769cb . From: Frank Li To: Linus Walleij , Bartosz Golaszewski , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-gpio@vger.kernel.org (open list:GPIO SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Cc: imx@lists.linux.dev Subject: [PATCH 1/1] dt-bindings: gpio: fsl,qoriq-gpio: Add compatible string fsl,ls1046a-gpio Date: Tue, 2 Jul 2024 16:17:24 -0400 Message-Id: <20240702201724.96681-1-Frank.Li@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265672 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-gpio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add compatible string for chip ls1046 to fix below warning. arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dtb: /soc/gpio@2300000: failed to match any schema with compatible: ['fsl,ls1046a-gpio', 'fsl,qoriq-gpio'] Signed-off-by: Frank Li --- Documentation/devicetree/bindings/gpio/fsl,qoriq-gpio.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/gpio/fsl,qoriq-gpio.yaml b/Documentation/devicetree/bindings/gpio/fsl,qoriq-gpio.yaml index f386ff3df6a8b..84fd82291ee40 100644 --- a/Documentation/devicetree/bindings/gpio/fsl,qoriq-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/fsl,qoriq-gpio.yaml @@ -24,6 +24,7 @@ properties: - fsl,ls1021a-gpio - fsl,ls1028a-gpio - fsl,ls1043a-gpio + - fsl,ls1046a-gpio - fsl,ls1088a-gpio - fsl,ls2080a-gpio - const: fsl,qoriq-gpio -- 2.34.1 . From: Jeff Johnson Date: Tue, 2 Jul 2024 13:27:34 -0700 Subject: [PATCH] hostfs: add missing MODULE_DESCRIPTION() macro X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20240702-md-um-fs-hostfs-v1-1-fd2b565027e7@quicinc.com> To: Richard Weinberger , Anton Ivanov , Johannes Berg CC: , , , Jeff Johnson Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265676 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-um,org.kernel.vger.kernel-janitors Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With ARCH=um, make allmodconfig && make W=1 C=1 reports: WARNING: modpost: missing MODULE_DESCRIPTION() in fs/hostfs/hostfs.o Add the missing invocation of the MODULE_DESCRIPTION() macro. Signed-off-by: Jeff Johnson --- fs/hostfs/hostfs_kern.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index a73d27c4dd58..ff5f14ffa838 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -1010,4 +1010,5 @@ static void __exit exit_hostfs(void) module_init(init_hostfs) module_exit(exit_hostfs) +MODULE_DESCRIPTION("User-Mode Linux Host filesystem"); MODULE_LICENSE("GPL"); --- base-commit: 1dfe225e9af5bd3399a1dbc6a4df6a6041ff9c23 change-id: 20240702-md-um-fs-hostfs-fa6ebcf75249 . Content-Type: multipart/mixed; boundary="------------vKec7RVSzFt68m7lUfQmMBOZ" Message-ID: <457af485-777d-4675-aea5-e3b77ccb8246@linuxfoundation.org> Date: Tue, 2 Jul 2024 14:49:16 -0600 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Language: en-US To: Linus Torvalds Cc: shuah , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] Kselftest fixes for Linux 6.10-rc7 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265688 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is a multi-part message in MIME format. --------------vKec7RVSzFt68m7lUfQmMBOZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Linus, Please pull this kselftest fixes update for Linux 6.10-rc7. This kselftest fixes update for Linux 6.10-rc7 consists of one single patch to fix the non-contiguous CBM resctrl: - AMD supports non-contiguous CBM but does not report it via CPUID. This test should not use CPUID on AMD to detect non-contiguous CBM support. Fix the problem so the test uses CPUID to discover non-contiguous CBM support only on Intel. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit ed3994ac847e0d6605f248e7f6776b1d4f445f4b: selftests/fchmodat2: fix clang build failure due to -static-libasan (2024-06-11 15:05:05 -0600) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.10-rc7 for you to fetch changes up to 48236960c06d32370bfa6f2cc408e786873262c8: selftests/resctrl: Fix non-contiguous CBM for AMD (2024-06-26 13:22:34 -0600) ---------------------------------------------------------------- linux_kselftest-fixes-6.10-rc7 This kselftest fixes update for Linux 6.10-rc7 consists of one single patch to fix the non-contiguous CBM resctrl: - AMD supports non-contiguous CBM but does not report it via CPUID. This test should not use CPUID on AMD to detect non-contiguous CBM support. Fix the problem so the test uses CPUID to discover non-contiguous CBM support only on Intel. ---------------------------------------------------------------- Babu Moger (1): selftests/resctrl: Fix non-contiguous CBM for AMD tools/testing/selftests/resctrl/cat_test.c | 32 ++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) ---------------------------------------------------------------- --------------vKec7RVSzFt68m7lUfQmMBOZ Content-Type: text/x-patch; charset=UTF-8; name="linux_kselftest-fixes-6.10-rc7.diff" Content-Disposition: attachment; filename="linux_kselftest-fixes-6.10-rc7.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL3Jlc2N0cmwvY2F0X3Rlc3Qu YyBiL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL3Jlc2N0cmwvY2F0X3Rlc3QuYwppbmRleCBj NzY4NmZiNjY0MWEuLjU1MzE1ZWQ2OTVmNCAxMDA2NDQKLS0tIGEvdG9vbHMvdGVzdGluZy9z ZWxmdGVzdHMvcmVzY3RybC9jYXRfdGVzdC5jCisrKyBiL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRl c3RzL3Jlc2N0cmwvY2F0X3Rlc3QuYwpAQCAtMjkxLDExICsyOTEsMzAgQEAgc3RhdGljIGlu dCBjYXRfcnVuX3Rlc3QoY29uc3Qgc3RydWN0IHJlc2N0cmxfdGVzdCAqdGVzdCwgY29uc3Qg c3RydWN0IHVzZXJfcGFyYW0KIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgYm9vbCBhcmNo X3N1cHBvcnRzX25vbmNvbnRfY2F0KGNvbnN0IHN0cnVjdCByZXNjdHJsX3Rlc3QgKnRlc3Qp Cit7CisJdW5zaWduZWQgaW50IGVheCwgZWJ4LCBlY3gsIGVkeDsKKworCS8qIEFNRCBhbHdh eXMgc3VwcG9ydHMgbm9uLWNvbnRpZ3VvdXMgQ0JNLiAqLworCWlmIChnZXRfdmVuZG9yKCkg PT0gQVJDSF9BTUQpCisJCXJldHVybiB0cnVlOworCisJLyogSW50ZWwgc3VwcG9ydCBmb3Ig bm9uLWNvbnRpZ3VvdXMgQ0JNIG5lZWRzIHRvIGJlIGRpc2NvdmVyZWQuICovCisJaWYgKCFz dHJjbXAodGVzdC0+cmVzb3VyY2UsICJMMyIpKQorCQlfX2NwdWlkX2NvdW50KDB4MTAsIDEs IGVheCwgZWJ4LCBlY3gsIGVkeCk7CisJZWxzZSBpZiAoIXN0cmNtcCh0ZXN0LT5yZXNvdXJj ZSwgIkwyIikpCisJCV9fY3B1aWRfY291bnQoMHgxMCwgMiwgZWF4LCBlYngsIGVjeCwgZWR4 KTsKKwllbHNlCisJCXJldHVybiBmYWxzZTsKKworCXJldHVybiAoKGVjeCA+PiAzKSAmIDEp OworfQorCiBzdGF0aWMgaW50IG5vbmNvbnRfY2F0X3J1bl90ZXN0KGNvbnN0IHN0cnVjdCBy ZXNjdHJsX3Rlc3QgKnRlc3QsCiAJCQkJY29uc3Qgc3RydWN0IHVzZXJfcGFyYW1zICp1cGFy YW1zKQogewogCXVuc2lnbmVkIGxvbmcgZnVsbF9jYWNoZV9tYXNrLCBjb250X21hc2ssIG5v bmNvbnRfbWFzazsKLQl1bnNpZ25lZCBpbnQgZWF4LCBlYngsIGVjeCwgZWR4LCBzcGFyc2Vf bWFza3M7CisJdW5zaWduZWQgaW50IHNwYXJzZV9tYXNrczsKIAlpbnQgYml0X2NlbnRlciwg cmV0OwogCWNoYXIgc2NoZW1hdGFbNjRdOwogCkBAIC0zMDQsMTUgKzMyMyw4IEBAIHN0YXRp YyBpbnQgbm9uY29udF9jYXRfcnVuX3Rlc3QoY29uc3Qgc3RydWN0IHJlc2N0cmxfdGVzdCAq dGVzdCwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JaWYgKCFzdHJjbXAodGVzdC0+ cmVzb3VyY2UsICJMMyIpKQotCQlfX2NwdWlkX2NvdW50KDB4MTAsIDEsIGVheCwgZWJ4LCBl Y3gsIGVkeCk7Ci0JZWxzZSBpZiAoIXN0cmNtcCh0ZXN0LT5yZXNvdXJjZSwgIkwyIikpCi0J CV9fY3B1aWRfY291bnQoMHgxMCwgMiwgZWF4LCBlYngsIGVjeCwgZWR4KTsKLQllbHNlCi0J CXJldHVybiAtRUlOVkFMOwotCi0JaWYgKHNwYXJzZV9tYXNrcyAhPSAoKGVjeCA+PiAzKSAm IDEpKSB7Ci0JCWtzZnRfcHJpbnRfbXNnKCJDUFVJRCBvdXRwdXQgZG9lc24ndCBtYXRjaCAn c3BhcnNlX21hc2tzJyBmaWxlIGNvbnRlbnQhXG4iKTsKKwlpZiAoYXJjaF9zdXBwb3J0c19u b25jb250X2NhdCh0ZXN0KSAhPSBzcGFyc2VfbWFza3MpIHsKKwkJa3NmdF9wcmludF9tc2co IkhhcmR3YXJlIGFuZCBrZXJuZWwgZGlmZmVyIG9uIG5vbi1jb250aWd1b3VzIENCTSBzdXBw b3J0IVxuIik7CiAJCXJldHVybiAxOwogCX0KIAo= --------------vKec7RVSzFt68m7lUfQmMBOZ-- . From: "Rob Herring (Arm)" To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N. Rao" Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] powerpc: kexec: Use of_property_read_reg() Date: Tue, 2 Jul 2024 15:03:44 -0600 Message-ID: <20240702210344.722364-1-robh@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265694 Newsgroups: org.kernel.vger.linux-kernel,org.ozlabs.lists.linuxppc-dev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Replace open-coded parsing of "reg" property with of_property_read_reg(). Signed-off-by: Rob Herring (Arm) --- arch/powerpc/kexec/file_load_64.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c index 925a69ad2468..5200529bf4db 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -376,10 +377,9 @@ static int kdump_setup_usable_lmb(struct drmem_lmb *lmb, const __be32 **usm, static int add_usable_mem_property(void *fdt, struct device_node *dn, struct umem_info *um_info) { - int n_mem_addr_cells, n_mem_size_cells, node; + int node; char path[NODE_PATH_LEN]; - int i, len, ranges, ret; - const __be32 *prop; + int i, ret; u64 base, end; of_node_get(dn); @@ -399,40 +399,29 @@ static int add_usable_mem_property(void *fdt, struct device_node *dn, goto out; } - /* Get the address & size cells */ - n_mem_addr_cells = of_n_addr_cells(dn); - n_mem_size_cells = of_n_size_cells(dn); - kexec_dprintk("address cells: %d, size cells: %d\n", n_mem_addr_cells, - n_mem_size_cells); - um_info->idx = 0; if (!check_realloc_usable_mem(um_info, 2)) { ret = -ENOMEM; goto out; } - prop = of_get_property(dn, "reg", &len); - if (!prop || len <= 0) { - ret = 0; - goto out; - } - /* * "reg" property represents sequence of (addr,size) tuples * each representing a memory range. */ - ranges = (len >> 2) / (n_mem_addr_cells + n_mem_size_cells); + for (i = 0; ; i++) { + ret = of_property_read_reg(dn, i, &base, &end); + if (ret) + break; - for (i = 0; i < ranges; i++) { - base = of_read_number(prop, n_mem_addr_cells); - prop += n_mem_addr_cells; - end = base + of_read_number(prop, n_mem_size_cells) - 1; - prop += n_mem_size_cells; + end += base - 1; ret = add_usable_mem(um_info, base, end); if (ret) goto out; } + if (!i) + goto out; /* * No kdump kernel usable memory found in this memory node. -- 2.43.0 . From: Kees Cook To: Mark Rutland Cc: Kees Cook , "liuyuntao (F)" , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] randomize_kstack: Improve stack alignment codegen Date: Tue, 2 Jul 2024 14:16:16 -0700 Message-Id: <20240702211612.work.576-kees@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265698 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-hardening Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The codgen for adding architecture-specific stack alignment to the effective alloca() usage is somewhat inefficient and allows a bit to get carried beyond the desired entropy range. This isn't really a problem, but it's unexpected and the codegen is kind of bad. Quoting Mark[1], the disassembly for arm64's invoke_syscall() looks like: // offset = raw_cpu_read(kstack_offset) mov x4, sp adrp x0, kstack_offset mrs x5, tpidr_el1 add x0, x0, #:lo12:kstack_offset ldr w0, [x0, x5] // offset = KSTACK_OFFSET_MAX(offset) and x0, x0, #0x3ff // alloca(offset) add x0, x0, #0xf and x0, x0, #0x7f0 sub sp, x4, x0 ... which in C would be: offset = raw_cpu_read(kstack_offset) offset &= 0x3ff; // [0x0, 0x3ff] offset += 0xf; // [0xf, 0x40e] offset &= 0x7f0; // [0x0, ... so when *all* bits [3:0] are 0, they'll have no impact, and when *any* of bits [3:0] are 1 they'll trigger a carry into bit 4, which could ripple all the way up and spill into bit 10. Switch the masking in KSTACK_OFFSET_MAX() to explicitly clear the bottom bits to avoid the rounding by using 0b1111110000 instead of 0b1111111111: // offset = raw_cpu_read(kstack_offset) mov x4, sp adrp x0, 0 mrs x5, tpidr_el1 add x0, x0, #:lo12:kstack_offset ldr w0, [x0, x5] // offset = KSTACK_OFFSET_MAX(offset) and x0, x0, #0x3f0 // alloca(offset) sub sp, x4, x0 Suggested-by: Mark Rutland Link: https://lore.kernel.org/lkml/ZnVfOnIuFl2kNWkT@J2N7QTR9R3/ [1] Signed-off-by: Kees Cook --- Cc: Mark Rutland Cc: "liuyuntao (F)" Cc: "Gustavo A. R. Silva" Cc: linux-hardening@vger.kernel.org --- include/linux/randomize_kstack.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/linux/randomize_kstack.h b/include/linux/randomize_kstack.h index 6d92b68efbf6..1d982dbdd0d0 100644 --- a/include/linux/randomize_kstack.h +++ b/include/linux/randomize_kstack.h @@ -32,13 +32,19 @@ DECLARE_PER_CPU(u32, kstack_offset); #endif /* - * Use, at most, 10 bits of entropy. We explicitly cap this to keep the - * "VLA" from being unbounded (see above). 10 bits leaves enough room for - * per-arch offset masks to reduce entropy (by removing higher bits, since - * high entropy may overly constrain usable stack space), and for - * compiler/arch-specific stack alignment to remove the lower bits. + * Use, at most, 6 bits of entropy (on 64-bit; 8 on 32-bit). This cap is + * to keep the "VLA" from being unbounded (see above). Additionally clear + * the bottom 4 bits (on 64-bit systems, 2 for 32-bit), since stack + * alignment will always be at least word size. This makes the compiler + * code gen better when it is applying the actual per-arch alignment to + * the final offset. The resulting randomness is reasonable without overly + * constraining usable stack space. */ -#define KSTACK_OFFSET_MAX(x) ((x) & 0x3FF) +#ifdef CONFIG_64BIT +#define KSTACK_OFFSET_MAX(x) ((x) & 0b1111110000) +#else +#define KSTACK_OFFSET_MAX(x) ((x) & 0b1111111100) +#endif /** * add_random_kstack_offset - Increase stack utilization by previously -- 2.34.1 . From: =?UTF-8?q?Andr=C3=A9=20Almeida?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: kernel-dev@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, Simon Ser , Pekka Paalanen , daniel@ffwll.ch, Daniel Stone , =?UTF-8?q?=27Marek=20Ol=C5=A1=C3=A1k=27?= , Dave Airlie , ville.syrjala@linux.intel.com, Xaver Hugl , Joshua Ashton , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Dmitry Baryshkov , =?UTF-8?q?Andr=C3=A9=20Almeida?= Subject: [PATCH v2 1/2] drm/atomic: Allow userspace to use explicit sync with atomic async flips Date: Tue, 2 Jul 2024 18:22:14 -0300 Message-ID: <20240702212215.109696-1-andrealmeid@igalia.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265703 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.amd-gfx,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Allow userspace to use explicit synchronization with atomic async flips. That means that the flip will wait for some hardware fence, and then will flip as soon as possible (async) in regard of the vblank. Signed-off-by: André Almeida Reviewed-by: Simon Ser --- v2 changes: - Add r-b drivers/gpu/drm/drm_atomic_uapi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 22bbb2d83e30..2e1d9391febe 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1070,7 +1070,9 @@ int drm_atomic_set_property(struct drm_atomic_state *state, break; } - if (async_flip && prop != config->prop_fb_id) { + if (async_flip && + prop != config->prop_fb_id && + prop != config->prop_in_fence_fd) { ret = drm_atomic_plane_get_property(plane, plane_state, prop, &old_val); ret = drm_atomic_check_prop_changes(ret, old_val, prop_value, prop); -- 2.45.2 . From: =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= Date: Tue, 02 Jul 2024 17:24:56 -0400 Subject: [PATCH] thermal: gov_power_allocator: Return early in manage if trip_max is null X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240702-power-allocator-null-trip-max-v1-1-47a60dc55414@collabora.com> To: Lukasz Luba , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Nikita Travkin Cc: kernel@collabora.com, "Rafael J. Wysocki" , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265705 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Commit da781936e7c3 ("thermal: gov_power_allocator: Allow binding without trip points") allowed the governor to bind even when trip_max is null. This allows a null pointer dereference to happen in the manage callback. Add an early return to prevent it, since the governor is expected to not do anything in this case. Fixes: da781936e7c3 ("thermal: gov_power_allocator: Allow binding without trip points") Signed-off-by: Nícolas F. R. A. Prado --- This issue was noticed by KernelCI during a boot test on the mt8195-cherry-tomato-r2 platform with the config in [1]. The stack trace is attached below. [1] http://0x0.st/XaON.txt [ 4.015786] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 4.015791] Mem abort info: [ 4.015793] ESR = 0x0000000096000004 [ 4.015796] EC = 0x25: DABT (current EL), IL = 32 bits [ 4.015799] SET = 0, FnV = 0 [ 4.015802] EA = 0, S1PTW = 0 [ 4.015804] FSC = 0x04: level 0 translation fault [ 4.015807] Data abort info: [ 4.015809] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 [ 4.015811] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 4.015814] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 4.015818] user pgtable: 4k pages, 48-bit VAs, pgdp=0000000109809000 [ 4.015821] [0000000000000000] pgd=0000000000000000, p4d=0000000000000000 [ 4.015835] Modules linked in: mt8195_mt6359(+) mt6577_auxadc snd_soc_mt8195_afe mtk_scp_ipi snd_sof_utils mtk_wdt(+) [ 4.015852] CPU: 2 PID: 13 Comm: kworker/u32:1 Not tainted 6.10.0-rc6 #1 c5d519ae8e7fec6bbe67cb8c50bfebcb89dfa54e [ 4.015859] Hardware name: Acer Tomato (rev2) board (DT) [ 4.015862] Workqueue: events_unbound deferred_probe_work_func [ 4.015875] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.015880] pc : power_allocator_manage+0x110/0x6a0 [ 4.015888] lr : __thermal_zone_device_update+0x1dc/0x400 [ 4.015893] sp : ffff8000800eb800 [ 4.015895] x29: ffff8000800eb810 x28: 0000000000000001 x27: 0000000000000001 [ 4.015903] x26: aaaaaaaaaaaaaaab x25: ffff07a0461c15a0 x24: ffffb58530ca67c0 [ 4.015911] x23: 0000000000000000 x22: ffff07a04098fcc0 x21: ffffb58532eec848 [ 4.015918] x20: ffff8000800eb920 x19: ffff07a0461c1000 x18: 0000000000000b4b [ 4.015926] x17: 5359534255530031 x16: ffffb585310352e4 x15: 0000000000000020 [ 4.015933] x14: 0000000000000000 x13: ffffffff00000000 x12: 0000000000000040 [ 4.015940] x11: 0101010101010101 x10: ffffffffffffffff x9 : ffffb58530ca8d78 [ 4.015948] x8 : 0101010101010101 x7 : 7f7f7f7f7f7f7f7f x6 : 0000000000001388 [ 4.015955] x5 : 0000000000000000 x4 : 0000000000000384 x3 : 0000000000000000 [ 4.015962] x2 : 0000000000000000 x1 : 0000000000000000 x0 : 0000000000000000 [ 4.015970] Call trace: [ 4.015972] power_allocator_manage+0x110/0x6a0 [ 4.015978] __thermal_zone_device_update+0x1dc/0x400 [ 4.015983] thermal_zone_device_set_mode+0x7c/0xa0 [ 4.015987] thermal_zone_device_enable+0x1c/0x28 [ 4.015991] thermal_of_zone_register+0x43c/0x498 [ 4.015996] devm_thermal_of_zone_register+0x6c/0xb8 [ 4.016001] gadc_thermal_probe+0x140/0x214 [ 4.016007] platform_probe+0x70/0xc4 [ 4.016012] really_probe+0x140/0x270 [ 4.016018] __driver_probe_device+0xfc/0x114 [ 4.016024] driver_probe_device+0x44/0x100 [ 4.016029] __device_attach_driver+0x64/0xdc [ 4.016035] bus_for_each_drv+0xb4/0xdc [ 4.016041] __device_attach+0xdc/0x16c [ 4.016046] device_initial_probe+0x1c/0x28 [ 4.016052] bus_probe_device+0x44/0xac [ 4.016057] deferred_probe_work_func+0xb0/0xc4 [ 4.016063] process_scheduled_works+0x114/0x330 [ 4.016070] worker_thread+0x1c0/0x20c [ 4.016076] kthread+0xf8/0x108 [ 4.016081] ret_from_fork+0x10/0x20 [ 4.016090] Code: d1030294 17ffffdd f94012c0 f9401ed7 (b9400000) [ 4.016095] ---[ end trace 0000000000000000 ]--- --- drivers/thermal/gov_power_allocator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c index 45f04a25255a..1b2345a697c5 100644 --- a/drivers/thermal/gov_power_allocator.c +++ b/drivers/thermal/gov_power_allocator.c @@ -759,6 +759,9 @@ static void power_allocator_manage(struct thermal_zone_device *tz) return; } + if (!params->trip_max) + return; + allocate_power(tz, params->trip_max->temperature); params->update_cdevs = true; } --- base-commit: 82e4255305c554b0bb18b7ccf2db86041b4c8b6e change-id: 20240702-power-allocator-null-trip-max-bc82c8d7eaec Best regards, -- Nícolas F. R. A. Prado . From: Tomer Maimon To: , , , , , , , , , CC: , , , , Tomer Maimon Subject: [PATCH v26 0/3] Introduce Nuvoton Arbel NPCM8XX BMC SoC Date: Tue, 2 Jul 2024 22:16:47 +0300 Message-ID: <20240702191650.57364-1-tmaimon77@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265718 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree,org.ozlabs.lists.openbmc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patchset adds clock support for the Nuvoton Arbel NPCM8XX Board Management controller (BMC) SoC family. The NPCM8xx clock controller is created using the auxiliary device framework and set up in the npcm reset driver since the NPCM8xx clock is using the same register region. This patchset cover letter is based from the initial support for NPCM8xx BMC to keep tracking the version history. This patchset was tested on the Arbel NPCM8XX evaluation board. Addressed comments from: - kernel test robot : https://www.spinics.net/lists/linux-clk/msg100302.html Changes since version 25: - Add select AUXILIARY_BUS to npcm_reset kconfig. - Include and in reset and clock driver. Changes since version 24: - Keep clock npcm8xx dt-binding to avoid ABI break. - Fix kfree parameter. - Correct reference. - Modify commit message. Changes since version 23: - NPCM8xx clock controller using the auxiliary device framework. - Add NPCM8xx clock controller aux device registration support in npcm reset driver. - Remove unused nuvoton,npcm845 clk bindings. - Remove all string #define Changes since version 22: - Modify commit message to explain broken ABI in dt-binding - Using regmap parenet regmap memory therefore remove use of npcm8xx rst-clock patch. - Leave npcm7xx rst node as is Changes since version 21: - Since using regmap instead of ioremap replace reg to syscon property in dt-bindings and dts. - Add reference clock property to the dt-bindings and dts. - Using .index instead of .name in clk_parent_data structures. - Using string where any macros are used once. Changes since version 20: - Using regmap instead of ioremap. the clock and reset modules are sharing the same memory region and cause failure when using devm_platform_ioremap_resource function, this version uses regmap to handle shared reset and clock memory region, in case it is approved I will modify the reset driver to use the regmap as well. - Using clk_hw instead of clk_parent_data structre. - Divider clock definition to one line Changes since version 19: - Remove unnecessary free command. - Defining pr_fmt(). - Using dev_err_probe. - Return zero in the end of the probe function. Changes since version 18: - NPCM8XX clock driver did not changed from version 18 only build and tested under kernel 6.6-rc1. Changes since version 17: - NPCM8XX clock driver did not changed from version 17 only build and tested under kernel 6.5-rc3. Changes since version 16: - NPCM8XX clock driver - Using devm_kzalloc instead kzalloc. - Remove unnecessary parenthesis. - Modify incorrect spelling. Changes since version 15: - NPCM8XX clock driver - Remove unused regs parameter from npcm8xx_pll_data structure. - Using index and clk_hw parameters to set the clock parent in the clock structures. Changes since version 14: - NPCM8XX clock driver - Remove unnecessary register definitions. - Remove the internal reference clock, instead use the external DT reference clock. - rearrange the driver. - using .names parameter in DT to define clock (refclk). Changes since version 13: - NPCM8XX clock driver - Remove unnecessary definitions and add module.h define - Use in clk_parent_data struct.fw_name and .name. - Add module_exit function. - Add const to divider clock names. - Add MODULE_DESCRIPTION and MODULE_LICENSE Changes since version 12: - NPCM8XX clock driver - Use clk_parent_data in mux and div clock structure. - Add const to mux tables. - Using devm_clk_hw_register_fixed_rate function. - use only .name clk_parent_data instead .name and .fw_name. - Modify mask values in mux clocks. Changes since version 11: - NPCM8XX clock driver - Modify Kconfig help. - Modify loop variable to unsigned int. Changes since version 11: - NPCM8XX clock driver - Modify Kconfig help. - Modify loop variable to unsigned int. Changes since version 10: - NPCM8XX clock driver - Fix const warning. Changes since version 9: - NPCM8XX clock driver - Move configuration place. - Using clk_parent_data instead of parent_name - using devm_ioremap instead of ioremap. deeply sorry, I know we had a long discussion on what should the driver use, from other examples (also in other clock drivers) I see the combination of platform_get_resource and devm_ioremap are commonly used and it answer the reset and clock needs. Changes since version 8: - NPCM8XX clock driver - Move configuration place. - Add space before and aftre '{' '}'. - Handle devm_of_clk_add_hw_provider function error. Changes since version 7: - NPCM8XX clock driver - The clock and reset registers using the same memory region, due to it the clock driver should claim the ioremap directly without checking the memory region. Changes since version 5: - NPCM8XX clock driver - Remove refclk if devm_of_clk_add_hw_provider function failed. Changes since version 4: - NPCM8XX clock driver - Use the same quote in the dt-binding file. Changes since version 3: - NPCM8XX clock driver - Rename NPCM8xx clock dt-binding header file. - Remove unused structures. - Improve Handling the clocks registration. Changes since version 2: - NPCM8XX clock driver - Add debug new line. - Add 25M fixed rate clock. - Remove unused clocks and clock name from dt-binding. Changes since version 1: - NPCM8XX clock driver - Modify dt-binding. - Remove unsed definition and include. - Include alphabetically. - Use clock devm. Tomer Maimon (3): dt-bindings: reset: npcm: add clock properties reset: npcm: register npcm8xx clock auxiliary bus device clk: npcm8xx: add clock controller .../bindings/reset/nuvoton,npcm750-reset.yaml | 18 + drivers/clk/Kconfig | 8 + drivers/clk/Makefile | 1 + drivers/clk/clk-npcm8xx.c | 430 ++++++++++++++++++ drivers/reset/Kconfig | 1 + drivers/reset/reset-npcm.c | 74 ++- include/soc/nuvoton/clock-npcm8xx.h | 16 + 7 files changed, 547 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/clk-npcm8xx.c create mode 100644 include/soc/nuvoton/clock-npcm8xx.h -- 2.34.1 . From: "Rob Herring (Arm)" To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: PCM6240: Use of_property_read_reg() Date: Tue, 2 Jul 2024 15:53:49 -0600 Message-ID: <20240702215349.839350-1-robh@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265719 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Replace the open-coded parsing of "reg" with of_property_read_reg(). The #ifdef is also easily replaced with IS_ENABLED(). Signed-off-by: Rob Herring (Arm) --- sound/soc/codecs/pcm6240.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/pcm6240.c b/sound/soc/codecs/pcm6240.c index 86e126783a1d..4a6019ee3d83 100644 --- a/sound/soc/codecs/pcm6240.c +++ b/sound/soc/codecs/pcm6240.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -2081,10 +2082,6 @@ static int pcmdevice_i2c_probe(struct i2c_client *i2c) struct device_node *np; unsigned int dev_addrs[PCMDEVICE_MAX_I2C_DEVICES]; int ret = 0, i = 0, ndev = 0; -#ifdef CONFIG_OF - const __be32 *reg, *reg_end; - int len, sw, aw; -#endif pcm_dev = devm_kzalloc(&i2c->dev, sizeof(*pcm_dev), GFP_KERNEL); if (!pcm_dev) { @@ -2120,27 +2117,19 @@ static int pcmdevice_i2c_probe(struct i2c_client *i2c) i2c_set_clientdata(i2c, pcm_dev); mutex_init(&pcm_dev->codec_lock); np = pcm_dev->dev->of_node; -#ifdef CONFIG_OF - aw = of_n_addr_cells(np); - sw = of_n_size_cells(np); - if (sw == 0) { - reg = (const __be32 *)of_get_property(np, - "reg", &len); - reg_end = reg + len/sizeof(*reg); - ndev = 0; - do { - dev_addrs[ndev] = of_read_number(reg, aw); - reg += aw; - ndev++; - } while (reg < reg_end); + + if (IS_ENABLED(CONFIG_OF)) { + u64 addr; + + for (i = 0; i < PCMDEVICE_MAX_I2C_DEVICES; i++) { + if (of_property_read_reg(np, i, &addr, NULL)) + break; + dev_addrs[ndev++] = addr; + } } else { ndev = 1; dev_addrs[0] = i2c->addr; } -#else - ndev = 1; - dev_addrs[0] = i2c->addr; -#endif pcm_dev->irq_info.gpio = of_irq_get(np, 0); for (i = 0; i < ndev; i++) -- 2.43.0 . From: "Rob Herring (Arm)" To: Shenghao Ding , Kevin Lu , Baojun Xu , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: tas2781: Use of_property_read_reg() Date: Tue, 2 Jul 2024 15:54:01 -0600 Message-ID: <20240702215402.839673-1-robh@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265720 Newsgroups: org.kernel.vger.linux-kernel,org.alsa-project.alsa-devel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Replace the open-coded parsing of "reg" with of_property_read_reg(). The #ifdef is also easily replaced with IS_ENABLED(). Signed-off-by: Rob Herring (Arm) --- sound/soc/codecs/tas2781-i2c.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 9350972dfefe..746e6964bfb3 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -622,33 +623,20 @@ static void tasdevice_parse_dt(struct tasdevice_priv *tas_priv) tas_priv->irq_info.irq_gpio = acpi_dev_gpio_irq_get(ACPI_COMPANION(&client->dev), 0); - } else { + } else if (IS_ENABLED(CONFIG_OF)) { struct device_node *np = tas_priv->dev->of_node; -#ifdef CONFIG_OF - const __be32 *reg, *reg_end; - int len, sw, aw; - - aw = of_n_addr_cells(np); - sw = of_n_size_cells(np); - if (sw == 0) { - reg = (const __be32 *)of_get_property(np, - "reg", &len); - reg_end = reg + len/sizeof(*reg); - ndev = 0; - do { - dev_addrs[ndev] = of_read_number(reg, aw); - reg += aw; - ndev++; - } while (reg < reg_end); - } else { - ndev = 1; - dev_addrs[0] = client->addr; + u64 addr; + + for (i = 0; i < TASDEVICE_MAX_CHANNELS; i++) { + if (of_property_read_reg(np, i, &addr, NULL)) + break; + dev_addrs[ndev++] = addr; } -#else + + tas_priv->irq_info.irq_gpio = of_irq_get(np, 0); + } else { ndev = 1; dev_addrs[0] = client->addr; -#endif - tas_priv->irq_info.irq_gpio = of_irq_get(np, 0); } tas_priv->ndev = ndev; for (i = 0; i < ndev; i++) -- 2.43.0 . From: Jim Cromie To: daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux@rasmusvillemoes.dk, joe@perches.com, mcgrof@kernel.org, Jim Cromie Subject: [PATCH v9 00/53] fix CONFIG_DRM_USE_DYNAMIC_DEBUG=y Date: Tue, 2 Jul 2024 15:56:50 -0600 Message-ID: <20240702215804.2201271-1-jim.cromie@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265726 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This fixes dynamic-debug support for DRM.debug, added via classmaps. commit bb2ff6c27bc9 (drm: Disable dynamic debug as broken) CONFIG_DRM_USE_DYNAMIC_DEBUG=y was marked broken because drm.debug=val was applied when drm.ko was modprobed; too early for the yet-to-load drivers, which thus missed the enablement. My testing with /etc/modprobe.d/ entries and modprobes with dyndbg=$querycmd options obscured this omission. The fix is to replace invocations of DECLARE_DYNDBG_CLASSMAP with DYNDBG_CLASSMAP_DEFINE for core, and DYNDBG_CLASSMAP_USE for drivers. The distinction allows dyndbg to also handle the users properly. DRM is the only current classmaps user, and is not really using it, so if you think DRM could benefit from zero-off-cost debugs based on static-keys, please test. HISTORY 9/4/22 - ee879be38bc8..ace7c4bbb240 commited - classmaps-v1 dyndbg parts 9/11/22 - 0406faf25fb1..16deeb8e18ca commited - classmaps-v1 drm parts https://lore.kernel.org/lkml/Y3XUrOGAV4I7bB3M@kroah.com/ greg k-h says: This should go through the drm tree now. The rest probably should also go that way and not through my tree as well. https://lore.kernel.org/lkml/20221206003424.592078-1-jim.cromie@gmail.com/ v1- RFC. adds DYNDBG_CLASSMAP_DEFINE + test-submod to recap DRM failure https://lore.kernel.org/lkml/20230113193016.749791-1-jim.cromie@gmail.com/ v2- w RFC on "tolerate toggled state" https://lore.kernel.org/lkml/Y8aNMxHpvZ8qecSc@hirez.programming.kicks-ass.net/ - PeterZ - nacks tolerance of insane/uninit static-key state https://lore.kernel.org/lkml/8ca08fba-1120-ca86-6129-0b33afb4a1da@akamai.com/ - JasonB diagnoses prob - set jump-label b4 init 7deabd674988 dyndbg: use the module notifier callbacks - JasonB lands fix for my problem he moves dyndbg to use notifiers to do init, like & after jump-labels https://lore.kernel.org/lkml/20230125203743.564009-20-jim.cromie@gmail.com/ v3- probing, workaround-ish https://lore.kernel.org/lkml/20230713163626.31338-1-jim.cromie@gmail.com/ v4 - 7/13/23 - had extra/unused __UNIQUE_ID warnings/errs on lkp-tested arches due to unmatched __used marks - RandyD doc fixes, thx. https://lore.kernel.org/lkml/20230801170255.163237-1-jim.cromie@gmail.com/ v5 - 8/1/23 - lkp-test reported panics-on-boot https://lore.kernel.org/lkml/202308031432.fcb4197-oliver.sang@intel.com/ - DRM=y in apply-params - missing align(8) in init-macro, failed only for builtin modules https://lore.kernel.org/lkml/20230911230838.14461-1-jim.cromie@gmail.com/ v6 - 9/11/23 - no feedback v7[a-d] - attempts to get into/thru DRM patchwork CI.. - "jenius" struck, I preserved DECLARE_DYNDBG_CLASSMAP til later v8[a-i] - added tools/testing/selftests/dynamic_debug/* - now turnkey testable without DRM CLASSMAPS FROM THE TOP dynamic-debug classmap's primary goal was to bring zero-off-cost debugs, via static-keys, to DRM. drm.debug: is ~5000 debugs across core, drivers, helpers; each in 1 of 10 exclusive categories, all controlled by bits in a sysfs knob. drm.debug=0x1ff # bootarg echo 0x4 > /sys/module/drm/parameters/debug # run-time setting Below the sysfs interface, classmaps are exposed in the >control grammar with a new "class" keyword. This is mostly like the other keywords, differing by: a- classnames are client/subsystem/domain defined, not code-name-structural. the classnames are global, across system IOW: "class DRM_UT_CORE" selects on any module which knows the class b- classes are protected from unqualified modification. # cannot disable any DRM (or other) classes echo -p > /proc/dynamic_debug/control c- classes don't have wildcards - add if needed. DRM uses "${SUBSYS}_${CATNAME}" probably more useful with "${TOP}_${MID}_${LOW}" classnames API in use: DRM defines its categories with an enum-type, the obvious thing to do was to copy/emulate that for classmaps; this also preserves the __pr_dbg_class(DRM_UT_CORE, "core stuff") style already used in drm's ~5000 drm_dbg_* macro calls. DYNDBG_CLASSMAP_DEFINE(drm_debug_classes, ...); DYNDBG_CLASSMAP_USE(drm_debug_classes); Classmaps get DEFINEd once (in drm.ko for core) and USEd (in drivers and helpers), these 2 declarations respectively define and export a classmap (in core), and refer to the exported class-struct from the modules. They both tell dynamic-debug that the module has some of these class'd pr_debugs, so dyndbg uses the classmap's names to validate >control inputs. The distinction allows USErs to act differently than the DEFINEr; they have to follow the ref back to the DEFINEing module, find the kparam connected to the classmap, and lookup and apply its modprobed value. (this is the bug-fix). Dyndbg uses the classnames to validate "class FOO" >control inputs, and apply the changes to each module that has DEFINEd or USEd the classmap. This makes classmaps opt-in: modules must _DEFINE or _USE a classmap for their class'd pr_debug()s to be >control'd. NOTE: __pr_dbg_class(1, "const-int unreachable class 1"); is legal, but not controllable unless the const 1 has been mapped to a _DEFINE'd classname. NB: and __pr_dbg_class(i++, "undeclared class") is illegal. In drm_print.c we have: /* classnames must match value-symbols of enum drm_debug_category */ DRM_CLASSMAP_DEFINE(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, DRM_UT_CORE, "DRM_UT_CORE", "DRM_UT_DRIVER", "DRM_UT_KMS", "DRM_UT_PRIME", "DRM_UT_ATOMIC", "DRM_UT_VBL", "DRM_UT_STATE", "DRM_UT_LEASE", "DRM_UT_DP", "DRM_UT_DRMRES"); This maps the sequence of "classnames" to ints starting with DRM_UT_CORE. other offsets allow sharing the per-module 0..63 class-id space Only complete, linear maps are recommended. An APPLY_FN(__stringify, __VA_ARGS__) would fix the "string-indirection" I have one written, but didnt want to overload this submission. DYNDBG_CLASSMAP_PARAM_REF() creates the sysfs-kparam classbits knob, binding the extern'd long-int/bitvec to the classmap. DRM's categories are independent of each other. The other possible classmap-type/behavior is "related", ie somehow "ordered": V3>V2. The relatedness of classes in a classmap is enforced at the kparam, where they are all set together, not at the >control interface. THE PATCHSET has 2 halves: 1- dynamic-debug fix - API change The root cause was DECLARE_DYNDBG_CLASSMAP tried to do too much, and its use in both core and drivers, helpers couldnt sort the difference. The fix is to replace it with DYNDBG_CLASSMAP_DEFINE in core, and DYNDBG_CLASSMAP_USE in drivers,helpers. The 1st differs from -v1 by exporting the classmap, allowing 2nd to ref it. They respectively add records to 2 ELF sections in the module. Now, dyndbg's on-modprobe handler follows the _USE/refs to the owning module, finds the controlling kparam: drm.debug, and applies its value thru the classmap, to the module's pr_debugs. Recent revs of this patchset added a selftest for dyndbg, which recapitulates the DRM regression scenario using the 2 test modules. The test verifies that the dependent module is initialized properly from the parent's classmap kparam. So it gives a basic turnkey selftest: [root@v6 b0-dd-drm]# V=0 ../../tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh # consulting KCONFIG_CONFIG: .config # BASIC_TESTS : 0 matches on =p : 14 matches on =p : 0 matches on =p : 21 matches on =mf : 0 matches on =ml : 6 matches on =mfl ... # Done on: Sun Jun 30 10:34:24 PM MDT 2024 This latest rev fixes the test for the various CONFIG_DYNAMIC_DEBUG* build combos, by skipping some subtests where the expected counts are wrong. Lukasz Bartosik caught this - thanks. CC: ukaszb@chromium.org 2- DRM fixes - use new api. These are largely unchanged since -v1 above: a. update core to invoke DRM_CLASSMAP_DEFINE b. wrap DYNDBG_CLASSMAP_* with DRM_CLASSMAP_* - hide ifdef c. now with separate +DRM_CLASSMAP_USE patches for each driver/helper: d. and defer dropping DECLARE_DYNDBG_CLASSMAP til later Maybe theres a single place to invoke DRM_CLASSMAP_USE just once, perhaps from a client library c-file. I poked a little, didn't find it. Patches are against v6.9 theyre also at: tree/branch: https://github.com/jimc/linux.git dd-classmap-fix-8i branch HEAD: dd31011435409a5bd70cc92bfd846407f6f1a2d8 drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN Finally, classmaps are in a meta-stable state right now; some governor might walk it over to the gravel pit out back. Tested-bys would help greatly, get it off the fence it straddles. Please specify method: selftest or drm.debug=0x1ff boot. Also entertaining Reviewed-bys :-} Jim Cromie (52): DYNAMIC-DEBUG parts: cleanup: docs/dyndbg: update examples \012 to \n test-dyndbg: fixup CLASSMAP usage error dyndbg: reword "class unknown," to "class:_UNKNOWN_" dyndbg: make ddebug_class_param union members same size dyndbg: replace classmap list with a vector prep: dyndbg: ddebug_apply_class_bitmap - add module arg, select on it dyndbg: split param_set_dyndbg_classes to _module & wrapper fns dyndbg: drop NUM_TYPE_ARRAY dyndbg: reduce verbose/debug clutter dyndbg: silence debugs with no-change updates dyndbg: tighten ddebug_class_name() 1st arg type dyndbg: tighten fn-sig of ddebug_apply_class_bitmap dyndbg: reduce verbose=3 messages in ddebug_add_module API changes & selftest: dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code dyndbg-API: fix DECLARE_DYNDBG_CLASSMAP selftests-dyndbg: add tools/testing/selftests/dynamic_debug/* dyndbg-API: promote DYNDBG_CLASSMAP_PARAM to API dyndbg-doc: add classmap info to howto dyndbg: treat comma as a token separator selftests-dyndbg: add comma_terminator_tests dyndbg: split multi-query strings with % selftests-dyndbg: test_percent_splitting docs/dyndbg: explain new delimiters: comma, percent selftests-dyndbg: add test_mod_submod dyndbg-doc: explain flags parse 1st dyndbg: change __dynamic_func_call_cls* macros into expressions selftests-dyndbg: check KCONFIG_CONFIG to avoid silly fails dyndbg-selftest: reduce default verbosity DRM-parts: drm: use correct ccflags-y spelling drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 drm-dyndbg: adapt DRM to invoke DYNDBG_CLASSMAP_PARAM drm-dyndbg: DRM_CLASSMAP_USE in amdgpu driver drm-dyndbg: DRM_CLASSMAP_USE in i915 driver drm-dyndbg: DRM_CLASSMAP_USE in drm_crtc_helper drm-dyndbg: DRM_CLASSMAP_USE in drm_dp_helper drm-dyndbg: DRM_CLASSMAP_USE in nouveau drm-print: workaround unused variable compiler meh drm-dyndbg: add DRM_CLASSMAP_USE to Xe driver drm-dyndbg: add DRM_CLASSMAP_USE to virtio_gpu drm-dyndbg: add DRM_CLASSMAP_USE to simpledrm drm-dyndbg: add DRM_CLASSMAP_USE to bochs drm-dyndbg: add DRM_CLASSMAP_USE to etnaviv drm-dyndbg: add DRM_CLASSMAP_USE to gma500 driver drm-dyndbg: add DRM_CLASSMAP_USE to radeon drm-dyndbg: add DRM_CLASSMAP_USE to vmwgfx driver drm-dyndbg: add DRM_CLASSMAP_USE to vkms driver drm-dyndbg: add DRM_CLASSMAP_USE to udl driver drm-dyndbg: add DRM_CLASSMAP_USE to mgag200 driver drm-dyndbg: add DRM_CLASSMAP_USE to the gud driver drm-dyndbg: add DRM_CLASSMAP_USE to the qxl driver drm-dyndbg: add DRM_CLASSMAP_USE to the drm_gem_shmem_helper driver drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN .../admin-guide/dynamic-debug-howto.rst | 99 ++- MAINTAINERS | 3 +- drivers/gpu/drm/Kconfig | 3 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +- drivers/gpu/drm/display/drm_dp_helper.c | 12 +- drivers/gpu/drm/drm_crtc_helper.c | 12 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 + drivers/gpu/drm/drm_print.c | 38 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 + drivers/gpu/drm/gma500/psb_drv.c | 2 + drivers/gpu/drm/gud/gud_drv.c | 2 + drivers/gpu/drm/i915/i915_params.c | 12 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 + drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- drivers/gpu/drm/qxl/qxl_drv.c | 2 + drivers/gpu/drm/radeon/radeon_drv.c | 2 + drivers/gpu/drm/tiny/bochs.c | 2 + drivers/gpu/drm/tiny/simpledrm.c | 2 + drivers/gpu/drm/udl/udl_main.c | 2 + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 + drivers/gpu/drm/vkms/vkms_drv.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 + drivers/gpu/drm/xe/xe_drm_client.c | 2 + include/asm-generic/vmlinux.lds.h | 1 + include/drm/drm_print.h | 10 + include/linux/dynamic_debug.h | 135 ++- kernel/module/main.c | 3 + lib/Kconfig.debug | 24 +- lib/Makefile | 3 + lib/dynamic_debug.c | 436 ++++++---- lib/test_dynamic_debug.c | 131 +-- lib/test_dynamic_debug_submod.c | 17 + tools/testing/selftests/Makefile | 1 + .../testing/selftests/dynamic_debug/Makefile | 9 + tools/testing/selftests/dynamic_debug/config | 2 + .../dynamic_debug/dyndbg_selftest.sh | 810 ++++++++++++++++++ 37 files changed, 1453 insertions(+), 363 deletions(-) create mode 100644 lib/test_dynamic_debug_submod.c create mode 100644 tools/testing/selftests/dynamic_debug/Makefile create mode 100644 tools/testing/selftests/dynamic_debug/config create mode 100755 tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh -- 2.45.2 . From: Brian Norris To: Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Thomas Richter , Josh Poimboeuf , Peter Zijlstra Cc: Masahiro Yamada , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Brian Norris Subject: [PATCH v2 0/3] tools build: Incorrect fixdep dependencies Date: Tue, 2 Jul 2024 14:58:36 -0700 Message-ID: <20240702215854.408532-1-briannorris@chromium.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265766 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf,org.kernel.vger.linux-kbuild Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi all, The following series consists of a few bugfixes on the topic of "misuse of fixdep in the tools/ build tree." There is no listed maintainer for tools/build, but there are for tools/bpf and tools/objtool, which are the main pieces that affect most users, because they're built as part of the main kernel build. I've addressed this series to a selection of those maintainers, and those that have previously applied build changes in tools/. I hope one of you can apply this series, pending favorable review. Or feel free to point me to a different set of maintainers. This patch series came out of poking around some build errors seen by me and my coworkers, and I found that there were rather similar reports a while back here: Subject: possible dependency error? https://lore.kernel.org/all/ZGVi9HbI43R5trN8@bhelgaas/ I reported some findings to that thread; see also subsequent discussion: https://lore.kernel.org/all/Zk-C5Eg84yt6_nml@google.com/ One element of that discussion: these problems are already solved consistently in Kbuild. tools/build purposely borrows some from Kbuild, but also purposely does not actually use Kbuild. While it'd make my life easier if tools/ would just adopt Kbuild (at least for the tools which are built during kernel builds), I've chosen a path that I hope will yield less resistance -- simply hacking up the existing tools/ build without major changes to its design. NB: I've also CC'd Kbuild folks, since Masahiro has already been so helpful here, but note that this is not really a "kbuild" patch series. Regards, Brian Changes in v2: - also fix libbpf shared library rules - ensure OUTPUT is always set in lib/bpf, and always an absolute path - add backup $(Q) definition in tools/build/Makefile.include Brian Norris (3): tools build: Correct libsubcmd fixdep dependencies tools build: Avoid circular .fixdep-in.o.cmd issues tools build: Correct bpf fixdep dependencies tools/build/Makefile | 11 ++--------- tools/build/Makefile.include | 12 +++++++++++- tools/lib/bpf/Makefile | 14 ++++++++++++-- tools/lib/subcmd/Makefile | 2 +- 4 files changed, 26 insertions(+), 13 deletions(-) -- 2.45.2.803.g4e1b14247a-goog .