diff options
Diffstat (limited to 'patch-5.19-redhat.patch')
| -rw-r--r-- | patch-5.19-redhat.patch | 3184 |
1 files changed, 3184 insertions, 0 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch new file mode 100644 index 000000000..cc73ad29f --- /dev/null +++ b/patch-5.19-redhat.patch @@ -0,0 +1,3184 @@ + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + + .../bindings/soc/bcm/brcm,bcm2835-pm.txt | 46 - + .../bindings/soc/bcm/brcm,bcm2835-pm.yaml | 86 ++ + Kconfig | 2 + + Kconfig.redhat | 17 + + Makefile | 4 + + arch/arm/Kconfig | 4 +- + arch/arm/boot/dts/bcm2711-rpi.dtsi | 4 + + arch/arm/boot/dts/bcm2711.dtsi | 14 +- + arch/arm/boot/dts/bcm2835-common.dtsi | 1 + + arch/arm/configs/bcm2835_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/Kconfig | 3 +- + arch/arm64/configs/defconfig | 1 + + arch/s390/include/asm/ipl.h | 1 + + arch/s390/kernel/ipl.c | 5 + + arch/s390/kernel/setup.c | 4 + + arch/x86/kernel/setup.c | 22 +- + drivers/acpi/apei/hest.c | 8 + + drivers/acpi/irq.c | 17 +- + drivers/acpi/scan.c | 9 + + drivers/ata/libahci.c | 18 + + drivers/char/ipmi/ipmi_dmi.c | 15 + + drivers/char/ipmi/ipmi_msghandler.c | 16 +- + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/efi.c | 124 ++- + drivers/firmware/efi/secureboot.c | 38 + + drivers/firmware/sysfb.c | 18 +- + drivers/gpu/drm/drm_ioctl.c | 8 +- + drivers/gpu/drm/v3d/Kconfig | 5 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +- + drivers/gpu/drm/v3d/v3d_drv.c | 12 +- + drivers/gpu/drm/v3d/v3d_gem.c | 12 +- + drivers/hid/hid-rmi.c | 64 -- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + + drivers/input/rmi4/rmi_driver.c | 124 +-- + drivers/iommu/iommu.c | 22 + + drivers/mfd/bcm2835-pm.c | 74 +- + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm-phy-lib.h | 19 + + drivers/net/phy/bcm-phy-ptp.c | 944 +++++++++++++++++++++ + drivers/net/phy/broadcom.c | 33 +- + drivers/pci/quirks.c | 24 + + drivers/soc/bcm/bcm2835-power.c | 72 +- + drivers/usb/core/hub.c | 7 + + include/linux/efi.h | 22 +- + include/linux/lsm_hook_defs.h | 2 + + include/linux/lsm_hooks.h | 6 + + include/linux/mfd/bcm2835-pm.h | 1 + + include/linux/rmi.h | 1 + + include/linux/security.h | 5 + + init/Kconfig | 2 +- + kernel/module/signing.c | 9 +- + net/bluetooth/hci_event.c | 20 + + scripts/tags.sh | 2 + + security/integrity/platform_certs/load_uefi.c | 6 +- + security/lockdown/Kconfig | 13 + + security/lockdown/lockdown.c | 1 + + security/security.c | 6 + + 60 files changed, 1727 insertions(+), 313 deletions(-) + +diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml +index e6485f7b046f..217c42874f41 100644 +--- a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml ++++ b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml +@@ -16,6 +16,7 @@ properties: + + compatible: + enum: ++ - brcm,2711-v3d + - brcm,7268-v3d + - brcm,7278-v3d + +diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt +deleted file mode 100644 +index 72ff033565e5..000000000000 +--- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt ++++ /dev/null +@@ -1,46 +0,0 @@ +-BCM2835 PM (Power domains, watchdog) +- +-The PM block controls power domains and some reset lines, and includes +-a watchdog timer. This binding supersedes the brcm,bcm2835-pm-wdt +-binding which covered some of PM's register range and functionality. +- +-Required properties: +- +-- compatible: Should be "brcm,bcm2835-pm" +-- reg: Specifies base physical address and size of the two +- register ranges ("PM" and "ASYNC_BRIDGE" in that +- order) +-- clocks: a) v3d: The V3D clock from CPRMAN +- b) peri_image: The PERI_IMAGE clock from CPRMAN +- c) h264: The H264 clock from CPRMAN +- d) isp: The ISP clock from CPRMAN +-- #reset-cells: Should be 1. This property follows the reset controller +- bindings[1]. +-- #power-domain-cells: Should be 1. This property follows the power domain +- bindings[2]. +- +-Optional properties: +- +-- timeout-sec: Contains the watchdog timeout in seconds +-- system-power-controller: Whether the watchdog is controlling the +- system power. This node follows the power controller bindings[3]. +- +-[1] Documentation/devicetree/bindings/reset/reset.txt +-[2] Documentation/devicetree/bindings/power/power-domain.yaml +-[3] Documentation/devicetree/bindings/power/power-controller.txt +- +-Example: +- +-pm { +- compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; +- #power-domain-cells = <1>; +- #reset-cells = <1>; +- reg = <0x7e100000 0x114>, +- <0x7e00a000 0x24>; +- clocks = <&clocks BCM2835_CLOCK_V3D>, +- <&clocks BCM2835_CLOCK_PERI_IMAGE>, +- <&clocks BCM2835_CLOCK_H264>, +- <&clocks BCM2835_CLOCK_ISP>; +- clock-names = "v3d", "peri_image", "h264", "isp"; +- system-power-controller; +-}; +diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml +new file mode 100644 +index 000000000000..894786640938 +--- /dev/null ++++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml +@@ -0,0 +1,86 @@ ++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause ++%YAML 1.2 ++--- ++$id: "http://devicetree.org/schemas/soc/bcm/brcm,bcm2835-pm.yaml#" ++$schema: "http://devicetree.org/meta-schemas/core.yaml#" ++ ++title: BCM2835 PM (Power domains, watchdog) ++ ++description: | ++ The PM block controls power domains and some reset lines, and includes a ++ watchdog timer. ++ ++maintainers: ++ - Nicolas Saenz Julienne <nsaenz@kernel.org> ++ ++allOf: ++ - $ref: ../../watchdog/watchdog.yaml# ++ ++properties: ++ compatible: ++ items: ++ - enum: ++ - brcm,bcm2835-pm ++ - brcm,bcm2711-pm ++ - const: brcm,bcm2835-pm-wdt ++ ++ reg: ++ minItems: 2 ++ maxItems: 3 ++ ++ reg-names: ++ minItems: 2 ++ items: ++ - const: pm ++ - const: asb ++ - const: rpivid_asb ++ ++ "#power-domain-cells": ++ const: 1 ++ ++ "#reset-cells": ++ const: 1 ++ ++ clocks: ++ minItems: 4 ++ maxItems: 4 ++ ++ clock-names: ++ items: ++ - const: v3d ++ - const: peri_image ++ - const: h264 ++ - const: isp ++ ++ system-power-controller: ++ type: boolean ++ ++ timeout-sec: true ++ ++required: ++ - compatible ++ - reg ++ - "#power-domain-cells" ++ - "#reset-cells" ++ - clocks ++ ++additionalProperties: false ++ ++examples: ++ - | ++ #include <dt-bindings/clock/bcm2835.h> ++ ++ watchdog@7e100000 { ++ compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; ++ #power-domain-cells = <1>; ++ #reset-cells = <1>; ++ reg = <0x7e100000 0x114>, ++ <0x7e00a000 0x24>; ++ reg-names = "pm", "asb"; ++ clocks = <&clocks BCM2835_CLOCK_V3D>, ++ <&clocks BCM2835_CLOCK_PERI_IMAGE>, ++ <&clocks BCM2835_CLOCK_H264>, ++ <&clocks BCM2835_CLOCK_ISP>; ++ clock-names = "v3d", "peri_image", "h264", "isp"; ++ system-power-controller; ++ }; +diff --git a/Kconfig b/Kconfig +index 745bc773f567..f57ff40109d7 100644 +--- a/Kconfig ++++ b/Kconfig +@@ -30,3 +30,5 @@ source "lib/Kconfig" + source "lib/Kconfig.debug" + + source "Documentation/Kconfig" ++ ++source "Kconfig.redhat" +diff --git a/Kconfig.redhat b/Kconfig.redhat +new file mode 100644 +index 000000000000..733a26bd887a +--- /dev/null ++++ b/Kconfig.redhat +@@ -0,0 +1,17 @@ ++# SPDX-License-Identifier: GPL-2.0-only ++# ++# Red Hat specific options ++# ++ ++menu "Red Hat options" ++ ++config RH_DISABLE_DEPRECATED ++ bool "Remove support for deprecated features" ++ help ++ Red Hat may choose to deprecate certain features in its kernels. ++ Enable this option to remove support for hardware that is no ++ longer supported. ++ ++ Unless you want a restricted kernel, say N here. ++ ++endmenu +diff --git a/Makefile b/Makefile +index 65dc4f93ffdb..f305e434bc0c 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ + PHONY := __all + __all: + ++# Set RHEL variables ++# Use this spot to avoid future merge conflicts ++include Makefile.rhelver ++ + # We are using a recursive build, so we need to do a little thinking + # to get the ordering right. + # +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 7630ba9cb6cc..c2e2991edd11 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1382,9 +1382,9 @@ config HIGHMEM + If unsure, say n. + + config HIGHPTE +- bool "Allocate 2nd-level pagetables from highmem" if EXPERT ++ bool "Allocate 2nd-level pagetables from highmem" + depends on HIGHMEM +- default y ++ default n + help + The VM uses one page of physical memory for each page table. + For systems with a lot of processes, this can use a lot of +diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi +index ca266c5d9f9b..98817a6675b9 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi +@@ -69,6 +69,10 @@ blconfig: nvram@0 { + }; + }; + ++&v3d { ++ clocks = <&firmware_clocks 5>; ++}; ++ + &vchiq { + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + }; +diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi +index 89af57482bc8..941c4d16791b 100644 +--- a/arch/arm/boot/dts/bcm2711.dtsi ++++ b/arch/arm/boot/dts/bcm2711.dtsi +@@ -107,12 +107,13 @@ dma: dma@7e007000 { + }; + + pm: watchdog@7e100000 { +- compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; ++ compatible = "brcm,bcm2711-pm", "brcm,bcm2835-pm-wdt"; + #power-domain-cells = <1>; + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>, + <0x7ec11000 0x20>; ++ reg-names = "pm", "asb", "rpivid_asb"; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, +@@ -601,6 +602,17 @@ genet_mdio: mdio@e14 { + #size-cells = <0x0>; + }; + }; ++ ++ v3d: gpu@7ec00000 { ++ compatible = "brcm,2711-v3d"; ++ reg = <0x0 0x7ec00000 0x4000>, ++ <0x0 0x7ec04000 0x4000>; ++ reg-names = "hub", "core0"; ++ ++ power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; ++ resets = <&pm BCM2835_RESET_V3D>; ++ interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ++ }; + }; + }; + +diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi +index c25e797b9060..a037d2bc5b11 100644 +--- a/arch/arm/boot/dts/bcm2835-common.dtsi ++++ b/arch/arm/boot/dts/bcm2835-common.dtsi +@@ -62,6 +62,7 @@ pm: watchdog@7e100000 { + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>; ++ reg-names = "pm", "asb"; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, +diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig +index a9ed79b7f871..9270512c14ea 100644 +--- a/arch/arm/configs/bcm2835_defconfig ++++ b/arch/arm/configs/bcm2835_defconfig +@@ -106,6 +106,7 @@ CONFIG_REGULATOR_GPIO=y + CONFIG_MEDIA_SUPPORT=y + CONFIG_MEDIA_CAMERA_SUPPORT=y + CONFIG_DRM=y ++CONFIG_DRM_V3D=y + CONFIG_DRM_VC4=y + CONFIG_FB_SIMPLE=y + CONFIG_FRAMEBUFFER_CONSOLE=y +diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig +index ce9826bce29b..948d18e59cf5 100644 +--- a/arch/arm/configs/multi_v7_defconfig ++++ b/arch/arm/configs/multi_v7_defconfig +@@ -747,6 +747,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m + CONFIG_DRM_IMX_TVE=m + CONFIG_DRM_IMX_LDB=m + CONFIG_DRM_IMX_HDMI=m ++CONFIG_DRM_V3D=m + CONFIG_DRM_VC4=m + CONFIG_DRM_ETNAVIV=m + CONFIG_DRM_MXSFB=m +diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig +index a5d1b561ed53..cd93c9041679 100644 +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig +@@ -1145,7 +1145,7 @@ endchoice + + config ARM64_FORCE_52BIT + bool "Force 52-bit virtual addresses for userspace" +- depends on ARM64_VA_BITS_52 && EXPERT ++ depends on ARM64_VA_BITS_52 + help + For systems with 52-bit userspace VAs enabled, the kernel will attempt + to maintain compatibility with older software by providing 48-bit VAs +@@ -1384,6 +1384,7 @@ config XEN + config FORCE_MAX_ZONEORDER + int + default "14" if ARM64_64K_PAGES ++ default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES) + default "12" if ARM64_16K_PAGES + default "11" + help +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 7d1105343bc2..36aace2b5b28 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -754,6 +754,7 @@ CONFIG_DRM_CDNS_MHDP8546=m + CONFIG_DRM_DW_HDMI_AHB_AUDIO=m + CONFIG_DRM_DW_HDMI_CEC=m + CONFIG_DRM_IMX_DCSS=m ++CONFIG_DRM_V3D=m + CONFIG_DRM_VC4=m + CONFIG_DRM_ETNAVIV=m + CONFIG_DRM_HISI_HIBMC=m +diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h +index a405b6bb89fb..50827b341fd7 100644 +--- a/arch/s390/include/asm/ipl.h ++++ b/arch/s390/include/asm/ipl.h +@@ -128,6 +128,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, + unsigned char flags, unsigned short cert); + int ipl_report_add_certificate(struct ipl_report *report, void *key, + unsigned long addr, unsigned long len); ++bool ipl_get_secureboot(void); + + /* + * DIAG 308 support +diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c +index 1cc85b8ff42e..b7ee128c67ce 100644 +--- a/arch/s390/kernel/ipl.c ++++ b/arch/s390/kernel/ipl.c +@@ -2216,3 +2216,8 @@ int ipl_report_free(struct ipl_report *report) + } + + #endif ++ ++bool ipl_get_secureboot(void) ++{ ++ return !!ipl_secure_flag; ++} +diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c +index 0a37f5de2863..e2644fc7a172 100644 +--- a/arch/s390/kernel/setup.c ++++ b/arch/s390/kernel/setup.c +@@ -49,6 +49,7 @@ + #include <linux/memory.h> + #include <linux/compat.h> + #include <linux/start_kernel.h> ++#include <linux/security.h> + #include <linux/hugetlb.h> + #include <linux/kmemleak.h> + +@@ -970,6 +971,9 @@ void __init setup_arch(char **cmdline_p) + + log_component_list(); + ++ if (ipl_get_secureboot()) ++ security_lock_kernel_down("Secure IPL mode", LOCKDOWN_INTEGRITY_MAX); ++ + /* Have one command line that is parsed and saved in /proc/cmdline */ + /* boot_command_line has been already set up in early.c */ + *cmdline_p = boot_command_line; +diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c +index bd6c6fd373ae..3333b08a778d 100644 +--- a/arch/x86/kernel/setup.c ++++ b/arch/x86/kernel/setup.c +@@ -20,6 +20,7 @@ + #include <linux/root_dev.h> + #include <linux/hugetlb.h> + #include <linux/tboot.h> ++#include <linux/security.h> + #include <linux/usb/xhci-dbgp.h> + #include <linux/static_call.h> + #include <linux/swiotlb.h> +@@ -963,6 +964,13 @@ void __init setup_arch(char **cmdline_p) + if (efi_enabled(EFI_BOOT)) + efi_init(); + ++ efi_set_secure_boot(boot_params.secure_boot); ++ ++#ifdef CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT ++ if (efi_enabled(EFI_SECURE_BOOT)) ++ security_lock_kernel_down("EFI Secure Boot mode", LOCKDOWN_INTEGRITY_MAX); ++#endif ++ + dmi_setup(); + + /* +@@ -1132,19 +1140,7 @@ void __init setup_arch(char **cmdline_p) + /* Allocate bigger log buffer */ + setup_log_buf(1); + +- if (efi_enabled(EFI_BOOT)) { +- switch (boot_params.secure_boot) { +- case efi_secureboot_mode_disabled: +- pr_info("Secure boot disabled\n"); +- break; +- case efi_secureboot_mode_enabled: +- pr_info("Secure boot enabled\n"); +- break; +- default: +- pr_info("Secure boot could not be determined\n"); +- break; +- } +- } ++ efi_set_secure_boot(boot_params.secure_boot); + + reserve_initrd(); + +diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c +index 6aef1ee5e1bd..8f146b1b4972 100644 +--- a/drivers/acpi/apei/hest.c ++++ b/drivers/acpi/apei/hest.c +@@ -96,6 +96,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data) + if (hest_disable || !hest_tab) + return -EINVAL; + ++#ifdef CONFIG_ARM64 ++ /* Ignore broken firmware */ ++ if (!strncmp(hest_tab->header.oem_id, "HPE ", 6) && ++ !strncmp(hest_tab->header.oem_table_id, "ProLiant", 8) && ++ MIDR_IMPLEMENTOR(read_cpuid_id()) == ARM_CPU_IMP_APM) ++ return -EINVAL; ++#endif ++ + hest_hdr = (struct acpi_hest_header *)(hest_tab + 1); + for (i = 0; i < hest_tab->error_source_count; i++) { + len = hest_esrc_len(hest_hdr); +diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c +index c68e694fca26..146cba5ae5bc 100644 +--- a/drivers/acpi/irq.c ++++ b/drivers/acpi/irq.c +@@ -130,6 +130,7 @@ struct acpi_irq_parse_one_ctx { + unsigned int index; + unsigned long *res_flags; + struct irq_fwspec *fwspec; ++ bool skip_producer_check; + }; + + /** +@@ -201,7 +202,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, + return AE_CTRL_TERMINATE; + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + eirq = &ares->data.extended_irq; +- if (eirq->producer_consumer == ACPI_PRODUCER) ++ if (!ctx->skip_producer_check && ++ eirq->producer_consumer == ACPI_PRODUCER) + return AE_OK; + if (ctx->index >= eirq->interrupt_count) { + ctx->index -= eirq->interrupt_count; +@@ -236,8 +238,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, + static int acpi_irq_parse_one(acpi_handle handle, unsigned int index, + struct irq_fwspec *fwspec, unsigned long *flags) + { +- struct acpi_irq_parse_one_ctx ctx = { -EINVAL, index, flags, fwspec }; ++ struct acpi_irq_parse_one_ctx ctx = { -EINVAL, index, flags, fwspec, false }; + ++ /* ++ * Firmware on arm64-based HPE m400 platform incorrectly marks ++ * its UART interrupt as ACPI_PRODUCER rather than ACPI_CONSUMER. ++ * Don't do the producer/consumer check for that device. ++ */ ++ if (IS_ENABLED(CONFIG_ARM64)) { ++ struct acpi_device *adev = acpi_bus_get_acpi_device(handle); ++ ++ if (adev && !strcmp(acpi_device_hid(adev), "APMC0D08")) ++ ctx.skip_producer_check = true; ++ } + acpi_walk_resources(handle, METHOD_NAME__CRS, acpi_irq_parse_one_cb, &ctx); + return ctx.rc; + } +diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c +index 762b61f67e6c..3581d4898dc4 100644 +--- a/drivers/acpi/scan.c ++++ b/drivers/acpi/scan.c +@@ -1766,6 +1766,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) + if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) + return false; + ++ /* ++ * Firmware on some arm64 X-Gene platforms will make the UART ++ * device appear as both a UART and a slave of that UART. Just ++ * bail out here for X-Gene UARTs. ++ */ ++ if (IS_ENABLED(CONFIG_ARM64) && ++ !strcmp(acpi_device_hid(device), "APMC0D08")) ++ return false; ++ + INIT_LIST_HEAD(&resource_list); + acpi_dev_get_resources(device, &resource_list, + acpi_check_serial_bus_slave, +diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c +index cf8c7fd59ada..28a8189be64f 100644 +--- a/drivers/ata/libahci.c ++++ b/drivers/ata/libahci.c +@@ -690,6 +690,24 @@ int ahci_stop_engine(struct ata_port *ap) + tmp &= ~PORT_CMD_START; + writel(tmp, port_mmio + PORT_CMD); + ++#ifdef CONFIG_ARM64 ++ /* Rev Ax of Cavium CN99XX needs a hack for port stop */ ++ if (dev_is_pci(ap->host->dev) && ++ to_pci_dev(ap->host->dev)->vendor == 0x14e4 && ++ to_pci_dev(ap->host->dev)->device == 0x9027 && ++ midr_is_cpu_model_range(read_cpuid_id(), ++ MIDR_CPU_MODEL(ARM_CPU_IMP_BRCM, BRCM_CPU_PART_VULCAN), ++ MIDR_CPU_VAR_REV(0, 0), ++ MIDR_CPU_VAR_REV(0, MIDR_REVISION_MASK))) { ++ tmp = readl(hpriv->mmio + 0x8000); ++ udelay(100); ++ writel(tmp | (1 << 26), hpriv->mmio + 0x8000); ++ udelay(100); ++ writel(tmp & ~(1 << 26), hpriv->mmio + 0x8000); ++ dev_warn(ap->host->dev, "CN99XX SATA reset workaround applied\n"); ++ } ++#endif ++ + /* wait for engine to stop. This could be as long as 500 msec */ + tmp = ata_wait_register(ap, port_mmio + PORT_CMD, + PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); +diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c +index bbf7029e224b..cf7faa970dd6 100644 +--- a/drivers/char/ipmi/ipmi_dmi.c ++++ b/drivers/char/ipmi/ipmi_dmi.c +@@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void) + { + const struct dmi_device *dev = NULL; + ++#ifdef CONFIG_ARM64 ++ /* RHEL-only ++ * If this is ARM-based HPE m400, return now, because that platform ++ * reports the host-side ipmi address as intel port-io space, which ++ * does not exist in the ARM architecture. ++ */ ++ const char *dmistr = dmi_get_system_info(DMI_PRODUCT_NAME); ++ ++ if (dmistr && (strcmp("ProLiant m400 Server", dmistr) == 0)) { ++ pr_debug("%s does not support host ipmi\n", dmistr); ++ return 0; ++ } ++ /* END RHEL-only */ ++#endif ++ + while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) + dmi_decode_ipmi((const struct dmi_header *) dev->device_data); + +diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c +index 703433493c85..6b1b102b9b7d 100644 +--- a/drivers/char/ipmi/ipmi_msghandler.c ++++ b/drivers/char/ipmi/ipmi_msghandler.c +@@ -35,6 +35,7 @@ + #include <linux/uuid.h> + #include <linux/nospec.h> + #include <linux/vmalloc.h> ++#include <linux/dmi.h> + #include <linux/delay.h> + + #define IPMI_DRIVER_VERSION "39.2" +@@ -5516,8 +5517,21 @@ static int __init ipmi_init_msghandler_mod(void) + { + int rv; + +- pr_info("version " IPMI_DRIVER_VERSION "\n"); ++#ifdef CONFIG_ARM64 ++ /* RHEL-only ++ * If this is ARM-based HPE m400, return now, because that platform ++ * reports the host-side ipmi address as intel port-io space, which ++ * does not exist in the ARM architecture. ++ */ ++ const char *dmistr = dmi_get_system_info(DMI_PRODUCT_NAME); + ++ if (dmistr && (strcmp("ProLiant m400 Server", dmistr) == 0)) { ++ pr_debug("%s does not support host ipmi\n", dmistr); ++ return -ENOSYS; ++ } ++ /* END RHEL-only */ ++#endif ++ pr_info("version " IPMI_DRIVER_VERSION "\n"); + mutex_lock(&ipmi_interfaces_mutex); + rv = ipmi_register_driver(); + mutex_unlock(&ipmi_interfaces_mutex); +diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile +index c02ff25dd477..d860f8eb9a81 100644 +--- a/drivers/firmware/efi/Makefile ++++ b/drivers/firmware/efi/Makefile +@@ -28,6 +28,7 @@ obj-$(CONFIG_EFI_FAKE_MEMMAP) += fake_map.o + obj-$(CONFIG_EFI_BOOTLOADER_CONTROL) += efibc.o + obj-$(CONFIG_EFI_TEST) += test/ + obj-$(CONFIG_EFI_DEV_PATH_PARSER) += dev-path-parser.o ++obj-$(CONFIG_EFI) += secureboot.o + obj-$(CONFIG_APPLE_PROPERTIES) += apple-properties.o + obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o + obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o +diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c +index 860534bcfdac..96548e72f5df 100644 +--- a/drivers/firmware/efi/efi.c ++++ b/drivers/firmware/efi/efi.c +@@ -31,6 +31,7 @@ + #include <linux/ucs2_string.h> + #include <linux/memblock.h> + #include <linux/security.h> ++#include <linux/bsearch.h> + + #include <asm/early_ioremap.h> + +@@ -862,40 +863,101 @@ int efi_mem_type(unsigned long phys_addr) + } + #endif + ++struct efi_error_code { ++ efi_status_t status; ++ int errno; ++ const char *description; ++}; ++ ++static const struct efi_error_code efi_error_codes[] = { ++ { EFI_SUCCESS, 0, "Success"}, ++#if 0 ++ { EFI_LOAD_ERROR, -EPICK_AN_ERRNO, "Load Error"}, ++#endif ++ { EFI_INVALID_PARAMETER, -EINVAL, "Invalid Parameter"}, ++ { EFI_UNSUPPORTED, -ENOSYS, "Unsupported"}, ++ { EFI_BAD_BUFFER_SIZE, -ENOSPC, "Bad Buffer Size"}, ++ { EFI_BUFFER_TOO_SMALL, -ENOSPC, "Buffer Too Small"}, ++ { EFI_NOT_READY, -EAGAIN, "Not Ready"}, ++ { EFI_DEVICE_ERROR, -EIO, "Device Error"}, ++ { EFI_WRITE_PROTECTED, -EROFS, "Write Protected"}, ++ { EFI_OUT_OF_RESOURCES, -ENOMEM, "Out of Resources"}, ++#if 0 ++ { EFI_VOLUME_CORRUPTED, -EPICK_AN_ERRNO, "Volume Corrupt"}, ++ { EFI_VOLUME_FULL, -EPICK_AN_ERRNO, "Volume Full"}, ++ { EFI_NO_MEDIA, -EPICK_AN_ERRNO, "No Media"}, ++ { EFI_MEDIA_CHANGED, -EPICK_AN_ERRNO, "Media changed"}, ++#endif ++ { EFI_NOT_FOUND, -ENOENT, "Not Found"}, ++#if 0 ++ { EFI_ACCESS_DENIED, -EPICK_AN_ERRNO, "Access Denied"}, ++ { EFI_NO_RESPONSE, -EPICK_AN_ERRNO, "No Response"}, ++ { EFI_NO_MAPPING, -EPICK_AN_ERRNO, "No mapping"}, ++ { EFI_TIMEOUT, -EPICK_AN_ERRNO, "Time out"}, ++ { EFI_NOT_STARTED, -EPICK_AN_ERRNO, "Not started"}, ++ { EFI_ALREADY_STARTED, -EPICK_AN_ERRNO, "Already started"}, ++#endif ++ { EFI_ABORTED, -EINTR, "Aborted"}, ++#if 0 ++ { EFI_ICMP_ERROR, -EPICK_AN_ERRNO, "ICMP Error"}, ++ { EFI_TFTP_ERROR, -EPICK_AN_ERRNO, "TFTP Error"}, ++ { EFI_PROTOCOL_ERROR, -EPICK_AN_ERRNO, "Protocol Error"}, ++ { EFI_INCOMPATIBLE_VERSION, -EPICK_AN_ERRNO, "Incompatible Version"}, ++#endif ++ { EFI_SECURITY_VIOLATION, -EACCES, "Security Policy Violation"}, ++#if 0 ++ { EFI_CRC_ERROR, -EPICK_AN_ERRNO, "CRC Error"}, ++ { EFI_END_OF_MEDIA, -EPICK_AN_ERRNO, "End of Media"}, ++ { EFI_END_OF_FILE, -EPICK_AN_ERRNO, "End of File"}, ++ { EFI_INVALID_LANGUAGE, -EPICK_AN_ERRNO, "Invalid Languages"}, ++ { EFI_COMPROMISED_DATA, -EPICK_AN_ERRNO, "Compromised Data"}, ++ ++ // warnings ++ { EFI_WARN_UNKOWN_GLYPH, -EPICK_AN_ERRNO, "Warning Unknown Glyph"}, ++ { EFI_WARN_DELETE_FAILURE, -EPICK_AN_ERRNO, "Warning Delete Failure"}, ++ { EFI_WARN_WRITE_FAILURE, -EPICK_AN_ERRNO, "Warning Write Failure"}, ++ { EFI_WARN_BUFFER_TOO_SMALL, -EPICK_AN_ERRNO, "Warning Buffer Too Small"}, ++#endif ++}; ++ ++static int ++efi_status_cmp_bsearch(const void *key, const void *item) ++{ ++ u64 status = (u64)(uintptr_t)key; ++ struct efi_error_code *code = (struct efi_error_code *)item; ++ ++ if (status < code->status) ++ return -1; ++ if (status > code->status) ++ return 1; ++ return 0; ++} ++ + int efi_status_to_err(efi_status_t status) + { +- int err; +- +- switch (status) { +- case EFI_SUCCESS: +- err = 0; +- break; +- case EFI_INVALID_PARAMETER: +- err = -EINVAL; +- break; +- case EFI_OUT_OF_RESOURCES: +- err = -ENOSPC; +- break; +- case EFI_DEVICE_ERROR: +- err = -EIO; +- break; +- case EFI_WRITE_PROTECTED: +- err = -EROFS; +- break; +- case EFI_SECURITY_VIOLATION: +- err = -EACCES; +- break; +- case EFI_NOT_FOUND: +- err = -ENOENT; +- break; +- case EFI_ABORTED: +- err = -EINTR; +- break; +- default: +- err = -EINVAL; +- } ++ struct efi_error_code *found; ++ size_t num = sizeof(efi_error_codes) / sizeof(struct efi_error_code); + +- return err; ++ found = bsearch((void *)(uintptr_t)status, efi_error_codes, ++ sizeof(struct efi_error_code), num, ++ efi_status_cmp_bsearch); ++ if (!found) ++ return -EINVAL; ++ return found->errno; ++} ++ ++const char * ++efi_status_to_str(efi_status_t status) ++{ ++ struct efi_error_code *found; ++ size_t num = sizeof(efi_error_codes) / sizeof(struct efi_error_code); ++ ++ found = bsearch((void *)(uintptr_t)status, efi_error_codes, ++ sizeof(struct efi_error_code), num, ++ efi_status_cmp_bsearch); ++ if (!found) ++ return "Unknown error code"; ++ return found->description; + } + + static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); +diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c +new file mode 100644 +index 000000000000..de0a3714a5d4 +--- /dev/null ++++ b/drivers/firmware/efi/secureboot.c +@@ -0,0 +1,38 @@ ++/* Core kernel secure boot support. ++ * ++ * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved. ++ * Written by David Howells (dhowells@redhat.com) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public Licence ++ * as published by the Free Software Foundation; either version ++ * 2 of the Licence, or (at your option) any later version. ++ */ ++ ++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ++ ++#include <linux/efi.h> ++#include <linux/kernel.h> ++#include <linux/printk.h> ++ ++/* ++ * Decide what to do when UEFI secure boot mode is enabled. ++ */ ++void __init efi_set_secure_boot(enum efi_secureboot_mode mode) ++{ ++ if (efi_enabled(EFI_BOOT)) { ++ switch (mode) { ++ case efi_secureboot_mode_disabled: ++ pr_info("Secure boot disabled\n"); ++ break; ++ case efi_secureboot_mode_enabled: ++ set_bit(EFI_SECURE_BOOT, &efi.flags); ++ pr_info("Secure boot enabled\n"); ++ break; ++ default: ++ pr_warn("Secure boot could not be determined (mode %u)\n", ++ mode); ++ break; ++ } ++ } ++} +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 1f276f108cc9..7039ad9bdf7f 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include <linux/screen_info.h> + #include <linux/sysfb.h> + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -83,7 +99,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; +diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c +index 51fcf1298023..7f1097947731 100644 +--- a/drivers/gpu/drm/drm_ioctl.c ++++ b/drivers/gpu/drm/drm_ioctl.c +@@ -472,7 +472,13 @@ EXPORT_SYMBOL(drm_invalid_op); + */ + static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value) + { +- int len; ++ size_t len; ++ ++ /* don't attempt to copy a NULL pointer */ ++ if (WARN_ONCE(!value, "BUG: the value to copy was not set!")) { ++ *buf_len = 0; ++ return 0; ++ } + + /* don't overflow userbuf */ + len = strlen(value); +diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig +index e973ec487484..ce62c5908e1d 100644 +--- a/drivers/gpu/drm/v3d/Kconfig ++++ b/drivers/gpu/drm/v3d/Kconfig +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0-only + config DRM_V3D + tristate "Broadcom V3D 3.x and newer" +- depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST ++ depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST + depends on DRM + depends on COMMON_CLK + depends on MMU +@@ -9,4 +9,5 @@ config DRM_V3D + select DRM_GEM_SHMEM_HELPER + help + Choose this option if you have a system that has a Broadcom +- V3D 3.x or newer GPU, such as BCM7268. ++ V3D 3.x or newer GPUs. SoCs supported include the BCM2711, ++ BCM7268 and BCM7278. +diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c +index 29fd13109e43..efbde124c296 100644 +--- a/drivers/gpu/drm/v3d/v3d_debugfs.c ++++ b/drivers/gpu/drm/v3d/v3d_debugfs.c +@@ -4,7 +4,6 @@ + #include <linux/circ_buf.h> + #include <linux/ctype.h> + #include <linux/debugfs.h> +-#include <linux/pm_runtime.h> + #include <linux/seq_file.h> + #include <linux/string_helpers.h> + +@@ -131,11 +130,7 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) + struct drm_device *dev = node->minor->dev; + struct v3d_dev *v3d = to_v3d_dev(dev); + u32 ident0, ident1, ident2, ident3, cores; +- int ret, core; +- +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- return ret; ++ int core; + + ident0 = V3D_READ(V3D_HUB_IDENT0); + ident1 = V3D_READ(V3D_HUB_IDENT1); +@@ -188,9 +183,6 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) + (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0); + } + +- pm_runtime_mark_last_busy(v3d->drm.dev); +- pm_runtime_put_autosuspend(v3d->drm.dev); +- + return 0; + } + +@@ -218,11 +210,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) + uint32_t cycles; + int core = 0; + int measure_ms = 1000; +- int ret; +- +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- return ret; + + if (v3d->ver >= 40) { + V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3, +@@ -246,9 +233,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) + cycles / (measure_ms * 1000), + (cycles / (measure_ms * 100)) % 10); + +- pm_runtime_mark_last_busy(v3d->drm.dev); +- pm_runtime_put_autosuspend(v3d->drm.dev); +- + return 0; + } + +diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c +index 1afcd54fbbd5..8c7f910daa28 100644 +--- a/drivers/gpu/drm/v3d/v3d_drv.c ++++ b/drivers/gpu/drm/v3d/v3d_drv.c +@@ -19,7 +19,6 @@ + #include <linux/module.h> + #include <linux/of_platform.h> + #include <linux/platform_device.h> +-#include <linux/pm_runtime.h> + #include <linux/reset.h> + + #include <drm/drm_drv.h> +@@ -43,7 +42,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, + { + struct v3d_dev *v3d = to_v3d_dev(dev); + struct drm_v3d_get_param *args = data; +- int ret; + static const u32 reg_map[] = { + [DRM_V3D_PARAM_V3D_UIFCFG] = V3D_HUB_UIFCFG, + [DRM_V3D_PARAM_V3D_HUB_IDENT1] = V3D_HUB_IDENT1, +@@ -69,17 +67,12 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, + if (args->value != 0) + return -EINVAL; + +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- return ret; + if (args->param >= DRM_V3D_PARAM_V3D_CORE0_IDENT0 && + args->param <= DRM_V3D_PARAM_V3D_CORE0_IDENT2) { + args->value = V3D_CORE_READ(0, offset); + } else { + args->value = V3D_READ(offset); + } +- pm_runtime_mark_last_busy(v3d->drm.dev); +- pm_runtime_put_autosuspend(v3d->drm.dev); + return 0; + } + +@@ -198,6 +191,7 @@ static const struct drm_driver v3d_drm_driver = { + }; + + static const struct of_device_id v3d_of_match[] = { ++ { .compatible = "brcm,2711-v3d" }, + { .compatible = "brcm,7268-v3d" }, + { .compatible = "brcm,7278-v3d" }, + {}, +@@ -280,10 +274,6 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) + return -ENOMEM; + } + +- pm_runtime_use_autosuspend(dev); +- pm_runtime_set_autosuspend_delay(dev, 50); +- pm_runtime_enable(dev); +- + ret = v3d_gem_init(drm); + if (ret) + goto dma_free; +diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c +index 2352e9640922..725a252e837b 100644 +--- a/drivers/gpu/drm/v3d/v3d_gem.c ++++ b/drivers/gpu/drm/v3d/v3d_gem.c +@@ -6,7 +6,6 @@ + #include <linux/io.h> + #include <linux/module.h> + #include <linux/platform_device.h> +-#include <linux/pm_runtime.h> + #include <linux/reset.h> + #include <linux/sched/signal.h> + #include <linux/uaccess.h> +@@ -372,9 +371,6 @@ v3d_job_free(struct kref *ref) + dma_fence_put(job->irq_fence); + dma_fence_put(job->done_fence); + +- pm_runtime_mark_last_busy(job->v3d->drm.dev); +- pm_runtime_put_autosuspend(job->v3d->drm.dev); +- + if (job->perfmon) + v3d_perfmon_put(job->perfmon); + +@@ -476,14 +472,10 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, + job->v3d = v3d; + job->free = free; + +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- goto fail; +- + ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue], + v3d_priv); + if (ret) +- goto fail_job; ++ goto fail; + + if (has_multisync) { + if (se->in_sync_count && se->wait_stage == queue) { +@@ -514,8 +506,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, + + fail_deps: + drm_sched_job_cleanup(&job->base); +-fail_job: +- pm_runtime_put_autosuspend(v3d->drm.dev); + fail: + kfree(*container); + *container = NULL; +diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c +index 311eee599ce9..2460c6bd46f8 100644 +--- a/drivers/hid/hid-rmi.c ++++ b/drivers/hid/hid-rmi.c +@@ -322,19 +322,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) + { + struct rmi_data *hdata = hid_get_drvdata(hdev); + struct rmi_device *rmi_dev = hdata->xport.rmi_dev; +- unsigned long flags; + + if (!(test_bit(RMI_STARTED, &hdata->flags))) + return 0; + +- local_irq_save(flags); +- + rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2); + +- generic_handle_irq(hdata->rmi_irq); +- +- local_irq_restore(flags); +- + return 1; + } + +@@ -591,56 +584,6 @@ static const struct rmi_transport_ops hid_rmi_ops = { + .reset = rmi_hid_reset, + }; + +-static void rmi_irq_teardown(void *data) +-{ +- struct rmi_data *hdata = data; +- struct irq_domain *domain = hdata->domain; +- +- if (!domain) +- return; +- +- irq_dispose_mapping(irq_find_mapping(domain, 0)); +- +- irq_domain_remove(domain); +- hdata->domain = NULL; +- hdata->rmi_irq = 0; +-} +- +-static int rmi_irq_map(struct irq_domain *h, unsigned int virq, +- irq_hw_number_t hw_irq_num) +-{ +- irq_set_chip_and_handler(virq, &dummy_irq_chip, handle_simple_irq); +- +- return 0; +-} +- +-static const struct irq_domain_ops rmi_irq_ops = { +- .map = rmi_irq_map, +-}; +- +-static int rmi_setup_irq_domain(struct hid_device *hdev) +-{ +- struct rmi_data *hdata = hid_get_drvdata(hdev); +- int ret; +- +- hdata->domain = irq_domain_create_linear(hdev->dev.fwnode, 1, +- &rmi_irq_ops, hdata); +- if (!hdata->domain) +- return -ENOMEM; +- +- ret = devm_add_action_or_reset(&hdev->dev, &rmi_irq_teardown, hdata); +- if (ret) +- return ret; +- +- hdata->rmi_irq = irq_create_mapping(hdata->domain, 0); +- if (hdata->rmi_irq <= 0) { +- hid_err(hdev, "Can't allocate an IRQ\n"); +- return hdata->rmi_irq < 0 ? hdata->rmi_irq : -ENXIO; +- } +- +- return 0; +-} +- + static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) + { + struct rmi_data *data = NULL; +@@ -713,18 +656,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) + + mutex_init(&data->page_mutex); + +- ret = rmi_setup_irq_domain(hdev); +- if (ret) { +- hid_err(hdev, "failed to allocate IRQ domain\n"); +- return ret; +- } +- + if (data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS) + rmi_hid_pdata.gpio_data.disable = true; + + data->xport.dev = hdev->dev.parent; + data->xport.pdata = rmi_hid_pdata; +- data->xport.pdata.irq = data->rmi_irq; + data->xport.proto_name = "hid"; + data->xport.ops = &hid_rmi_ops; + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index 87299e99dabb..d37b689ad1bf 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -9,6 +9,7 @@ + #include <linux/init.h> + #include <linux/types.h> + #include <linux/device.h> ++#include <linux/dmi.h> + #include <linux/io.h> + #include <linux/err.h> + #include <linux/fs.h> +@@ -2123,6 +2124,16 @@ static const struct amba_id etm4_ids[] = { + {}, + }; + ++static const struct dmi_system_id broken_coresight[] = { ++ { ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "HPE"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Apollo 70"), ++ }, ++ }, ++ { } /* terminating entry */ ++}; ++ + MODULE_DEVICE_TABLE(amba, etm4_ids); + + static struct amba_driver etm4x_amba_driver = { +@@ -2156,6 +2167,11 @@ static int __init etm4x_init(void) + { + int ret; + ++ if (dmi_check_system(broken_coresight)) { ++ pr_info("ETM4 disabled due to firmware bug\n"); ++ return 0; ++ } ++ + ret = etm4_pm_setup(); + + /* etm4_pm_setup() does its own cleanup - exit on error */ +@@ -2182,6 +2198,9 @@ static int __init etm4x_init(void) + + static void __exit etm4x_exit(void) + { ++ if (dmi_check_system(broken_coresight)) ++ return; ++ + amba_driver_unregister(&etm4x_amba_driver); + platform_driver_unregister(&etm4_platform_driver); + etm4_pm_clear(); +diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c +index 258d5fe3d395..f7298e3dc8f3 100644 +--- a/drivers/input/rmi4/rmi_driver.c ++++ b/drivers/input/rmi4/rmi_driver.c +@@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, + attn_data.data = fifo_data; + + kfifo_put(&drvdata->attn_fifo, attn_data); ++ ++ schedule_work(&drvdata->attn_work); + } + EXPORT_SYMBOL_GPL(rmi_set_attn_data); + +-static irqreturn_t rmi_irq_fn(int irq, void *dev_id) ++static void attn_callback(struct work_struct *work) + { +- struct rmi_device *rmi_dev = dev_id; +- struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev); ++ struct rmi_driver_data *drvdata = container_of(work, ++ struct rmi_driver_data, ++ attn_work); + struct rmi4_attn_data attn_data = {0}; + int ret, count; + + count = kfifo_get(&drvdata->attn_fifo, &attn_data); +- if (count) { +- *(drvdata->irq_status) = attn_data.irq_status; +- drvdata->attn_data = attn_data; +- } ++ if (!count) ++ return; + +- ret = rmi_process_interrupt_requests(rmi_dev); ++ *(drvdata->irq_status) = attn_data.irq_status; ++ drvdata->attn_data = attn_data; ++ ++ ret = rmi_process_interrupt_requests(drvdata->rmi_dev); + if (ret) +- rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, ++ rmi_dbg(RMI_DEBUG_CORE, &drvdata->rmi_dev->dev, + "Failed to process interrupt request: %d\n", ret); + +- if (count) { +- kfree(attn_data.data); +- drvdata->attn_data.data = NULL; +- } ++ kfree(attn_data.data); ++ drvdata->attn_data.data = NULL; + + if (!kfifo_is_empty(&drvdata->attn_fifo)) +- return rmi_irq_fn(irq, dev_id); ++ schedule_work(&drvdata->attn_work); ++} ++ ++static irqreturn_t rmi_irq_fn(int irq, void *dev_id) ++{ ++ struct rmi_device *rmi_dev = dev_id; ++ int ret; ++ ++ ret = rmi_process_interrupt_requests(rmi_dev); ++ if (ret) ++ rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, ++ "Failed to process interrupt request: %d\n", ret); + + return IRQ_HANDLED; + } +@@ -217,7 +230,6 @@ static irqreturn_t rmi_irq_fn(int irq, void *dev_id) + static int rmi_irq_init(struct rmi_device *rmi_dev) + { + struct rmi_device_platform_data *pdata = rmi_get_platform_data(rmi_dev); +- struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev); + int irq_flags = irq_get_trigger_type(pdata->irq); + int ret; + +@@ -235,8 +247,6 @@ static int rmi_irq_init(struct rmi_device *rmi_dev) + return ret; + } + +- data->enabled = true; +- + return 0; + } + +@@ -886,23 +896,27 @@ void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake) + if (data->enabled) + goto out; + +- enable_irq(irq); +- data->enabled = true; +- if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) { +- retval = disable_irq_wake(irq); +- if (retval) +- dev_warn(&rmi_dev->dev, +- "Failed to disable irq for wake: %d\n", +- retval); +- } ++ if (irq) { ++ enable_irq(irq); ++ data->enabled = true; ++ if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) { ++ retval = disable_irq_wake(irq); ++ if (retval) ++ dev_warn(&rmi_dev->dev, ++ "Failed to disable irq for wake: %d\n", ++ retval); ++ } + +- /* +- * Call rmi_process_interrupt_requests() after enabling irq, +- * otherwise we may lose interrupt on edge-triggered systems. +- */ +- irq_flags = irq_get_trigger_type(pdata->irq); +- if (irq_flags & IRQ_TYPE_EDGE_BOTH) +- rmi_process_interrupt_requests(rmi_dev); ++ /* ++ * Call rmi_process_interrupt_requests() after enabling irq, ++ * otherwise we may lose interrupt on edge-triggered systems. ++ */ ++ irq_flags = irq_get_trigger_type(pdata->irq); ++ if (irq_flags & IRQ_TYPE_EDGE_BOTH) ++ rmi_process_interrupt_requests(rmi_dev); ++ } else { ++ data->enabled = true; ++ } + + out: + mutex_unlock(&data->enabled_mutex); +@@ -922,20 +936,22 @@ void rmi_disable_irq(struct rmi_device *rmi_dev, bool enable_wake) + goto out; + + data->enabled = false; +- disable_irq(irq); +- if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) { +- retval = enable_irq_wake(irq); +- if (retval) +- dev_warn(&rmi_dev->dev, +- "Failed to enable irq for wake: %d\n", +- retval); +- } +- +- /* make sure the fifo is clean */ +- while (!kfifo_is_empty(&data->attn_fifo)) { +- count = kfifo_get(&data->attn_fifo, &attn_data); +- if (count) +- kfree(attn_data.data); ++ if (irq) { ++ disable_irq(irq); ++ if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) { ++ retval = enable_irq_wake(irq); ++ if (retval) ++ dev_warn(&rmi_dev->dev, ++ "Failed to enable irq for wake: %d\n", ++ retval); ++ } ++ } else { ++ /* make sure the fifo is clean */ ++ while (!kfifo_is_empty(&data->attn_fifo)) { ++ count = kfifo_get(&data->attn_fifo, &attn_data); ++ if (count) ++ kfree(attn_data.data); ++ } + } + + out: +@@ -981,6 +997,8 @@ static int rmi_driver_remove(struct device *dev) + irq_domain_remove(data->irqdomain); + data->irqdomain = NULL; + ++ cancel_work_sync(&data->attn_work); ++ + rmi_f34_remove_sysfs(rmi_dev); + rmi_free_function_list(rmi_dev); + +@@ -1219,9 +1237,15 @@ static int rmi_driver_probe(struct device *dev) + } + } + +- retval = rmi_irq_init(rmi_dev); +- if (retval < 0) +- goto err_destroy_functions; ++ if (pdata->irq) { ++ retval = rmi_irq_init(rmi_dev); ++ if (retval < 0) ++ goto err_destroy_functions; ++ } ++ ++ data->enabled = true; ++ ++ INIT_WORK(&data->attn_work, attn_callback); + + if (data->f01_container->dev.driver) { + /* Driver already bound, so enable ATTN now. */ +diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c +index 847ad47a2dfd..e5e545c80de7 100644 +--- a/drivers/iommu/iommu.c ++++ b/drivers/iommu/iommu.c +@@ -7,6 +7,7 @@ + #define pr_fmt(fmt) "iommu: " fmt + + #include <linux/device.h> ++#include <linux/dmi.h> + #include <linux/dma-iommu.h> + #include <linux/kernel.h> + #include <linux/bits.h> +@@ -2856,6 +2857,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) + } + EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); + ++#ifdef CONFIG_ARM64 ++static int __init iommu_quirks(void) ++{ ++ const char *vendor, *name; ++ ++ vendor = dmi_get_system_info(DMI_SYS_VENDOR); ++ name = dmi_get_system_info(DMI_PRODUCT_NAME); ++ ++ if (vendor && ++ (strncmp(vendor, "GIGABYTE", 8) == 0 && name && ++ (strncmp(name, "R120", 4) == 0 || ++ strncmp(name, "R270", 4) == 0))) { ++ pr_warn("Gigabyte %s detected, force iommu passthrough mode", name); ++ iommu_def_domain_type = IOMMU_DOMAIN_IDENTITY; ++ } ++ ++ return 0; ++} ++arch_initcall(iommu_quirks); ++#endif ++ + /* + * Changes the default domain of an iommu group that has *only* one device + * +diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c +index 42fe67f1538e..49cd1f03884a 100644 +--- a/drivers/mfd/bcm2835-pm.c ++++ b/drivers/mfd/bcm2835-pm.c +@@ -25,9 +25,52 @@ static const struct mfd_cell bcm2835_power_devs[] = { + { .name = "bcm2835-power" }, + }; + ++static int bcm2835_pm_get_pdata(struct platform_device *pdev, ++ struct bcm2835_pm *pm) ++{ ++ if (of_find_property(pm->dev->of_node, "reg-names", NULL)) { ++ struct resource *res; ++ ++ pm->base = devm_platform_ioremap_resource_byname(pdev, "pm"); ++ if (IS_ERR(pm->base)) ++ return PTR_ERR(pm->base); ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "asb"); ++ if (res) { ++ pm->asb = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(pm->asb)) ++ pm->asb = NULL; ++ } ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, ++ "rpivid_asb"); ++ if (res) { ++ pm->rpivid_asb = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(pm->rpivid_asb)) ++ pm->rpivid_asb = NULL; ++ } ++ ++ return 0; ++ } ++ ++ /* If no 'reg-names' property is found we can assume we're using old DTB. */ ++ pm->base = devm_platform_ioremap_resource(pdev, 0); ++ if (IS_ERR(pm->base)) ++ return PTR_ERR(pm->base); ++ ++ pm->asb = devm_platform_ioremap_resource(pdev, 1); ++ if (IS_ERR(pm->asb)) ++ pm->asb = NULL; ++ ++ pm->rpivid_asb = devm_platform_ioremap_resource(pdev, 2); ++ if (IS_ERR(pm->rpivid_asb)) ++ pm->rpivid_asb = NULL; ++ ++ return 0; ++} ++ + static int bcm2835_pm_probe(struct platform_device *pdev) + { +- struct resource *res; + struct device *dev = &pdev->dev; + struct bcm2835_pm *pm; + int ret; +@@ -39,10 +82,9 @@ static int bcm2835_pm_probe(struct platform_device *pdev) + + pm->dev = dev; + +- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- pm->base = devm_ioremap_resource(dev, res); +- if (IS_ERR(pm->base)) +- return PTR_ERR(pm->base); ++ ret = bcm2835_pm_get_pdata(pdev, pm); ++ if (ret) ++ return ret; + + ret = devm_mfd_add_devices(dev, -1, + bcm2835_pm_devs, ARRAY_SIZE(bcm2835_pm_devs), +@@ -50,30 +92,22 @@ static int bcm2835_pm_probe(struct platform_device *pdev) + if (ret) + return ret; + +- /* We'll use the presence of the AXI ASB regs in the ++ /* ++ * We'll use the presence of the AXI ASB regs in the + * bcm2835-pm binding as the key for whether we can reference + * the full PM register range and support power domains. + */ +- res = platform_get_resource(pdev, IORESOURCE_MEM, 1); +- if (res) { +- pm->asb = devm_ioremap_resource(dev, res); +- if (IS_ERR(pm->asb)) +- return PTR_ERR(pm->asb); +- +- ret = devm_mfd_add_devices(dev, -1, +- bcm2835_power_devs, +- ARRAY_SIZE(bcm2835_power_devs), +- NULL, 0, NULL); +- if (ret) +- return ret; +- } +- ++ if (pm->asb) ++ return devm_mfd_add_devices(dev, -1, bcm2835_power_devs, ++ ARRAY_SIZE(bcm2835_power_devs), ++ NULL, 0, NULL); + return 0; + } + + static const struct of_device_id bcm2835_pm_of_match[] = { + { .compatible = "brcm,bcm2835-pm-wdt", }, + { .compatible = "brcm,bcm2835-pm", }, ++ { .compatible = "brcm,bcm2711-pm", }, + {}, + }; + MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match); +diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig +index 9fee639ee5c8..4bb231013009 100644 +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -104,6 +104,8 @@ config AX88796B_PHY + config BROADCOM_PHY + tristate "Broadcom 54XX PHYs" + select BCM_NET_PHYLIB ++ select BCM_NET_PHYPTP if NETWORK_PHY_TIMESTAMPING ++ depends on PTP_1588_CLOCK_OPTIONAL + help + Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464, + BCM5481, BCM54810 and BCM5482 PHYs. +@@ -160,6 +162,9 @@ config BCM_CYGNUS_PHY + config BCM_NET_PHYLIB + tristate + ++config BCM_NET_PHYPTP ++ tristate ++ + config CICADA_PHY + tristate "Cicada PHYs" + help +diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile +index b12b1d86fc99..f7138d3c896b 100644 +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -47,6 +47,7 @@ obj-$(CONFIG_BCM84881_PHY) += bcm84881.o + obj-$(CONFIG_BCM87XX_PHY) += bcm87xx.o + obj-$(CONFIG_BCM_CYGNUS_PHY) += bcm-cygnus.o + obj-$(CONFIG_BCM_NET_PHYLIB) += bcm-phy-lib.o ++obj-$(CONFIG_BCM_NET_PHYPTP) += bcm-phy-ptp.o + obj-$(CONFIG_BROADCOM_PHY) += broadcom.o + obj-$(CONFIG_CICADA_PHY) += cicada.o + obj-$(CONFIG_CORTINA_PHY) += cortina.o +diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h +index c3842f87c33b..9902fb182099 100644 +--- a/drivers/net/phy/bcm-phy-lib.h ++++ b/drivers/net/phy/bcm-phy-lib.h +@@ -87,4 +87,23 @@ int bcm_phy_cable_test_start_rdb(struct phy_device *phydev); + int bcm_phy_cable_test_start(struct phy_device *phydev); + int bcm_phy_cable_test_get_status(struct phy_device *phydev, bool *finished); + ++#if IS_ENABLED(CONFIG_BCM_NET_PHYPTP) ++struct bcm_ptp_private *bcm_ptp_probe(struct phy_device *phydev); ++void bcm_ptp_config_init(struct phy_device *phydev); ++void bcm_ptp_stop(struct bcm_ptp_private *priv); ++#else ++static inline struct bcm_ptp_private *bcm_ptp_probe(struct phy_device *phydev) ++{ ++ return NULL; ++} ++ ++static inline void bcm_ptp_config_init(struct phy_device *phydev) ++{ ++} ++ ++static inline void bcm_ptp_stop(struct bcm_ptp_private *priv) ++{ ++} ++#endif ++ + #endif /* _LINUX_BCM_PHY_LIB_H */ +diff --git a/drivers/net/phy/bcm-phy-ptp.c b/drivers/net/phy/bcm-phy-ptp.c +new file mode 100644 +index 000000000000..ef00d6163061 +--- /dev/null ++++ b/drivers/net/phy/bcm-phy-ptp.c +@@ -0,0 +1,944 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2022 Meta Platforms Inc. ++ * Copyright (C) 2022 Jonathan Lemon <jonathan.lemon@gmail.com> ++ */ ++ ++#include <asm/unaligned.h> ++#include <linux/mii.h> ++#include <linux/phy.h> ++#include <linux/ptp_classify.h> ++#include <linux/ptp_clock_kernel.h> ++#include <linux/net_tstamp.h> ++#include <linux/netdevice.h> ++#include <linux/workqueue.h> ++ ++#include "bcm-phy-lib.h" ++ ++/* IEEE 1588 Expansion registers */ ++#define SLICE_CTRL 0x0810 ++#define SLICE_TX_EN BIT(0) ++#define SLICE_RX_EN BIT(8) ++#define TX_EVENT_MODE 0x0811 ++#define MODE_TX_UPDATE_CF BIT(0) ++#define MODE_TX_REPLACE_TS_CF BIT(1) ++#define MODE_TX_REPLACE_TS GENMASK(1, 0) ++#define RX_EVENT_MODE 0x0819 ++#define MODE_RX_UPDATE_CF BIT(0) ++#define MODE_RX_INSERT_TS_48 BIT(1) ++#define MODE_RX_INSERT_TS_64 GENMASK(1, 0) ++ ++#define MODE_EVT_SHIFT_SYNC 0 ++#define MODE_EVT_SHIFT_DELAY_REQ 2 ++#define MODE_EVT_SHIFT_PDELAY_REQ 4 ++#define MODE_EVT_SHIFT_PDELAY_RESP 6 ++ ++#define MODE_SEL_SHIFT_PORT 0 ++#define MODE_SEL_SHIFT_CPU 8 ++ ++#define RX_MODE_SEL(sel, evt, act) \ ++ (((MODE_RX_##act) << (MODE_EVT_SHIFT_##evt)) << (MODE_SEL_SHIFT_##sel)) ++ ++#define TX_MODE_SEL(sel, evt, act) \ ++ (((MODE_TX_##act) << (MODE_EVT_SHIFT_##evt)) << (MODE_SEL_SHIFT_##sel)) ++ ++/* needs global TS capture first */ ++#define TX_TS_CAPTURE 0x0821 ++#define TX_TS_CAP_EN BIT(0) ++#define RX_TS_CAPTURE 0x0822 ++#define RX_TS_CAP_EN BIT(0) ++ ++#define TIME_CODE_0 0x0854 ++#define TIME_CODE_1 0x0855 ++#define TIME_CODE_2 0x0856 ++#define TIME_CODE_3 0x0857 ++#define TIME_CODE_4 0x0858 ++ ++#define DPLL_SELECT 0x085b ++#define DPLL_HB_MODE2 BIT(6) ++ ++#define SHADOW_CTRL 0x085c ++#define SHADOW_LOAD 0x085d ++#define TIME_CODE_LOAD BIT(10) ++#define SYNC_OUT_LOAD BIT(9) ++#define NCO_TIME_LOAD BIT(7) ++#define FREQ_LOAD BIT(6) ++#define INTR_MASK 0x085e ++#define INTR_STATUS 0x085f ++#define INTC_FSYNC BIT(0) ++#define INTC_SOP BIT(1) ++ ++#define NCO_FREQ_LSB 0x0873 ++#define NCO_FREQ_MSB 0x0874 ++ ++#define NCO_TIME_0 0x0875 ++#define NCO_TIME_1 0x0876 ++#define NCO_TIME_2_CTRL 0x0877 ++#define FREQ_MDIO_SEL BIT(14) ++ ++#define SYNC_OUT_0 0x0878 ++#define SYNC_OUT_1 0x0879 ++#define SYNC_OUT_2 0x087a ++ ++#define SYNC_IN_DIVIDER 0x087b ++ ++#define SYNOUT_TS_0 0x087c ++#define SYNOUT_TS_1 0x087d ++#define SYNOUT_TS_2 0x087e ++ ++#define NSE_CTRL 0x087f ++#define NSE_GMODE_EN GENMASK(15, 14) ++#define NSE_CAPTURE_EN BIT(13) ++#define NSE_INIT BIT(12) ++#define NSE_CPU_FRAMESYNC BIT(5) ++#define NSE_SYNC1_FRAMESYNC BIT(3) ++#define NSE_FRAMESYNC_MASK GENMASK(5, 2) ++#define NSE_PEROUT_EN BIT(1) ++#define NSE_ONESHOT_EN BIT(0) ++#define NSE_SYNC_OUT_MASK GENMASK(1, 0) ++ ++#define TS_READ_CTRL 0x0885 ++#define TS_READ_START BIT(0) ++#define TS_READ_END BIT(1) ++ ++#define HB_REG_0 0x0886 ++#define HB_REG_1 0x0887 ++#define HB_REG_2 0x0888 ++#define HB_REG_3 0x08ec ++#define HB_REG_4 0x08ed ++#define HB_STAT_CTRL 0x088e ++#define HB_READ_START BIT(10) ++#define HB_READ_END BIT(11) ++#define HB_READ_MASK GENMASK(11, 10) ++ ++#define TS_REG_0 0x0889 ++#define TS_REG_1 0x088a ++#define TS_REG_2 0x088b ++#define TS_REG_3 0x08c4 ++ ++#define TS_INFO_0 0x088c ++#define TS_INFO_1 0x088d ++ ++#define TIMECODE_CTRL 0x08c3 ++#define TX_TIMECODE_SEL GENMASK(7, 0) ++#define RX_TIMECODE_SEL GENMASK(15, 8) ++ ++#define TIME_SYNC 0x0ff5 ++#define TIME_SYNC_EN BIT(0) ++ ++struct bcm_ptp_private { ++ struct phy_device *phydev; ++ struct mii_timestamper mii_ts; ++ struct ptp_clock *ptp_clock; ++ struct ptp_clock_info ptp_info; ++ struct ptp_pin_desc pin; ++ struct mutex mutex; ++ struct sk_buff_head tx_queue; ++ int tx_type; ++ bool hwts_rx; ++ u16 nse_ctrl; ++ bool pin_active; ++ struct delayed_work pin_work; ++}; ++ ++struct bcm_ptp_skb_cb { ++ unsigned long timeout; ++ u16 seq_id; ++ u8 msgtype; ++ bool discard; ++}; ++ ++struct bcm_ptp_capture { ++ ktime_t hwtstamp; ++ u16 seq_id; ++ u8 msgtype; ++ bool tx_dir; ++}; ++ ++#define BCM_SKB_CB(skb) ((struct bcm_ptp_skb_cb *)(skb)->cb) ++#define SKB_TS_TIMEOUT 10 /* jiffies */ ++ ++#define BCM_MAX_PULSE_8NS ((1U << 9) - 1) ++#define BCM_MAX_PERIOD_8NS ((1U << 30) - 1) ++ ++#define BRCM_PHY_MODEL(phydev) \ ++ ((phydev)->drv->phy_id & (phydev)->drv->phy_id_mask) ++ ++static struct bcm_ptp_private *mii2priv(struct mii_timestamper *mii_ts) ++{ ++ return container_of(mii_ts, struct bcm_ptp_private, mii_ts); ++} ++ ++static struct bcm_ptp_private *ptp2priv(struct ptp_clock_info *info) ++{ ++ return container_of(info, struct bcm_ptp_private, ptp_info); ++} ++ ++static void bcm_ptp_get_framesync_ts(struct phy_device *phydev, ++ struct timespec64 *ts) ++{ ++ u16 hb[4]; ++ ++ bcm_phy_write_exp(phydev, HB_STAT_CTRL, HB_READ_START); ++ ++ hb[0] = bcm_phy_read_exp(phydev, HB_REG_0); ++ hb[1] = bcm_phy_read_exp(phydev, HB_REG_1); ++ hb[2] = bcm_phy_read_exp(phydev, HB_REG_2); ++ hb[3] = bcm_phy_read_exp(phydev, HB_REG_3); ++ ++ bcm_phy_write_exp(phydev, HB_STAT_CTRL, HB_READ_END); ++ bcm_phy_write_exp(phydev, HB_STAT_CTRL, 0); ++ ++ ts->tv_sec = (hb[3] << 16) | hb[2]; ++ ts->tv_nsec = (hb[1] << 16) | hb[0]; ++} ++ ++static u16 bcm_ptp_framesync_disable(struct phy_device *phydev, u16 orig_ctrl) ++{ ++ u16 ctrl = orig_ctrl & ~(NSE_FRAMESYNC_MASK | NSE_CAPTURE_EN); ++ ++ bcm_phy_write_exp(phydev, NSE_CTRL, ctrl); ++ ++ return ctrl; ++} ++ ++static void bcm_ptp_framesync_restore(struct phy_device *phydev, u16 orig_ctrl) ++{ ++ if (orig_ctrl & NSE_FRAMESYNC_MASK) ++ bcm_phy_write_exp(phydev, NSE_CTRL, orig_ctrl); ++} ++ ++static void bcm_ptp_framesync(struct phy_device *phydev, u16 ctrl) ++{ ++ /* trigger framesync - must have 0->1 transition. */ ++ bcm_phy_write_exp(phydev, NSE_CTRL, ctrl | NSE_CPU_FRAMESYNC); ++} ++ ++static int bcm_ptp_framesync_ts(struct phy_device *phydev, ++ struct ptp_system_timestamp *sts, ++ struct timespec64 *ts, ++ u16 orig_ctrl) ++{ ++ u16 ctrl, reg; ++ int i; ++ ++ ctrl = bcm_ptp_framesync_disable(phydev, orig_ctrl); ++ ++ ptp_read_system_prets(sts); ++ ++ /* trigger framesync + capture */ ++ bcm_ptp_framesync(phydev, ctrl | NSE_CAPTURE_EN); ++ ++ ptp_read_system_postts(sts); ++ ++ /* poll for FSYNC interrupt from TS capture */ ++ for (i = 0; i < 10; i++) { ++ reg = bcm_phy_read_exp(phydev, INTR_STATUS); ++ if (reg & INTC_FSYNC) { ++ bcm_ptp_get_framesync_ts(phydev, ts); ++ break; ++ } ++ } ++ ++ bcm_ptp_framesync_restore(phydev, orig_ctrl); ++ ++ return reg & INTC_FSYNC ? 0 : -ETIMEDOUT; ++} ++ ++static int bcm_ptp_gettimex(struct ptp_clock_info *info, ++ struct timespec64 *ts, ++ struct ptp_system_timestamp *sts) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err; ++ ++ mutex_lock(&priv->mutex); ++ err = bcm_ptp_framesync_ts(priv->phydev, sts, ts, priv->nse_ctrl); ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++static int bcm_ptp_settime_locked(struct bcm_ptp_private *priv, ++ const struct timespec64 *ts) ++{ ++ struct phy_device *phydev = priv->phydev; ++ u16 ctrl; ++ u64 ns; ++ ++ ctrl = bcm_ptp_framesync_disable(phydev, priv->nse_ctrl); ++ ++ /* set up time code */ ++ bcm_phy_write_exp(phydev, TIME_CODE_0, ts->tv_nsec); ++ bcm_phy_write_exp(phydev, TIME_CODE_1, ts->tv_nsec >> 16); ++ bcm_phy_write_exp(phydev, TIME_CODE_2, ts->tv_sec); ++ bcm_phy_write_exp(phydev, TIME_CODE_3, ts->tv_sec >> 16); ++ bcm_phy_write_exp(phydev, TIME_CODE_4, ts->tv_sec >> 32); ++ ++ /* set NCO counter to match */ ++ ns = timespec64_to_ns(ts); ++ bcm_phy_write_exp(phydev, NCO_TIME_0, ns >> 4); ++ bcm_phy_write_exp(phydev, NCO_TIME_1, ns >> 20); ++ bcm_phy_write_exp(phydev, NCO_TIME_2_CTRL, (ns >> 36) & 0xfff); ++ ++ /* set up load on next frame sync (auto-clears due to NSE_INIT) */ ++ bcm_phy_write_exp(phydev, SHADOW_LOAD, TIME_CODE_LOAD | NCO_TIME_LOAD); ++ ++ /* must have NSE_INIT in order to write time code */ ++ bcm_ptp_framesync(phydev, ctrl | NSE_INIT); ++ ++ bcm_ptp_framesync_restore(phydev, priv->nse_ctrl); ++ ++ return 0; ++} ++ ++static int bcm_ptp_settime(struct ptp_clock_info *info, ++ const struct timespec64 *ts) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err; ++ ++ mutex_lock(&priv->mutex); ++ err = bcm_ptp_settime_locked(priv, ts); ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++static int bcm_ptp_adjtime_locked(struct bcm_ptp_private *priv, ++ s64 delta_ns) ++{ ++ struct timespec64 ts; ++ int err; ++ s64 ns; ++ ++ err = bcm_ptp_framesync_ts(priv->phydev, NULL, &ts, priv->nse_ctrl); ++ if (!err) { ++ ns = timespec64_to_ns(&ts) + delta_ns; ++ ts = ns_to_timespec64(ns); ++ err = bcm_ptp_settime_locked(priv, &ts); ++ } ++ return err; ++} ++ ++static int bcm_ptp_adjtime(struct ptp_clock_info *info, s64 delta_ns) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err; ++ ++ mutex_lock(&priv->mutex); ++ err = bcm_ptp_adjtime_locked(priv, delta_ns); ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++/* A 125Mhz clock should adjust 8ns per pulse. ++ * The frequency adjustment base is 0x8000 0000, or 8*2^28. ++ * ++ * Frequency adjustment is ++ * adj = scaled_ppm * 8*2^28 / (10^6 * 2^16) ++ * which simplifies to: ++ * adj = scaled_ppm * 2^9 / 5^6 ++ */ ++static int bcm_ptp_adjfine(struct ptp_clock_info *info, long scaled_ppm) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int neg_adj = 0; ++ u32 diff, freq; ++ u16 ctrl; ++ u64 adj; ++ ++ if (scaled_ppm < 0) { ++ neg_adj = 1; ++ scaled_ppm = -scaled_ppm; ++ } ++ ++ adj = scaled_ppm << 9; ++ diff = div_u64(adj, 15625); ++ freq = (8 << 28) + (neg_adj ? -diff : diff); ++ ++ mutex_lock(&priv->mutex); ++ ++ ctrl = bcm_ptp_framesync_disable(priv->phydev, priv->nse_ctrl); ++ ++ bcm_phy_write_exp(priv->phydev, NCO_FREQ_LSB, freq); ++ bcm_phy_write_exp(priv->phydev, NCO_FREQ_MSB, freq >> 16); ++ ++ bcm_phy_write_exp(priv->phydev, NCO_TIME_2_CTRL, FREQ_MDIO_SEL); ++ ++ /* load on next framesync */ ++ bcm_phy_write_exp(priv->phydev, SHADOW_LOAD, FREQ_LOAD); ++ ++ bcm_ptp_framesync(priv->phydev, ctrl); ++ ++ /* clear load */ ++ bcm_phy_write_exp(priv->phydev, SHADOW_LOAD, 0); ++ ++ bcm_ptp_framesync_restore(priv->phydev, priv->nse_ctrl); ++ ++ mutex_unlock(&priv->mutex); ++ ++ return 0; ++} ++ ++static bool bcm_ptp_rxtstamp(struct mii_timestamper *mii_ts, ++ struct sk_buff *skb, int type) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ struct skb_shared_hwtstamps *hwts; ++ struct ptp_header *header; ++ u32 sec, nsec; ++ u8 *data; ++ int off; ++ ++ if (!priv->hwts_rx) ++ return false; ++ ++ header = ptp_parse_header(skb, type); ++ if (!header) ++ return false; ++ ++ data = (u8 *)(header + 1); ++ sec = get_unaligned_be32(data); ++ nsec = get_unaligned_be32(data + 4); ++ ++ hwts = skb_hwtstamps(skb); ++ hwts->hwtstamp = ktime_set(sec, nsec); ++ ++ off = data - skb->data + 8; ++ if (off < skb->len) { ++ memmove(data, data + 8, skb->len - off); ++ __pskb_trim(skb, skb->len - 8); ++ } ++ ++ return false; ++} ++ ++static bool bcm_ptp_get_tstamp(struct bcm_ptp_private *priv, ++ struct bcm_ptp_capture *capts) ++{ ++ struct phy_device *phydev = priv->phydev; ++ u16 ts[4], reg; ++ u32 sec, nsec; ++ ++ mutex_lock(&priv->mutex); ++ ++ reg = bcm_phy_read_exp(phydev, INTR_STATUS); ++ if ((reg & INTC_SOP) == 0) { ++ mutex_unlock(&priv->mutex); ++ return false; ++ } ++ ++ bcm_phy_write_exp(phydev, TS_READ_CTRL, TS_READ_START); ++ ++ ts[0] = bcm_phy_read_exp(phydev, TS_REG_0); ++ ts[1] = bcm_phy_read_exp(phydev, TS_REG_1); ++ ts[2] = bcm_phy_read_exp(phydev, TS_REG_2); ++ ts[3] = bcm_phy_read_exp(phydev, TS_REG_3); ++ ++ /* not in be32 format for some reason */ ++ capts->seq_id = bcm_phy_read_exp(priv->phydev, TS_INFO_0); ++ ++ reg = bcm_phy_read_exp(phydev, TS_INFO_1); ++ capts->msgtype = reg >> 12; ++ capts->tx_dir = !!(reg & BIT(11)); ++ ++ bcm_phy_write_exp(phydev, TS_READ_CTRL, TS_READ_END); ++ bcm_phy_write_exp(phydev, TS_READ_CTRL, 0); ++ ++ mutex_unlock(&priv->mutex); ++ ++ sec = (ts[3] << 16) | ts[2]; ++ nsec = (ts[1] << 16) | ts[0]; ++ capts->hwtstamp = ktime_set(sec, nsec); ++ ++ return true; ++} ++ ++static void bcm_ptp_match_tstamp(struct bcm_ptp_private *priv, ++ struct bcm_ptp_capture *capts) ++{ ++ struct skb_shared_hwtstamps hwts; ++ struct sk_buff *skb, *ts_skb; ++ unsigned long flags; ++ bool first = false; ++ ++ ts_skb = NULL; ++ spin_lock_irqsave(&priv->tx_queue.lock, flags); ++ skb_queue_walk(&priv->tx_queue, skb) { ++ if (BCM_SKB_CB(skb)->seq_id == capts->seq_id && ++ BCM_SKB_CB(skb)->msgtype == capts->msgtype) { ++ first = skb_queue_is_first(&priv->tx_queue, skb); ++ __skb_unlink(skb, &priv->tx_queue); ++ ts_skb = skb; ++ break; ++ } ++ } ++ spin_unlock_irqrestore(&priv->tx_queue.lock, flags); ++ ++ /* TX captures one-step packets, discard them if needed. */ ++ if (ts_skb) { ++ if (BCM_SKB_CB(ts_skb)->discard) { ++ kfree_skb(ts_skb); ++ } else { ++ memset(&hwts, 0, sizeof(hwts)); ++ hwts.hwtstamp = capts->hwtstamp; ++ skb_complete_tx_timestamp(ts_skb, &hwts); ++ } ++ } ++ ++ /* not first match, try and expire entries */ ++ if (!first) { ++ while ((skb = skb_dequeue(&priv->tx_queue))) { ++ if (!time_after(jiffies, BCM_SKB_CB(skb)->timeout)) { ++ skb_queue_head(&priv->tx_queue, skb); ++ break; ++ } ++ kfree_skb(skb); ++ } ++ } ++} ++ ++static long bcm_ptp_do_aux_work(struct ptp_clock_info *info) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ struct bcm_ptp_capture capts; ++ bool reschedule = false; ++ ++ while (!skb_queue_empty_lockless(&priv->tx_queue)) { ++ if (!bcm_ptp_get_tstamp(priv, &capts)) { ++ reschedule = true; ++ break; ++ } ++ bcm_ptp_match_tstamp(priv, &capts); ++ } ++ ++ return reschedule ? 1 : -1; ++} ++ ++static int bcm_ptp_cancel_func(struct bcm_ptp_private *priv) ++{ ++ if (!priv->pin_active) ++ return 0; ++ ++ priv->pin_active = false; ++ ++ priv->nse_ctrl &= ~(NSE_SYNC_OUT_MASK | NSE_SYNC1_FRAMESYNC | ++ NSE_CAPTURE_EN); ++ bcm_phy_write_exp(priv->phydev, NSE_CTRL, priv->nse_ctrl); ++ ++ cancel_delayed_work_sync(&priv->pin_work); ++ ++ return 0; ++} ++ ++static void bcm_ptp_perout_work(struct work_struct *pin_work) ++{ ++ struct bcm_ptp_private *priv = ++ container_of(pin_work, struct bcm_ptp_private, pin_work.work); ++ struct phy_device *phydev = priv->phydev; ++ struct timespec64 ts; ++ u64 ns, next; ++ u16 ctrl; ++ ++ mutex_lock(&priv->mutex); ++ ++ /* no longer running */ ++ if (!priv->pin_active) { ++ mutex_unlock(&priv->mutex); ++ return; ++ } ++ ++ bcm_ptp_framesync_ts(phydev, NULL, &ts, priv->nse_ctrl); ++ ++ /* this is 1PPS only */ ++ next = NSEC_PER_SEC - ts.tv_nsec; ++ ts.tv_sec += next < NSEC_PER_MSEC ? 2 : 1; ++ ts.tv_nsec = 0; ++ ++ ns = timespec64_to_ns(&ts); ++ ++ /* force 0->1 transition for ONESHOT */ ++ ctrl = bcm_ptp_framesync_disable(phydev, ++ priv->nse_ctrl & ~NSE_ONESHOT_EN); ++ ++ bcm_phy_write_exp(phydev, SYNOUT_TS_0, ns & 0xfff0); ++ bcm_phy_write_exp(phydev, SYNOUT_TS_1, ns >> 16); ++ bcm_phy_write_exp(phydev, SYNOUT_TS_2, ns >> 32); ++ ++ /* load values on next framesync */ ++ bcm_phy_write_exp(phydev, SHADOW_LOAD, SYNC_OUT_LOAD); ++ ++ bcm_ptp_framesync(phydev, ctrl | NSE_ONESHOT_EN | NSE_INIT); ++ ++ priv->nse_ctrl |= NSE_ONESHOT_EN; ++ bcm_ptp_framesync_restore(phydev, priv->nse_ctrl); ++ ++ mutex_unlock(&priv->mutex); ++ ++ next = next + NSEC_PER_MSEC; ++ schedule_delayed_work(&priv->pin_work, nsecs_to_jiffies(next)); ++} ++ ++static int bcm_ptp_perout_locked(struct bcm_ptp_private *priv, ++ struct ptp_perout_request *req, int on) ++{ ++ struct phy_device *phydev = priv->phydev; ++ u64 period, pulse; ++ u16 val; ++ ++ if (!on) ++ return bcm_ptp_cancel_func(priv); ++ ++ /* 1PPS */ ++ if (req->period.sec != 1 || req->period.nsec != 0) ++ return -EINVAL; ++ ++ period = BCM_MAX_PERIOD_8NS; /* write nonzero value */ ++ ++ if (req->flags & PTP_PEROUT_PHASE) ++ return -EOPNOTSUPP; ++ ++ if (req->flags & PTP_PEROUT_DUTY_CYCLE) ++ pulse = ktime_to_ns(ktime_set(req->on.sec, req->on.nsec)); ++ else ++ pulse = (u64)BCM_MAX_PULSE_8NS << 3; ++ ++ /* convert to 8ns units */ ++ pulse >>= 3; ++ ++ if (!pulse || pulse > period || pulse > BCM_MAX_PULSE_8NS) ++ return -EINVAL; ++ ++ bcm_phy_write_exp(phydev, SYNC_OUT_0, period); ++ ++ val = ((pulse & 0x3) << 14) | ((period >> 16) & 0x3fff); ++ bcm_phy_write_exp(phydev, SYNC_OUT_1, val); ++ ++ val = ((pulse >> 2) & 0x7f) | (pulse << 7); ++ bcm_phy_write_exp(phydev, SYNC_OUT_2, val); ++ ++ if (priv->pin_active) ++ cancel_delayed_work_sync(&priv->pin_work); ++ ++ priv->pin_active = true; ++ INIT_DELAYED_WORK(&priv->pin_work, bcm_ptp_perout_work); ++ schedule_delayed_work(&priv->pin_work, 0); ++ ++ return 0; ++} ++ ++static void bcm_ptp_extts_work(struct work_struct *pin_work) ++{ ++ struct bcm_ptp_private *priv = ++ container_of(pin_work, struct bcm_ptp_private, pin_work.work); ++ struct phy_device *phydev = priv->phydev; ++ struct ptp_clock_event event; ++ struct timespec64 ts; ++ u16 reg; ++ ++ mutex_lock(&priv->mutex); ++ ++ /* no longer running */ ++ if (!priv->pin_active) { ++ mutex_unlock(&priv->mutex); ++ return; ++ } ++ ++ reg = bcm_phy_read_exp(phydev, INTR_STATUS); ++ if ((reg & INTC_FSYNC) == 0) ++ goto out; ++ ++ bcm_ptp_get_framesync_ts(phydev, &ts); ++ ++ event.index = 0; ++ event.type = PTP_CLOCK_EXTTS; ++ event.timestamp = timespec64_to_ns(&ts); ++ ptp_clock_event(priv->ptp_clock, &event); ++ ++out: ++ mutex_unlock(&priv->mutex); ++ schedule_delayed_work(&priv->pin_work, HZ / 4); ++} ++ ++static int bcm_ptp_extts_locked(struct bcm_ptp_private *priv, int on) ++{ ++ struct phy_device *phydev = priv->phydev; ++ ++ if (!on) ++ return bcm_ptp_cancel_func(priv); ++ ++ if (priv->pin_active) ++ cancel_delayed_work_sync(&priv->pin_work); ++ ++ bcm_ptp_framesync_disable(phydev, priv->nse_ctrl); ++ ++ priv->nse_ctrl |= NSE_SYNC1_FRAMESYNC | NSE_CAPTURE_EN; ++ ++ bcm_ptp_framesync_restore(phydev, priv->nse_ctrl); ++ ++ priv->pin_active = true; ++ INIT_DELAYED_WORK(&priv->pin_work, bcm_ptp_extts_work); ++ schedule_delayed_work(&priv->pin_work, 0); ++ ++ return 0; ++} ++ ++static int bcm_ptp_enable(struct ptp_clock_info *info, ++ struct ptp_clock_request *rq, int on) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err = -EBUSY; ++ ++ mutex_lock(&priv->mutex); ++ ++ switch (rq->type) { ++ case PTP_CLK_REQ_PEROUT: ++ if (priv->pin.func == PTP_PF_PEROUT) ++ err = bcm_ptp_perout_locked(priv, &rq->perout, on); ++ break; ++ case PTP_CLK_REQ_EXTTS: ++ if (priv->pin.func == PTP_PF_EXTTS) ++ err = bcm_ptp_extts_locked(priv, on); ++ break; ++ default: ++ err = -EOPNOTSUPP; ++ break; ++ } ++ ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++static int bcm_ptp_verify(struct ptp_clock_info *info, unsigned int pin, ++ enum ptp_pin_function func, unsigned int chan) ++{ ++ switch (func) { ++ case PTP_PF_NONE: ++ case PTP_PF_EXTTS: ++ case PTP_PF_PEROUT: ++ break; ++ default: ++ return -EOPNOTSUPP; ++ } ++ return 0; ++} ++ ++static const struct ptp_clock_info bcm_ptp_clock_info = { ++ .owner = THIS_MODULE, ++ .name = KBUILD_MODNAME, ++ .max_adj = 100000000, ++ .gettimex64 = bcm_ptp_gettimex, ++ .settime64 = bcm_ptp_settime, ++ .adjtime = bcm_ptp_adjtime, ++ .adjfine = bcm_ptp_adjfine, ++ .enable = bcm_ptp_enable, ++ .verify = bcm_ptp_verify, ++ .do_aux_work = bcm_ptp_do_aux_work, ++ .n_pins = 1, ++ .n_per_out = 1, ++ .n_ext_ts = 1, ++}; ++ ++static void bcm_ptp_txtstamp(struct mii_timestamper *mii_ts, ++ struct sk_buff *skb, int type) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ struct ptp_header *hdr; ++ bool discard = false; ++ int msgtype; ++ ++ hdr = ptp_parse_header(skb, type); ++ if (!hdr) ++ goto out; ++ msgtype = ptp_get_msgtype(hdr, type); ++ ++ switch (priv->tx_type) { ++ case HWTSTAMP_TX_ONESTEP_P2P: ++ if (msgtype == PTP_MSGTYPE_PDELAY_RESP) ++ discard = true; ++ fallthrough; ++ case HWTSTAMP_TX_ONESTEP_SYNC: ++ if (msgtype == PTP_MSGTYPE_SYNC) ++ discard = true; ++ fallthrough; ++ case HWTSTAMP_TX_ON: ++ BCM_SKB_CB(skb)->timeout = jiffies + SKB_TS_TIMEOUT; ++ BCM_SKB_CB(skb)->seq_id = be16_to_cpu(hdr->sequence_id); ++ BCM_SKB_CB(skb)->msgtype = msgtype; ++ BCM_SKB_CB(skb)->discard = discard; ++ skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; ++ skb_queue_tail(&priv->tx_queue, skb); ++ ptp_schedule_worker(priv->ptp_clock, 0); ++ return; ++ default: ++ break; ++ } ++ ++out: ++ kfree_skb(skb); ++} ++ ++static int bcm_ptp_hwtstamp(struct mii_timestamper *mii_ts, ++ struct ifreq *ifr) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ struct hwtstamp_config cfg; ++ u16 mode, ctrl; ++ ++ if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg))) ++ return -EFAULT; ++ ++ switch (cfg.rx_filter) { ++ case HWTSTAMP_FILTER_NONE: ++ priv->hwts_rx = false; ++ break; ++ case HWTSTAMP_FILTER_PTP_V2_L4_EVENT: ++ case HWTSTAMP_FILTER_PTP_V2_L4_SYNC: ++ case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ: ++ case HWTSTAMP_FILTER_PTP_V2_L2_EVENT: ++ case HWTSTAMP_FILTER_PTP_V2_L2_SYNC: ++ case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ: ++ case HWTSTAMP_FILTER_PTP_V2_EVENT: ++ case HWTSTAMP_FILTER_PTP_V2_SYNC: ++ case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ: ++ cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT; ++ priv->hwts_rx = true; ++ break; ++ default: ++ return -ERANGE; ++ } ++ ++ priv->tx_type = cfg.tx_type; ++ ++ ctrl = priv->hwts_rx ? SLICE_RX_EN : 0; ++ ctrl |= priv->tx_type != HWTSTAMP_TX_OFF ? SLICE_TX_EN : 0; ++ ++ mode = TX_MODE_SEL(PORT, SYNC, REPLACE_TS) | ++ TX_MODE_SEL(PORT, DELAY_REQ, REPLACE_TS) | ++ TX_MODE_SEL(PORT, PDELAY_REQ, REPLACE_TS) | ++ TX_MODE_SEL(PORT, PDELAY_RESP, REPLACE_TS); ++ ++ bcm_phy_write_exp(priv->phydev, TX_EVENT_MODE, mode); ++ ++ mode = RX_MODE_SEL(PORT, SYNC, INSERT_TS_64) | ++ RX_MODE_SEL(PORT, DELAY_REQ, INSERT_TS_64) | ++ RX_MODE_SEL(PORT, PDELAY_REQ, INSERT_TS_64) | ++ RX_MODE_SEL(PORT, PDELAY_RESP, INSERT_TS_64); ++ ++ bcm_phy_write_exp(priv->phydev, RX_EVENT_MODE, mode); ++ ++ bcm_phy_write_exp(priv->phydev, SLICE_CTRL, ctrl); ++ ++ if (ctrl & SLICE_TX_EN) ++ bcm_phy_write_exp(priv->phydev, TX_TS_CAPTURE, TX_TS_CAP_EN); ++ else ++ ptp_cancel_worker_sync(priv->ptp_clock); ++ ++ /* purge existing data */ ++ skb_queue_purge(&priv->tx_queue); ++ ++ return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0; ++} ++ ++static int bcm_ptp_ts_info(struct mii_timestamper *mii_ts, ++ struct ethtool_ts_info *ts_info) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ ++ ts_info->phc_index = ptp_clock_index(priv->ptp_clock); ++ ts_info->so_timestamping = ++ SOF_TIMESTAMPING_TX_HARDWARE | ++ SOF_TIMESTAMPING_RX_HARDWARE | ++ SOF_TIMESTAMPING_RAW_HARDWARE; ++ ts_info->tx_types = ++ BIT(HWTSTAMP_TX_ON) | ++ BIT(HWTSTAMP_TX_OFF) | ++ BIT(HWTSTAMP_TX_ONESTEP_SYNC) | ++ BIT(HWTSTAMP_TX_ONESTEP_P2P); ++ ts_info->rx_filters = ++ BIT(HWTSTAMP_FILTER_NONE) | ++ BIT(HWTSTAMP_FILTER_PTP_V2_EVENT); ++ ++ return 0; ++} ++ ++void bcm_ptp_stop(struct bcm_ptp_private *priv) ++{ ++ ptp_cancel_worker_sync(priv->ptp_clock); ++ bcm_ptp_cancel_func(priv); ++} ++EXPORT_SYMBOL_GPL(bcm_ptp_stop); ++ ++void bcm_ptp_config_init(struct phy_device *phydev) ++{ ++ /* init network sync engine */ ++ bcm_phy_write_exp(phydev, NSE_CTRL, NSE_GMODE_EN | NSE_INIT); ++ ++ /* enable time sync (TX/RX SOP capture) */ ++ bcm_phy_write_exp(phydev, TIME_SYNC, TIME_SYNC_EN); ++ ++ /* use sec.nsec heartbeat capture */ ++ bcm_phy_write_exp(phydev, DPLL_SELECT, DPLL_HB_MODE2); ++ ++ /* use 64 bit timecode for TX */ ++ bcm_phy_write_exp(phydev, TIMECODE_CTRL, TX_TIMECODE_SEL); ++ ++ /* always allow FREQ_LOAD on framesync */ ++ bcm_phy_write_exp(phydev, SHADOW_CTRL, FREQ_LOAD); ++ ++ bcm_phy_write_exp(phydev, SYNC_IN_DIVIDER, 1); ++} ++EXPORT_SYMBOL_GPL(bcm_ptp_config_init); ++ ++static void bcm_ptp_init(struct bcm_ptp_private *priv) ++{ ++ priv->nse_ctrl = NSE_GMODE_EN; ++ ++ mutex_init(&priv->mutex); ++ skb_queue_head_init(&priv->tx_queue); ++ ++ priv->mii_ts.rxtstamp = bcm_ptp_rxtstamp; ++ priv->mii_ts.txtstamp = bcm_ptp_txtstamp; ++ priv->mii_ts.hwtstamp = bcm_ptp_hwtstamp; ++ priv->mii_ts.ts_info = bcm_ptp_ts_info; ++ ++ priv->phydev->mii_ts = &priv->mii_ts; ++} ++ ++struct bcm_ptp_private *bcm_ptp_probe(struct phy_device *phydev) ++{ ++ struct bcm_ptp_private *priv; ++ struct ptp_clock *clock; ++ ++ switch (BRCM_PHY_MODEL(phydev)) { ++ case PHY_ID_BCM54210E: ++ break; ++ default: ++ return NULL; ++ } ++ ++ priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL); ++ if (!priv) ++ return ERR_PTR(-ENOMEM); ++ ++ priv->ptp_info = bcm_ptp_clock_info; ++ ++ snprintf(priv->pin.name, sizeof(priv->pin.name), "SYNC_OUT"); ++ priv->ptp_info.pin_config = &priv->pin; ++ ++ clock = ptp_clock_register(&priv->ptp_info, &phydev->mdio.dev); ++ if (IS_ERR(clock)) ++ return ERR_CAST(clock); ++ priv->ptp_clock = clock; ++ ++ priv->phydev = phydev; ++ bcm_ptp_init(priv); ++ ++ return priv; ++} ++EXPORT_SYMBOL_GPL(bcm_ptp_probe); ++ ++MODULE_LICENSE("GPL"); +diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c +index e36809aa6d30..876bc45ede60 100644 +--- a/drivers/net/phy/broadcom.c ++++ b/drivers/net/phy/broadcom.c +@@ -27,6 +27,11 @@ MODULE_DESCRIPTION("Broadcom PHY driver"); + MODULE_AUTHOR("Maciej W. Rozycki"); + MODULE_LICENSE("GPL"); + ++struct bcm54xx_phy_priv { ++ u64 *stats; ++ struct bcm_ptp_private *ptp; ++}; ++ + static int bcm54xx_config_clock_delay(struct phy_device *phydev) + { + int rc, val; +@@ -313,6 +318,22 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) + bcm_phy_write_shadow(phydev, BCM54XX_SHD_APD, val); + } + ++static void bcm54xx_ptp_stop(struct phy_device *phydev) ++{ ++ struct bcm54xx_phy_priv *priv = phydev->priv; ++ ++ if (priv->ptp) ++ bcm_ptp_stop(priv->ptp); ++} ++ ++static void bcm54xx_ptp_config_init(struct phy_device *phydev) ++{ ++ struct bcm54xx_phy_priv *priv = phydev->priv; ++ ++ if (priv->ptp) ++ bcm_ptp_config_init(phydev); ++} ++ + static int bcm54xx_config_init(struct phy_device *phydev) + { + int reg, err, val; +@@ -390,6 +411,8 @@ static int bcm54xx_config_init(struct phy_device *phydev) + bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val); + } + ++ bcm54xx_ptp_config_init(phydev); ++ + return 0; + } + +@@ -418,6 +441,8 @@ static int bcm54xx_suspend(struct phy_device *phydev) + { + int ret; + ++ bcm54xx_ptp_stop(phydev); ++ + /* We cannot use a read/modify/write here otherwise the PHY gets into + * a bad state where its LEDs keep flashing, thus defeating the purpose + * of low power mode. +@@ -741,10 +766,6 @@ static irqreturn_t brcm_fet_handle_interrupt(struct phy_device *phydev) + return IRQ_HANDLED; + } + +-struct bcm54xx_phy_priv { +- u64 *stats; +-}; +- + static int bcm54xx_phy_probe(struct phy_device *phydev) + { + struct bcm54xx_phy_priv *priv; +@@ -761,6 +782,10 @@ static int bcm54xx_phy_probe(struct phy_device *phydev) + if (!priv->stats) + return -ENOMEM; + ++ priv->ptp = bcm_ptp_probe(phydev); ++ if (IS_ERR(priv->ptp)) ++ return PTR_ERR(priv->ptp); ++ + return 0; + } + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 2e68f50bc7ae..00e1d5bc83a5 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -4285,6 +4285,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, + quirk_bridge_cavm_thrx2_pcie_root); + ++/* ++ * PCI BAR 5 is not setup correctly for the on-board AHCI controller ++ * on Broadcom's Vulcan processor. Added a quirk to fix BAR 5 by ++ * using BAR 4's resources which are populated correctly and NOT ++ * actually used by the AHCI controller. ++ */ ++static void quirk_fix_vulcan_ahci_bars(struct pci_dev *dev) ++{ ++ struct resource *r = &dev->resource[4]; ++ ++ if (!(r->flags & IORESOURCE_MEM) || (r->start == 0)) ++ return; ++ ++ /* Set BAR5 resource to BAR4 */ ++ dev->resource[5] = *r; ++ ++ /* Update BAR5 in pci config space */ ++ pci_write_config_dword(dev, PCI_BASE_ADDRESS_5, r->start); ++ ++ /* Clear BAR4's resource */ ++ memset(r, 0, sizeof(*r)); ++} ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9027, quirk_fix_vulcan_ahci_bars); ++ + /* + * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) + * class code. Fix it. +diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c +index 1e0041ec8132..5bcd047768b6 100644 +--- a/drivers/soc/bcm/bcm2835-power.c ++++ b/drivers/soc/bcm/bcm2835-power.c +@@ -126,8 +126,7 @@ + + #define ASB_AXI_BRDG_ID 0x20 + +-#define ASB_READ(reg) readl(power->asb + (reg)) +-#define ASB_WRITE(reg, val) writel(PM_PASSWORD | (val), power->asb + (reg)) ++#define BCM2835_BRDG_ID 0x62726467 + + struct bcm2835_power_domain { + struct generic_pm_domain base; +@@ -142,24 +141,41 @@ struct bcm2835_power { + void __iomem *base; + /* AXI Async bridge registers. */ + void __iomem *asb; ++ /* RPiVid bridge registers. */ ++ void __iomem *rpivid_asb; + + struct genpd_onecell_data pd_xlate; + struct bcm2835_power_domain domains[BCM2835_POWER_DOMAIN_COUNT]; + struct reset_controller_dev reset; + }; + +-static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) ++static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable) + { ++ void __iomem *base = power->asb; + u64 start; ++ u32 val; + +- if (!reg) ++ switch (reg) { ++ case 0: + return 0; ++ case ASB_V3D_S_CTRL: ++ case ASB_V3D_M_CTRL: ++ if (power->rpivid_asb) ++ base = power->rpivid_asb; ++ break; ++ } + + start = ktime_get_ns(); + + /* Enable the module's async AXI bridges. */ +- ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); +- while (ASB_READ(reg) & ASB_ACK) { ++ if (enable) { ++ val = readl(base + reg) & ~ASB_REQ_STOP; ++ } else { ++ val = readl(base + reg) | ASB_REQ_STOP; ++ } ++ writel(PM_PASSWORD | val, base + reg); ++ ++ while (readl(base + reg) & ASB_ACK) { + cpu_relax(); + if (ktime_get_ns() - start >= 1000) + return -ETIMEDOUT; +@@ -168,30 +184,24 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) + return 0; + } + +-static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) ++static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) + { +- u64 start; +- +- if (!reg) +- return 0; +- +- start = ktime_get_ns(); +- +- /* Enable the module's async AXI bridges. */ +- ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); +- while (!(ASB_READ(reg) & ASB_ACK)) { +- cpu_relax(); +- if (ktime_get_ns() - start >= 1000) +- return -ETIMEDOUT; +- } ++ return bcm2835_asb_control(power, reg, true); ++} + +- return 0; ++static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) ++{ ++ return bcm2835_asb_control(power, reg, false); + } + + static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg) + { + struct bcm2835_power *power = pd->power; + ++ /* We don't run this on BCM2711 */ ++ if (power->rpivid_asb) ++ return 0; ++ + /* Enable functional isolation */ + PM_WRITE(pm_reg, PM_READ(pm_reg) & ~PM_ISFUNC); + +@@ -213,6 +223,10 @@ static int bcm2835_power_power_on(struct bcm2835_power_domain *pd, u32 pm_reg) + int inrush; + bool powok; + ++ /* We don't run this on BCM2711 */ ++ if (power->rpivid_asb) ++ return 0; ++ + /* If it was already powered on by the fw, leave it that way. */ + if (PM_READ(pm_reg) & PM_POWUP) + return 0; +@@ -626,13 +640,23 @@ static int bcm2835_power_probe(struct platform_device *pdev) + power->dev = dev; + power->base = pm->base; + power->asb = pm->asb; ++ power->rpivid_asb = pm->rpivid_asb; + +- id = ASB_READ(ASB_AXI_BRDG_ID); +- if (id != 0x62726467 /* "BRDG" */) { ++ id = readl(power->asb + ASB_AXI_BRDG_ID); ++ if (id != BCM2835_BRDG_ID /* "BRDG" */) { + dev_err(dev, "ASB register ID returned 0x%08x\n", id); + return -ENODEV; + } + ++ if (power->rpivid_asb) { ++ id = readl(power->rpivid_asb + ASB_AXI_BRDG_ID); ++ if (id != BCM2835_BRDG_ID /* "BRDG" */) { ++ dev_err(dev, "RPiVid ASB register ID returned 0x%08x\n", ++ id); ++ return -ENODEV; ++ } ++ } ++ + power->pd_xlate.domains = devm_kcalloc(dev, + ARRAY_SIZE(power_domain_names), + sizeof(*power->pd_xlate.domains), +diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c +index 68e9121c1878..ccd7566adb4b 100644 +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -5686,6 +5686,13 @@ static void hub_event(struct work_struct *work) + (u16) hub->change_bits[0], + (u16) hub->event_bits[0]); + ++ /* Don't disconnect USB-SATA on TrimSlice */ ++ if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) { ++ if ((hdev->state == 7) && (hub->change_bits[0] == 0) && ++ (hub->event_bits[0] == 0x2)) ++ hub->event_bits[0] = 0; ++ } ++ + /* Lock the device, then check to see if we were + * disconnected while waiting for the lock to succeed. */ + usb_lock_device(hdev); +diff --git a/include/linux/efi.h b/include/linux/efi.h +index 7d9b0bb47eb3..221776a5377a 100644 +--- a/include/linux/efi.h ++++ b/include/linux/efi.h +@@ -43,6 +43,8 @@ + #define EFI_ABORTED (21 | (1UL << (BITS_PER_LONG-1))) + #define EFI_SECURITY_VIOLATION (26 | (1UL << (BITS_PER_LONG-1))) + ++#define EFI_IS_ERROR(x) ((x) & (1UL << (BITS_PER_LONG-1))) ++ + typedef unsigned long efi_status_t; + typedef u8 efi_bool_t; + typedef u16 efi_char16_t; /* UNICODE character */ +@@ -849,6 +851,14 @@ extern int __init efi_setup_pcdp_console(char *); + #define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ + #define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */ + #define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */ ++#define EFI_SECURE_BOOT 13 /* Are we in Secure Boot mode? */ ++ ++enum efi_secureboot_mode { ++ efi_secureboot_mode_unset, ++ efi_secureboot_mode_unknown, ++ efi_secureboot_mode_disabled, ++ efi_secureboot_mode_enabled, ++}; + + #ifdef CONFIG_EFI + /* +@@ -860,6 +870,8 @@ static inline bool efi_enabled(int feature) + } + extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); + ++extern void __init efi_set_secure_boot(enum efi_secureboot_mode mode); ++ + bool __pure __efi_soft_reserve_enabled(void); + + static inline bool __pure efi_soft_reserve_enabled(void) +@@ -880,6 +892,8 @@ static inline bool efi_enabled(int feature) + static inline void + efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {} + ++static inline void efi_set_secure_boot(enum efi_secureboot_mode mode) {} ++ + static inline bool efi_soft_reserve_enabled(void) + { + return false; +@@ -892,6 +906,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) + #endif + + extern int efi_status_to_err(efi_status_t status); ++extern const char *efi_status_to_str(efi_status_t status); + + /* + * Variable Attributes +@@ -1144,13 +1159,6 @@ static inline bool efi_runtime_disabled(void) { return true; } + extern void efi_call_virt_check_flags(unsigned long flags, const char *call); + extern unsigned long efi_call_virt_save_flags(void); + +-enum efi_secureboot_mode { +- efi_secureboot_mode_unset, +- efi_secureboot_mode_unknown, +- efi_secureboot_mode_disabled, +- efi_secureboot_mode_enabled, +-}; +- + static inline + enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) + { +diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h +index eafa1d2489fd..8a7165ea78d5 100644 +--- a/include/linux/lsm_hook_defs.h ++++ b/include/linux/lsm_hook_defs.h +@@ -394,6 +394,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) + #endif /* CONFIG_BPF_SYSCALL */ + + LSM_HOOK(int, 0, locked_down, enum lockdown_reason what) ++LSM_HOOK(int, 0, lock_kernel_down, const char *where, enum lockdown_reason level) ++ + + #ifdef CONFIG_PERF_EVENTS + LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) +diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h +index 91c8146649f5..42a73934404e 100644 +--- a/include/linux/lsm_hooks.h ++++ b/include/linux/lsm_hooks.h +@@ -1550,6 +1550,12 @@ + * + * @what: kernel feature being accessed + * ++ * @lock_kernel_down ++ * Put the kernel into lock-down mode. ++ * ++ * @where: Where the lock-down is originating from (e.g. command line option) ++ * @level: The lock-down level (can only increase) ++ * + * Security hooks for perf events + * + * @perf_event_open: +diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h +index ed37dc40e82a..f70a810c55f7 100644 +--- a/include/linux/mfd/bcm2835-pm.h ++++ b/include/linux/mfd/bcm2835-pm.h +@@ -9,6 +9,7 @@ struct bcm2835_pm { + struct device *dev; + void __iomem *base; + void __iomem *asb; ++ void __iomem *rpivid_asb; + }; + + #endif /* BCM2835_MFD_PM_H */ +diff --git a/include/linux/rmi.h b/include/linux/rmi.h +index ab7eea01ab42..fff7c5f737fc 100644 +--- a/include/linux/rmi.h ++++ b/include/linux/rmi.h +@@ -364,6 +364,7 @@ struct rmi_driver_data { + + struct rmi4_attn_data attn_data; + DECLARE_KFIFO(attn_fifo, struct rmi4_attn_data, 16); ++ struct work_struct attn_work; + }; + + int rmi_register_transport_device(struct rmi_transport_dev *xport); +diff --git a/include/linux/security.h b/include/linux/security.h +index 7fc4e9f49f54..6f0b0b2dc73d 100644 +--- a/include/linux/security.h ++++ b/include/linux/security.h +@@ -473,6 +473,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); + int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); + int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); + int security_locked_down(enum lockdown_reason what); ++int security_lock_kernel_down(const char *where, enum lockdown_reason level); + #else /* CONFIG_SECURITY */ + + static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) +@@ -1349,6 +1350,10 @@ static inline int security_locked_down(enum lockdown_reason what) + { + return 0; + } ++static inline int security_lock_kernel_down(const char *where, enum lockdown_reason level) ++{ ++ return 0; ++} + #endif /* CONFIG_SECURITY */ + + #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) +diff --git a/init/Kconfig b/init/Kconfig +index c7900e8975f1..ea721c12c251 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -1678,7 +1678,7 @@ config AIO + this option saves about 7k. + + config IO_URING +- bool "Enable IO uring support" if EXPERT ++ bool "Enable IO uring support" + select IO_WQ + default y + help +diff --git a/kernel/module/signing.c b/kernel/module/signing.c +index a2ff4242e623..f0d2be1ee4f1 100644 +--- a/kernel/module/signing.c ++++ b/kernel/module/signing.c +@@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info) + modlen -= sig_len + sizeof(ms); + info->len = modlen; + +- return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, ++ ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, + VERIFY_USE_SECONDARY_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); ++ if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) { ++ ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, ++ VERIFY_USE_PLATFORM_KEYRING, ++ VERIFYING_MODULE_SIGNATURE, ++ NULL, NULL); ++ } ++ return ret; + } + + int module_sig_check(struct load_info *info, int flags) +diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c +index 7cb956d3abb2..12df96177187 100644 +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -3997,6 +3997,26 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data, + break; + } + } ++ if (i == ARRAY_SIZE(hci_cc_table)) { ++ /* Unknown opcode, assume byte 0 contains the status, so ++ * that e.g. __hci_cmd_sync() properly returns errors ++ * for vendor specific commands send by HCI drivers. ++ * ++ * Note that the specification does not specify that ++ * byte 0 is the status: ++ * ++ * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E ++ * page 2189: ++ * ++ * Return_Parameters: ++ * Size: Depends on command ++ * ++ * For now using byte 0 seems to work fine, but in the future ++ * this may need to be updated so that drivers using vendor ++ * commands can specify their own completion handler. ++ */ ++ *status = skb->data[0]; ++ } + + handle_cmd_cnt_and_timer(hdev, ev->ncmd); + +diff --git a/scripts/tags.sh b/scripts/tags.sh +index 01fab3d4f90b..2ae5dfc904f9 100755 +--- a/scripts/tags.sh ++++ b/scripts/tags.sh +@@ -16,6 +16,8 @@ fi + ignore="$(echo "$RCS_FIND_IGNORE" | sed 's|\\||g' )" + # tags and cscope files should also ignore MODVERSION *.mod.c files + ignore="$ignore ( -name *.mod.c ) -prune -o" ++# RHEL tags and cscope should also ignore redhat/rpm ++ignore="$ignore ( -path redhat/rpm ) -prune -o" + + # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope} + # to force full paths for a non-O= build +diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c +index 093894a640dc..1c43a9462b4b 100644 +--- a/security/integrity/platform_certs/load_uefi.c ++++ b/security/integrity/platform_certs/load_uefi.c +@@ -73,7 +73,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, + return NULL; + + if (*status != EFI_BUFFER_TOO_SMALL) { +- pr_err("Couldn't get size: 0x%lx\n", *status); ++ pr_err("Couldn't get size: %s (0x%lx)\n", ++ efi_status_to_str(*status), *status); + return NULL; + } + +@@ -84,7 +85,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, + *status = efi.get_variable(name, guid, NULL, &lsize, db); + if (*status != EFI_SUCCESS) { + kfree(db); +- pr_err("Error reading db var: 0x%lx\n", *status); ++ pr_err("Error reading db var: %s (0x%lx)\n", ++ efi_status_to_str(*status), *status); + return NULL; + } + +diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig +index e84ddf484010..d0501353a4b9 100644 +--- a/security/lockdown/Kconfig ++++ b/security/lockdown/Kconfig +@@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY + subsystem is fully initialised. If enabled, lockdown will + unconditionally be called before any other LSMs. + ++config LOCK_DOWN_IN_EFI_SECURE_BOOT ++ bool "Lock down the kernel in EFI Secure Boot mode" ++ default n ++ depends on EFI && SECURITY_LOCKDOWN_LSM_EARLY ++ help ++ UEFI Secure Boot provides a mechanism for ensuring that the firmware ++ will only load signed bootloaders and kernels. Secure boot mode may ++ be determined from EFI variables provided by the system firmware if ++ not indicated by the boot parameters. ++ ++ Enabling this option results in kernel lockdown being triggered if ++ EFI Secure Boot is set. ++ + choice + prompt "Kernel default lockdown mode" + default LOCK_DOWN_KERNEL_FORCE_NONE +diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c +index 87cbdc64d272..18555cf18da7 100644 +--- a/security/lockdown/lockdown.c ++++ b/security/lockdown/lockdown.c +@@ -73,6 +73,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what) + + static struct security_hook_list lockdown_hooks[] __lsm_ro_after_init = { + LSM_HOOK_INIT(locked_down, lockdown_is_locked_down), ++ LSM_HOOK_INIT(lock_kernel_down, lock_kernel_down), + }; + + static int __init lockdown_lsm_init(void) +diff --git a/security/security.c b/security/security.c +index 188b8f782220..dab400de2335 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -2617,6 +2617,12 @@ int security_locked_down(enum lockdown_reason what) + } + EXPORT_SYMBOL(security_locked_down); + ++int security_lock_kernel_down(const char *where, enum lockdown_reason level) ++{ ++ return call_int_hook(lock_kernel_down, 0, where, level); ++} ++EXPORT_SYMBOL(security_lock_kernel_down); ++ + #ifdef CONFIG_PERF_EVENTS + int security_perf_event_open(struct perf_event_attr *attr, int type) + { |